datastake-daf 0.6.491 → 0.6.493

package/dist/services/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('react/jsx-runtime');
+require('antd');
 
 var global$1 = (typeof global !== "undefined" ? global :
   typeof self !== "undefined" ? self :
@@ -6095,6 +6096,32 @@ const isProxy = () => {
 };
 const getToken = () => isProxy() ? StorageManager.get('proxy_token') : StorageManager.get('token');
 
+/**
+ * Custom params serializer to maintain JSON format for nested objects
+ * Ensures consistent behavior across all axios versions
+ */
+const paramsSerializer = params => {
+  const parts = [];
+  Object.keys(params).forEach(key => {
+    const value = params[key];
+    if (value !== null && value !== undefined) {
+      if (typeof value === 'object' && !Array.isArray(value)) {
+        // Serialize objects as JSON strings
+        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`);
+      } else if (Array.isArray(value)) {
+        // Handle arrays
+        value.forEach(val => {
+          parts.push(`${encodeURIComponent(key)}[]=${encodeURIComponent(val)}`);
+        });
+      } else {
+        // Handle primitive values
+        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+      }
+    }
+  });
+  return parts.join('&');
+};
+
 /**
  * Base HTTP Service Class
  * Provides axios wrapper with token management, cancel tokens, and interceptors
@@ -6130,6 +6157,7 @@ class BaseHTTPService {
       baseURL: this.getBaseURL(),
       headers,
       timeout: this.timeout,
+      paramsSerializer: paramsSerializer,
       ...this.customAxiosConfig
     });
     this.setupInterceptors();
@@ -6151,6 +6179,7 @@ class BaseHTTPService {
     const options = {
       baseURL: this.getBaseURL(),
       timeout: this.timeout,
+      paramsSerializer: paramsSerializer,
       ...this.customAxiosConfig
     };
     if (token) {
@@ -6334,5 +6363,185 @@ class ErrorHandler {
   }
 }
 
+let globalConfig = {
+  application: null,
+  mainApiUrl: null,
+  storeUrl: null,
+  language: 'en',
+  onError: null,
+  messageHandler: null,
+  store: null,
+  addToastAction: null
+};
+const configureServices = config => {
+  globalConfig = {
+    ...globalConfig,
+    ...config
+  };
+};
+const getConfig = () => globalConfig;
+
+/**
+ * Generic error handler factory for axios requests
+ * Highly configurable to adapt to different project needs
+ */
+const createErrorHandler = (config = {}) => {
+  const {
+    onUnauthorized,
+    handleError,
+    getStorageManager,
+    checkTokenValidity = true,
+    unauthorizedRedirect = '/',
+    tokenStorageKey = 'token',
+    handleNetworkError = true
+  } = config;
+  return (error, customOnUnauthorized) => {
+    // Handle cases where error.response doesn't exist (network errors)
+    if (!error.response) {
+      if (handleNetworkError && handleError) {
+        handleError({
+          status: 0,
+          statusText: "Network Error",
+          data: ["Please check your internet connection."]
+        });
+      }
+      return Promise.reject(error);
+    }
+    const {
+      status,
+      statusText,
+      data: {
+        errors,
+        message
+      } = {}
+    } = error.response || {
+      data: {}
+    };
+
+    // Handle 401 Unauthorized
+    if (status === 401) {
+      if (checkTokenValidity && getStorageManager) {
+        const token = getStorageManager().get(tokenStorageKey);
+        if (token) {
+          if (typeof customOnUnauthorized === 'function') {
+            customOnUnauthorized();
+          } else if (typeof onUnauthorized === 'function') {
+            onUnauthorized();
+          } else {
+            getStorageManager().clearOne(tokenStorageKey);
+            if (typeof window !== 'undefined') {
+              window.location.href = unauthorizedRedirect;
+            }
+          }
+        }
+      }
+    }
+
+    // Handle 4xx and 5xx errors
+    if (status >= 400 && status <= 500) {
+      if (handleError) {
+        handleError({
+          status,
+          statusText: message || statusText,
+          data: errors || []
+        });
+      }
+    }
+    return Promise.reject(error);
+  };
+};
+
+class ErrorService {
+  static handle({
+    status,
+    statusText,
+    data
+  }) {
+    const config = getConfig();
+    if (config.store && config.addToastAction) {
+      config.store.dispatch(config.addToastAction({
+        title: statusText,
+        type: 'danger',
+        body: this.formatData(data)
+      }));
+    }
+  }
+  static formatData(errors) {
+    const e = [];
+    errors?.forEach(error => {
+      Object.keys(error.constraints || {}).forEach(key => e.push(error.constraints[key]));
+    });
+    return e.join('\n');
+  }
+}
+
+class BaseService extends BaseHTTPService {
+  constructor() {
+    const config = getConfig();
+    const onError = createErrorHandler({
+      getStorageManager: () => StorageManager,
+      handleError: ({
+        status,
+        statusText,
+        data
+      }) => {
+        ErrorService.handle({
+          status,
+          statusText,
+          data
+        });
+      },
+      tokenStorageKey: 'token',
+      unauthorizedRedirect: '/',
+      checkTokenValidity: true,
+      handleNetworkError: true
+    });
+    super({
+      getToken: () => getToken(),
+      getHeaders: () => ({
+        Language: config.language || StorageManager.get('datastakeLng') || 'en',
+        'ngrok-skip-browser-warning': true,
+        Application: config.application
+      }),
+      getBaseURL: options => {
+        if (options?.isStore) return config.storeUrl;
+        return config.mainApiUrl;
+      },
+      onError: onError,
+      timeout: 300000
+    });
+    this.config = config;
+  }
+  apiGet(options) {
+    const token = getToken();
+    const config = this.config;
+    if (token !== this.token || !token) {
+      this.reloadAxios();
+    }
+    const {
+      url,
+      ...restConfig
+    } = options;
+    const baseURL = options.isStore ? config.storeUrl : config.mainApiUrl;
+    return this.formatResponse(this.api.get(url, {
+      ...restConfig,
+      baseURL,
+      headers: options.isStore ? {
+        Authorization: `Bearer ${getToken()}`,
+        ...(restConfig?.headers || {})
+      } : {
+        Authorization: `Bearer ${getToken()}`,
+        Language: config.language || StorageManager.get('datastakeLng') || 'en',
+        Application: config.application,
+        ...(restConfig?.headers || {})
+      }
+    }).catch(err => this.onError(err)));
+  }
+}
+
 exports.BaseHTTPService = BaseHTTPService;
+exports.BaseService = BaseService;
 exports.ErrorHandler = ErrorHandler;
+exports.ErrorService = ErrorService;
+exports.configureServices = configureServices;
+exports.getConfig = getConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.491",
+	"version": "0.6.493",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/services/BaseService.js

@@ -0,0 +1,69 @@
+import { BaseHTTPService } from './helpers/BaseHTTPService.js';
+import { getToken } from '../../helpers/Token.js';
+import { createErrorHandler } from '../../helpers/errorHandling.js';
+import { StorageManager } from '../../helpers/StorageManager.js';
+import { getConfig } from './helpers/config.js';
+import { ErrorService } from './ErrorService.js';
+
+export class BaseService extends BaseHTTPService {
+  constructor() {
+    const config = getConfig();
+    
+    const onError = createErrorHandler({
+      getStorageManager: () => StorageManager,
+      handleError: ({ status, statusText, data }) => {
+        ErrorService.handle({ status, statusText, data });
+      },
+      tokenStorageKey: 'token',
+      unauthorizedRedirect: '/',
+      checkTokenValidity: true,
+      handleNetworkError: true,
+    });
+
+    super({
+      getToken: () => getToken(),
+      getHeaders: () => ({
+        Language: config.language || StorageManager.get('datastakeLng') || 'en',
+        'ngrok-skip-browser-warning': true,
+        Application: config.application,
+      }),
+      getBaseURL: (options) => {
+        if (options?.isStore) return config.storeUrl;
+        return config.mainApiUrl;
+      },
+      onError: onError,
+      timeout: 300000,
+    });
+    
+    this.config = config;
+  }
+
+  apiGet(options) {
+    const token = getToken();
+    const config = this.config;
+    
+    if (token !== this.token || !token) {
+      this.reloadAxios();
+    }
+    
+    const { url, ...restConfig } = options;
+    const baseURL = options.isStore ? config.storeUrl : config.mainApiUrl;
+
+    return this.formatResponse(
+      this.api.get(url, {
+        ...restConfig,
+        baseURL,
+        headers: options.isStore ? {
+          Authorization: `Bearer ${getToken()}`,
+          ...(restConfig?.headers || {}),
+        } : {
+          Authorization: `Bearer ${getToken()}`,
+          Language: config.language || StorageManager.get('datastakeLng') || 'en',
+          Application: config.application,
+          ...(restConfig?.headers || {}),
+        }
+      })
+      .catch((err) => this.onError(err))
+    );
+  }
+}

package/src/@daf/services/ErrorService.js

@@ -0,0 +1,29 @@
+import { getConfig } from './helpers/config.js';
+
+export class ErrorService {
+    static handle({ status, statusText, data }) {
+      const config = getConfig();
+      
+      if (config.store && config.addToastAction) {
+        config.store.dispatch(config.addToastAction({
+          title: statusText,
+          type: 'danger',
+          body: this.formatData(data)
+        }));
+      }
+    }
+  
+    static formatData(errors) {
+      const e = [];
+      errors?.forEach(error => {
+        Object.keys(error.constraints || {})
+          .forEach(key => e.push(error.constraints[key]));
+      });
+      return e.join('\n');
+    }
+  }
+  
+  export const handleError = (err) => {
+    const config = getConfig();
+    config.messageHandler?.error(err?.response?.data?.message);
+  };

package/src/@daf/services/{BaseHTTPService.js → helpers/BaseHTTPService.js}

@@ -1,7 +1,33 @@
 import axios from 'axios';
-import { cleanJSON } from '../../helpers/StringHelper.js';
-import { assignParamsToUrl } from '../../helpers/urlHelpers.js';
-import { getToken } from '../../helpers/Token.js';
+import { cleanJSON } from '../../../helpers/StringHelper.js';
+import { assignParamsToUrl } from '../../../helpers/urlHelpers.js';
+import { getToken } from '../../../helpers/Token.js';
+
+/**
+ * Custom params serializer to maintain JSON format for nested objects
+ * Ensures consistent behavior across all axios versions
+ */
+const paramsSerializer = (params) => {
+    const parts = [];
+    Object.keys(params).forEach(key => {
+        const value = params[key];
+        if (value !== null && value !== undefined) {
+            if (typeof value === 'object' && !Array.isArray(value)) {
+                // Serialize objects as JSON strings
+                parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`);
+            } else if (Array.isArray(value)) {
+                // Handle arrays
+                value.forEach(val => {
+                    parts.push(`${encodeURIComponent(key)}[]=${encodeURIComponent(val)}`);
+                });
+            } else {
+                // Handle primitive values
+                parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+            }
+        }
+    });
+    return parts.join('&');
+};
 
 /**
  * Base HTTP Service Class
@@ -36,6 +62,7 @@ export class BaseHTTPService {
             baseURL: this.getBaseURL(),
             headers,
             timeout: this.timeout,
+            paramsSerializer: paramsSerializer,
             ...this.customAxiosConfig,
         });
 
@@ -43,7 +70,8 @@ export class BaseHTTPService {
     }
 
     setupInterceptors() {
-        this.api.interceptors.response.use((response) => response,
+        this.api.interceptors.response.use(
+            (response) => response,
             (error) => Promise.reject(error)
         );
 
@@ -67,6 +95,7 @@ export class BaseHTTPService {
         const options = {
             baseURL: this.getBaseURL(),
             timeout: this.timeout,
+            paramsSerializer: paramsSerializer,
             ...this.customAxiosConfig,
         };
 
@@ -221,9 +250,8 @@ export class BaseHTTPService {
         );
     }
     
-
     // Utility method
     assignParamsToUrl(path, params) {
         return assignParamsToUrl(path, params);
     }
-}
+}

package/src/@daf/services/helpers/config.js

@@ -0,0 +1,16 @@
+let globalConfig = {
+    application: null,
+    mainApiUrl: null,
+    storeUrl: null,
+    language: 'en',
+    onError: null,
+    messageHandler: null,
+    store: null,
+    addToastAction: null,
+};
+  
+export const configureServices = (config) => {
+    globalConfig = { ...globalConfig, ...config };
+};
+  
+export const getConfig = () => globalConfig;

package/src/services.js

@@ -1,2 +1,8 @@
-export { BaseHTTPService } from './@daf/services/BaseHTTPService.js';
-export { ErrorHandler } from './@daf/services/ErrorHandler.js';
+// HELPERS
+export { BaseHTTPService } from './@daf/services/helpers/BaseHTTPService.js';
+export { ErrorHandler } from './@daf/services/helpers/ErrorHandler.js';
+export { configureServices, getConfig } from './@daf/services/helpers/config.js';
+
+// SERVICES
+export { BaseService } from './@daf/services/BaseService.js';
+export { ErrorService } from './@daf/services/ErrorService.js';