@qlibs/utils 1.10.0 → 1.11.0

package/dist/utils/basePath.d.ts

@@ -0,0 +1,2 @@
+export declare function getBasePath(): string;
+export declare function goBack(navigateFunction: Function): void;

package/dist/utils/basePath.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBasePath = getBasePath;
+exports.goBack = goBack;
+function getBasePath() {
+    const pathname = window.location.pathname;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments.length <= 1)
+        return '/' + (segments[0] || '');
+    const baseSegments = segments.slice(0, -1);
+    return '/' + baseSegments.join('/');
+}
+function goBack(navigateFunction) {
+    if (window.history.length > 0) {
+        navigateFunction(-1);
+    }
+    else {
+        const backPath = getBasePath();
+        navigateFunction(backPath);
+    }
+}

package/dist/utils/errorHandler.d.ts

@@ -15,3 +15,4 @@ export declare function getStandardError(err: any, config?: {
     errors: any[] | null;
 };
 export declare function handleFormValidation(errors: any[], formRef: any): void;
+export declare function showErrorMessage(toastFunction: any, message: any): void;

package/dist/utils/errorHandler.js

@@ -5,6 +5,7 @@ exports.getErrorCode = getErrorCode;
 exports.getErrors = getErrors;
 exports.getStandardError = getStandardError;
 exports.handleFormValidation = handleFormValidation;
+exports.showErrorMessage = showErrorMessage;
 function getErrorMessage(err, config) {
     let errMessage = 'Failed. Please try again.';
     console.info('err', err);
@@ -116,20 +117,8 @@ function getStandardError(err, config) {
     if (config === null || config === void 0 ? void 0 : config.triggerFormValidation) {
         handleFormValidation(errors || [], config.formRef);
     }
-    if ((config === null || config === void 0 ? void 0 : config.showToast) && (config === null || config === void 0 ? void 0 : config.toastFunction)) {
-        if (config.toastFunction.confirm) {
-            config.toastFunction.error({
-                title: 'Failed',
-                content: message,
-                closable: true,
-            });
-        }
-        else if (config.toastFunction.error) {
-            config.toastFunction.error(message);
-        }
-        else if (typeof config.toastFunction === 'function') {
-            config.toastFunction(message);
-        }
+    if (config === null || config === void 0 ? void 0 : config.showToast) {
+        showErrorMessage(config.toastFunction, message);
     }
     return {
         code,
@@ -163,3 +152,20 @@ function handleFormValidation(errors, formRef) {
         formRef.setFields(fields);
     }
 }
+function showErrorMessage(toastFunction, message) {
+    if (toastFunction) {
+        if (toastFunction.confirm) {
+            toastFunction.error({
+                title: 'Failed',
+                content: message,
+                closable: true,
+            });
+        }
+        else if (toastFunction.error) {
+            toastFunction.error(message);
+        }
+        else if (typeof toastFunction === 'function') {
+            toastFunction(message);
+        }
+    }
+}

package/dist/utils/formHandler.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onFinishFailed = void 0;
+const errorHandler_1 = require("./errorHandler");
 const onFinishFailed = (antdErrorInfo, config) => {
     console.error('antdErrorInfo', antdErrorInfo);
     const { errorFields } = antdErrorInfo;
     if (errorFields && errorFields.length > 0) {
         const firstError = errorFields[0];
         if (firstError.errors && firstError.errors.length > 0) {
-            config.toastFunction.error(firstError.errors.join(' '));
+            const message = firstError.errors.join(' ');
+            (0, errorHandler_1.showErrorMessage)(config.toastFunction, message);
         }
         setTimeout(() => {
             config.form.scrollToField(firstError.name, {
@@ -17,7 +19,7 @@ const onFinishFailed = (antdErrorInfo, config) => {
         }, 100);
     }
     else {
-        config.toastFunction.error('Something wrong. Please check your inputs.');
+        (0, errorHandler_1.showErrorMessage)(config.toastFunction, 'Something wrong. Please check your inputs.');
     }
 };
 exports.onFinishFailed = onFinishFailed;

package/dist/utils/index.d.ts

@@ -1,5 +1,6 @@
 export * from './auth';
 export * from './axios';
+export * from './basePath';
 export * from './datetime';
 export * from './errorHandler';
 export * from './formRules';

package/dist/utils/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth"), exports);
 __exportStar(require("./axios"), exports);
+__exportStar(require("./basePath"), exports);
 __exportStar(require("./datetime"), exports);
 __exportStar(require("./errorHandler"), exports);
 __exportStar(require("./formRules"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlibs/utils",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "",
   "author": "QBIT Developer",
   "license": "MIT",