@fctc/interface-logic 1.7.5 → 1.7.6

package/dist/provider.js

@@ -3037,91 +3037,93 @@ var axiosClient = {
 // src/environment/EnvStore.ts
 var EnvStore = class _EnvStore {
   static instance = null;
-  state = {};
+  envStore;
+  baseUrl;
+  requests;
+  context;
+  defaultCompany;
+  config;
+  companies;
+  user;
+  db;
   localStorageUtils;
   sessionStorageUtils;
-  constructor(localStorageUtils2, sessionStorageUtils2) {
+  refreshTokenEndpoint;
+  constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
     this.sessionStorageUtils = sessionStorageUtils2;
+    this.setup();
   }
-  static getInstance(localStorageUtils2, sessionStorageUtils2) {
+  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
     if (!_EnvStore.instance) {
       console.log("Creating new EnvStore instance");
-      _EnvStore.instance = new _EnvStore(localStorageUtils2, sessionStorageUtils2);
+      _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
     } else {
       console.log("Returning existing EnvStore instance");
     }
     return _EnvStore.instance;
   }
+  setup() {
+    const env = this.envStore.getState().env;
+    console.log("Redux env state in A1:", env);
+    this.baseUrl = env?.baseUrl;
+    this.requests = env?.requests;
+    this.context = env?.context;
+    this.defaultCompany = env?.defaultCompany;
+    this.config = env?.config;
+    this.companies = env?.companies || [];
+    this.user = env?.user;
+    this.db = env?.db;
+    this.refreshTokenEndpoint = env?.refreshTokenEndpoint;
+    console.log("Env setup in A1:", this);
+  }
   setupEnv(envConfig) {
-    this.state = {
-      ...this.state,
+    const dispatch = this.envStore.dispatch;
+    const env = {
       ...envConfig,
       localStorageUtils: this.localStorageUtils,
       sessionStorageUtils: this.sessionStorageUtils
     };
     console.log("Setting up env with config:", envConfig);
-    this.state.requests = axiosClient.init(this.state);
-    console.log("axiosClient.init result:", this.state.requests);
+    const requests = axiosClient.init(env);
+    console.log("axiosClient.init result:", requests);
+    dispatch(setEnv({ ...env, requests }));
+    this.setup();
   }
   setUid(uid) {
-    this.state.uid = uid;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUid(uid));
+    this.setup();
   }
   setLang(lang) {
-    this.state.lang = lang;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setLang(lang));
+    this.setup();
   }
   setAllowCompanies(allowCompanies) {
-    this.state.allowCompanies = allowCompanies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setAllowCompanies(allowCompanies));
+    this.setup();
   }
   setCompanies(companies) {
-    this.state.companies = companies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setCompanies(companies));
+    this.setup();
   }
   setDefaultCompany(company) {
-    this.state.defaultCompany = company;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setDefaultCompany(company));
+    this.setup();
   }
   setUserInfo(userInfo) {
-    this.state.user = userInfo;
-  }
-  // Getters để truy cập trạng thái
-  get baseUrl() {
-    return this.state.baseUrl;
-  }
-  get requests() {
-    return this.state.requests;
-  }
-  get context() {
-    return this.state.context;
-  }
-  get defaultCompany() {
-    return this.state.defaultCompany;
-  }
-  get config() {
-    return this.state.config;
-  }
-  get companies() {
-    return this.state.companies;
-  }
-  get user() {
-    return this.state.user;
-  }
-  get db() {
-    return this.state.db;
-  }
-  get refreshTokenEndpoint() {
-    return this.state.refreshTokenEndpoint;
-  }
-  get uid() {
-    return this.state.uid;
-  }
-  get lang() {
-    return this.state.lang;
-  }
-  get allowCompanies() {
-    return this.state.allowCompanies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUser(userInfo));
+    this.setup();
   }
 };
 function getEnv() {
-  const instance = EnvStore.getInstance();
+  const instance = EnvStore.getInstance(envStore);
   if (!instance) {
     throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
   }

package/dist/provider.mjs

@@ -2999,91 +2999,93 @@ var axiosClient = {
 // src/environment/EnvStore.ts
 var EnvStore = class _EnvStore {
   static instance = null;
-  state = {};
+  envStore;
+  baseUrl;
+  requests;
+  context;
+  defaultCompany;
+  config;
+  companies;
+  user;
+  db;
   localStorageUtils;
   sessionStorageUtils;
-  constructor(localStorageUtils2, sessionStorageUtils2) {
+  refreshTokenEndpoint;
+  constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
     this.sessionStorageUtils = sessionStorageUtils2;
+    this.setup();
   }
-  static getInstance(localStorageUtils2, sessionStorageUtils2) {
+  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
     if (!_EnvStore.instance) {
       console.log("Creating new EnvStore instance");
-      _EnvStore.instance = new _EnvStore(localStorageUtils2, sessionStorageUtils2);
+      _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
     } else {
       console.log("Returning existing EnvStore instance");
     }
     return _EnvStore.instance;
   }
+  setup() {
+    const env = this.envStore.getState().env;
+    console.log("Redux env state in A1:", env);
+    this.baseUrl = env?.baseUrl;
+    this.requests = env?.requests;
+    this.context = env?.context;
+    this.defaultCompany = env?.defaultCompany;
+    this.config = env?.config;
+    this.companies = env?.companies || [];
+    this.user = env?.user;
+    this.db = env?.db;
+    this.refreshTokenEndpoint = env?.refreshTokenEndpoint;
+    console.log("Env setup in A1:", this);
+  }
   setupEnv(envConfig) {
-    this.state = {
-      ...this.state,
+    const dispatch = this.envStore.dispatch;
+    const env = {
       ...envConfig,
       localStorageUtils: this.localStorageUtils,
       sessionStorageUtils: this.sessionStorageUtils
     };
     console.log("Setting up env with config:", envConfig);
-    this.state.requests = axiosClient.init(this.state);
-    console.log("axiosClient.init result:", this.state.requests);
+    const requests = axiosClient.init(env);
+    console.log("axiosClient.init result:", requests);
+    dispatch(setEnv({ ...env, requests }));
+    this.setup();
   }
   setUid(uid) {
-    this.state.uid = uid;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUid(uid));
+    this.setup();
   }
   setLang(lang) {
-    this.state.lang = lang;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setLang(lang));
+    this.setup();
   }
   setAllowCompanies(allowCompanies) {
-    this.state.allowCompanies = allowCompanies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setAllowCompanies(allowCompanies));
+    this.setup();
   }
   setCompanies(companies) {
-    this.state.companies = companies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setCompanies(companies));
+    this.setup();
   }
   setDefaultCompany(company) {
-    this.state.defaultCompany = company;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setDefaultCompany(company));
+    this.setup();
   }
   setUserInfo(userInfo) {
-    this.state.user = userInfo;
-  }
-  // Getters để truy cập trạng thái
-  get baseUrl() {
-    return this.state.baseUrl;
-  }
-  get requests() {
-    return this.state.requests;
-  }
-  get context() {
-    return this.state.context;
-  }
-  get defaultCompany() {
-    return this.state.defaultCompany;
-  }
-  get config() {
-    return this.state.config;
-  }
-  get companies() {
-    return this.state.companies;
-  }
-  get user() {
-    return this.state.user;
-  }
-  get db() {
-    return this.state.db;
-  }
-  get refreshTokenEndpoint() {
-    return this.state.refreshTokenEndpoint;
-  }
-  get uid() {
-    return this.state.uid;
-  }
-  get lang() {
-    return this.state.lang;
-  }
-  get allowCompanies() {
-    return this.state.allowCompanies;
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUser(userInfo));
+    this.setup();
   }
 };
 function getEnv() {
-  const instance = EnvStore.getInstance();
+  const instance = EnvStore.getInstance(envStore);
   if (!instance) {
     throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
   }