Merge pull request #2104 from undb-io/release/v1.0.0-106

Release version v1.0.0-106

Author: nichenqin

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-106
+
+
+### 🩹 Fixes
+
+- Fix dropping table ([f2bf79b](https://github.com/undb-io/undb/commit/f2bf79b))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-105
 
 

apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte

@@ -210,6 +210,7 @@
                       hasFilter && "bg-orange-50",
                     )}
                     use:props.resize
+                    data-field-id={cell.id}
                   >
                     {#if cell.id === "$select" && !$hasRecord}
                       <Checkbox checked={false} disabled />

apps/frontend/src/lib/components/blocks/widget/widget.svelte

@@ -14,9 +14,11 @@
   import * as AlertDialog from "$lib/components/ui/alert-dialog"
   import { invalidate } from "$app/navigation"
   import { toast } from "svelte-sonner"
-  import { getDashboard, getIsDashboard } from "$lib/store/dashboard.store"
+  import { getDashboard, getDashboardWidgetItemsStore, getIsDashboard } from "$lib/store/dashboard.store"
   import { cn } from "$lib/utils"
-  import { GripVerticalIcon, ChevronRightIcon } from "lucide-svelte"
+  import { GripVerticalIcon, ChevronRightIcon, CopyIcon } from "lucide-svelte"
+  import { COLS } from "$lib/store/widget.store"
+  import { DashboardLayouts } from "@undb/dashboard"
 
   export let tableId: string | undefined
   export let table: TableDo | undefined
@@ -61,6 +63,34 @@
       toast.error(error.message)
     },
   })
+
+  const dashboardWidgets = getDashboardWidgetItemsStore()
+
+  let confirmDuplicate = false
+  const duplicateDashboardWidgetMutation = createMutation({
+    mutationFn: trpc.dashboard.widget.duplicate.mutate,
+    onSuccess: async () => {
+      if ($isDashboard) {
+        await invalidate(`dashboard:${$dashboard.id.value}`)
+      }
+    },
+    onError(error, variables, context) {
+      toast.error(error.message)
+    },
+  })
+
+  const duplicateViewWidgetMutation = createMutation({
+    mutationFn: trpc.table.view.widget.duplicate.mutate,
+    onSuccess: async () => {
+      confirmDuplicate = false
+      if (table) {
+        await invalidate(`table:${tableId}`)
+      }
+    },
+    onError(error, variables, context) {
+      toast.error(error.message)
+    },
+  })
 </script>
 
 <div class={cn("group flex h-full w-full flex-col rounded-sm border", $$restProps.class)}>
@@ -150,6 +180,10 @@
               <PencilIcon class="mr-2 size-3" />
               Edit Name
             </DropdownMenu.Item>
+            <DropdownMenu.Item class="text-xs" on:click={() => (confirmDuplicate = true)}>
+              <CopyIcon class="mr-2 size-3" />
+              Duplicate
+            </DropdownMenu.Item>
             <DropdownMenu.Item class="text-xs" on:click={() => (confirmDelete = true)}>
               <TrashIcon class="mr-2 size-3" />
               Delete
@@ -202,3 +236,39 @@
     </AlertDialog.Footer>
   </AlertDialog.Content>
 </AlertDialog.Root>
+
+<AlertDialog.Root bind:open={confirmDuplicate}>
+  <AlertDialog.Content>
+    <AlertDialog.Header>
+      <AlertDialog.Title>Duplicate Widget {widget.name}?</AlertDialog.Title>
+    </AlertDialog.Header>
+    <AlertDialog.Footer>
+      <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
+      <AlertDialog.Action asChild>
+        <Button
+          on:click={() => {
+            if ($isDashboard) {
+              const added = dashboardWidgets.add(widget.item.type)
+              const layout = added[COLS]
+              const defaultLayout = DashboardLayouts.default()
+              $duplicateDashboardWidgetMutation.mutate({
+                dashboardId: $dashboard.id.value,
+                widgetId: widget.id,
+                layout: {
+                  x: layout.x ?? defaultLayout.x,
+                  y: layout.y ?? defaultLayout.y,
+                  w: layout.w ?? defaultLayout.w,
+                  h: layout.h ?? defaultLayout.h,
+                },
+              })
+            } else if (viewId && tableId) {
+              $duplicateViewWidgetMutation.mutate({ tableId, viewId, widgetId: widget.id })
+            }
+          }}
+        >
+          Duplicate
+        </Button>
+      </AlertDialog.Action>
+    </AlertDialog.Footer>
+  </AlertDialog.Content>
+</AlertDialog.Root>

package.json

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

packages/command-handlers/src/handlers/duplicate-dashboard-widget.command-handler.ts

@@ -0,0 +1,27 @@
+import { DuplicateDashboardWidgetCommand } from "@undb/commands"
+import { commandHandler } from "@undb/cqrs"
+import { injectDashboardService, type IDashboarService } from "@undb/dashboard"
+import { singleton } from "@undb/di"
+import { type ICommandHandler } from "@undb/domain"
+import { createLogger } from "@undb/logger"
+
+@commandHandler(DuplicateDashboardWidgetCommand)
+@singleton()
+export class DuplicateDashboardWidgetCommandHandler implements ICommandHandler<DuplicateDashboardWidgetCommand, any> {
+  private readonly logger = createLogger(DuplicateDashboardWidgetCommandHandler.name)
+
+  constructor(
+    @injectDashboardService()
+    private readonly service: IDashboarService,
+  ) {}
+
+  async execute(command: DuplicateDashboardWidgetCommand): Promise<any> {
+    this.logger.debug(command)
+
+    await this.service.duplicateWidget({
+      dashboardId: command.dashboardId,
+      widgetId: command.widgetId,
+      layout: command.layout,
+    })
+  }
+}

