gomtm 0.0.189 → 0.0.191

package/dist/esm/components/blog/BlogPostActions.js

@@ -1,11 +1,14 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useAtom } from "jotai";
 import { Icons } from "mtxuilib/icons/icons";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuShortcut, DropdownMenuTrigger } from "mtxuilib/ui/dropdown-menu";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
 import { DropdownMenuItemLink } from "mtxuilib/ui/ui-mt/DropdownMenuItemLink";
+import { curdSlugPathAtom } from "../../curd/CommonListViewV2";
 const BlogPostItemActions = (props) => {
   const { postId } = props;
+  const [curdSlugPath] = useAtom(curdSlugPathAtom);
   return /* @__PURE__ */ jsxs(DropdownMenu, { children: [
     /* @__PURE__ */ jsx(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
       MtButton,
@@ -19,8 +22,10 @@ const BlogPostItemActions = (props) => {
       }
     ) }),
     /* @__PURE__ */ jsxs(DropdownMenuContent, { align: "end", className: "w-[160px]", children: [
-      /* @__PURE__ */ jsx(DropdownMenuItemLink, { href: `/post/${postId}/edit`, children: "Edit" }),
       /* @__PURE__ */ jsx(DropdownMenuItemLink, { href: `/post/${postId}/create`, children: "create" }),
+      /* @__PURE__ */ jsx(DropdownMenuItemLink, { href: `/post/show`, children: "show" }),
+      /* @__PURE__ */ jsx(DropdownMenuItemLink, { href: `${curdSlugPath}/edit`, children: "edit" }),
+      /* @__PURE__ */ jsx(DropdownMenuItemLink, { href: `${curdSlugPath}/listdebug`, children: "list debug" }),
       /* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
       /* @__PURE__ */ jsxs(DropdownMenuItem, { children: [
         "Delete",

package/dist/esm/curd/CommonListViewV2.backup.d.ts

@@ -0,0 +1,7 @@
+import { Message } from "@bufbuild/protobuf";
+import { PropsWithChildren } from "react";
+import { MethodUnaryDescriptor } from "../connectquery";
+export declare function CommonListViewProvider<I extends Message<I>, O extends Message<O>>(props: {
+    methodList: MethodUnaryDescriptor<I, any>;
+} & PropsWithChildren): import("react").JSX.Element;
+export declare function CommonListView<I extends Message<I>, O extends Message<O>>(): import("react").JSX.Element | null;

package/dist/esm/curd/CommonListViewV2.backup.js

@@ -0,0 +1,81 @@
+"use client";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { atom, useAtom } from "jotai";
+import { ScopeAtomsHydrator } from "mtxlib/jotai/jotai-helper";
+import { cn } from "mtxuilib/lib/utils";
+import { Pagination, PaginationContent, PaginationEllipsis, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "mtxuilib/ui/pagination";
+import { MtUnaryCallErrorView } from "../components/MtUnaryCallErrorView";
+import { useSuspenseInfiniteQuery } from "../connectquery";
+import { ListViewLayout } from "../gomtmpb/mtm/sppb/mtm_pb";
+import { ListItemView } from "./list-item/ListItem";
+const listQueryAtom = atom(null);
+function CommonListViewProvider(props) {
+  const { children, methodList } = props;
+  const listquery = useSuspenseInfiniteQuery(methodList, {
+    //@ts-expect-error
+    page: 1
+  }, {
+    pageParamKey: "pagination",
+    getNextPageParam: (res, b, c) => {
+      return {
+        //@ts-expect-error
+        page: ((c == null ? void 0 : c.page) || 0) + 1
+      };
+    }
+  });
+  return /* @__PURE__ */ jsx(ScopeAtomsHydrator, { atomValues: [
+    [listQueryAtom, listquery]
+  ], children });
+}
+function CommonListView() {
+  const [listQuery, setListQuery] = useAtom(listQueryAtom);
+  if (!(listQuery == null ? void 0 : listQuery.data)) {
+    return null;
+  }
+  return /* @__PURE__ */ jsxs("div", { className: "relative w-full", children: [
+    /* @__PURE__ */ jsx(
+      "div",
+      {
+        className: cn(
+          "w-full"
+          // 滚动设置
+          // " max-h-[700px] overflow-y-auto"
+        ),
+        children: listQuery.data.pages.map((page, i) => {
+          var _a;
+          if (page.error_code) {
+            return /* @__PURE__ */ jsx(MtUnaryCallErrorView, { unaryError: page }, i);
+          } else {
+            return /* @__PURE__ */ jsx(ListLayout, { layout: page.listLayout, children: (_a = page == null ? void 0 : page.items) == null ? void 0 : _a.map((item, j) => /* @__PURE__ */ jsx(ListItemView, { item }, `${i}-${j}`)) }, i);
+          }
+        })
+      }
+    ),
+    /* @__PURE__ */ jsx(Pagination, { children: /* @__PURE__ */ jsxs(PaginationContent, { children: [
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationPrevious, { href: "#" }) }),
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationLink, { href: "#", children: "1" }) }),
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationLink, { href: "#", isActive: true, children: "2" }) }),
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationLink, { href: "#", children: "3" }) }),
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationEllipsis, {}) }),
+      /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationNext, { href: "#" }) })
+    ] }) }),
+    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1" })
+  ] });
+}
+const ListLayout = (props) => {
+  const { children } = props;
+  switch (props.layout) {
+    case ListViewLayout.simple:
+      return /* @__PURE__ */ jsx("div", { className: "flex flex-col space-y-1 rounded-md p-2 shadow-sm", children });
+    case ListViewLayout.grid:
+      return /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 grid-rows-3 gap-4 px-4 lg:grid-cols-3", children });
+    case ListViewLayout.card:
+      return /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 grid-rows-3 gap-4 px-4 lg:grid-cols-3", children });
+    default:
+      return children;
+  }
+};
+export {
+  CommonListView,
+  CommonListViewProvider
+};

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

