feat: create from shared base

undb-io · Oct 9, 2024 · f26eb0f · f26eb0f
1 parent f03c7b5
commit f26eb0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/apps/frontend/src/routes/(authed)/(share)/create-from-share/[shareId]/+page.svelte b/apps/frontend/src/routes/(authed)/(share)/create-from-share/[shareId]/+page.svelte
@@ -99,8 +99,8 @@
   <form method="POST" use:enhance>
     <Card.Root class="mx-auto">
       <Card.Header>
-        <Card.Title class="text-2xl">Create from template</Card.Title>
-        <Card.Description>Create a new base from a template.</Card.Description>
+        <Card.Title class="text-2xl">Create from share</Card.Title>
+        <Card.Description>Create a new base from a shared base.</Card.Description>
       </Card.Header>
       <Card.Content>
         <div class="grid gap-2">

diff --git a/apps/frontend/src/routes/(share)/s/b/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/b/[shareId]/+layout.svelte
@@ -4,6 +4,8 @@
   import type { PaneAPI } from "paneforge"
   import type { LayoutData } from "./$types"
   import Logo from "$lib/images/logo.svg"
+  import { Button } from "$lib/components/ui/button"
+  import { page } from "$app/stores"
 
   export let data: LayoutData
 
@@ -34,13 +36,7 @@
               <span class="font-bold"> Undb </span>
             </a>
 
-            <!-- <button on:click={() => (collapsed = !collapsed)}>
-              {#if collapsed}
-                <PanelLeftOpenIcon class="h-5 w-5" />
-              {:else}
-                <PanelLeftCloseIcon class="h-5 w-5" />
-              {/if}
-            </button> -->
+            <Button href={`/create-from-share/${$page.params.shareId}`} size="sm">Use this template</Button>
           </div>
           <div class="w-full flex-1 overflow-y-auto">
             <ShareBaseNav {base} />

diff --git a/packages/command-handlers/src/handlers/create-from-share.command-handler.ts b/packages/command-handlers/src/handlers/create-from-share.command-handler.ts
@@ -8,6 +8,7 @@ import { type ICommandHandler } from "@undb/domain"
 import { createLogger } from "@undb/logger"
 import { injectShareRepository, WithShareId, type IShareRepository } from "@undb/share"
 import { injectTableService, type ITableService } from "@undb/table"
+import { getNextName } from "@undb/utils"
 
 @commandHandler(CreateFromShareCommand)
 @singleton()
@@ -44,12 +45,15 @@ export class CreateFromShareCommandHandler implements ICommandHandler<CreateFrom
     const member = (await this.spaceMemberService.getSpaceMember(userId, targetSpaceId)).expect("Member not found")
     checkPermission(member.props.role, ["base:create"])
 
+    const bases = await this.baseRepository.find(new WithBaseSpaceId(spaceId))
+    const baseNames = bases.map((base) => base.name.value)
+
     const spec = new WithBaseId(new BaseId(baseId)).and(new WithBaseSpaceId(spaceId))
     const base = (await this.baseRepository.findOne(spec)).expect("Base not found")
 
     const duplicatedBase = await this.tableService.duplicateBase(base, spaceId, targetSpaceId, {
       id: baseId,
-      name: command.name,
+      name: getNextName(baseNames, command.name),
       includeData: command.includeData,
     })