gomtm 0.0.223 → 0.0.225

package/dist/esm/consts.d.ts

@@ -10,6 +10,7 @@ export declare const MTM_SERVER_COOKIE_ACTIVATE_URL = "mtm:serverUrl";
 export declare const MTM_SERVER_COOKIE_ACTIVATE_SELFBACKEND_URL = "mtm:selfbackendUrl";
 export declare const DEFAULT_revalidate_SECONDS = 3;
 export declare const LOGIN_CALLBACK_URL_KEY = "back";
+export declare const MTM_API_PREFIX = "/api";
 export declare const ExtKey_Hostname = "host";
 export declare const ExtKey_mtmaccessToken = "access_token";
 export declare const ItemAction_list_new_item = "list_new_item";

package/dist/esm/consts.js

@@ -10,6 +10,7 @@ const MTM_SERVER_COOKIE_ACTIVATE_URL = "mtm:serverUrl";
 const MTM_SERVER_COOKIE_ACTIVATE_SELFBACKEND_URL = "mtm:selfbackendUrl";
 const DEFAULT_revalidate_SECONDS = 3;
 const LOGIN_CALLBACK_URL_KEY = "back";
+const MTM_API_PREFIX = "/api";
 const ExtKey_Hostname = "host";
 const ExtKey_mtmaccessToken = "access_token";
 const ItemAction_list_new_item = "list_new_item";
@@ -45,6 +46,7 @@ export {
   ListView_DefaultPageSize,
   Listview_list_filter,
   MEMBER_ROLE,
+  MTM_API_PREFIX,
   MTM_SERVER_COOKIE_ACTIVATE_SELFBACKEND_URL,
   MTM_SERVER_COOKIE_ACTIVATE_URL,
   MTM_SITE_HOSTNAME,

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

@@ -13,3 +13,4 @@ export declare function CommonListViewProvider<I extends Message<I>, O extends M
     slugPath?: string;
 } & PropsWithChildren): import("react").JSX.Element;
 export declare function CommonListView<I extends Message<I>, O extends Message<O>>(): import("react").JSX.Element | null;
+export declare const ListViewActions: () => import("react").JSX.Element;

package/dist/esm/curd/CommonListViewV2.js

@@ -23,8 +23,10 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { atom, useAtom } from "jotai";
 import { ScopeAtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { DebugAtomValue } from "mtxuilib/common/devtools/DebugAtomValue";
+import { Icons } from "mtxuilib/icons/icons";
 import { cn } from "mtxuilib/lib/utils";
 import { Dialog, DialogContent, DialogTitle } from "mtxuilib/ui/dialog";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "mtxuilib/ui/dropdown-menu";
 import { Pagination, PaginationContent, PaginationEllipsis, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "mtxuilib/ui/pagination";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
 import { Suspense } from "react";
@@ -113,18 +115,7 @@ function CommonListView() {
       /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationEllipsis, {}) }),
       /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationNext, { href: "#" }) })
     ] }) }),
-    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1" }),
-    /* @__PURE__ */ jsxs(Suspense, { children: [
-      /* @__PURE__ */ jsx(PanelRemove, {}),
-      /* @__PURE__ */ jsx(PanelCreate, {}),
-      /* @__PURE__ */ jsx(DlgCurdDebugInfo, {}),
-      /* @__PURE__ */ jsx(CurdCreatePanel, {}),
-      /* @__PURE__ */ jsxs("div", { className: "bg-yellow-100 p-2", children: [
-        /* @__PURE__ */ jsx(DlgCurdDebugInfoTriggerButton, {}),
-        /* @__PURE__ */ jsx(CurdEditPanelTriggerButton, {}),
-        /* @__PURE__ */ jsx(CurdCreatePanelTriggerButton, {})
-      ] })
-    ] })
+    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1", children: /* @__PURE__ */ jsx(ListViewActions, {}) })
   ] });
 }
 const PanelRemove = () => {
@@ -156,9 +147,31 @@ const PanelCreate = () => {
     }), children: "ok" })
   ] }) });
 };