@@ -1,7 +1,9 @@
 import { Message } from "@bufbuild/protobuf";
 import { PropsWithChildren } from "react";
 import { MethodUnaryDescriptor } from "../connectquery";
+export declare const curdSlugPathAtom: import("jotai").Atom<string>;
 export declare function CommonListViewProvider<I extends Message<I>, O extends Message<O>>(props: {
     methodList: MethodUnaryDescriptor<I, any>;
+    slugPath?: string;
 } & PropsWithChildren): import("react").JSX.Element;
 export declare function CommonListView<I extends Message<I>, O extends Message<O>>(): import("react").JSX.Element | null;

package/dist/esm/curd/CommonListViewV2.js

@@ -1,7 +1,7 @@
 "use client";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { atom, useAtom } from "jotai";
-import { useHydrateAtoms } from "jotai/utils";
+import { ScopeAtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { cn } from "mtxuilib/lib/utils";
 import { Pagination, PaginationContent, PaginationEllipsis, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "mtxuilib/ui/pagination";
 import { MtUnaryCallErrorView } from "../components/MtUnaryCallErrorView";
@@ -9,8 +9,13 @@ import { useSuspenseInfiniteQuery } from "../connectquery";
 import { ListViewLayout } from "../gomtmpb/mtm/sppb/mtm_pb";
 import { ListItemView } from "./list-item/ListItem";
 const listQueryAtom = atom(null);
+const curdSlugPathValueAtom = atom("");
+const curdSlugPathAtom = atom((get) => {
+  const value = get(curdSlugPathValueAtom);
+  return value || "/";
+});
 function CommonListViewProvider(props) {
-  const { children, methodList } = props;
+  const { children, methodList, slugPath } = props;
   const listquery = useSuspenseInfiniteQuery(methodList, {
     //@ts-expect-error
     page: 1
@@ -23,13 +28,10 @@ function CommonListViewProvider(props) {
       };
     }
   });
-  useHydrateAtoms([
-    [
-      listQueryAtom,
-      listquery
-    ]
-  ]);
-  return /* @__PURE__ */ jsx(Fragment, { children });
+  return /* @__PURE__ */ jsx(ScopeAtomsHydrator, { atomValues: [
+    [listQueryAtom, listquery],
+    [curdSlugPathValueAtom, slugPath]
+  ], children });
 }
 function CommonListView() {
   const [listQuery, setListQuery] = useAtom(listQueryAtom);
@@ -81,5 +83,6 @@ const ListLayout = (props) => {
 };
 export {
   CommonListView,
-  CommonListViewProvider
+  CommonListViewProvider,
+  curdSlugPathAtom
 };

package/dist/esm/curd/curd-detail.d.ts

@@ -2,5 +2,6 @@ import { PropsWithChildren } from "react";
 export declare const curdDetailSlugAtom: import("jotai").PrimitiveAtom<string> & {
     init: string;
 };
-export declare function CurdViewDetail<T = any>(props: PropsWithChildren): import("react").JSX.Element;
+export declare function CurdViewDetailProvider<T = any>(props: PropsWithChildren): import("react").JSX.Element;
+export declare const CurdViewDetailDefault: () => import("react").JSX.Element;
 export declare const DetailViewActions: () => import("react").JSX.Element;

package/dist/esm/curd/curd-detail.js

@@ -1,6 +1,5 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { useMemo } from "react";
 import { atom, useAtom } from "jotai";
 import { ScopeAtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { Icons } from "mtxuilib/icons/icons";
@@ -10,28 +9,25 @@ import { usePathname } from "next/navigation";
 import { useSuspenseQuery } from "../connectquery";
 import { SchemaFormView } from "../form/SchemaFormView";
 import { curdDetail } from "../gomtmpb/mtm/sppb/curd-CurdService_connectquery";
+import { curdViewGet } from "../gomtmpb/mtm/sppb/mtm-MtmService_connectquery";
+import { useCurdSlugName } from "./curd.atoms";
 const curdDetailSlugAtom = atom("");
-function CurdViewDetail(props) {
+function CurdViewDetailProvider(props) {
   const { children } = props;
   const pathName = usePathname();
-  return /* @__PURE__ */ jsxs(ScopeAtomsHydrator, { atomValues: [
+  return /* @__PURE__ */ jsx(ScopeAtomsHydrator, { atomValues: [
     [curdDetailSlugAtom, pathName]
-  ], children: [
-    /* @__PURE__ */ jsx(CurdViewDetailInner, {}),
-    children
-  ] });
+  ], children });
 }
-const CurdViewDetailInner = () => {
+const CurdViewDetailDefault = () => {
   var _a, _b, _c, _d;
   const [slugPath] = useAtom(curdDetailSlugAtom);
-  const slug = useMemo(() => {
-    const path2 = slugPath.split("/");
-    if (path2.length >= 2) {
-      return path2[2];
-    }
-  }, [slugPath]);
+  const nameSlug = useCurdSlugName();
   const detailQuery = useSuspenseQuery(curdDetail, {
-    slug
+    slug: nameSlug
+  });
+  const curdGetQuery = useSuspenseQuery(curdViewGet, {
+    name: nameSlug
   });
   if ((_b = (_a = detailQuery.data) == null ? void 0 : _a.detailView) == null ? void 0 : _b.form) {
     return /* @__PURE__ */ jsx(
@@ -44,7 +40,10 @@ const CurdViewDetailInner = () => {
       }
     );
   }
-  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx("pre", { children: JSON.stringify(detailQuery.data, null, 2) }) });
+  return /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx("pre", { children: JSON.stringify(detailQuery.data, null, 2) }),
+    /* @__PURE__ */ jsx("pre", { children: JSON.stringify(curdGetQuery.data, null, 2) })
+  ] });
 };
 const DetailViewActions = () => {
   return /* @__PURE__ */ jsxs(DropdownMenu, { children: [
@@ -58,7 +57,8 @@ const DetailViewActions = () => {
   ] });
 };
 export {
-  CurdViewDetail,
+  CurdViewDetailDefault,
+  CurdViewDetailProvider,
   DetailViewActions,
   curdDetailSlugAtom
 };

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

@@ -13,3 +13,4 @@ export declare const curdPathAtom: import("jotai").PrimitiveAtom<string> & {
     init: string;
 };
 export declare const curd3ItemsV2Atom: import("jotai").Atom<Promise<CommontListRes>>;
+export declare const useCurdSlugName: () => string | undefined;

package/dist/esm/curd/curd.atoms.js

@@ -22,6 +22,8 @@ var __async = (__this, __arguments, generator) => {
 import { atom } from "jotai";
 import { CommontListRes } from "../gomtmpb/mtm/sppb/mtm_pb";
 import { gomtmBaseUrlAtom } from "../providers/GomtmProvider";
+import { usePathname } from "next/navigation";
+import { useMemo } from "react";
 const curdDashPathPrefixAtom = atom("/gomtmadmin");
 const curdActivateIdAtom = atom("");
 const curd3ListParamsAtom = atom({});
@@ -36,10 +38,21 @@ const curd3ItemsV2Atom = atom((get) => __async(void 0, null, function* () {
   const data2 = CommontListRes.fromJson(data);
   return data2;
 }));
+const useCurdSlugName = () => {
+  const pathname = usePathname();
+  const nameSlug = useMemo(() => {
+    const a = pathname.split("/");
+    if (a.length >= 2) {
+      return a[2];
+    }
+  }, [pathname]);
+  return nameSlug;
+};
 export {
   curd3ItemsV2Atom,
   curd3ListParamsAtom,
   curdActivateIdAtom,
   curdDashPathPrefixAtom,
-  curdPathAtom
+  curdPathAtom,
+  useCurdSlugName
 };

package/dist/esm/curd/list-item/ListItem.js

@@ -44,7 +44,7 @@ const CommonListItemView = (props) => {
         // item.id == curd.activateId && " font-bold"
       ),
       "aria-label": item.id,
-      children: /* @__PURE__ */ jsxs(MtLink, { href: `/gomtmadmin/${slug}/${item.id}`, children: [
+      children: /* @__PURE__ */ jsxs(MtLink, { href: `/admin/${slug}/${item.id}`, children: [
         item.title || item.id,
         item.description && /* @__PURE__ */ jsx("div", { children: item.description })
       ] })

package/dist/esm/gomtm-clients-ss.js

@@ -103,6 +103,7 @@ const gomtmFetcher = (initGlobal) => {
       }), headerCookie && { "Cookie": headerCookie })
     });
     let fetcher = fetch;
+    req.enableCache = false;
     if (req.enableCache) {
       fetcher = fetchMiddleWithCache(fetch);
     }
@@ -110,7 +111,11 @@ const gomtmFetcher = (initGlobal) => {
       const responseData = yield fetcher(input, init);
       return responseData;
     } catch (e) {
-      console.error("mtmfetch error", e);
+      console.error("[mtmfetch error]", {
+        input,
+        error: e,
+        init
+      });
       const errorRsp = {
         errCode: "-1",
         errMessage: (e == null ? void 0 : e.toString()) || "unknow error"

package/dist/esm/gomtmcurd/gomtmcurd-detailview.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const GomtmCurdDetailView: () => import("react").JSX.Element;

package/dist/esm/gomtmcurd/gomtmcurd-detailview.js

@@ -0,0 +1,19 @@
+"use client";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useSuspenseQuery } from "../connectquery";
+import { curdViewGet } from "../gomtmpb/mtm/sppb/mtm-MtmService_connectquery";
+import { useCurdSlugName } from "./hooks";
+const GomtmCurdDetailView = () => {
+  const nameSlug = useCurdSlugName();
+  const curdGetQuery = useSuspenseQuery(curdViewGet, {
+    name: nameSlug
+  });
+  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs("div", { className: "bg-blue-200 p-2", children: [
+    "nameSlug:",
+    nameSlug,
+    /* @__PURE__ */ jsx("pre", { children: JSON.stringify(curdGetQuery.data, null, 2) })
+  ] }) });
+};
+export {
+  GomtmCurdDetailView
+};

