gomtm 0.0.178 → 0.0.180

package/dist/esm/curd/CurdListView.js

@@ -26,7 +26,7 @@ import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { MtUnaryCallErrorView } from "../components/MtUnaryCallErrorView";
 import { callUnaryMethod } from "../connectquery";
 import { ListViewLayout } from "../gomtmpb/mtm/sppb/mtm_pb";
-import { gomtmBaseUrlAtom, transportAtom } from "../store/GomtmBackendProvider";
+import { gomtmBaseUrlAtom, transportAtom } from "../providers/GomtmProvider";
 import { ListItemView } from "./list-item/ListItem";
 const curdActivateIdAtom = atom("");
 const curd3ListParamsAtom = atom({});

package/dist/esm/providers/GomtmAppSS.js

@@ -20,7 +20,6 @@ var __async = (__this, __arguments, generator) => {
 };
 import { Fragment, jsx } from "react/jsx-runtime";
 import { MTM_SERVER_COOKIE_ACTIVATE_URL } from "../consts";
-import { GomtmBackendProvider } from "../store/GomtmBackendProvider";
 import { GomtmProvider } from "./GomtmProvider";
 function GomtmAppSS(props) {
   return __async(this, null, function* () {
@@ -29,12 +28,7 @@ function GomtmAppSS(props) {
     if (!backend) {
       return /* @__PURE__ */ jsx(Fragment, { children: "missing backend" });
     }
-    return /* @__PURE__ */ jsx(
-      GomtmProvider,
-      {
-        children: /* @__PURE__ */ jsx(GomtmBackendProvider, { baseUrl: backend, children })
-      }
-    );
+    return /* @__PURE__ */ jsx(GomtmProvider, { backendUrl: backend, children });
   });
 }
 const ssrGetBackendUrl = () => {

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

@@ -1,4 +1,5 @@
 import { Dispatch, PropsWithChildren } from 'react';
+import { Transport } from '@connectrpc/connect';
 import React from 'react';
 export declare const mtmAppStore: {
     get: <Value>(atom: import("jotai").Atom<Value>) => Value;
@@ -43,20 +44,27 @@ export type ActionHandler = (props: {
     action: string;
     values?: any;
 }) => void;
+export declare const gomtmBaseUrlAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const transportAtom: import("jotai").Atom<Transport>;
+export declare const useGomtmBackend: () => {
+    gomtmBaseUrl: string;
+};
+interface GomtmAppProps {
+    backendUrl?: string | null;
+}
 interface IAppContext {
-    extKv: Record<string, any>;
     token?: string | null;
     hostname?: string | null;
-    backendUrl?: string | null;
-    trpcBackendUrl?: string | null;
     isDebug?: boolean;
     debugData?: any;
     setDebugData: Dispatch<any>;
     isOpenDebugView?: boolean;
     setOpenDebugView: Dispatch<React.SetStateAction<boolean>>;
 }
-export declare function GomtmProvider(props: {} & PropsWithChildren): React.JSX.Element;
-export declare function useMtmApp(): IAppContext;
+export declare function GomtmProvider(props: {} & GomtmAppProps & PropsWithChildren): React.JSX.Element;
+export declare function useMtmApp(): IAppContext & GomtmAppProps;
 export declare const useMtmBackendUrl: () => string | null | undefined;
 export declare const useHostname: () => string;
 export declare const useExtInfo: () => (key: string) => string | null | undefined;
@@ -64,4 +72,5 @@ export declare const useToken: () => {
     token: string;
     setToken: (newToken: string) => void;
 };
+export declare const MtConnectProvider: (props: PropsWithChildren) => React.JSX.Element;
 export {};

package/dist/esm/providers/GomtmProvider.js

@@ -1,22 +1,52 @@
 "use client";
 import { Fragment, jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useState } from "react";
-import { createStore, useAtom } from "jotai";
+import { createConnectTransport } from "@connectrpc/connect-web";
+import { atom, createStore, useAtom } from "jotai";
 import { getCookie } from "mtxlib/clientlib";
+import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { isDebugAtom } from "mtxuilib/store/app.atoms";
 import { useHotkeys } from "react-hotkeys-hook";
+import { TransportProvider } from "../connectquery";
 import { ExtKey_Hostname, ExtKey_SelfBackend, ExtKey_mtmaccessToken, ExtKey_mtmbackend, MtM_TOKEN_NAME } from "../consts";
-import { MtConnectProvider } from "./MtConnectProvider";
+import { gomtmFetcher } from "../gomtm-clients-ss";
 import { MtReactQueryProvider } from "./ReactQueryProvider";
 const mtmAppStore = createStore();
+const gomtmBaseUrlAtom = atom("");
+const curd3BackendUrlAtom = atom((get) => {
+  const value1 = get(gomtmBaseUrlAtom);
+  if (value1) {
+    return value1;
+  }
+  if (typeof window == "undefined") {
+    console.log("get gomtm backendurl(SSR)", process.env.MTM_BACKEND);
+    return process.env.MTM_BACKEND || "";
+  }
+  return "";
+});
+const transportAtom = atom((get) => {
+  const baseUrl = get(curd3BackendUrlAtom);
+  return createConnectTransport({
+    baseUrl,
+    fetch: gomtmFetcher()
+  });
+});
+const useGomtmBackend = () => {
+  const [gomtmBaseUrl, setgomtmBaseUrl] = useAtom(gomtmBaseUrlAtom);
+  return {
+    gomtmBaseUrl
+  };
+};
 const AppContext = createContext(void 0);
 function GomtmProvider(props) {
   const { children } = props;
   const [isDebug, setDebug] = useAtom(isDebugAtom);
   useHotkeys("alt+j", () => {
     setDebug(!isDebug);
-  }, []);
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(MtConnectProvider, { children: /* @__PURE__ */ jsx(MtReactQueryProvider, { children }) }) });
+  }, [isDebug, setDebug]);
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(AtomsHydrator, { atomValues: [
+    [gomtmBaseUrlAtom, props.backendUrl]
+  ], children: /* @__PURE__ */ jsx(MtConnectProvider, { children: /* @__PURE__ */ jsx(MtReactQueryProvider, { children }) }) }) });
 }
 function useMtmApp() {
   const mtappContext = useContext(AppContext);
@@ -69,10 +99,19 @@ const useToken = () => {
     }
   };
 };