+const ListViewActions = () => {
+  return /* @__PURE__ */ jsxs(DropdownMenu, { children: [
+    /* @__PURE__ */ jsx(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsx(MtButton, { variant: "ghost", className: "m-0 flex h-10 w-10 items-center justify-center border p-0 shadow-sm backdrop-blur", children: /* @__PURE__ */ jsx(Icons.ellipsis, {}) }) }),
+    /* @__PURE__ */ jsxs(DropdownMenuContent, { className: "w-56", children: [
+      /* @__PURE__ */ jsx(DropdownMenuLabel, { children: "Edit" }),
+      /* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
+      /* @__PURE__ */ jsx(DropdownMenuGroup, { children: /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
+        /* @__PURE__ */ jsx(PanelRemove, {}),
+        /* @__PURE__ */ jsx(PanelCreate, {}),
+        /* @__PURE__ */ jsx(DlgCurdDebugInfo, {}),
+        /* @__PURE__ */ jsx(CurdCreatePanel, {}),
+        /* @__PURE__ */ jsxs("div", { className: "bg-yellow-100 p-2", children: [
+          /* @__PURE__ */ jsx(DlgCurdDebugInfoTriggerButton, {}),
+          /* @__PURE__ */ jsx(CurdEditPanelTriggerButton, {}),
+          /* @__PURE__ */ jsx(CurdCreatePanelTriggerButton, {})
+        ] })
+      ] }) }) }),
+      /* @__PURE__ */ jsx(DropdownMenuSeparator, {})
+    ] })
+  ] });
+};
 export {
   CommonListView,
   CommonListViewProvider,
+  ListViewActions,
   curdSlugPathAtom,
   exampleListItemComponent,
   exampleListItemValueComponent

package/dist/esm/curd/dlg/DlgCurdDebugInfo.js

@@ -5,7 +5,7 @@ import { DebugAtomValue } from "mtxuilib/common/devtools/DebugAtomValue";
 import { flexRender } from "mtxuilib/lib/render";
 import { Dialog, DialogContent, DialogTitle } from "mtxuilib/ui/dialog";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
-import { isDebugAtom } from "../../store/gomtm.atom";
+import { isDebugAtom } from "../../providers/GomtmProvider";
 import { exampleListItemComponent } from "../CommonListViewV2";
 import { createMethodSigAtom, curdActivateIdAtom, removeMethodSigAtom } from "../curd.atoms";
 const openDlgCurdDebugInfoAtom = atom(false);
@@ -30,7 +30,7 @@ const DlgCurdDebugInfoTriggerButton = () => {
   }
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(MtButton, { onClick: () => {
     setOpenDlgCurdDebugInfo(true);
-  }, children: "DlgCurdDebugInfoTriggerButton" }) });
+  }, children: "DlgCurdDebug" }) });
 };
 export {
   DlgCurdDebugInfo,

package/dist/esm/mtmFetcher.d.ts

@@ -1,4 +1,5 @@
 import { ServiceType } from "@bufbuild/protobuf";
+export declare const ssrGetBackendUrl: () => string;
 export declare function createMtmServiceClient<T extends ServiceType>(service: T, url?: string): import("@connectrpc/connect").PromiseClient<T>;
 export declare function createMtmServiceClientByName<T extends ServiceType>(svcName: string, url?: string): import("@connectrpc/connect").PromiseClient<ServiceType>;
 type CustomRequestInit = RequestInit & {

package/dist/esm/mtmFetcher.js

@@ -37,17 +37,28 @@ var __async = (__this, __arguments, generator) => {
 import { createPromiseClient } from "@connectrpc/connect";
 import { createConnectTransport } from "@connectrpc/connect-web";
 import { merge } from "lodash";
+import { MTM_API_PREFIX } from "./consts";
 import { MtmService } from "./gomtmpb/mtm/sppb/mtm_connect";
-function createMtmServiceClient(service, url) {
-  const baseUrl = url || process.env.MTM_BACKEND;
-  if (!baseUrl) {
-    throw new Error("missing mtm api url,\xB7MTM_BACKEND\xB7");
+const ssrGetBackendUrl = () => {
+  var _a;
+  if (typeof window == "undefined") {
+    if ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.MTM_BACKEND) {
+      return process.env.MTM_BACKEND;
+    }
+    if (process.env.VERCEL_URL) {
+      return `https://${process.env.VERCEL_URL}`;
+    }
   }
-  console.info("gomtm baseUrl:", baseUrl);
+  return "";
+};
+function createMtmServiceClient(service, url) {
+  const baseUrl = ssrGetBackendUrl();
+  const apiUrl = new URL(MTM_API_PREFIX, baseUrl).toString();
+  console.info("gomtm apiUrl:", baseUrl);
   return createPromiseClient(
     service,
     createConnectTransport({
-      baseUrl,
+      baseUrl: apiUrl,
       fetch: gomtmFetcher()
     })
   );
@@ -125,5 +136,6 @@ const gomtmFetcher = (initGlobal) => {
 export {
   createMtmServiceClient,
   createMtmServiceClientByName,
-  gomtmFetcher
+  gomtmFetcher,
+  ssrGetBackendUrl
 };

package/dist/esm/providers/GomtmAppSS.d.ts

@@ -1,3 +1,2 @@
 import { PropsWithChildren } from "react";
 export declare function GomtmAppSS(props: {} & PropsWithChildren): Promise<import("react").JSX.Element>;
-export declare const ssrGetBackendUrl: () => string;

package/dist/esm/providers/GomtmAppSS.js

@@ -19,7 +19,10 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { Fragment, jsx } from "react/jsx-runtime";
-import { GomtmProvider } from "./GomtmProvider";
+import { ScopeAtomsHydrator } from "mtxlib/jotai/jotai-helper";
+import { headers } from "next/headers";
+import { GomtmProvider, cookiesAtom } from "./GomtmProvider";
+import { ssrGetBackendUrl } from "../mtmFetcher";
 function GomtmAppSS(props) {
   return __async(this, null, function* () {
     const { children } = props;
@@ -27,22 +30,12 @@ function GomtmAppSS(props) {
     if (!backend) {
       return /* @__PURE__ */ jsx(Fragment, { children: "missing backend" });
     }
-    return /* @__PURE__ */ jsx(GomtmProvider, { backendUrl: backend, children });
+    const cookiesStr = headers().get("Cookie");
+    return /* @__PURE__ */ jsx(GomtmProvider, { backendUrl: backend, children: /* @__PURE__ */ jsx(ScopeAtomsHydrator, { atomValues: [
+      [cookiesAtom, cookiesStr]
+    ], children }) });
   });
 }
-const ssrGetBackendUrl = () => {
-  var _a;
-  if (typeof window == "undefined") {
-    if ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.MTM_BACKEND) {
-      return process.env.MTM_BACKEND;
-    }
-    if (process.env.VERCEL_URL) {
-      return `https://${process.env.VERCEL_URL}`;
-    }
-  }
-  return "https://localhost";
-};
 export {
-  GomtmAppSS,
-  ssrGetBackendUrl
+  GomtmAppSS
 };

package/dist/esm/providers/GomtmProvider.d.ts

@@ -46,14 +46,12 @@ export type ActionHandler = (props: {
 export declare const gomtmBaseUrlAtom: import("jotai").PrimitiveAtom<string> & {
     init: string;
 };
-export declare const cookiesValueAtom: import("jotai").PrimitiveAtom<string | undefined> & {
-    init: string | undefined;
+export declare const cookiesAtom: import("jotai").WritableAtom<string | undefined, [value: string], void>;
+export declare const isDebugValueAtom: import("jotai").PrimitiveAtom<boolean> & {
+    init: boolean;
 };
-export declare const cookiesAtom: import("jotai").Atom<string | undefined>;
+export declare const isDebugAtom: import("jotai").WritableAtom<boolean, [value: boolean], void>;
 export declare const transportAtom: import("jotai").Atom<Transport>;
-export declare const useGomtmBackend: () => {
-    gomtmBaseUrl: string;
-};
 interface GomtmAppProps {
     backendUrl?: string | null;
 }

package/dist/esm/providers/GomtmProvider.js

@@ -7,7 +7,6 @@ import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { useHotkeys } from "react-hotkeys-hook";
 import { TransportProvider } from "../connectquery";
 import { gomtmFetcher } from "../mtmFetcher";
-import { isDebugAtom } from "../store/gomtm.atom";
 import { MtReactQueryProvider } from "./ReactQueryProvider";
 const mtmAppStore = createStore();
 const gomtmBaseUrlAtom = atom("");
@@ -26,28 +25,25 @@ const cookiesValueAtom = atom(void 0);
 const cookiesAtom = atom((get) => {
   const v = get(cookiesValueAtom);
   return v;
+}, (_, set, value) => {
+  set(cookiesValueAtom, value);
+});
+const isDebugValueAtom = atom(false);
+const isDebugAtom = atom((get) => {
+  return get(isDebugValueAtom);
+}, (_, set, value) => {
+  set(isDebugValueAtom, value);
 });
 const transportAtom = atom((get) => {
   const baseUrl = get(curd3BackendUrlAtom);
-  const baseUrl2 = new URL("/api", baseUrl).toString();
   const cookiesStr = get(cookiesAtom);
-  console.log("transportAtom :", {
-    baseUrl2,
-    cookiesStr
-  });
   return createConnectTransport({
-    baseUrl: baseUrl2,
+    baseUrl,
     fetch: gomtmFetcher({
       cookieStr: cookiesStr
     })
   });
 });
-const useGomtmBackend = () => {
-  const [gomtmBaseUrl, setgomtmBaseUrl] = useAtom(gomtmBaseUrlAtom);
-  return {
-    gomtmBaseUrl
-  };
-};
 const AppContext = createContext(void 0);
 function GomtmProvider(props) {
   const { children } = props;
@@ -88,11 +84,11 @@ export {
   GomtmProvider,
   MtConnectProvider,
   cookiesAtom,
-  cookiesValueAtom,
   gomtmBaseUrlAtom,
+  isDebugAtom,
+  isDebugValueAtom,
   mtmAppStore,
   transportAtom,
-  useGomtmBackend,
   useHostname,
   useMtmApp,
   useMtmBackendUrl

package/dist/esm/store/auth.d.ts

@@ -1,7 +1,3 @@
-export declare const isAdminAtom: import("jotai").PrimitiveAtom<boolean> & {
-    init: boolean;
-};
-export declare const useIsAdmin: () => boolean;
 export declare function isRoleMatch(currentRoles: string[], allowRoles?: string[]): boolean;
 import { MyJWTPayload } from "../lib/auth/jwt";
 export declare function useAuth(): {

package/dist/esm/store/auth.js

@@ -1,10 +1,4 @@
 "use client";
-import { atom, useAtom } from "jotai";
-const isAdminAtom = atom(false);
-const useIsAdmin = () => {
-  const [isAdmin, setisAdmin] = useAtom(isAdminAtom);
-  return isAdmin;
-};
 function isRoleMatch(currentRoles, allowRoles) {
   if (!currentRoles) {
     return true;
@@ -36,8 +30,6 @@ function useAuth() {
   return { auth, userId, isAdmin };
 }
 export {
-  isAdminAtom,
   isRoleMatch,
-  useAuth,
-  useIsAdmin
+  useAuth
 };