Merge pull request #2061 from undb-io/release/v1.0.0-87

Release version v1.0.0-87

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-87
+
+
+### 🏡 Chore
+
+- Remove buttong ([a74b338](https://github.com/undb-io/undb/commit/a74b338))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-86
 
 

apps/frontend/src/lib/components/blocks/grid-view/editable-cell/rollup-cell.svelte

@@ -42,7 +42,7 @@
       {/if}
     {/if}
   </div>
-  {#if (isSelected || isEditing) && ((!Array.isArray(value) && !!value) || (Array.isArray(value) && value.length))}
+  {#if (isSelected || isEditing) && ((!Array.isArray(value) && !!value) || (Array.isArray(value) && value.length)) && field.fn === "lookup"}
     <Popover.Root>
       <Popover.Trigger asChild let:builder>
         <Button builders={[builder]} variant="link" class="min-w-4 pl-2 pr-0">

apps/frontend/src/lib/components/blocks/kanban-view/kanban-view.svelte

@@ -22,31 +22,33 @@
   setRecordsStore(recordsStore)
 </script>
 
-<TableTools>
-  {#if !shareId}
-    <KanbanOptionButton {view} />
-  {/if}
-</TableTools>
-{#if view.type === "kanban"}
-  {#if field?.type === "select"}
-    {#if field.isSingle}
-      <SelectKanbanView {view} {shareId} {viewId} />
-    {:else}
-      <section class="flex h-full w-full items-center justify-center">
-        <SelectKanbanRequiresSingle {view} {field} {shareId} />
+{#key $table.id.value}
+  <TableTools>
+    {#if !shareId}
+      <KanbanOptionButton {view} />
+    {/if}
+  </TableTools>
+  {#if view.type === "kanban"}
+    {#if field?.type === "select"}
+      {#if field.isSingle}
+        <SelectKanbanView {view} {shareId} {viewId} />
+      {:else}
+        <section class="flex h-full w-full items-center justify-center">
+          <SelectKanbanRequiresSingle {view} {field} {shareId} />
+        </section>
+      {/if}
+    {:else if !shareId}
+      <section class="bg-muted flex h-full w-full items-center justify-center">
+        <SelectKanbanField {view} />
       </section>
     {/if}
-  {:else if !shareId}
-    <section class="bg-muted flex h-full w-full items-center justify-center">
-      <SelectKanbanField {view} />
-    </section>
   {/if}
-{/if}
 
-{#await import("$lib/components/blocks/create-record/create-record-sheet.svelte") then { default: CreateRecordSheet }}
-  <CreateRecordSheet />
-{/await}
+  {#await import("$lib/components/blocks/create-record/create-record-sheet.svelte") then { default: CreateRecordSheet }}
+    <CreateRecordSheet />
+  {/await}
 
-{#await import("$lib/components/blocks/record-detail/table-record-detail-sheet.svelte") then { default: TableRecordDetailSheet }}
-  <TableRecordDetailSheet />
-{/await}
+  {#await import("$lib/components/blocks/record-detail/table-record-detail-sheet.svelte") then { default: TableRecordDetailSheet }}
+    <TableRecordDetailSheet />
+  {/await}
+{/key}

apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-lane.svelte

@@ -324,11 +324,13 @@
             {:else}
               <div class="flex h-full w-full flex-col items-center justify-center space-y-3">
                 <p class="text-sm font-semibold">No records</p>
-                <p class="text-muted-foreground text-xs">
-                  Create a new record of this option <Option
-                    option={option ?? { id: "", name: "No Option", color: "gray" }}
-                  />
-                </p>
+                <div class="text-muted-foreground space-y-2 text-xs">
+                  <p>Create a new record of this option</p>
+
+                  <div class="flex w-full items-center justify-center">
+                    <Option option={option ?? { id: "", name: "No Option", color: "gray" }} />
+                  </div>
+                </div>
                 <Button on:click={onCreateRecord} variant="outline" size="sm">
                   <PlusIcon class="text-muted-foreground mr-2 h-4 w-4 font-semibold" />
                   New Record

apps/frontend/src/lib/components/blocks/share/share-button.svelte

@@ -156,7 +156,7 @@
               <Input
                 value={url}
                 readonly
-                class="flex-1 cursor-pointer"
+                class="flex-1 cursor-pointer text-gray-600"
                 on:click={(e) => {
                   copy()
                   e.target.select()
@@ -194,7 +194,7 @@
                     copyIFrame()
                     e.target.select()
                   }}
-                  class="flex-1 cursor-pointer"
+                  class="flex-1 cursor-pointer text-gray-600"
                   value={iframe}
                 />
                 <button type="button" on:click={copyIFrame}>
@@ -211,8 +211,21 @@
           <div class="space-y-2">
             <p class="text-xs font-semibold">Share ID</p>
             <div class="flex items-center gap-2">
-              <Input value={share?.id} readonly />
-              <button type="button" on:click={copyShareId}>
+              <Input
+                on:click={(e) => {
+                  copyShareId()
+                  e.target.select()
+                }}
+                value={share?.id}
+                readonly
+                class="cursor-pointer text-gray-600"
+              />
+              <button
+                type="button"
+                on:click={(e) => {
+                  copyShareId()
+                }}
+              >
                 {#if shareIdCopied}
                   <CopyCheckIcon class="h-4 w-4" />
                 {:else}

apps/frontend/src/lib/components/blocks/table-header/table-header.svelte

@@ -38,6 +38,7 @@
     DELETE_VIEW,
     DUPLICATE_TABLE_MODAL,
     DUPLICATE_VIEW,
+    SET_DEFAULT_VIEW,
     UPDATE_TABLE_MODAL,
     UPDATE_VIEW,
     toggleModal,
@@ -227,6 +228,10 @@
                       </DropdownMenu.SubContent>
                     </DropdownMenu.Sub>
                     {#if !view.isDefault}
+                      <DropdownMenu.Item class="text-xs " on:click={() => toggleModal(SET_DEFAULT_VIEW)}>
+                        <PencilIcon class="mr-2 h-3 w-3" />
+                        Set as Default View
+                      </DropdownMenu.Item>
                       <DropdownMenu.Item
                         class="text-xs text-red-500 hover:bg-red-200 hover:text-red-500"
                         on:click={() => toggleModal(DELETE_VIEW)}

apps/frontend/src/lib/components/blocks/tables-nav/tables-nav.svelte

@@ -17,6 +17,7 @@
     CREATE_TABLE_MODAL,
     DELETE_VIEW,
     DUPLICATE_VIEW,
+    SET_DEFAULT_VIEW,
     toggleModal,
     UPDATE_VIEW,
   } from "$lib/store/modal.store"
@@ -214,8 +215,12 @@
                                     Duplicate View
                                   </DropdownMenu.Item>
                                   {#if !view.isDefault}
+                                    <DropdownMenu.Item class="text-xs" on:click={() => toggleModal(SET_DEFAULT_VIEW)}>
+                                      <PencilIcon class="mr-2 h-3 w-3" />
+                                      Set as Default View
+                                    </DropdownMenu.Item>
                                     <DropdownMenu.Item
-                                      class="text-xs text-red-500 hover:bg-red-200 hover:text-red-500"
+                                      class="text-xs text-red-500 hover:!bg-red-200 hover:!text-red-500"
                                       on:click={() => toggleModal(DELETE_VIEW)}
                                     >
                                       <CopyPlusIcon class="mr-2 h-3 w-3" />

apps/frontend/src/lib/components/blocks/view/set-as-default-view.svelte

@@ -0,0 +1,46 @@
+<script lang="ts">
+  import * as AlertDialog from "$lib/components/ui/alert-dialog"
+  import { isModalOpen, SET_DEFAULT_VIEW, toggleModal, closeModal } from "$lib/store/modal.store"
+  import { trpc } from "$lib/trpc/client"
+  import { getTable, viewId } from "$lib/store/table.store"
+  import { createMutation } from "@tanstack/svelte-query"
+  import { derived } from "svelte/store"
+  import { invalidateAll } from "$app/navigation"
+  import { toast } from "svelte-sonner"
+  import { goto } from "$app/navigation"
+
+  const table = getTable()
+
+  let view = derived([table, viewId], ([$table, $viewId]) => $table.views.getViewById($viewId))
+
+  const setAsDefaultViewMutation = createMutation({
+    mutationFn: trpc.table.view.setDefault.mutate,
+    async onSuccess(data, variables, context) {
+      closeModal(SET_DEFAULT_VIEW)
+      await invalidateAll()
+      toast.success("View set as default")
+      await goto(`/t/${$table.id.value}`)
+    },
+    onError(error, variables, context) {
+      toast.error(error.message)
+    },
+  })
+</script>
+
+<AlertDialog.Root open={$isModalOpen(SET_DEFAULT_VIEW)} onOpenChange={() => toggleModal(SET_DEFAULT_VIEW)}>
+  <AlertDialog.Content>
+    <AlertDialog.Header>
+      <AlertDialog.Title>Set {$view.name.value} as default view</AlertDialog.Title>
+      <AlertDialog.Description>The original view will be replaced.</AlertDialog.Description>
+    </AlertDialog.Header>
+    <AlertDialog.Footer>
+      <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
+      <AlertDialog.Action
+        disabled={$setAsDefaultViewMutation.isPending}
+        on:click={() => $setAsDefaultViewMutation.mutate({ tableId: $table.id.value, viewId: $viewId })}
+      >
+        Continue
+      </AlertDialog.Action>
+    </AlertDialog.Footer>
+  </AlertDialog.Content>
+</AlertDialog.Root>

apps/frontend/src/lib/store/modal.store.ts

@@ -15,6 +15,7 @@ export const CREATE_WEBHOOK_MODAL = "createWebhook" as const
 export const CREATE_RLS_MODAL = "createRLS" as const
 export const UPDATE_VIEW = "updateView" as const
 export const DUPLICATE_VIEW = "duplicateView" as const
+export const SET_DEFAULT_VIEW = "setDefaultView" as const
 export const DELETE_VIEW = "deleteView" as const
 export const CREATE_BASE_MODAL = "createBase" as const
 export const DUPLICATE_BASE_MODAL = "duplicateBase" as const
@@ -34,6 +35,7 @@ type ModalType =
   | typeof UPDATE_VIEW
   | typeof DUPLICATE_VIEW
   | typeof DELETE_VIEW
+  | typeof SET_DEFAULT_VIEW
   | typeof CREATE_BASE_MODAL
   | typeof UPDATE_BASE_MODAL
   | typeof DELETE_TABLE_MODAL

apps/frontend/src/routes/(authed)/(space)/t/[tableId]/[[viewId]]/+page.svelte

@@ -52,6 +52,9 @@
   {#await import("$lib/components/blocks/view/duplicate-view-dialog.svelte") then { default: DuplicateViewDialog }}
     <DuplicateViewDialog />
   {/await}
+  {#await import("$lib/components/blocks/view/set-as-default-view.svelte") then { default: SetAsDefaultView }}
+    <SetAsDefaultView />
+  {/await}
   {#await import("$lib/components/blocks/view/delete-view-dialog.svelte") then { default: DeleteViewDialog }}
     <DeleteViewDialog />
   {/await}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-86",
+  "version": "1.0.0-87",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",

packages/command-handlers/src/handlers/create-from-template.command-handler.ts

@@ -21,7 +21,7 @@ export class CreateFromTemplateCommandHandler
   async execute(command: CreateFromTemplateCommand): Promise<ICreateFromTemplateCommandOutput> {
     this.logger.info(`create from template command received: ${command.templateName}`)
 
-    const template = templates["test"]
+    const template = templates["projectManagement"]
 
     const spaceId = mustGetCurrentSpaceId()
     const result = await this.templateService.createBase(template, spaceId)

packages/command-handlers/src/handlers/index.ts

@@ -33,6 +33,7 @@ import { DuplicateViewCommandHandler } from "./duplicate-view.command-handler"
 import { EnableShareCommandHandler } from "./enable-share.command-handler"
 import { ExportViewCommandHandler } from "./export-view.command-handler"
 import { InviteCommandHandler } from "./invite.command-handler"
+import { SetDefaultViewCommandHandler } from "./set-default-view.command-handler"
 import { SetFieldWidthCommandHandler } from "./set-field-width.command-handler"
 import { SetTableFormCommandHandler } from "./set-table-form.command-handler"
 import { SetTableRLSCommandHandler } from "./set-table-rls.command-handler"
@@ -108,4 +109,5 @@ export const commandHandlers = [
   SetFieldWidthCommandHandler,
   DuplicateTableFormCommandHandler,
   CreateFromTemplateCommandHandler,
+  SetDefaultViewCommandHandler,
 ]

packages/command-handlers/src/handlers/set-default-view.command-handler.ts

@@ -0,0 +1,26 @@
+import { SetDefaultViewCommand } from "@undb/commands"
+import { commandHandler } from "@undb/cqrs"
+import { singleton } from "@undb/di"
+import type { ICommandHandler } from "@undb/domain"
+import { createLogger } from "@undb/logger"
+import { TableIdVo, injectTableRepository, type ITableRepository } from "@undb/table"
+
+@commandHandler(SetDefaultViewCommand)
+@singleton()
+export class SetDefaultViewCommandHandler implements ICommandHandler<SetDefaultViewCommand, any> {
+  public readonly logger = createLogger(SetDefaultViewCommandHandler.name)
+  constructor(
+    @injectTableRepository()
+    private readonly repo: ITableRepository,
+  ) {}
+
+  async execute(command: SetDefaultViewCommand): Promise<any> {
+    const table = (await this.repo.findOneById(new TableIdVo(command.tableId))).unwrap()
+
+    const spec = table.$setDefaultView(command)
+
+    if (spec.isSome()) {
+      await this.repo.updateOneById(table, spec)
+    }
+  }
+}

packages/commands/src/index.ts

@@ -33,6 +33,7 @@ export * from "./duplicate-view.command"
 export * from "./enable-share.command"
 export * from "./export-view.command"
 export * from "./invite.command"
+export * from "./set-default-view.command"
 export * from "./set-field-width.command"
 export * from "./set-table-form.command"
 export * from "./set-table-rls.command"

packages/commands/src/set-default-view.command.ts

@@ -0,0 +1,18 @@
+import { Command, type CommandProps } from "@undb/domain"
+import { setDefaultViewDTO, tableId } from "@undb/table"
+import { z } from "@undb/zod"
+
+export const setDefaultViewCommand = setDefaultViewDTO.merge(z.object({ tableId: tableId }))
+
+export type ISetDefaultViewCommand = z.infer<typeof setDefaultViewCommand>
+
+export class SetDefaultViewCommand extends Command {
+  public readonly tableId: string
+  public readonly viewId: string
+
+  constructor(props: CommandProps<ISetDefaultViewCommand>) {
+    super(props)
+    this.tableId = props.tableId
+    this.viewId = props.viewId
+  }
+}

packages/persistence/src/qb.ts

@@ -17,7 +17,7 @@ export function createQueryBuilderWithDialect(dialect: Dialect) {
         logger.debug(
           {
             query: event.query.sql,
-            // params: event.query.parameters,
+            params: event.query.parameters,
             duration: event.queryDurationMillis,
           },
           "kysely.query",
@@ -27,7 +27,7 @@ export function createQueryBuilderWithDialect(dialect: Dialect) {
           {
             error: event.error,
             query: event.query.sql,
-            // params: event.query.parameters,
+            params: event.query.parameters,
             duration: event.queryDurationMillis,
           },
           "kysely.error",

packages/persistence/src/table/table.mutation-visitor.ts

@@ -74,6 +74,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
         table_id: this.table.id.value,
         subject_id: field.id.value,
       })
+      .onConflict((ob) => ob.doNothing())
       .compile()
     this.addSql(sql)
 
@@ -164,6 +165,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
         table_id: this.table.id.value,
         subject_id: views.view.id.value,
       })
+      .onConflict((ob) => ob.doNothing())
       .compile()
 
     this.addSql(sql)
@@ -212,6 +214,7 @@ export class TableMutationVisitor extends AbstractQBMutationVisitor implements I
         table_id: this.table.id.value,
         subject_id: views.form.id,
       })
+      .onConflict((ob) => ob.doNothing())
       .compile()
 
     this.addSql(sql)

packages/persistence/src/table/table.repository.ts

@@ -100,7 +100,11 @@ export class TableRepository implements ITableRepository {
       .concat(formIds)
       .concat(fieldsIds)
       .map((id) => ({ table_id: table.id.value, subject_id: id }))
-    await trx.insertInto("undb_table_id_mapping").values(mapping).execute()
+    await trx
+      .insertInto("undb_table_id_mapping")
+      .values(mapping)
+      .onConflict((ob) => ob.doNothing())
+      .execute()
 
     await this.underlyingTableService.create(table)
     await this.outboxService.save(table)