diff --git a/frontend/src/hooks/api/tags/queries.tsx b/frontend/src/hooks/api/tags/queries.tsx index 517eb9354..7c230e02a 100644 --- a/frontend/src/hooks/api/tags/queries.tsx +++ b/frontend/src/hooks/api/tags/queries.tsx @@ -38,7 +38,7 @@ export const useCreateWsTag = () => { mutationFn: async ({ workspaceID, tagName, tagColor, tagSlug }) => { const { data } = await apiRequest.post(`/api/v2/workspace/${workspaceID}/tags`, { name: tagName, - tagColor: tagColor || null, + tagColor: tagColor || "", slug: tagSlug }) return data; diff --git a/frontend/src/hooks/api/tags/types.ts b/frontend/src/hooks/api/tags/types.ts index 9d3129886..de09f5ac4 100644 --- a/frontend/src/hooks/api/tags/types.ts +++ b/frontend/src/hooks/api/tags/types.ts @@ -17,7 +17,7 @@ export type CreateTagDTO = { workspaceID: string; tagSlug: string; tagName: string; - tagColor: string | null; + tagColor: string; }; export type CreateTagRes = { diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx index 2a349229e..ca395423b 100644 --- a/frontend/src/views/Settings/ProjectSettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx +++ b/frontend/src/views/Settings/ProjectSettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx @@ -53,8 +53,8 @@ export const AddSecretTagModal = ({ await createWsTag.mutateAsync({ workspaceID: currentWorkspace?._id, tagName: name, - tagSlug: name.replace(" ", "_"), - tagColor: null + tagSlug: name.replace(/\s+/g, " ").replace(" ", "_"), + tagColor: "" }); handlePopUpClose("CreateSecretTag"); @@ -63,6 +63,7 @@ export const AddSecretTagModal = ({ text: "Successfully created a tag", type: "success" }); + reset() } catch (err) { console.error(err); createNotification({