packages/command-handlers/src/handlers/duplicate-view-widget.command-handler.ts

@@ -0,0 +1,22 @@
+import { DuplicateViewWidgetCommand } from "@undb/commands"
+import { commandHandler } from "@undb/cqrs"
+import { singleton } from "@undb/di"
+import type { ICommandHandler } from "@undb/domain"
+import { injectTableRepository, TableIdVo, type ITableRepository } from "@undb/table"
+
+@commandHandler(DuplicateViewWidgetCommand)
+@singleton()
+export class DuplicateViewWidgetCommandHandler implements ICommandHandler<DuplicateViewWidgetCommand, void> {
+  constructor(
+    @injectTableRepository()
+    private readonly repo: ITableRepository,
+  ) {}
+
+  async execute(command: DuplicateViewWidgetCommand): Promise<void> {
+    const table = (await this.repo.findOneById(new TableIdVo(command.tableId))).expect("table not found")
+
+    const spec = table.views.$duplicateWidget(table, command)
+
+    await this.repo.updateOneById(table, spec)
+  }
+}

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

@@ -31,11 +31,13 @@ import { DeleteViewCommandHandler } from "./delete-view.command-handler"
 import { DeleteWebhookCommandHandler } from "./delete-webhook.command-handler"
 import { DisableShareCommandHandler } from "./disable-share.command-handler"
 import { DuplicateBaseCommandHandler } from "./duplicate-base.command-handler"
+import { DuplicateDashboardWidgetCommandHandler } from "./duplicate-dashboard-widget.command-handler"
 import { DuplicateDashboardCommandHandler } from "./duplicate-dashboard.command-handler"
 import { DuplicateRecordCommandHandler } from "./duplicate-record.command-handler"
 import { DuplicateTableFieldCommandHandler } from "./duplicate-table-field.command-handler"
 import { DuplicateTableFormCommandHandler } from "./duplicate-table-form.command-handler"
 import { DuplicateTableCommandHandler } from "./duplicate-table.command-handler"
+import { DuplicateViewWidgetCommandHandler } from "./duplicate-view-widget.command-handler"
 import { DuplicateViewCommandHandler } from "./duplicate-view.command-handler"
 import { EnableShareCommandHandler } from "./enable-share.command-handler"
 import { ExportViewCommandHandler } from "./export-view.command-handler"
@@ -132,4 +134,6 @@ export const commandHandlers = [
   DeleteDashboardCommandHandler,
   UpdateDashboardCommandHandler,
   DuplicateDashboardCommandHandler,
+  DuplicateDashboardWidgetCommandHandler,
+  DuplicateViewWidgetCommandHandler,
 ]

packages/commands/src/duplicate-dashboard-widget.command.ts

@@ -0,0 +1,20 @@
+import { duplicateDashboardWidgetDTO, type IDashboardLayout } from "@undb/dashboard"
+import { Command, type CommandProps } from "@undb/domain"
+import { z } from "@undb/zod"
+
+export const duplicateDashboardWidgetCommand = duplicateDashboardWidgetDTO
+
+export type IDuplicateDashboardWidgetCommand = z.infer<typeof duplicateDashboardWidgetCommand>
+
+export class DuplicateDashboardWidgetCommand extends Command implements IDuplicateDashboardWidgetCommand {
+  public readonly dashboardId: string
+  public readonly widgetId: string
+  public readonly layout: IDashboardLayout
+
+  constructor(props: CommandProps<IDuplicateDashboardWidgetCommand>) {
+    super(props)
+    this.dashboardId = props.dashboardId
+    this.widgetId = props.widgetId
+    this.layout = props.layout
+  }
+}

packages/commands/src/duplicate-view-widget.command.ts

@@ -0,0 +1,22 @@
+import { Command, type CommandProps } from "@undb/domain"
+import { duplicateViewWidgetDTO, tableId } from "@undb/table"
+import { z } from "@undb/zod"
+
+export const duplicateViewWidgetCommand = duplicateViewWidgetDTO.extend({
+  tableId,
+})
+
+export type IDuplicateViewWidgetCommand = z.infer<typeof duplicateViewWidgetCommand>
+
+export class DuplicateViewWidgetCommand extends Command implements IDuplicateViewWidgetCommand {
+  public readonly tableId: string
+  public readonly viewId: string
+  public readonly widgetId: string
+
+  constructor(props: CommandProps<IDuplicateViewWidgetCommand>) {
+    super(props)
+    this.tableId = props.tableId
+    this.viewId = props.viewId
+    this.widgetId = props.widgetId
+  }
+}

packages/commands/src/index.ts

@@ -31,11 +31,13 @@ export * from "./delete-view.command"
 export * from "./delete-webhook.command"
 export * from "./disable-share.command"
 export * from "./duplicate-base.command"
+export * from "./duplicate-dashboard-widget.command"
 export * from "./duplicate-dashboard.command"
 export * from "./duplicate-record.command"
 export * from "./duplicate-table-field.command"
 export * from "./duplicate-table-form.command"
 export * from "./duplicate-table.command"
+export * from "./duplicate-view-widget.command"
 export * from "./duplicate-view.command"
 export * from "./enable-share.command"
 export * from "./export-view.command"