From e719176b9ce3ab570d6253659736901652d690e6 Mon Sep 17 00:00:00 2001 From: Huakun Shen Date: Fri, 24 Jan 2025 02:37:36 -0500 Subject: [PATCH] Fix: form submit (#76) * fix: worker template extension form submit * bump @kksh/api * update api package version --- .changeset/config.json | 4 +++- apps/cli/CHANGELOG.md | 7 +++++++ apps/cli/package.json | 2 +- apps/create-kunkun/CHANGELOG.md | 7 +++++++ apps/create-kunkun/package.json | 2 +- .../app/extension/ui-worker/+page.svelte | 9 ++++++++- packages/api/CHANGELOG.md | 6 ++++++ packages/api/jsr.json | 4 ++-- packages/api/package.json | 2 +- .../api/src/ui/worker/components/form-view.ts | 2 ++ packages/api/src/ui/worker/schema/form.ts | 2 ++ packages/api/src/version.ts | 2 +- .../demo-worker-template-ext/CHANGELOG.md | 7 +++++++ .../demo-worker-template-ext/package.json | 2 +- .../extensions/ext-sveltekit-exp/CHANGELOG.md | 7 +++++++ .../extensions/ext-sveltekit-exp/package.json | 2 +- packages/extensions/form-view/src/index.ts | 3 ++- .../template-ext-headless/CHANGELOG.md | 7 +++++++ .../template-ext-headless/package.json | 2 +- .../templates/template-ext-next/CHANGELOG.md | 7 +++++++ .../templates/template-ext-next/package.json | 2 +- .../templates/template-ext-nuxt/CHANGELOG.md | 7 +++++++ .../templates/template-ext-nuxt/package.json | 2 +- .../templates/template-ext-react/CHANGELOG.md | 7 +++++++ .../templates/template-ext-react/package.json | 2 +- .../template-ext-svelte/CHANGELOG.md | 7 +++++++ .../template-ext-svelte/package.json | 2 +- .../template-ext-sveltekit/CHANGELOG.md | 7 +++++++ .../template-ext-sveltekit/package.json | 2 +- .../templates/template-ext-vue/CHANGELOG.md | 7 +++++++ .../templates/template-ext-vue/package.json | 2 +- .../template-ext-worker/CHANGELOG.md | 7 +++++++ .../template-ext-worker/package.json | 2 +- .../common/date/DatePickerWithPreset.svelte | 18 +++++++++++------- .../extension/templates/form-view.svelte | 13 ++++++++++--- .../extension/templates/form.svelte | 19 +++++++++---------- 36 files changed, 153 insertions(+), 39 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index e3e1b7f..ee081b1 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -9,11 +9,13 @@ "updateInternalDependencies": "patch", "ignore": [ "jarvis", + "form-view", "@kksh/desktop", "@kksh/supabase", "@kksh/utils", "@kksh/extension", "@kksh/schema", - "@kksh/supabase" + "@kksh/supabase", + "@kksh/ui" ] } diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md index 68709f0..8b385f8 100644 --- a/apps/cli/CHANGELOG.md +++ b/apps/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # kksh +## 0.0.30 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.29 ### Patch Changes diff --git a/apps/cli/package.json b/apps/cli/package.json index b6b84c3..e4f8c3d 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,7 +1,7 @@ { "name": "kksh", "module": "dist/cli.js", - "version": "0.0.29", + "version": "0.0.30", "type": "module", "bin": { "kksh": "./dist/cli.js", diff --git a/apps/create-kunkun/CHANGELOG.md b/apps/create-kunkun/CHANGELOG.md index 09cd648..5e11369 100644 --- a/apps/create-kunkun/CHANGELOG.md +++ b/apps/create-kunkun/CHANGELOG.md @@ -1,5 +1,12 @@ # create-kunkun +## 0.1.40 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.1.38 ### Patch Changes diff --git a/apps/create-kunkun/package.json b/apps/create-kunkun/package.json index dc4eda4..8b7834b 100644 --- a/apps/create-kunkun/package.json +++ b/apps/create-kunkun/package.json @@ -1,7 +1,7 @@ { "name": "create-kunkun", "type": "module", - "version": "0.1.39", + "version": "0.1.40", "bin": { "create-kunkun": "dist/index.mjs" }, diff --git a/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte index 29fd670..3b2e6f3 100644 --- a/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte +++ b/apps/desktop/src/routes/app/extension/ui-worker/+page.svelte @@ -359,7 +359,14 @@ {/snippet} {:else if loaded && formViewContent !== undefined} - + ) => { + console.log("formData", formData) + workerAPI?.onFormSubmit(formData) + }} + /> {:else if loaded && markdownViewContent !== undefined} {/if} diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index b44a1f9..7ccefef 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -1,5 +1,11 @@ # @kksh/api +## 0.0.53 + +### Patch Changes + +- Add Show Debug option for worker template form view + ## 0.0.48 ### Patch Changes diff --git a/packages/api/jsr.json b/packages/api/jsr.json index 8baf85e..ddfaf0e 100644 --- a/packages/api/jsr.json +++ b/packages/api/jsr.json @@ -1,7 +1,7 @@ { "$schema": "https://jsr.io/schema/config-file.v1.json", "name": "@kunkun/api", - "version": "0.0.52", + "version": "0.0.53", "license": "MIT", "exports": { ".": "./src/index.ts", @@ -17,6 +17,6 @@ "./dev": "./src/dev/index.ts", "./events": "./src/events.ts", "./extensions/jsr": "./src/extensions/jsr/index.ts" - }, + }, "imports": {} } diff --git a/packages/api/package.json b/packages/api/package.json index 3ed7a4b..630ab29 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@kksh/api", - "version": "0.0.52", + "version": "0.0.53", "type": "module", "exports": { ".": "./src/index.ts", diff --git a/packages/api/src/ui/worker/components/form-view.ts b/packages/api/src/ui/worker/components/form-view.ts index 7cb661c..81ad548 100644 --- a/packages/api/src/ui/worker/components/form-view.ts +++ b/packages/api/src/ui/worker/components/form-view.ts @@ -137,6 +137,7 @@ export class ArrayField export class Form implements IComponent { nodeName: FormNodeName = FormNodeNameEnum.Form fields: (AllFormFields | Form)[] + showFormDataDebug?: boolean key: string title?: string description?: string @@ -148,6 +149,7 @@ export class Form implements IComponent { this.title = model.title this.description = model.description this.submitBtnText = model.submitBtnText + this.showFormDataDebug = model.showFormDataDebug } toModel(): FormSchema.Form { diff --git a/packages/api/src/ui/worker/schema/form.ts b/packages/api/src/ui/worker/schema/form.ts index 7b1c125..42c1be1 100644 --- a/packages/api/src/ui/worker/schema/form.ts +++ b/packages/api/src/ui/worker/schema/form.ts @@ -136,6 +136,7 @@ export type FormField = InferOutput export const Form: GenericSchema
= object({ nodeName: FormNodeName, key: string(), + showFormDataDebug: optional(boolean()), fields: array(union([lazy(() => Form), FormField])), title: optional(string()), description: optional(string()), @@ -144,6 +145,7 @@ export const Form: GenericSchema = object({ export type Form = { nodeName: FormNodeName title?: string + showFormDataDebug?: boolean description?: string submitBtnText?: string key: string diff --git a/packages/api/src/version.ts b/packages/api/src/version.ts index e2e0c4c..2a28116 100644 --- a/packages/api/src/version.ts +++ b/packages/api/src/version.ts @@ -21,7 +21,7 @@ export const breakingChangesVersionCheckpoints = [ const checkpointVersions = breakingChangesVersionCheckpoints.map((c) => c.version) const sortedCheckpointVersions = sort(checkpointVersions) -export const version = "0.0.52" +export const version = "0.0.53" export function isVersionBetween(v: string, start: string, end: string) { const vCleaned = clean(v) diff --git a/packages/extensions/demo-worker-template-ext/CHANGELOG.md b/packages/extensions/demo-worker-template-ext/CHANGELOG.md index c77c2e2..6e6ba13 100644 --- a/packages/extensions/demo-worker-template-ext/CHANGELOG.md +++ b/packages/extensions/demo-worker-template-ext/CHANGELOG.md @@ -1,5 +1,12 @@ # demo-template-extension +## 0.0.6 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.5 ### Patch Changes diff --git a/packages/extensions/demo-worker-template-ext/package.json b/packages/extensions/demo-worker-template-ext/package.json index b2ab18a..172ddc2 100644 --- a/packages/extensions/demo-worker-template-ext/package.json +++ b/packages/extensions/demo-worker-template-ext/package.json @@ -1,7 +1,7 @@ { "$schema": "../../schema/manifest-json-schema.json", "name": "demo-template-extension", - "version": "0.0.5", + "version": "0.0.6", "type": "module", "license": "MIT", "kunkun": { diff --git a/packages/extensions/ext-sveltekit-exp/CHANGELOG.md b/packages/extensions/ext-sveltekit-exp/CHANGELOG.md index 0a332d9..53f3830 100644 --- a/packages/extensions/ext-sveltekit-exp/CHANGELOG.md +++ b/packages/extensions/ext-sveltekit-exp/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-sveltekit +## 0.0.6 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.5 ### Patch Changes diff --git a/packages/extensions/ext-sveltekit-exp/package.json b/packages/extensions/ext-sveltekit-exp/package.json index 80657cd..fb47dae 100644 --- a/packages/extensions/ext-sveltekit-exp/package.json +++ b/packages/extensions/ext-sveltekit-exp/package.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.kunkun.sh", "name": "ext-sveltekit-exp", - "version": "0.0.5", + "version": "0.0.6", "license": "MIT", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/extensions/form-view/src/index.ts b/packages/extensions/form-view/src/index.ts index 4e95ddd..28d2f64 100644 --- a/packages/extensions/form-view/src/index.ts +++ b/packages/extensions/form-view/src/index.ts @@ -25,10 +25,11 @@ class ExtensionTemplate extends WorkerExtension { const markdown = new Markdown(`# Hello World `) // markdown.toModel - return ui.render(markdown) + // return ui.render(markdown) const form = new Form.Form({ title: "Form 1", key: "form1", + showFormDataDebug: true, submitBtnText: "Download", fields: [ new Form.DateField({ diff --git a/packages/templates/template-ext-headless/CHANGELOG.md b/packages/templates/template-ext-headless/CHANGELOG.md index c95bcc7..f98a43b 100644 --- a/packages/templates/template-ext-headless/CHANGELOG.md +++ b/packages/templates/template-ext-headless/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-worker +## 0.0.5 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.4 ### Patch Changes diff --git a/packages/templates/template-ext-headless/package.json b/packages/templates/template-ext-headless/package.json index a64f586..3c6a990 100644 --- a/packages/templates/template-ext-headless/package.json +++ b/packages/templates/template-ext-headless/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-headless", - "version": "0.0.4", + "version": "0.0.5", "license": "MIT", "type": "module", "kunkun": { diff --git a/packages/templates/template-ext-next/CHANGELOG.md b/packages/templates/template-ext-next/CHANGELOG.md index 3795ce8..c01f97b 100644 --- a/packages/templates/template-ext-next/CHANGELOG.md +++ b/packages/templates/template-ext-next/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-next +## 0.1.4 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.1.3 ### Patch Changes diff --git a/packages/templates/template-ext-next/package.json b/packages/templates/template-ext-next/package.json index 84023c3..94ffb26 100644 --- a/packages/templates/template-ext-next/package.json +++ b/packages/templates/template-ext-next/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-next", - "version": "0.1.3", + "version": "0.1.4", "license": "MIT", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/templates/template-ext-nuxt/CHANGELOG.md b/packages/templates/template-ext-nuxt/CHANGELOG.md index e3fe10d..d066452 100644 --- a/packages/templates/template-ext-nuxt/CHANGELOG.md +++ b/packages/templates/template-ext-nuxt/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-nuxt +## 0.0.6 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.5 ### Patch Changes diff --git a/packages/templates/template-ext-nuxt/package.json b/packages/templates/template-ext-nuxt/package.json index 85e97e2..edbc77e 100644 --- a/packages/templates/template-ext-nuxt/package.json +++ b/packages/templates/template-ext-nuxt/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-nuxt", - "version": "0.0.5", + "version": "0.0.6", "type": "module", "license": "MIT", "kunkun": { diff --git a/packages/templates/template-ext-react/CHANGELOG.md b/packages/templates/template-ext-react/CHANGELOG.md index c9a7494..67c9097 100644 --- a/packages/templates/template-ext-react/CHANGELOG.md +++ b/packages/templates/template-ext-react/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-react +## 0.0.5 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.4 ### Patch Changes diff --git a/packages/templates/template-ext-react/package.json b/packages/templates/template-ext-react/package.json index 49c62b0..8436529 100644 --- a/packages/templates/template-ext-react/package.json +++ b/packages/templates/template-ext-react/package.json @@ -2,7 +2,7 @@ "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-react", "license": "MIT", - "version": "0.0.4", + "version": "0.0.5", "type": "module", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/templates/template-ext-svelte/CHANGELOG.md b/packages/templates/template-ext-svelte/CHANGELOG.md index cec9402..b2e60c4 100644 --- a/packages/templates/template-ext-svelte/CHANGELOG.md +++ b/packages/templates/template-ext-svelte/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-svelte +## 0.0.5 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.4 ### Patch Changes diff --git a/packages/templates/template-ext-svelte/package.json b/packages/templates/template-ext-svelte/package.json index 57488ff..3c4618c 100644 --- a/packages/templates/template-ext-svelte/package.json +++ b/packages/templates/template-ext-svelte/package.json @@ -2,7 +2,7 @@ "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-svelte", "license": "MIT", - "version": "0.0.4", + "version": "0.0.5", "type": "module", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/templates/template-ext-sveltekit/CHANGELOG.md b/packages/templates/template-ext-sveltekit/CHANGELOG.md index 0a332d9..53f3830 100644 --- a/packages/templates/template-ext-sveltekit/CHANGELOG.md +++ b/packages/templates/template-ext-sveltekit/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-sveltekit +## 0.0.6 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.5 ### Patch Changes diff --git a/packages/templates/template-ext-sveltekit/package.json b/packages/templates/template-ext-sveltekit/package.json index a15a03d..8edb31c 100644 --- a/packages/templates/template-ext-sveltekit/package.json +++ b/packages/templates/template-ext-sveltekit/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-sveltekit", - "version": "0.0.5", + "version": "0.0.6", "license": "MIT", "kunkun": { "name": "TODO: Change Display Name", diff --git a/packages/templates/template-ext-vue/CHANGELOG.md b/packages/templates/template-ext-vue/CHANGELOG.md index e5a0d3d..64726a6 100644 --- a/packages/templates/template-ext-vue/CHANGELOG.md +++ b/packages/templates/template-ext-vue/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-vue +## 0.0.3 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.2 ### Patch Changes diff --git a/packages/templates/template-ext-vue/package.json b/packages/templates/template-ext-vue/package.json index f5fa3dc..bcdeb87 100644 --- a/packages/templates/template-ext-vue/package.json +++ b/packages/templates/template-ext-vue/package.json @@ -1,7 +1,7 @@ { "name": "template-ext-vue", "license": "MIT", - "version": "0.0.2", + "version": "0.0.3", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/templates/template-ext-worker/CHANGELOG.md b/packages/templates/template-ext-worker/CHANGELOG.md index c95bcc7..f98a43b 100644 --- a/packages/templates/template-ext-worker/CHANGELOG.md +++ b/packages/templates/template-ext-worker/CHANGELOG.md @@ -1,5 +1,12 @@ # template-ext-worker +## 0.0.5 + +### Patch Changes + +- Updated dependencies + - @kksh/api@0.0.53 + ## 0.0.4 ### Patch Changes diff --git a/packages/templates/template-ext-worker/package.json b/packages/templates/template-ext-worker/package.json index 69fbbca..c7791ea 100644 --- a/packages/templates/template-ext-worker/package.json +++ b/packages/templates/template-ext-worker/package.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@kksh/api/dist/schema.json", "name": "template-ext-worker", - "version": "0.0.4", + "version": "0.0.5", "license": "MIT", "type": "module", "kunkun": { diff --git a/packages/ui/src/components/common/date/DatePickerWithPreset.svelte b/packages/ui/src/components/common/date/DatePickerWithPreset.svelte index 14b7bb4..82d399b 100644 --- a/packages/ui/src/components/common/date/DatePickerWithPreset.svelte +++ b/packages/ui/src/components/common/date/DatePickerWithPreset.svelte @@ -10,12 +10,16 @@ let { date = $bindable(), + dateValue = $bindable(), class: className, value = $bindable() - }: { date?: DateValue; class?: string; value?: string } = $props() - const valueString = $derived(date ? df.format(date.toDate(getLocalTimeZone())) : "") + }: { date?: Date; dateValue?: DateValue; class?: string; value?: string } = $props() + const valueString = $derived(dateValue ? df.format(dateValue.toDate(getLocalTimeZone())) : "") $effect(() => { - value = date ? date.toString() : "" + value = dateValue ? dateValue.toString() : "" + if (dateValue) { + date = dateValue?.toDate(getLocalTimeZone()) + } }) const items = [ { value: 0, label: "Today" }, @@ -32,12 +36,12 @@ variant: "outline", class: "w-[280px] justify-start text-left font-normal" }), - !date && "text-muted-foreground", + !dateValue && "text-muted-foreground", className )} > - {date ? df.format(date.toDate(getLocalTimeZone())) : "Pick a date"} + {dateValue ? df.format(dateValue.toDate(getLocalTimeZone())) : "Pick a date"} { if (!v) return - date = today(getLocalTimeZone()).add({ days: Number.parseInt(v) }) + dateValue = today(getLocalTimeZone()).add({ days: Number.parseInt(v) }) }} > @@ -59,7 +63,7 @@
- +
diff --git a/packages/ui/src/components/extension/templates/form-view.svelte b/packages/ui/src/components/extension/templates/form-view.svelte index 9a3957e..3954e81 100644 --- a/packages/ui/src/components/extension/templates/form-view.svelte +++ b/packages/ui/src/components/extension/templates/form-view.svelte @@ -4,8 +4,15 @@ import { ArrowLeftIcon } from "lucide-svelte" import Form from "./form.svelte" - let { formViewContent, onGoBack }: { formViewContent: FormSchema.Form; onGoBack: () => void } = - $props() + let { + formViewContent, + onGoBack, + onSubmit + }: { + formViewContent: FormSchema.Form + onGoBack: () => void + onSubmit?: (formData: Record) => void + } = $props()
@@ -14,5 +21,5 @@

{formViewContent.title}

- +
diff --git a/packages/ui/src/components/extension/templates/form.svelte b/packages/ui/src/components/extension/templates/form.svelte index a9c3c6c..e098b16 100644 --- a/packages/ui/src/components/extension/templates/form.svelte +++ b/packages/ui/src/components/extension/templates/form.svelte @@ -1,14 +1,12 @@ {#snippet error(messages?: string[])} @@ -83,7 +80,7 @@ /> {:else if field.nodeName === FormNodeNameEnum.Date} {@const field2 = field as FormSchema.DateField} - + {:else if field.nodeName === FormNodeNameEnum.Select} {@const field2 = field as FormSchema.SelectField} @@ -141,4 +138,6 @@ {/key} - +{#if formViewContent.showFormDataDebug} + +{/if}