package/dist/esm/gomtmcurd/gomtmcurd-listview.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const GomtmCurdListView: () => import("react").JSX.Element;

package/dist/esm/gomtmcurd/gomtmcurd-listview.js

@@ -0,0 +1,24 @@
+"use client";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { useSuspenseQuery } from "../connectquery";
+import { ListItemView } from "../curd/list-item/ListItem";
+import { curdList } from "../gomtmpb/mtm/sppb/curd-CurdService_connectquery";
+import { useCurdSlugName } from "./hooks";
+const GomtmCurdListView = () => {
+  var _a, _b;
+  const slugName = useCurdSlugName();
+  const listQuery = useSuspenseQuery(curdList, {
+    params: {
+      slugs: slugName
+    }
+  });
+  return /* @__PURE__ */ jsx("div", { className: " bg-cyan-500", children: ((_a = listQuery.data.error) == null ? void 0 : _a.code) ? /* @__PURE__ */ jsxs("div", { children: [
+    "error: ",
+    listQuery.data.error.code
+  ] }) : /* @__PURE__ */ jsx(Fragment, { children: (_b = listQuery.data.items) == null ? void 0 : _b.map((item, i) => {
+    return /* @__PURE__ */ jsx(ListItemView, { item }, i);
+  }) }) });
+};
+export {
+  GomtmCurdListView
+};

package/dist/esm/gomtmcurd/hooks.d.ts

@@ -0,0 +1 @@
+export declare const useCurdSlugName: () => string | undefined;

package/dist/esm/gomtmcurd/hooks.js

@@ -0,0 +1,16 @@
+"use client";
+import { usePathname } from "next/navigation";
+import { useMemo } from "react";
+const useCurdSlugName = () => {
+  const pathname = usePathname();
+  const nameSlug = useMemo(() => {
+    const a = pathname.split("/");
+    if (a.length >= 2) {
+      return a[2];
+    }
+  }, [pathname]);
+  return nameSlug;
+};
+export {
+  useCurdSlugName
+};

package/dist/esm/providers/GomtmProvider.js

@@ -24,8 +24,9 @@ const curd3BackendUrlAtom = atom((get) => {
 });
 const transportAtom = atom((get) => {
   const baseUrl = get(curd3BackendUrlAtom);
+  const baseUrl2 = new URL("/api", baseUrl).toString();
   return createConnectTransport({
-    baseUrl,
+    baseUrl: baseUrl2,
     fetch: gomtmFetcher()
   });
 });