gomtm 0.0.290 → 0.0.292

package/dist/esm/components/devtools/GoMtmDebug.d.ts

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

package/dist/esm/components/devtools/GoMtmDebug.js

@@ -5,10 +5,15 @@ import { CommandDialog, CommandEmpty, CommandInput, CommandList, CommandSeparato
 import { Dialog, DialogContent, DialogTrigger } from "mtxuilib/ui/dialog";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
 import { useState } from "react";
-import { useGomtm } from "../../store/mtapp-store";
+import { GomtmAppSetting } from "../../store/GomtmAppSetting";
+import { DebugCounter, useGomtm } from "../../store/mtapp-store";
 const GoMtmDebug = () => {
   const [open, setOpen] = useState(false);
-  return /* @__PURE__ */ jsxs("div", { className: "fixed bottom-12 right-2 bg-red-300", children: [
+  const debug = useGomtm((x) => x.debug);
+  if (!debug) {
+    return null;
+  }
+  return /* @__PURE__ */ jsxs("div", { className: "fixed bottom-24 right-8 z-20 bg-red-300", children: [
     /* @__PURE__ */ jsx(MtButton, { onClick: () => {
       setOpen(true);
     }, children: /* @__PURE__ */ jsx(Icons.bug, {}) }),
@@ -18,7 +23,11 @@ const GoMtmDebug = () => {
       } }),
       /* @__PURE__ */ jsxs(CommandList, { children: [
         /* @__PURE__ */ jsx(CommandEmpty, { children: "No results found." }),
-        /* @__PURE__ */ jsx("div", { className: "flex gap-2 bg-slate-100 p-2", children: /* @__PURE__ */ jsx(DebugAppMainStateDlg, {}) }),
+        /* @__PURE__ */ jsxs("div", { className: "flex gap-2 bg-slate-100 p-2", children: [
+          /* @__PURE__ */ jsx(DebugAppMainStateDlg, {}),
+          /* @__PURE__ */ jsx(GomtmAppSetting, {}),
+          /* @__PURE__ */ jsx(DebugCounter, {})
+        ] }),
         /* @__PURE__ */ jsx(CommandSeparator, {})
       ] })
     ] })

package/dist/esm/consts.d.ts

@@ -30,13 +30,6 @@ export declare const HOTKEY_Listview_Switchlayout = "alt+m";
 export declare const HOTKEY_ListViewCMDK = "alt+c";
 export declare const CONST_cookieListViewLayout = "listViewLayout";
 export declare const CONST_debounce_INPUT = 300;
-export declare const gomtmAppConfig: {
-    cookieBackendUrl: string;
-    CookieLayout: string;
-    CookieConfigState: string;
-};
-export declare const getGomtmConfig: () => {
-    cookieBackendUrl: string;
-    CookieLayout: string;
-    CookieConfigState: string;
-};
+export declare const CookieConfigState = "_config";
+export declare const CookieLayout = "layout";
+export declare const cookieBackendUrl = "backendUrl";

package/dist/esm/consts.js

@@ -30,15 +30,9 @@ const HOTKEY_Listview_Switchlayout = "alt+m";
 const HOTKEY_ListViewCMDK = "alt+c";
 const CONST_cookieListViewLayout = "listViewLayout";
 const CONST_debounce_INPUT = 300;
-const gomtmAppConfig = {
-  cookieBackendUrl: "backendUrl",
-  // cookieListViewLayout: "listViewLayout",
-  CookieLayout: "layout",
-  CookieConfigState: "_config"
-};
-const getGomtmConfig = () => {
-  return gomtmAppConfig;
-};
+const CookieConfigState = "_config";
+const CookieLayout = "layout";
+const cookieBackendUrl = "backendUrl";
 export {
   ADMIN_ROLE,
   ActionCreate,
@@ -49,6 +43,8 @@ export {
   CONST_cookieListViewLayout,
   CONST_debounce_INPUT,
   COOKIE_MTM_SITE_ID,
+  CookieConfigState,
+  CookieLayout,
   Cookie_Site_Host,
   DEFAULT_revalidate_SECONDS,
   ExtKey_Hostname,
@@ -71,7 +67,6 @@ export {
   MTM_SITE_HOSTNAME,
   MtM_TOKEN_NAME,
   TRPC_API_PREFIX,
-  fetchMaxRetry,
-  getGomtmConfig,
-  gomtmAppConfig
+  cookieBackendUrl,
+  fetchMaxRetry
 };

package/dist/esm/curd/list-item/ListLayout.d.ts

@@ -2,4 +2,4 @@ import { PropsWithChildren } from "react";
 import { ListViewLayout } from "../../gomtmpb/mtm/sppb/mtm_pb";
 export declare const ListLayout: (props: {
     layout: ListViewLayout;
-} & PropsWithChildren) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | import("react").JSX.Element | null | undefined;
+} & PropsWithChildren) => string | number | bigint | boolean | import("react").JSX.Element | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | null | undefined;

package/dist/esm/curd/listview/ListViewProvider.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { Message } from "@bufbuild/protobuf";
 export declare const LzListViewLayoutDemo: import("react").LazyExoticComponent<typeof import("./listview-layouts/listviewlayout-demo").default>;
 export declare const LzListViewLayoutDefault: import("react").LazyExoticComponent<typeof import("./listview-layouts/default").default>;
-export declare function CommonListView<I extends Message<I>, O extends Message<O>>(): import("react").JSX.Element | null;
+export declare function CommonListView(): import("react").JSX.Element | null;
+export declare function CommonListViewV2(): import("react").JSX.Element;
 export declare const ListViewActions: () => import("react").JSX.Element;

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

@@ -26,7 +26,7 @@ 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, lazy, useMemo, useState } from "react";
+import { Suspense, lazy, use, useMemo, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { MtmErrorView } from "../../components/MtmErrorView";
 import { HOTKEY_Listview_Switchlayout } from "../../consts";
@@ -46,7 +46,6 @@ function CommonListView() {
   const svc = useListview((x) => x.svc);
   const methodList = useListview((x) => x.methodList);
   const paramList = useListview((x) => x.paramsList);
-  const backendUrl = useListview((x) => x.backendUrl);
   const listQuery = useGomtmSuspenseInfiniteQuery(svc, methodList, paramList);
   if (!(listQuery == null ? void 0 : listQuery.data)) {
     return null;
@@ -70,7 +69,7 @@ function CommonListView() {
         })
       }
     ),
-    /* @__PURE__ */ jsx(Pagination, { children: /* @__PURE__ */ jsxs(PaginationContent, { children: [
+    listQuery.data.pages && !!listQuery.data.pages.length && /* @__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" }) }),
@@ -81,6 +80,28 @@ function CommonListView() {
     /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1", children: /* @__PURE__ */ jsx(ListViewActions, {}) })
   ] });
 }
+function CommonListViewV2() {
+  const useListData = useListview((x) => x.loadListData);
+  const bbb = use(useListData());
+  return /* @__PURE__ */ jsxs("div", { className: "relative w-full bg-slate-200 p-2", children: [
+    /* @__PURE__ */ jsxs(
+      "div",
+      {
+        className: cn(
+          "w-full"
+          // 滚动设置
+          // " max-h-[700px] overflow-y-auto"
+        ),
+        children: [
+          /* @__PURE__ */ jsx(MtButton, { onClick: () => {
+          }, children: "fetch next" }),
+          /* @__PURE__ */ jsx("pre", { children: JSON.stringify(bbb, null, 2) })
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1" })
+  ] });
+}
 const PanelRemove = () => {
   const svc = useListview((x) => x.svc);
   const openRemove = useListview((x) => x.openRemove);
@@ -167,6 +188,7 @@ const ListViewLayoutSwitch = () => {
 };
 export {
   CommonListView,
+  CommonListViewV2,
   ListViewActions,
   LzListViewLayoutDefault,
   LzListViewLayoutDemo

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

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import { ComponentProps, PropsWithChildren } from 'react';
 interface ListViewStateProps {
-    backendUrl?: string;
+    backendUrl: string;
     svc: string;
     methodList: string;
     methodGet: string;
@@ -12,6 +12,8 @@ interface ListViewStateProps {
     activateItem?: any;
     detailData?: any;
     layout?: string;
+    data?: any;
+    error?: any;
 }
 export interface ListViewState extends ListViewStateProps {
     openRemove: boolean;
@@ -22,17 +24,12 @@ export interface ListViewState extends ListViewStateProps {
     setOpenEdit: (openEdit: boolean) => void;
     setLayout: (layout: string) => void;
     setActivateItem: (activateItem: any) => void;
-    loading?: boolean;
-    success?: boolean;
-    error?: boolean;
-    data?: any;
-    errorData?: any;
-    demoListData?: any;
-    items?: any[];
-    value1?: any;
+    loadListData: () => Promise<any>;
+    nextPage: () => void;
 }
 export declare const listViewContext: import("react").Context<import("zustand").StoreApi<ListViewState> | null>;
 type BearProviderProps = React.PropsWithChildren<ListViewStateProps>;
 export declare const ListViewStoreProvider: (props: BearProviderProps) => import("react").JSX.Element;
+export declare const ListView: (props: Omit<ComponentProps<typeof ListViewStoreProvider>, 'backendUrl'> & PropsWithChildren) => import("react").JSX.Element;
 export declare function useListview<T>(selector: (state: ListViewState) => T): T;
 export {};

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

@@ -30,21 +30,44 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 import { jsx } from "react/jsx-runtime";
 import { setCookie } from "mtxlib/clientlib";
 import { createContext, useContext, useRef } from "react";
 import { useStore } from "zustand";
 import { createStore } from "zustand/vanilla";
 import { CONST_cookieListViewLayout } from "../../consts";
+import { goMtmQueryFn } from "../../mtmFetcher";
+import { useGomtm } from "../../store/mtapp-store";
 const createListviewStore = (initProps) => {
   const DEFAULT_PROPS = {
     svc: initProps.svc || "",
     methodList: initProps.methodList || "",
     methodGet: "",
     methodDelete: "",
-    methodCreate: ""
+    methodCreate: "",
+    backendUrl: ""
   };
-  return createStore()((set) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
+  return createStore()((set, get) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
     openRemove: false,
     setOpenRemove: (openRemove) => set({ openRemove }),
     openCreate: false,
@@ -55,6 +78,20 @@ const createListviewStore = (initProps) => {
     setLayout: (layout) => {
       setCookie(CONST_cookieListViewLayout, layout);
       return set((state) => ({ layout }));
+    },
+    loadListData: () => __async(void 0, null, function* () {
+      const data = yield goMtmQueryFn({
+        svc: get().svc,
+        method: get().methodList,
+        input: get().paramsList,
+        options: {
+          url: get().backendUrl
+        }
+      });
+      set({ data });
+      return data;
+    }),
+    nextPage: () => {
     }
   }));
 };
@@ -67,6 +104,11 @@ const ListViewStoreProvider = (props) => {
   }
   return /* @__PURE__ */ jsx(listViewContext.Provider, { value: storeRef.current, children });
 };
+const ListView = (props) => {
+  const backendUrl = useGomtm((x) => x.backendUrl);
+  const _a = props, { children } = _a, etc = __objRest(_a, ["children"]);
+  return /* @__PURE__ */ jsx(ListViewStoreProvider, __spreadProps(__spreadValues({}, props), { backendUrl: backendUrl || "", children }));
+};
 function useListview(selector) {
   const store = useContext(listViewContext);
   if (!store)
@@ -74,6 +116,7 @@ function useListview(selector) {
   return useStore(store, selector);
 }
 export {
+  ListView,
   ListViewStoreProvider,
   listViewContext,
   useListview

package/dist/esm/gomtmQuery.js

@@ -4,14 +4,25 @@ import { MTM_API_PREFIX } from "./consts";
 import { createInfiniteQueryKey, createQueryKey, goMtmQueryFn } from "./mtmFetcher";
 import { useGomtm } from "./store/mtapp-store";
 const useGomtmQuery = (svc, method, input) => {
+  const cookieStr = useGomtm((x) => x.cookieStr);
+  const backendUrl = useGomtm((x) => x.backendUrl);
   const query = useQuery({
     queryKey: createQueryKey(svc, method, input),
-    queryFn: (k) => goMtmQueryFn({ svc, method, input })
+    queryFn: (k) => goMtmQueryFn({
+      svc,
+      method,
+      input,
+      options: {
+        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
+        token: cookieStr
+      }
+    })
   });
   return query;
 };
 const useGomtmSuspenseQuery = (svc, method, input) => {
-  const backendUrl = useGomtm((x) => x.configState.backendUrl);
+  const backendUrl = useGomtm((x) => x.backendUrl);
+  const cookieStr = useGomtm((x) => x.cookieStr);
   const query = useSuspenseQuery({
     queryKey: createQueryKey(svc, method, input),
     queryFn: (k) => goMtmQueryFn({
@@ -19,14 +30,16 @@ const useGomtmSuspenseQuery = (svc, method, input) => {
       method,
       input,
       options: {
-        url: new URL(MTM_API_PREFIX, backendUrl).toString()
+        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
+        token: cookieStr
       }
     })
   });
   return query;
 };
 const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
-  const backendUrl = useGomtm((x) => x.configState.backendUrl);
+  const backendUrl = useGomtm((x) => x.backendUrl);
+  const cookieStr = useGomtm((x) => x.cookieStr);
   const query = useSuspenseInfiniteQuery({
     queryKey: createInfiniteQueryKey(svc, method, input),
     queryFn: (k) => goMtmQueryFn({
@@ -34,7 +47,8 @@ const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
       method,
       input,
       options: {
-        url: new URL(MTM_API_PREFIX, backendUrl).toString()
+        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
+        token: cookieStr
       }
     }),
     initialPageParam: input,
@@ -45,14 +59,16 @@ const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
   return query;
 };
 const useGomtmMutation = (svc, method) => {
-  const backendUrl = useGomtm((x) => x.configState.backendUrl);
+  const backendUrl = useGomtm((x) => x.backendUrl);
+  const cookieStr = useGomtm((x) => x.cookieStr);
   return useMutation({
     mutationFn: (input) => goMtmQueryFn({
       svc,
       method,
       input,
       options: {
-        url: new URL(MTM_API_PREFIX, backendUrl).toString()
+        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
+        token: cookieStr
       }
     })
   });

package/dist/esm/ly/LayoutBase.js

@@ -25,7 +25,7 @@ const LzDebugLayout = lazy(() => import("./debug-layout"));
 const LzFrontLayout = lazy(() => import("./front-layout"));
 const LayoutBase = (props) => {
   const { children } = props;
-  const layout = useGomtm((x) => x.configState.layout);
+  const layout = useGomtm((x) => x.layout);
   const LayoutComponent = useMemo(() => {
     switch (layout) {
       case "dash5":
@@ -57,7 +57,7 @@ const LayoutBase = (props) => {
   ] }) });
 };
 const LayoutSwitchDlg = () => {
-  const layout = useGomtm((x) => x.configState.layout);
+  const layout = useGomtm((x) => x.layout);
   const setLayout = useGomtm((x) => x.setLayout);
   const [open, setOpen] = useState(false);
   useHotkeys(HOTKEY_Switchlayout, () => {

package/dist/esm/ly/UserAvatorMenus.js

@@ -10,6 +10,7 @@ import { useAuth } from "../providers/AuthProvider";
 function UserAvatorMenus() {
   const pathName = usePathname();
   const auth = useAuth();
+  console.log("auth.userId", auth.userId);
   return /* @__PURE__ */ jsx(Fragment, { children: !auth.userId ? /* @__PURE__ */ jsx(MtLink, { variant: "ghost", href: `/login?next=${pathName}`, children: " login" }) : /* @__PURE__ */ jsxs(DropdownMenu, { children: [
     /* @__PURE__ */ jsx(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(Avatar, { children: [
       /* @__PURE__ */ jsx(AvatarImage, { src: "/mtm_images/placeholder-user.jpg", alt: "@siteCook" }),

package/dist/esm/ly/front-layout/PageSearchCmd.js

@@ -36,27 +36,24 @@ const PageSearchCmd = () => {
   const setSearchParams = useGomtm((x) => x.setGlobalSearchParams);
   const form = useForm();
   return /* @__PURE__ */ jsxs(MtForm, __spreadProps(__spreadValues({}, form), { children: [
-    /* @__PURE__ */ jsxs("form", { onSubmit: form.handleSubmit(() => {
-    }), children: [
-      /* @__PURE__ */ jsx("pre", { children: JSON.stringify(globalSearchParams, null, 2) }),
-      /* @__PURE__ */ jsxs("div", { className: "relative ml-auto flex-1 md:grow-0", children: [
-        /* @__PURE__ */ jsx(Search, { className: "text-muted-foreground absolute left-2.5 top-2.5 h-4 w-4" }),
-        /* @__PURE__ */ jsx(
-          Input,
-          {
-            type: "search",
-            placeholder: "Search...",
-            className: "bg-background w-full rounded-lg pl-8 md:w-[200px] lg:w-[336px]",
-            defaultValue: globalSearchParams == null ? void 0 : globalSearchParams.q,
-            onChange: (e) => {
-              setSearchParams({
-                q: e.target.value
-              });
-            }
+    /* @__PURE__ */ jsx("form", { onSubmit: form.handleSubmit(() => {
+    }), children: /* @__PURE__ */ jsxs("div", { className: "relative ml-auto flex-1 md:grow-0", children: [
+      /* @__PURE__ */ jsx(Search, { className: "text-muted-foreground absolute left-2.5 top-2.5 h-4 w-4" }),
+      /* @__PURE__ */ jsx(
+        Input,
+        {
+          type: "search",
+          placeholder: "Search...",
+          className: "bg-background w-full rounded-lg pl-8 md:w-[200px] lg:w-[336px]",
+          defaultValue: globalSearchParams == null ? void 0 : globalSearchParams.q,
+          onChange: (e) => {
+            setSearchParams({
+              q: e.target.value
+            });
           }
-        )
-      ] })
-    ] }),
+        }
+      )
+    ] }) }),
     /* @__PURE__ */ jsxs(CommandDialog, { open, onOpenChange: setOpen, children: [
       /* @__PURE__ */ jsx(CommandInput, { placeholder: "Type a command or search...", onValueChange: (s) => {
         setOpen(false);

package/dist/esm/mtmFetcher.d.ts

@@ -7,6 +7,7 @@ interface goMtmQueryFnProps {
     input?: any;
     options?: {
         url: string;
+        token?: string;
     };
 }
 export declare const goMtmQueryFn: (props: goMtmQueryFnProps) => Promise<any>;
@@ -14,9 +15,10 @@ export declare const ssrGetBackendUrl: () => string;
 export declare const gomtmApiUrl: () => string;
 export declare function createMtmServiceClient<T extends ServiceType>(service: T, url?: string): import("@connectrpc/connect").PromiseClient<T>;
 export declare function createTransport(): import("@connectrpc/connect").Transport;
-export declare function createMtmServiceClientByName<T extends ServiceType>(svcName: string, url?: string): import("@connectrpc/connect").PromiseClient<ServiceType>;
+export declare function createMtmServiceClientByName<T extends ServiceType>(svcName: string, url?: string, token?: string): import("@connectrpc/connect").PromiseClient<ServiceType>;
 type CustomRequestInit = RequestInit & {
     cookieStr?: string;
+    token?: string;
     enableCache?: boolean;
     enableLog?: boolean;
 };

package/dist/esm/mtmFetcher.js

@@ -49,8 +49,8 @@ const createInfiniteQueryKey = (svc, method, input) => {
   return [...createQueryKey(svc, method, input), "infinite"];
 };
 const goMtmQueryFn = (props) => __async(void 0, null, function* () {
-  var _a;
-  const client = createMtmServiceClientByName(props.svc, (_a = props.options) == null ? void 0 : _a.url);
+  var _a, _b, _c;
+  const client = createMtmServiceClientByName(props.svc, (_a = props.options) == null ? void 0 : _a.url, (_b = props.options) == null ? void 0 : _b.token);
   if (!client) {
     throw new Error(`missing mtmclient:"${props.svc}"`);
   }
@@ -60,7 +60,7 @@ const goMtmQueryFn = (props) => __async(void 0, null, function* () {
     throw new Error(`missing mtmclient method:"${props.svc}.${methodName}"`);
   }
   const data = yield methodFn(props.input);
-  console.log(`goMtmQueryFn ${props.svc}.${props.method}.(${props.input})`, data);
+  console.log(`goMtmQueryFn ${props.svc}.${props.method}.(${props.input})`, { token: (_c = props.options) == null ? void 0 : _c.token, data });
   return toPlainMessage(data);
 });
 const ssrGetBackendUrl = () => {
@@ -94,7 +94,7 @@ function createTransport() {
     useHttpGet: true
   });
 }
-function createMtmServiceClientByName(svcName, url) {
+function createMtmServiceClientByName(svcName, url, token) {
   let svcType = void 0;
   for (const a of allServices) {
     if (a.typeName == svcName) {
@@ -109,7 +109,9 @@ function createMtmServiceClientByName(svcName, url) {
     svcType,
     createConnectTransport({
       baseUrl,
-      fetch: gomtmFetcher()
+      fetch: gomtmFetcher({
+        cookieStr: token
+      })
     })
   );
 }
@@ -129,11 +131,15 @@ const gomtmFetcher = (initGlobal) => {
       const decoder = new TextDecoder();
       init.body = decoder.decode(init.body);
     }
+    let cookieStr1 = initGlobal == null ? void 0 : initGlobal.cookieStr;
+    if (typeof window == "undefined") {
+      cookieStr1 = (yield import("next/headers")).headers().get("cookie") || "";
+    }
     init = __spreadValues(__spreadValues({}, init), {
       headers: __spreadValues({
         // ...init.headers,
         "Content-Type": "application/json"
-      }, (initGlobal == null ? void 0 : initGlobal.cookieStr) && { "Cookie": initGlobal == null ? void 0 : initGlobal.cookieStr })
+      }, cookieStr1 && { "Cookie": cookieStr1 })
     });
     let fetcher = fetch;
     req.enableCache = true;

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

@@ -1,7 +1,4 @@
-import { MyJWTPayload } from "../lib/auth/jwt";
 export declare function isRoleMatch(currentRoles: string[], allowRoles?: string[]): boolean;
 export declare function useAuth(): {
-    auth: MyJWTPayload | null;
-    userId: string | undefined;
-    isAdmin: boolean;
+    userId: any;
 };

package/dist/esm/providers/AuthProvider.js

@@ -1,7 +1,8 @@
 "use client";
-import React, { useMemo } from "react";
-import { useSuspenseQuery } from "../connectquery";
+import { useMemo } from "react";
+import { useGomtmSuspenseQuery } from "../gomtmQuery";
 import { userinfo } from "../gomtmpb/mtm/sppb/mtm-MtmService_connectquery";
+import { useGomtm } from "../store/mtapp-store";
 function isRoleMatch(currentRoles, allowRoles) {
   if (!currentRoles) {
     return true;
@@ -18,16 +19,19 @@ function isRoleMatch(currentRoles, allowRoles) {
   return false;
 }
 function useAuth() {
-  const [auth, setAuth] = React.useState(null);
-  const isAdmin = useMemo(() => {
-    return (auth == null ? void 0 : auth.role) == "admin";
-  }, [auth]);
-  const userInfoQuery = useSuspenseQuery(userinfo);
+  const cookieStr = useGomtm((x) => x.cookieStr);
+  console.log("cookieStr-----------", cookieStr);
+  const userInfoQuery = useGomtmSuspenseQuery(userinfo.service.typeName, userinfo.name);
+  console.log("userInfoQuery.data", userInfoQuery.data);
   const userId = useMemo(() => {
     var _a;
     return (_a = userInfoQuery.data.userInfo) == null ? void 0 : _a.ID;
   }, [userInfoQuery.data]);
-  return { auth, userId, isAdmin };
+  return {
+    // auth,
+    userId
+    // isAdmin
+  };
 }
 export {
   isRoleMatch,

package/dist/esm/providers/GomtmAppSS.js

@@ -1,3 +1,22 @@
+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 __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -18,38 +37,26 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { Fragment, jsx } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 import { cookies, headers } from "next/headers";
-import { getGomtmConfig } from "../consts";
+import { CookieConfigState } from "../consts";
 import { ssrGetBackendUrl } from "../mtmFetcher";
 import { GoMtmAppProvider } from "../store/mtapp-store";
 function GomtmAppSS(props) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a;
     const { children } = props;
-    const gomtmAppConfig = getGomtmConfig();
-    let backend = ssrGetBackendUrl();
-    const backendFromCookie = (_a = cookies().get(gomtmAppConfig.cookieBackendUrl)) == null ? void 0 : _a.value;
-    if (backendFromCookie) {
-      backend = backendFromCookie;
-    }
-    if (!backend) {
-      return /* @__PURE__ */ jsx(Fragment, { children: "missing backend" });
-    }
+    const backend = ssrGetBackendUrl();
     const cookiesStr = headers().get("Cookie");
-    const configStateJson = ((_b = cookies().get(gomtmAppConfig.CookieConfigState)) == null ? void 0 : _b.value) || "{}";
-    const configState = JSON.parse(configStateJson);
-    if (!configState.backendUrl) {
-      configState.backendUrl = backend;
-    }
+    const configState = JSON.parse(((_a = cookies().get(CookieConfigState)) == null ? void 0 : _a.value) || "{}");
+    const cState = configState["state"];
     return /* @__PURE__ */ jsx(
       GoMtmAppProvider,
-      {
-        configState,
-        params: {},
+      __spreadProps(__spreadValues({}, cState), {
         cookieStr: cookiesStr || "",
+        backendUrl: (cState == null ? void 0 : cState.backendUrl) || backend,
         children
-      }
+      })
     );
   });
 }

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

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