From 421bf2abc7574e9a3a4e7dcccda2a62d8e5bd1d6 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Fri, 9 Aug 2024 19:03:25 +0530 Subject: [PATCH] [WEB-2178] fix: empty folder title (#5344) * fix: empty folder title * fix: collapsible overflow issue --- packages/ui/src/collapsible/collapsible.tsx | 1 - .../sidebar/favorites/new-fav-folder.tsx | 40 +++++++++++++++---- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/packages/ui/src/collapsible/collapsible.tsx b/packages/ui/src/collapsible/collapsible.tsx index a069be3ed..a02330861 100644 --- a/packages/ui/src/collapsible/collapsible.tsx +++ b/packages/ui/src/collapsible/collapsible.tsx @@ -38,7 +38,6 @@ export const Collapsible: FC = (props) => { { 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", ""); };