@fctc/interface-logic 1.7.8 → 1.7.10

package/dist/provider.d.mts

@@ -1,16 +1,15 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 
 declare const MainProvider: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element;
+}) => JSX.Element;
 
 declare const ReactQueryProvider: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element;
+}) => JSX.Element;
 
 declare const VersionGate: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element | null;
+}) => JSX.Element | null;
 
 export { MainProvider, ReactQueryProvider, VersionGate };

package/dist/provider.d.ts

@@ -1,16 +1,15 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 
 declare const MainProvider: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element;
+}) => JSX.Element;
 
 declare const ReactQueryProvider: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element;
+}) => JSX.Element;
 
 declare const VersionGate: ({ children }: {
     children: ReactNode;
-}) => react_jsx_runtime.JSX.Element | null;
+}) => JSX.Element | null;
 
 export { MainProvider, ReactQueryProvider, VersionGate };

package/dist/provider.js

@@ -2861,9 +2861,9 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
-    const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
-    const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
-    const db = config?.db;
+    const localStorage2 = config.localStorageUtils ?? localStorageUtils();
+    const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
+    const db = config.db;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2882,19 +2882,16 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(
-      async (config2) => {
-        const useRefreshToken = config2.useRefreshToken;
-        const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
-        if (token) {
-          config2.headers["Authorization"] = "Bearer " + token;
-        }
-        return config2;
-      },
-      (error) => {
-        Promise.reject(error);
-      }
-    );
+    instance.interceptors.request.use(async (config2) => {
+      const { useRefreshToken, useActionToken, actionToken } = config2;
+      if (useActionToken && actionToken) {
+        config2.headers["Action-Token"] = actionToken;
+      }
+      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(
       (response) => {
         return handleResponse(response);
@@ -3035,81 +3032,84 @@ var axiosClient = {
 };
 
 // src/environment/EnvStore.ts
-var EnvStore = class _EnvStore {
-  static instance = null;
-  static localStorageUtils;
-  static sessionStorageUtils;
-  constructor() {
-  }
-  static getInstance(localStorageUtils2, sessionStorageUtils2) {
-    if (!_EnvStore.instance) {
-      console.log("Creating new EnvStore instance");
-      _EnvStore.instance = new _EnvStore();
-      _EnvStore.localStorageUtils = localStorageUtils2;
-      _EnvStore.sessionStorageUtils = sessionStorageUtils2;
-    } else {
-      console.log("Returning existing EnvStore instance");
-    }
-    return _EnvStore.instance;
-  }
-  static getState() {
-    const state = envStore.getState().env;
-    console.log("Redux env state:", state);
-    return {
-      baseUrl: state?.baseUrl,
-      requests: state?.requests,
-      context: state?.context,
-      defaultCompany: state?.defaultCompany,
-      config: state?.config,
-      companies: state?.companies || [],
-      user: state?.user,
-      db: state?.db,
-      refreshTokenEndpoint: state?.refreshTokenEndpoint,
-      uid: state?.uid,
-      lang: state?.lang,
-      allowCompanies: state?.allowCompanies
-    };
-  }
-  static setupEnv(envConfig) {
-    const dispatch = envStore.dispatch;
-    const env = {
-      ..._EnvStore.getState(),
+var EnvStore = class {
+  envStore;
+  baseUrl;
+  requests;
+  context;
+  defaultCompany;
+  config;
+  companies;
+  user;
+  db;
+  localStorageUtils;
+  sessionStorageUtils;
+  refreshTokenEndpoint;
+  constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    this.envStore = envStore2;
+    this.localStorageUtils = localStorageUtils2;
+    this.sessionStorageUtils = sessionStorageUtils2;
+    this.setup();
+  }
+  setup() {
+    const env2 = this.envStore.getState().env;
+    this.baseUrl = env2?.baseUrl;
+    this.requests = env2?.requests;
+    this.context = env2?.context;
+    this.defaultCompany = env2?.defaultCompany;
+    this.config = env2?.config;
+    this.companies = env2?.companies || [];
+    this.user = env2?.user;
+    this.db = env2?.db;
+    this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
+  }
+  setupEnv(envConfig) {
+    const dispatch = this.envStore.dispatch;
+    const env2 = {
       ...envConfig,
-      localStorageUtils: _EnvStore.localStorageUtils,
-      sessionStorageUtils: _EnvStore.sessionStorageUtils
+      localStorageUtils: this.localStorageUtils,
+      sessionStorageUtils: this.sessionStorageUtils
     };
-    console.log("Setting up env with config:", envConfig);
-    const requests = axiosClient.init(env);
-    console.log("axiosClient.init result:", requests);
-    dispatch(setEnv({ ...env, requests }));
+    const requests = axiosClient.init(env2);
+    dispatch(setEnv({ ...env2, requests }));
+    this.setup();
   }
-  static setUid(uid) {
-    const dispatch = envStore.dispatch;
+  setUid(uid) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setUid(uid));
+    this.setup();
   }
-  static setLang(lang) {
-    const dispatch = envStore.dispatch;
+  setLang(lang) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setLang(lang));
+    this.setup();
   }
-  static setAllowCompanies(allowCompanies) {
-    const dispatch = envStore.dispatch;
+  setAllowCompanies(allowCompanies) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setAllowCompanies(allowCompanies));
+    this.setup();
   }
-  static setCompanies(companies) {
-    const dispatch = envStore.dispatch;
+  setCompanies(companies) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setCompanies(companies));
+    this.setup();
   }
-  static setDefaultCompany(company) {
-    const dispatch = envStore.dispatch;
+  setDefaultCompany(company) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setDefaultCompany(company));
+    this.setup();
   }
-  static setUserInfo(userInfo) {
-    const dispatch = envStore.dispatch;
+  setUserInfo(userInfo) {
+    const dispatch = this.envStore.dispatch;
     dispatch(setUser(userInfo));
+    this.setup();
   }
 };
+var env = null;
 function getEnv() {
-  return EnvStore.getState();
+  if (!env)
+    env = new EnvStore(envStore, localStorageUtils(), sessionStorageUtils());
+  return env;
 }
 
 // src/services/view-service/index.ts
@@ -3121,7 +3121,7 @@ var ViewService = {
     options = {},
     aid
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const defaultOptions = {
       load_filters: true,
       toolbar: true,
@@ -3136,14 +3136,14 @@ var ViewService = {
       },
       with_context: context
     };
-    return env?.requests?.post("/call" /* CALL_PATH */, jsonDataView, {
+    return env2?.requests?.post("/call" /* CALL_PATH */, jsonDataView, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getMenu(context) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       model: "ir.ui.menu" /* MENU */,
       method: "web_search_read" /* WEB_SEARCH_READ */,
@@ -3280,14 +3280,14 @@ var ViewService = {
         ]
       }
     };
-    return env?.requests?.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests?.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getActionDetail(aid, context) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       model: "ir.actions.act_window" /* WINDOW_ACTION */,
       method: "web_read" /* WEB_READ */,
@@ -3308,7 +3308,7 @@ var ViewService = {
         }
       }
     };
-    return env?.requests?.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests?.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3320,7 +3320,7 @@ var ViewService = {
     context,
     offset
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       model,
       with_context: context,
@@ -3328,14 +3328,14 @@ var ViewService = {
       field: "sequence",
       ...offset > 0 ? { offset } : {}
     };
-    return env?.requests.post("/web/dataset/resequence", jsonData, {
+    return env2?.requests.post("/web/dataset/resequence", jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getSelectionItem({ data }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       model: data.model,
       ids: [],
@@ -3353,15 +3353,15 @@ var ViewService = {
         }
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async loadMessages() {
-    const env = getEnv();
-    return env.requests.post(
+    const env2 = getEnv();
+    return env2.requests.post(
       "/load_message_failures" /* LOAD_MESSAGE */,
       {},
       {
@@ -3372,9 +3372,8 @@ var ViewService = {
     );
   },
   async getVersion() {
-    const env = getEnv();
-    console.log("env?.requests", env, env?.requests);
-    return env?.requests?.get("", {
+    const env2 = getEnv();
+    return env2?.requests.get("", {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3384,12 +3383,12 @@ var ViewService = {
     method,
     with_context
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       with_context
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3402,7 +3401,7 @@ var ViewService = {
     device,
     location
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3414,7 +3413,7 @@ var ViewService = {
       },
       with_context
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3428,7 +3427,7 @@ var ViewService = {
     response_type,
     path
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const params = new URLSearchParams({
       response_type,
       client_id,
@@ -3436,7 +3435,7 @@ var ViewService = {
       state
     });
     const url = `${path}?${params.toString()}`;
-    return env?.requests.get(url, {
+    return env2?.requests.get(url, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3449,14 +3448,14 @@ var ViewService = {
     client_id,
     scopes
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       redirect_uri,
       state,
       client_id,
       scopes
     };
-    return env?.requests.post("/grant-access" /* GRANT_ACCESS */, jsonData, {
+    return env2?.requests.post("/grant-access" /* GRANT_ACCESS */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3468,7 +3467,7 @@ var ViewService = {
     token,
     views
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3478,7 +3477,7 @@ var ViewService = {
         token
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3490,7 +3489,7 @@ var ViewService = {
     kwargs,
     token
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       model,
@@ -3499,21 +3498,21 @@ var ViewService = {
         token
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async requestSetupTotp({ method, token }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       with_context: {
         token
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3524,7 +3523,7 @@ var ViewService = {
     action_token,
     code
   }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3536,21 +3535,21 @@ var ViewService = {
         action_token
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async removeTotpSetUp({ method, token }) {
-    const env = getEnv();
+    const env2 = getEnv();
     const jsonData = {
       method,
       with_context: {
         token
       }
     };
-    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3571,7 +3570,6 @@ var VersionGate = ({ children }) => {
     };
     const validateVersion = async () => {
       const serverVersion = await view_service_default.getVersion();
-      console.log("serverVersion", serverVersion);
       const cached = localStorage.getItem("__api_version__");
       if (cached !== serverVersion?.api_version) {
         clearVersion();