gomtm 0.0.364 → 0.0.366

package/dist/esm/components/curdView/curdViewEditor.js

@@ -19,7 +19,7 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { jsx, jsxs } from "react/jsx-runtime";
-import { FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from "mtxuilib/ui/form";
+import { FormControl, FormField, FormItem, FormLabel, FormMessage } from "mtxuilib/ui/form";
 import { Input } from "mtxuilib/ui/input";
 import { useFormContext } from "react-hook-form";
 import { FormShell } from "../../curd/form/FormShell";
@@ -34,7 +34,6 @@ function CurdViewEditor(props) {
         render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
           /* @__PURE__ */ jsx(FormLabel, { children: "name" }),
           /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadProps(__spreadValues({ placeholder: "name" }, field), { readOnly: true, disabled: true })) }),
-          /* @__PURE__ */ jsx(FormDescription, { children: "name" }),
           /* @__PURE__ */ jsx(FormMessage, {})
         ] })
       }
@@ -47,11 +46,30 @@ function CurdViewEditor(props) {
         render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
           /* @__PURE__ */ jsx(FormLabel, { children: "Svc" }),
           /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "svcName" }, field)) }),
-          /* @__PURE__ */ jsx(FormDescription, { children: "svcName" }),
           /* @__PURE__ */ jsx(FormMessage, {})
         ] })
       }
-    )
+    ),
+    /* @__PURE__ */ jsx(FormField, { control: form.control, name: "title", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "title" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "title" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: form.control, name: "methodList", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodList" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodList" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: form.control, name: "methodGet", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodGet" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodGet" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: form.control, name: "methodUpdate", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodUpdate" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodUpdate" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) })
   ] });
 }
 export {

package/dist/esm/curd/CurdView.d.ts

@@ -1,17 +1,4 @@
 /// <reference types="react" />
-import { PlainMessage } from "@bufbuild/protobuf";
-import { CurdView } from "../gomtmpb/mtm/sppb/mtm_pb";
-interface CurdViewProps {
-    backendUrl?: string;
-    curdView: PlainMessage<CurdView>;
-}
-export interface ListViewState extends CurdViewProps {
-}
-export declare const curdViewContext: import("react").Context<import("zustand").StoreApi<ListViewState> | null>;
-type CurdViewProviderProps = React.PropsWithChildren<CurdViewProps>;
-export declare const CurdViewProvider: (props: CurdViewProviderProps) => import("react").JSX.Element;
-export declare function useCurdView<T>(selector: (state: ListViewState) => T): T;
 export declare const CurdViewView: (props: {
     name: string;
 }) => import("react").JSX.Element | null;
-export {};

package/dist/esm/curd/CurdView.js

@@ -1,70 +1,10 @@
 "use client";
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 import { jsx, jsxs } from "react/jsx-runtime";
-import { toPlainMessage } from "@bufbuild/protobuf";
-import { Suspense, createContext, useContext, useRef } from "react";
-import { createStore, useStore } from "zustand";
+import { Suspense } from "react";
 import { useSuspenseQuery } from "../connectquery";
 import { curdViewGet } from "../gomtmpb/mtm/sppb/curd-CurdService_connectquery";
-import { CurdView } from "../gomtmpb/mtm/sppb/mtm_pb";
 import { CommonListView } from "./listview/CommonListView";
 import { ListViewStoreProvider } from "./listview/list-store";
-const createListviewStore = (initProps) => {
-  const DEFAULT_PROPS = {
-    backendUrl: "",
-    curdView: toPlainMessage(new CurdView())
-  };
-  return createStore()((set, get) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
-    openRemove: false,
-    nextPage: () => {
-    }
-  }));
-};
-const curdViewContext = createContext(null);
-const CurdViewProvider = (props) => {
-  const _a = props, { children } = _a, etc = __objRest(_a, ["children"]);
-  const storeRef = useRef();
-  if (!storeRef.current) {
-    storeRef.current = createListviewStore(props);
-  }
-  return /* @__PURE__ */ jsx(curdViewContext.Provider, { value: storeRef.current, children });
-};
-function useCurdView(selector) {
-  const store = useContext(curdViewContext);
-  if (!store)
-    throw new Error("useCurd Missing CurdViewProvider in the tree");
-  return useStore(store, selector);
-}
 const CurdViewView = (props) => {
   const { name } = props;
   const query = useSuspenseQuery(curdViewGet, { name });
@@ -81,27 +21,9 @@ const CurdViewView = (props) => {
       if (!query.data.item.value) {
         return /* @__PURE__ */ jsx("div", { children: "missing curd data222" });
       }
-      const curdViewData = query.data.item.value;
-      return /* @__PURE__ */ jsx(CurdViewProvider, { curdView: curdViewData, children: /* @__PURE__ */ jsx(
-        ListViewStoreProvider,
-        {
-          slugPath: "/post",
-          svc: curdViewData.svcName,
-          methodList: curdViewData.methodList,
-          methodGet: curdViewData.methodGet,
-          methodCreate: curdViewData.methodCreate,
-          methodUpdate: curdViewData.methodUpdate,
-          methodDelete: curdViewData.methodDelete,
-          viewUpdate: curdViewData.routeEdit,
-          viewCreate: curdViewData.routeCreate,
-          children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, {}) })
-        }
-      ) });
+      return /* @__PURE__ */ jsx(ListViewStoreProvider, { curdView: query.data.item.value, children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, {}) }) });
   }
 };
 export {
-  CurdViewProvider,
-  CurdViewView,
-  curdViewContext,
-  useCurdView
+  CurdViewView
 };

