@fctc/interface-logic 1.7.6 → 1.7.8

package/dist/services.js

@@ -2251,9 +2251,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) => {
@@ -3041,97 +3041,79 @@ var envStore = (0, import_toolkit11.configureStore)({
 // src/environment/EnvStore.ts
 var EnvStore = class _EnvStore {
   static instance = null;
-  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();
-  }
-  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
+  static localStorageUtils;
+  static sessionStorageUtils;
+  constructor() {
+  }
+  static getInstance(localStorageUtils2, sessionStorageUtils2) {
     if (!_EnvStore.instance) {
       console.log("Creating new EnvStore instance");
-      _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
+      _EnvStore.instance = new _EnvStore();
+      _EnvStore.localStorageUtils = localStorageUtils2;
+      _EnvStore.sessionStorageUtils = 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) {
-    const dispatch = this.envStore.dispatch;
+  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(),
       ...envConfig,
-      localStorageUtils: this.localStorageUtils,
-      sessionStorageUtils: this.sessionStorageUtils
+      localStorageUtils: _EnvStore.localStorageUtils,
+      sessionStorageUtils: _EnvStore.sessionStorageUtils
     };
     console.log("Setting up env with config:", envConfig);
     const requests = axiosClient.init(env);
     console.log("axiosClient.init result:", requests);
     dispatch(setEnv({ ...env, requests }));
-    this.setup();
   }
-  setUid(uid) {
-    const dispatch = this.envStore.dispatch;
+  static setUid(uid) {
+    const dispatch = envStore.dispatch;
     dispatch(setUid(uid));
-    this.setup();
   }
-  setLang(lang) {
-    const dispatch = this.envStore.dispatch;
+  static setLang(lang) {
+    const dispatch = envStore.dispatch;
     dispatch(setLang(lang));
-    this.setup();
   }
-  setAllowCompanies(allowCompanies) {
-    const dispatch = this.envStore.dispatch;
+  static setAllowCompanies(allowCompanies) {
+    const dispatch = envStore.dispatch;
     dispatch(setAllowCompanies(allowCompanies));
-    this.setup();
   }
-  setCompanies(companies) {
-    const dispatch = this.envStore.dispatch;
+  static setCompanies(companies) {
+    const dispatch = envStore.dispatch;
     dispatch(setCompanies(companies));
-    this.setup();
   }
-  setDefaultCompany(company) {
-    const dispatch = this.envStore.dispatch;
+  static setDefaultCompany(company) {
+    const dispatch = envStore.dispatch;
     dispatch(setDefaultCompany(company));
-    this.setup();
   }
-  setUserInfo(userInfo) {
-    const dispatch = this.envStore.dispatch;
+  static setUserInfo(userInfo) {
+    const dispatch = envStore.dispatch;
     dispatch(setUser(userInfo));
-    this.setup();
   }
 };
 function getEnv() {
-  const instance = EnvStore.getInstance(envStore);
-  if (!instance) {
-    throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
-  }
-  return instance;
+  return EnvStore.getState();
 }
 
 // src/services/action-service/index.ts

package/dist/services.mjs

@@ -2207,9 +2207,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) => {
@@ -2997,97 +2997,79 @@ var envStore = configureStore({
 // src/environment/EnvStore.ts
 var EnvStore = class _EnvStore {
   static instance = null;
-  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();
-  }
-  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
+  static localStorageUtils;
+  static sessionStorageUtils;
+  constructor() {
+  }
+  static getInstance(localStorageUtils2, sessionStorageUtils2) {
     if (!_EnvStore.instance) {
       console.log("Creating new EnvStore instance");
-      _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
+      _EnvStore.instance = new _EnvStore();
+      _EnvStore.localStorageUtils = localStorageUtils2;
+      _EnvStore.sessionStorageUtils = 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) {
-    const dispatch = this.envStore.dispatch;
+  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(),
       ...envConfig,
-      localStorageUtils: this.localStorageUtils,
-      sessionStorageUtils: this.sessionStorageUtils
+      localStorageUtils: _EnvStore.localStorageUtils,
+      sessionStorageUtils: _EnvStore.sessionStorageUtils
     };
     console.log("Setting up env with config:", envConfig);
     const requests = axiosClient.init(env);
     console.log("axiosClient.init result:", requests);
     dispatch(setEnv({ ...env, requests }));
-    this.setup();
   }
-  setUid(uid) {
-    const dispatch = this.envStore.dispatch;
+  static setUid(uid) {
+    const dispatch = envStore.dispatch;
     dispatch(setUid(uid));
-    this.setup();
   }
-  setLang(lang) {
-    const dispatch = this.envStore.dispatch;
+  static setLang(lang) {
+    const dispatch = envStore.dispatch;
     dispatch(setLang(lang));
-    this.setup();
   }
-  setAllowCompanies(allowCompanies) {
-    const dispatch = this.envStore.dispatch;
+  static setAllowCompanies(allowCompanies) {
+    const dispatch = envStore.dispatch;
     dispatch(setAllowCompanies(allowCompanies));
-    this.setup();
   }
-  setCompanies(companies) {
-    const dispatch = this.envStore.dispatch;
+  static setCompanies(companies) {
+    const dispatch = envStore.dispatch;
     dispatch(setCompanies(companies));
-    this.setup();
   }
-  setDefaultCompany(company) {
-    const dispatch = this.envStore.dispatch;
+  static setDefaultCompany(company) {
+    const dispatch = envStore.dispatch;
     dispatch(setDefaultCompany(company));
-    this.setup();
   }
-  setUserInfo(userInfo) {
-    const dispatch = this.envStore.dispatch;
+  static setUserInfo(userInfo) {
+    const dispatch = envStore.dispatch;
     dispatch(setUser(userInfo));
-    this.setup();
   }
 };
 function getEnv() {
-  const instance = EnvStore.getInstance(envStore);
-  if (!instance) {
-    throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
-  }
-  return instance;
+  return EnvStore.getState();
 }
 
 // src/services/action-service/index.ts

package/dist/types.d.mts

@@ -1,4 +1,4 @@
-export { C as ContextApi, D as DeleteParams, F as ForgotPasswordBody, G as GetAllParams, a as GetDetailParams, b as GetListParams, c as GetSelectionType, f as GetViewParams, L as LoginCredentialBody, O as OnChangeParams, R as ResetPasswordRequest, S as SaveParams, d as SocialTokenBody, e as Specification, U as UpdatePasswordRequest, g as View, V as ViewData, u as updatePasswordBody } from './view-type-BGJfDe73.mjs';
+export { C as ContextApi, D as DeleteParams, F as ForgotPasswordBody, e as GetAllParams, c as GetDetailParams, b as GetListParams, G as GetSelectionType, a as GetViewParams, L as LoginCredentialBody, O as OnChangeParams, R as ResetPasswordRequest, d as SaveParams, S as SocialTokenBody, f as Specification, U as UpdatePasswordRequest, g as View, V as ViewData, u as updatePasswordBody } from './view-type-D8ukwj_2.mjs';
 
 interface Config {
     baseUrl: string;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export { C as ContextApi, D as DeleteParams, F as ForgotPasswordBody, G as GetAllParams, a as GetDetailParams, b as GetListParams, c as GetSelectionType, f as GetViewParams, L as LoginCredentialBody, O as OnChangeParams, R as ResetPasswordRequest, S as SaveParams, d as SocialTokenBody, e as Specification, U as UpdatePasswordRequest, g as View, V as ViewData, u as updatePasswordBody } from './view-type-BGJfDe73.js';
+export { C as ContextApi, D as DeleteParams, F as ForgotPasswordBody, e as GetAllParams, c as GetDetailParams, b as GetListParams, G as GetSelectionType, a as GetViewParams, L as LoginCredentialBody, O as OnChangeParams, R as ResetPasswordRequest, d as SaveParams, S as SocialTokenBody, f as Specification, U as UpdatePasswordRequest, g as View, V as ViewData, u as updatePasswordBody } from './view-type-D8ukwj_2.js';
 
 interface Config {
     baseUrl: string;

package/dist/{view-type-BGJfDe73.d.mts → view-type-D8ukwj_2.d.mts}

@@ -110,4 +110,4 @@ interface GetViewParams {
     aid?: number | string | null | boolean;
 }
 
-export type { ContextApi as C, DeleteParams as D, ForgotPasswordBody as F, GetAllParams as G, LoginCredentialBody as L, OnChangeParams as O, ResetPasswordRequest as R, SaveParams as S, UpdatePasswordRequest as U, ViewData as V, GetDetailParams as a, GetListParams as b, GetSelectionType as c, SocialTokenBody as d, Specification as e, GetViewParams as f, View as g, updatePasswordBody as u };
+export type { ContextApi as C, DeleteParams as D, ForgotPasswordBody as F, GetSelectionType as G, LoginCredentialBody as L, OnChangeParams as O, ResetPasswordRequest as R, SocialTokenBody as S, UpdatePasswordRequest as U, ViewData as V, GetViewParams as a, GetListParams as b, GetDetailParams as c, SaveParams as d, GetAllParams as e, Specification as f, View as g, updatePasswordBody as u };

package/dist/{view-type-BGJfDe73.d.ts → view-type-D8ukwj_2.d.ts}

@@ -110,4 +110,4 @@ interface GetViewParams {
     aid?: number | string | null | boolean;
 }
 
-export type { ContextApi as C, DeleteParams as D, ForgotPasswordBody as F, GetAllParams as G, LoginCredentialBody as L, OnChangeParams as O, ResetPasswordRequest as R, SaveParams as S, UpdatePasswordRequest as U, ViewData as V, GetDetailParams as a, GetListParams as b, GetSelectionType as c, SocialTokenBody as d, Specification as e, GetViewParams as f, View as g, updatePasswordBody as u };
+export type { ContextApi as C, DeleteParams as D, ForgotPasswordBody as F, GetSelectionType as G, LoginCredentialBody as L, OnChangeParams as O, ResetPasswordRequest as R, SocialTokenBody as S, UpdatePasswordRequest as U, ViewData as V, GetViewParams as a, GetListParams as b, GetDetailParams as c, SaveParams as d, GetAllParams as e, Specification as f, View as g, updatePasswordBody as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/interface-logic",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",