Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/apps/code-editor/src/app/components/SideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ export const SideBar: FC<SideBarProps> = ({
const NoResults = ({ keyword }: { keyword: string }) => (
<Stack gap={1.5} alignItems="center" justifyContent="center" p={1.5}>
<img
src="/noSearchResults.svg"
src="/images/noSearchResults.svg"
alt="No search results"
width="70"
height="64"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -647,10 +647,14 @@ export const FieldForm = ({
fieldStateOnSaveAction === "deactivate" &&
!fieldData?.deletedAt
) {
deleteContentModelField({
modelZUID: id,
fieldZUID: fieldData?.ZUID,
});
// added a delay to temporarily fix an issue with field not being deleted properly
// likely related to api response caching
setTimeout(() => {
deleteContentModelField({
modelZUID: id,
fieldZUID: fieldData?.ZUID,
});
}, 1000);
}
})
.catch((error) => {
Expand Down
10 changes: 8 additions & 2 deletions src/shell/components/FieldTypeDateTime/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1482,8 +1482,14 @@ export const toISOString = (timeString: string) => {

/** Converts "HH:mm:ss.SSSSSS" to "h:mm a" */
export const to12HrTime = (isoTime: string) => {
const d = parse(isoTime, "HH:mm:ss.SSSSSS", REF_DATE);
return format(d, "h:mm a");
try {
const d = parse(isoTime, "HH:mm:ss.SSSSSS", REF_DATE);
return format(d, "h:mm a");
} catch (error) {
console.error(error);

return "";
}
};

const generateTimeOptions = () => {
Expand Down
Loading