package/dist/esm/curd/form/CurdEditPanel.js

@@ -36,8 +36,8 @@ function CurdEditPanel(props) {
 }
 const WithLoadGetData = (props) => {
   const { children } = props;
-  const methodGet = useListview((x) => x.methodGet);
-  const svc = useListview((x) => x.svc);
+  const methodGet = useListview((x) => x.curdView.methodGet);
+  const svc = useListview((x) => x.curdView.svcName);
   const activateItem = useListview((x) => x.activateItem);
   const setDetailData = useListview((x) => x.setDetailData);
   const detailQuery = useGomtmSuspenseQuery(svc, methodGet, {

package/dist/esm/curd/form/FormShell.js

@@ -2,7 +2,7 @@
 import { jsx } from "react/jsx-runtime";
 const FormShell = (props) => {
   const { children } = props;
-  return /* @__PURE__ */ jsx("div", { children });
+  return /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-4 space-y-4", children });
 };
 export {
   FormShell

package/dist/esm/curd/form/formStore.d.ts

@@ -3,6 +3,7 @@ interface GomtmFormProps {
     svc: string;
     method?: string;
     open?: boolean;
+    defaultValues?: any;
     fullScreen?: boolean;
     viewName: string;
     title?: string;
@@ -10,7 +11,7 @@ interface GomtmFormProps {
 }
 export declare const GomtmForm: (props: PropsWithChildren<GomtmFormProps>) => import("react").JSX.Element;
 export declare function useGomtmForm2(): {
-    form: import("react-hook-form").UseFormReturn<import("react-hook-form").FieldValues, any, undefined>;
+    form: import("react-hook-form").UseFormReturn<any, any, undefined>;
     open: boolean | undefined;
     setOpen: (open: boolean) => void;
     fullScreen: boolean | undefined;
@@ -23,6 +24,7 @@ export declare function useGomtmForm2(): {
     setTitle: (title: string) => void;
     svc: string;
     method?: string | undefined;
+    defaultValues?: any;
     onOpenChange?: ((open: boolean) => void) | undefined;
 };
 export declare function GomtmFormDebug(): import("react").JSX.Element | null;

package/dist/esm/curd/form/formStore.js

@@ -111,39 +111,37 @@ function useGomtmForm2() {
   const method = useGomtmForm((x) => x.method);
   const svc = useGomtmForm((x) => x.svc);
   const mutation = useGomtmMutation(svc, method);
-  const form = useForm();
+  const defaultValues = useGomtmForm((x) => x.defaultValues);
+  const form = useForm({
+    defaultValues
+  });
   const setOpen = useCallback((open) => {
     _setOpen(open);
   }, [_setOpen]);
   const handleValuesSubmit = useCallback((values) => __async(this, null, function* () {
     try {
-      const result = yield mutation.mutateAsync(values);
-      console.log("result", result);
-      const a = result;
-      if (a.errCode) {
-        toast("Error:" + a.errCode, {
-          description: a.errMessage,
-          action: {
-            label: "Undo",
-            onClick: () => console.log("Undo")
-          }
+      const m = mutation;
+      const result = yield m.mutateAsync({
+        input: values
+      });
+      if (result.errCode) {
+        console.log({ result, values });
+        toast("Error:" + result.errCode, {
+          description: result.errMessage.substring(0, 100),
+          closeButton: true
         });
       } else {
         toast("OK", {
-          // description: JSON.stringify(result, null, 2),
           description: "ok",
-          action: {
-            label: "Undo",
-            onClick: () => console.log("Undo")
-          }
+          closeButton: true
         });
       }
     } catch (e) {
-      toast("Error", {
-        description: "Sunday, December 03, 2023 at 9:00 AM",
+      toast("Unknown", {
+        description: e.toString(),
         action: {
-          label: "Undo",
-          onClick: () => console.log("Undo")
+          label: "close",
+          onClick: () => console.log("close")
         }
       });
     }

package/dist/esm/curd/listview/CommonListView.js

@@ -20,19 +20,20 @@ const ALL_Layouts = [
 const LzListViewLayoutDemo = lazy(() => import("./listview-layouts/listviewlayout-demo"));
 const LzListViewLayoutDefault = lazy(() => import("./listview-layouts/default"));
 function CommonListView() {
-  const svc = useListview((x) => x.svc);
-  const methodList = useListview((x) => x.methodList);
+  const svc = useListview((x) => x.curdView.svcName);
+  const methodList = useListview((x) => x.curdView.methodList);
   const paramList = useListview((x) => x.paramsList);
   const setOpenEdit = useListview((x) => x.setOpenEdit);
   const openEdit = useListview((x) => x.openEdit);
   const openCreate = useListview((x) => x.openCreate);
   const setOpenCreate = useListview((x) => x.setOpenCreate);
-  const viewUpdate = useListview((x) => x.viewUpdate);
-  const viewCreate = useListview((x) => x.viewCreate);
-  const methodUpdate = useListview((x) => x.methodUpdate);
-  const methodCreate = useListview((x) => x.methodCreate);
+  const viewUpdate = useListview((x) => x.curdView.routeEdit);
+  const viewCreate = useListview((x) => x.curdView.routeCreate);
+  const methodUpdate = useListview((x) => x.curdView.methodUpdate);
+  const methodCreate = useListview((x) => x.curdView.methodCreate);
   const openCurdViewEditor = useListview((x) => x.openCurdViewEditor);
   const setOpenCurdViewEditor = useListview((x) => x.setOpenCurdViewEditor);
+  const curdView = useListview((x) => x.curdView);
   const listQuery = useGomtmSuspenseInfiniteQuery(svc, methodList, paramList);
   if (!(listQuery == null ? void 0 : listQuery.data)) {
     return null;
@@ -93,6 +94,7 @@ function CommonListView() {
       openCurdViewEditor && /* @__PURE__ */ jsx(
         GomtmForm,
         {
+          defaultValues: curdView,
           open: openCurdViewEditor,
           fullScreen: true,
           viewName: "CurdViewEditor",

package/dist/esm/curd/listview/list-store.d.ts

@@ -3,12 +3,7 @@ import { ComponentProps, PropsWithChildren } from 'react';
 import { CurdView } from '../../gomtmpb/mtm/sppb/mtm_pb';
 interface ListViewStateProps {
     backendUrl?: string;
-    svc: string;
-    methodList: string;
-    methodGet?: string;
-    methodUpdate?: string;
-    methodCreate?: string;
-    methodDelete?: string;
+    curdView: PlainMessage<CurdView>;
     paramsGet?: any;
     paramsList?: any;
     slugPath?: string;
@@ -17,9 +12,6 @@ interface ListViewStateProps {
     layout?: string;
     data?: any;
     error?: any;
-    viewUpdate: string;
-    viewCreate: string;
-    curdView?: PlainMessage<CurdView>;
     openCurdViewEditor?: boolean;
 }
 export interface ListViewState extends ListViewStateProps {

package/dist/esm/curd/listview/list-store.js

@@ -36,20 +36,15 @@ import { createContext, useContext, useRef } from "react";
 import { useStore } from "zustand";
 import { createStore } from "zustand/vanilla";
 import { CONST_cookieListViewLayout } from "../../consts";
+import { CurdView } from "../../gomtmpb/mtm/sppb/mtm_pb";
 import { useGomtm } from "../../store/mtapp-store";
 const createListviewStore = (initProps) => {
-  const DEFAULT_PROPS = {
-    svc: initProps.svc || "",
-    methodList: initProps.methodList || "",
-    methodUpdate: "",
-    methodGet: "",
-    methodDelete: "",
-    methodCreate: "",
+  return createStore()((set, get) => __spreadProps(__spreadValues({
+    curdView: new CurdView(),
     backendUrl: "",
     viewUpdate: "",
     viewCreate: ""
-  };
-  return createStore()((set, get) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
+  }, initProps), {
     openRemove: false,
     setOpenRemove: (openRemove) => set({ openRemove }),
     openCreate: false,

package/dist/esm/curd/remove/RemovePanel.js

@@ -28,11 +28,11 @@ import { useGomtmMutation } from "../../gomtmQuery";
 import { createQueryKey } from "../../mtmFetcher";
 import { useListview } from "../listview/list-store";
 function useCurdRemove() {
-  const svc = useListview((x) => x.svc);
+  const svc = useListview((x) => x.curdView.svcName);
   const openRemove = useListview((x) => x.openRemove);
   const setOpenRemove = useListview((x) => x.setOpenRemove);
-  const methodDelete = useListview((x) => x.methodDelete);
-  const methodList = useListview((x) => x.methodList);
+  const methodDelete = useListview((x) => x.curdView.methodDelete);
+  const methodList = useListview((x) => x.curdView.methodList);
   const mutation = useGomtmMutation(svc, methodDelete, {
     onSuccess(data, variables, context) {
       queryClient.invalidateQueries({

package/dist/esm/lib/meta.d.ts

@@ -1,5 +1,5 @@
 import type { Metadata, ResolvingMetadata } from 'next';
-type Props = {
+export type Props = {
     params: {
         id: string;
     };
@@ -8,4 +8,3 @@ type Props = {
     };
 };
 export declare function generateGomtmMetadata({ params, searchParams }: Props, parent: ResolvingMetadata): Promise<Metadata>;
-export {};