From d1bbb39eb8d38ba16cf33ac823fe0bc496b7cd27 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Fri, 9 Aug 2024 16:53:29 +0530 Subject: [PATCH 1/2] fix: empty folder title --- .../sidebar/favorites/new-fav-folder.tsx | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx index 7f0a47d88ca..f326804a329 100644 --- a/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx +++ b/web/core/components/workspace/sidebar/favorites/new-fav-folder.tsx @@ -45,10 +45,18 @@ export const NewFavoriteFolder = observer((props: TProps) => { formData = { entity_type: "folder", is_folder: true, - name: formData.name, + name: formData.name.trim(), parent: null, project_id: null, }; + + if (formData.name === "") + return setToast({ + type: TOAST_TYPE.ERROR, + title: "Error!", + message: "Folder name cannot be empty", + }); + addFavorite(workspaceSlug.toString(), formData) .then(() => { setToast({ @@ -77,15 +85,31 @@ export const NewFavoriteFolder = observer((props: TProps) => { message: "Folder already exists", }); const payload = { - name: formData.name, + name: formData.name.trim(), }; - updateFavorite(workspaceSlug.toString(), favoriteId, payload).then(() => { - setToast({ - type: TOAST_TYPE.SUCCESS, - title: "Success!", - message: "Favorite updated successfully.", + + if (formData.name.trim() === "") + return setToast({ + type: TOAST_TYPE.ERROR, + title: "Error!", + message: "Folder name cannot be empty", + }); + + updateFavorite(workspaceSlug.toString(), favoriteId, payload) + .then(() => { + setToast({ + type: TOAST_TYPE.SUCCESS, + title: "Success!", + message: "Favorite updated successfully.", + }); + }) + .catch(() => { + setToast({ + type: TOAST_TYPE.ERROR, + title: "Error!", + message: "Something went wrong!", + }); }); - }); setCreateNewFolder(false); setValue("name", ""); }; From c1721ba55b75d631fdf8ad3bbccac5318a8ecff9 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Fri, 9 Aug 2024 17:32:09 +0530 Subject: [PATCH 2/2] fix: collapsible overflow issue --- packages/ui/src/collapsible/collapsible.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ui/src/collapsible/collapsible.tsx b/packages/ui/src/collapsible/collapsible.tsx index a069be3ed57..a0233086140 100644 --- a/packages/ui/src/collapsible/collapsible.tsx +++ b/packages/ui/src/collapsible/collapsible.tsx @@ -38,7 +38,6 @@ export const Collapsible: FC = (props) => {