@fctc/interface-logic 2.1.3 → 2.1.4

package/dist/provider.js

@@ -4101,101 +4101,14 @@ function useViewService() {
     [env]
   );
   const getMenu = (0, import_react10.useCallback)(
-    async (context) => {
+    async (context, specification) => {
       const jsonData = {
         model: "ir.ui.menu" /* MENU */,
         method: "web_search_read" /* WEB_SEARCH_READ */,
         ids: [],
         with_context: context,
         kwargs: {
-          specification: {
-            active: {},
-            name: {},
-            is_display: {},
-            sequence: {},
-            complete_name: {},
-            action: {
-              fields: {
-                display_name: {},
-                type: {},
-                binding_view_types: {}
-              }
-            },
-            url_icon: {},
-            web_icon: {},
-            web_icon_data: {},
-            groups_id: {
-              fields: {
-                full_name: {}
-              },
-              limit: 40,
-              order: ""
-            },
-            display_name: {},
-            child_id: {
-              fields: {
-                active: {},
-                name: {},
-                is_display: {},
-                sequence: {},
-                complete_name: {},
-                action: {
-                  fields: {
-                    display_name: {},
-                    type: {},
-                    binding_view_types: {}
-                  }
-                },
-                url_icon: {},
-                web_icon: {},
-                web_icon_data: {},
-                groups_id: {
-                  fields: {
-                    full_name: {}
-                  },
-                  limit: 40,
-                  order: ""
-                },
-                display_name: {},
-                child_id: {
-                  fields: {
-                    active: {},
-                    name: {},
-                    is_display: {},
-                    sequence: {},
-                    complete_name: {},
-                    action: {
-                      fields: {
-                        display_name: {},
-                        type: {},
-                        binding_view_types: {}
-                      }
-                    },
-                    url_icon: {},
-                    web_icon: {},
-                    web_icon_data: {},
-                    groups_id: {
-                      fields: {
-                        full_name: {}
-                      },
-                      limit: 40,
-                      order: ""
-                    },
-                    display_name: {},
-                    child_id: {
-                      fields: {},
-                      limit: 40,
-                      order: ""
-                    }
-                  },
-                  limit: 40,
-                  order: ""
-                }
-              },
-              limit: 40,
-              order: ""
-            }
-          },
+          specification,
           domain: [
             "&",
             ["is_display", "=", true],
@@ -4390,18 +4303,25 @@ function useViewService() {
       redirect_uri,
       state,
       client_id,
-      response_type
+      response_type,
+      path,
+      scope
     }) => {
-      const jsonData = {
-        redirect_uri,
-        state,
+      const params = new URLSearchParams({
+        response_type,
         client_id,
-        response_type
-      };
-      return env?.requests.get("/signin-sso/oauth" /* SIGNIN_SSO */, jsonData, {
+        redirect_uri,
+        state
+      });
+      const queryString = `${params.toString()}&scope=${encodeURIComponent(
+        scope
+      )}`;
+      const url = `${path}?${queryString}`;
+      return env?.requests.get(url, {
         headers: {
-          credentials: "include"
-        }
+          "Content-Type": "application/json"
+        },
+        withCredentials: true
       });
     },
     [env]
@@ -4574,9 +4494,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -4597,12 +4519,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(
@@ -5717,7 +5646,6 @@ var useGetActionDetail = ({
   model,
   queryKey
 }) => {
-  const { getFormView } = useFormService();
   const { getActionDetail } = useViewService();
   const data = {
     id,
@@ -5732,9 +5660,6 @@ var useGetActionDetail = ({
         if (res && res.length > 0) {
           return res[0];
         }
-      } else {
-        const res = await getFormView({ data });
-        return res;
       }
     },
     enabled,
@@ -5807,11 +5732,11 @@ var use_get_list_data_default = useGetListData;
 
 // src/hooks/view/use-get-menu.ts
 var import_react_query50 = require("@tanstack/react-query");
-var useGetMenu = (context, enabled) => {
+var useGetMenu = (context, specification, enabled) => {
   const { getMenu } = useViewService();
   return (0, import_react_query50.useQuery)({
     queryKey: ["menus" /* MENU */, context],
-    queryFn: () => getMenu(context).then((res) => {
+    queryFn: () => getMenu(context, specification).then((res) => {
       if (res && res?.records && res?.records?.length > 0) {
         return res?.records;
       }
@@ -6000,13 +5925,16 @@ var useSignInSSO = () => {
       state,
       client_id,
       response_type,
-      path
+      path,
+      scope
     }) => {
       return signInSSO({
         redirect_uri,
         state,
         client_id,
-        response_type
+        response_type,
+        path,
+        scope
       });
     }
   });

package/dist/provider.mjs

@@ -4058,101 +4058,14 @@ function useViewService() {
     [env]
   );
   const getMenu = useCallback9(
-    async (context) => {
+    async (context, specification) => {
       const jsonData = {
         model: "ir.ui.menu" /* MENU */,
         method: "web_search_read" /* WEB_SEARCH_READ */,
         ids: [],
         with_context: context,
         kwargs: {
-          specification: {
-            active: {},
-            name: {},
-            is_display: {},
-            sequence: {},
-            complete_name: {},
-            action: {
-              fields: {
-                display_name: {},
-                type: {},
-                binding_view_types: {}
-              }
-            },
-            url_icon: {},
-            web_icon: {},
-            web_icon_data: {},
-            groups_id: {
-              fields: {
-                full_name: {}
-              },
-              limit: 40,
-              order: ""
-            },
-            display_name: {},
-            child_id: {
-              fields: {
-                active: {},
-                name: {},
-                is_display: {},
-                sequence: {},
-                complete_name: {},
-                action: {
-                  fields: {
-                    display_name: {},
-                    type: {},
-                    binding_view_types: {}
-                  }
-                },
-                url_icon: {},
-                web_icon: {},
-                web_icon_data: {},
-                groups_id: {
-                  fields: {
-                    full_name: {}
-                  },
-                  limit: 40,
-                  order: ""
-                },
-                display_name: {},
-                child_id: {
-                  fields: {
-                    active: {},
-                    name: {},
-                    is_display: {},
-                    sequence: {},
-                    complete_name: {},
-                    action: {
-                      fields: {
-                        display_name: {},
-                        type: {},
-                        binding_view_types: {}
-                      }
-                    },
-                    url_icon: {},
-                    web_icon: {},
-                    web_icon_data: {},
-                    groups_id: {
-                      fields: {
-                        full_name: {}
-                      },
-                      limit: 40,
-                      order: ""
-                    },
-                    display_name: {},
-                    child_id: {
-                      fields: {},
-                      limit: 40,
-                      order: ""
-                    }
-                  },
-                  limit: 40,
-                  order: ""
-                }
-              },
-              limit: 40,
-              order: ""
-            }
-          },
+          specification,
           domain: [
             "&",
             ["is_display", "=", true],
@@ -4347,18 +4260,25 @@ function useViewService() {
       redirect_uri,
       state,
       client_id,
-      response_type
+      response_type,
+      path,
+      scope
     }) => {
-      const jsonData = {
-        redirect_uri,
-        state,
+      const params = new URLSearchParams({
+        response_type,
         client_id,
-        response_type
-      };
-      return env?.requests.get("/signin-sso/oauth" /* SIGNIN_SSO */, jsonData, {
+        redirect_uri,
+        state
+      });
+      const queryString = `${params.toString()}&scope=${encodeURIComponent(
+        scope
+      )}`;
+      const url = `${path}?${queryString}`;
+      return env?.requests.get(url, {
         headers: {
-          credentials: "include"
-        }
+          "Content-Type": "application/json"
+        },
+        withCredentials: true
       });
     },
     [env]
@@ -4531,9 +4451,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -4554,12 +4476,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(
@@ -5674,7 +5603,6 @@ var useGetActionDetail = ({
   model,
   queryKey
 }) => {
-  const { getFormView } = useFormService();
   const { getActionDetail } = useViewService();
   const data = {
     id,
@@ -5689,9 +5617,6 @@ var useGetActionDetail = ({
         if (res && res.length > 0) {
           return res[0];
         }
-      } else {
-        const res = await getFormView({ data });
-        return res;
       }
     },
     enabled,
@@ -5764,11 +5689,11 @@ var use_get_list_data_default = useGetListData;
 
 // src/hooks/view/use-get-menu.ts
 import { useQuery as useQuery15 } from "@tanstack/react-query";
-var useGetMenu = (context, enabled) => {
+var useGetMenu = (context, specification, enabled) => {
   const { getMenu } = useViewService();
   return useQuery15({
     queryKey: ["menus" /* MENU */, context],
-    queryFn: () => getMenu(context).then((res) => {
+    queryFn: () => getMenu(context, specification).then((res) => {
       if (res && res?.records && res?.records?.length > 0) {
         return res?.records;
       }
@@ -5957,13 +5882,16 @@ var useSignInSSO = () => {
       state,
       client_id,
       response_type,
-      path
+      path,
+      scope
     }) => {
       return signInSSO({
         redirect_uri,
         state,
         client_id,
-        response_type
+        response_type,
+        path,
+        scope
       });
     }
   });

package/dist/services.d.mts

@@ -196,7 +196,7 @@ declare function useUserService(): {
 
 declare function useViewService(): {
     getView: ({ model, views, context, options, aid, }: GetViewParams) => Promise<any>;
-    getMenu: (context: any) => Promise<any>;
+    getMenu: (context: any, specification: any) => Promise<any>;
     getActionDetail: (aid: number, context: any) => Promise<any>;
     getResequence: ({ model, ids, context, offset, }: {
         model: string;
@@ -229,11 +229,13 @@ declare function useViewService(): {
         kwargs: any;
         model: string;
     }) => Promise<any>;
-    signInSSO: ({ redirect_uri, state, client_id, response_type, }: {
+    signInSSO: ({ redirect_uri, state, client_id, response_type, path, scope, }: {
         redirect_uri: string;
         state: string;
         client_id: string;
         response_type: string;
+        path: string;
+        scope: string;
     }) => Promise<any>;
     verify2FA: ({ method, with_context, code, device, location, }: {
         method: string;

package/dist/services.d.ts

@@ -196,7 +196,7 @@ declare function useUserService(): {
 
 declare function useViewService(): {
     getView: ({ model, views, context, options, aid, }: GetViewParams) => Promise<any>;
-    getMenu: (context: any) => Promise<any>;
+    getMenu: (context: any, specification: any) => Promise<any>;
     getActionDetail: (aid: number, context: any) => Promise<any>;
     getResequence: ({ model, ids, context, offset, }: {
         model: string;
@@ -229,11 +229,13 @@ declare function useViewService(): {
         kwargs: any;
         model: string;
     }) => Promise<any>;
-    signInSSO: ({ redirect_uri, state, client_id, response_type, }: {
+    signInSSO: ({ redirect_uri, state, client_id, response_type, path, scope, }: {
         redirect_uri: string;
         state: string;
         client_id: string;
         response_type: string;
+        path: string;
+        scope: string;
     }) => Promise<any>;
     verify2FA: ({ method, with_context, code, device, location, }: {
         method: string;

package/dist/services.js

@@ -4268,101 +4268,14 @@ function useViewService() {
     [env]
   );
   const getMenu = (0, import_react14.useCallback)(
-    async (context) => {
+    async (context, specification) => {
       const jsonData = {
         model: "ir.ui.menu" /* MENU */,
         method: "web_search_read" /* WEB_SEARCH_READ */,
         ids: [],
         with_context: context,
         kwargs: {
-          specification: {
-            active: {},
-            name: {},
-            is_display: {},
-            sequence: {},
-            complete_name: {},
-            action: {
-              fields: {
-                display_name: {},
-                type: {},
-                binding_view_types: {}
-              }
-            },
-            url_icon: {},
-            web_icon: {},
-            web_icon_data: {},
-            groups_id: {
-              fields: {
-                full_name: {}
-              },
-              limit: 40,
-              order: ""
-            },
-            display_name: {},
-            child_id: {
-              fields: {
-                active: {},
-                name: {},
-                is_display: {},
-                sequence: {},
-                complete_name: {},
-                action: {
-                  fields: {
-                    display_name: {},
-                    type: {},
-                    binding_view_types: {}
-                  }
-                },
-                url_icon: {},
-                web_icon: {},
-                web_icon_data: {},
-                groups_id: {
-                  fields: {
-                    full_name: {}
-                  },
-                  limit: 40,
-                  order: ""
-                },
-                display_name: {},
-                child_id: {
-                  fields: {
-                    active: {},
-                    name: {},
-                    is_display: {},
-                    sequence: {},
-                    complete_name: {},
-                    action: {
-                      fields: {
-                        display_name: {},
-                        type: {},
-                        binding_view_types: {}
-                      }
-                    },
-                    url_icon: {},
-                    web_icon: {},
-                    web_icon_data: {},
-                    groups_id: {
-                      fields: {
-                        full_name: {}
-                      },
-                      limit: 40,
-                      order: ""
-                    },
-                    display_name: {},
-                    child_id: {
-                      fields: {},
-                      limit: 40,
-                      order: ""
-                    }
-                  },
-                  limit: 40,
-                  order: ""
-                }
-              },
-              limit: 40,
-              order: ""
-            }
-          },
+          specification,
           domain: [
             "&",
             ["is_display", "=", true],
@@ -4557,18 +4470,25 @@ function useViewService() {
       redirect_uri,
       state,
       client_id,
-      response_type
+      response_type,
+      path,
+      scope
     }) => {
-      const jsonData = {
-        redirect_uri,
-        state,
+      const params = new URLSearchParams({
+        response_type,
         client_id,
-        response_type
-      };
-      return env?.requests.get("/signin-sso/oauth" /* SIGNIN_SSO */, jsonData, {
+        redirect_uri,
+        state
+      });
+      const queryString = `${params.toString()}&scope=${encodeURIComponent(
+        scope
+      )}`;
+      const url = `${path}?${queryString}`;
+      return env?.requests.get(url, {
         headers: {
-          credentials: "include"
-        }
+          "Content-Type": "application/json"
+        },
+        withCredentials: true
       });
     },
     [env]