🐛 Parse valid publicId even though the prefix is empty

baptisteArno · Aug 17, 2023 · a4ba9a8 · a4ba9a8
1 parent 9cfca38
commit a4ba9a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx
@@ -55,7 +55,7 @@ const Expression = ({
       )
     }
     case 'Empty':
-      return <Text>Reset {variableName}</Text>
+      return <Text as="span">Reset {variableName}</Text>
     case 'Random ID':
     case 'Today':
     case 'Now':

diff --git a/apps/builder/src/features/publish/helpers/parseDefaultPublicId.ts b/apps/builder/src/features/publish/helpers/parseDefaultPublicId.ts
@@ -1,4 +1,6 @@
 import { toKebabCase } from '@/helpers/toKebabCase'
 
-export const parseDefaultPublicId = (name: string, id: string) =>
-  toKebabCase(name) + `-${id?.slice(-7)}`
+export const parseDefaultPublicId = (name: string, id: string) => {
+  const prefix = toKebabCase(name)
+  return `${prefix !== '' ? `${prefix}-` : ''}${id?.slice(-7)}`
+}
diff --git a/apps/builder/src/features/typebot/api/updateTypebot.ts b/apps/builder/src/features/typebot/api/updateTypebot.ts
@@ -147,7 +147,7 @@ export const updateTypebot = authenticatedProcedure
           resultsTablePreferences: typebot.resultsTablePreferences ?? undefined,
           publicId: typebot.publicId ?? undefined,
           customDomain: typebot.customDomain ?? undefined,
-          isClosed: typebot.isClosed ?? false,
+          isClosed: typebot.isClosed,
         },
       })