+const MtConnectProvider = (props) => {
+  const { children } = props;
+  const [transport] = useAtom(transportAtom);
+  return /* @__PURE__ */ jsx(TransportProvider, { transport, children });
+};
 export {
   GomtmProvider,
+  MtConnectProvider,
+  gomtmBaseUrlAtom,
   mtmAppStore,
+  transportAtom,
   useExtInfo,
+  useGomtmBackend,
   useHostname,
   useMtmApp,
   useMtmBackendUrl,

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

@@ -0,0 +1,5 @@
+export declare const isAdminAtom: import("jotai").PrimitiveAtom<boolean> & {
+    init: boolean;
+};
+export declare const useIsAdmin: () => boolean;
+export declare function isRoleMatch(currentRoles: string[], allowRoles?: string[]): boolean;

package/dist/esm/{providers/userContext.js → store/auth.atoms.js}

@@ -1,4 +1,10 @@
 "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;
@@ -15,5 +21,7 @@ function isRoleMatch(currentRoles, allowRoles) {
   return false;
 }
 export {
-  isRoleMatch
+  isAdminAtom,
+  isRoleMatch,
+  useIsAdmin
 };

package/dist/esm/validations/spContentModi.d.ts

@@ -23,15 +23,15 @@ export declare const spContentModiCreateInput: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     value: string;
     action: string;
-    spRouteId: string;
     sel: string;
+    spRouteId: string;
     matchContentType: string;
     title?: string | undefined;
 }, {
     value: string;
     action: string;
-    spRouteId: string;
     sel: string;
+    spRouteId: string;
     matchContentType: string;
     title?: string | undefined;
 }>;
@@ -47,16 +47,16 @@ export declare const spContentModiSaveInput: z.ZodObject<{
     value: string;
     id: string;
     action: string;
-    spRouteId: string;
     sel: string;
+    spRouteId: string;
     matchContentType: string;
     title?: string | undefined;
 }, {
     value: string;
     id: string;
     action: string;
-    spRouteId: string;
     sel: string;
+    spRouteId: string;
     matchContentType: string;
     title?: string | undefined;
 }>;

package/dist/esm/validations/spRoute.d.ts

@@ -22,15 +22,15 @@ export declare const spRouteCreateInput: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     value: string;
     title: string;
+    spProjectId: string;
     hostPattern: string;
     pathPattern: string;
-    spProjectId: string;
 }, {
     value: string;
     title: string;
+    spProjectId: string;
     hostPattern: string;
     pathPattern: string;
-    spProjectId: string;
 }>;
 export type SpRouteSaveInput = z.infer<typeof SpRouteSaveInput>;
 export declare const SpRouteSaveInput: z.ZodObject<{
@@ -44,14 +44,14 @@ export declare const SpRouteSaveInput: z.ZodObject<{
     value: string;
     id: string;
     title: string;
+    spProjectId: string;
     hostPattern: string;
     pathPattern: string;
-    spProjectId: string;
 }, {
     value: string;
     id: string;
     title: string;
+    spProjectId: string;
     hostPattern: string;
     pathPattern: string;
-    spProjectId: string;
 }>;