@nettyapps/ntybase 21.1.30 → 21.1.31

package/fesm2022/nettyapps-ntybase.mjs

@@ -377,67 +377,42 @@ class AlertService {
             verticalPosition: 'bottom',
         });
     }
-    // For error notifications
     /**
-     * Flexible Error Display
-     * @param error - Error object from API or string
-     * @param fallbackOrComponent - Optional: Fallback message key (@...) OR Custom Component
-     * @param customComponent - Optional: Custom component to use if the 2nd parameter is a message
-     */
-    showError(error, fallbackOrComponent = ErrorAlert, customComponent = ErrorAlert, width = 'auto', height = 'auto') {
-        let componentToOpen = ErrorAlert;
-        let fallbackMsg = '';
-        if (typeof fallbackOrComponent === 'string' && fallbackOrComponent.startsWith('@')) {
-            // showError(err, '@updateFailed', ...)
-            fallbackMsg = fallbackOrComponent;
-            componentToOpen = (customComponent && typeof customComponent === 'function') ? customComponent : ErrorAlert;
-        }
-        else if (typeof fallbackOrComponent === 'function') {
-            // showError(err, MySpecialComponent)
-            componentToOpen = fallbackOrComponent;
-        }
-        // Extract Message (C# / Backend message has priority)
-        const backendError = this.getErrorMessage(error);
-        // Final Message Decision: Use backend message if exists, otherwise translate fallback key
-        const finalMessage = (backendError && backendError !== JSON.stringify(error))
-            ? backendError
-            : (fallbackMsg ? this.translate.instant(fallbackMsg) : backendError);
+       * Displays an error dialog with flexible parameters.
+       * Intelligently extracts meaningful C# error messages or falls back to a translation key.
+       * * Supported usages:
+       * - showError('@fallbackKey', err)
+       * - showError(err)
+       * - showError(err, '@fallbackKey')
+       * - showError('@fallbackKey')
+       */
+    showError(arg1, arg2, customComponent = ErrorAlert, width = 'auto', height = 'auto') {
+        const isArg1Str = typeof arg1 === 'string';
+        const fallbackKey = isArg1Str ? arg1 : (typeof arg2 === 'string' ? arg2 : '');
+        const errorObj = isArg1Str ? arg2 : arg1;
+        // Open the Dialog
         return new Promise((resolve) => {
-            const dialogRef = this.dialog.open(componentToOpen, {
-                width: width,
-                height: height,
-                maxWidth: '95vw',
+            this.dialog.open(customComponent, {
+                width, height, maxWidth: '95vw',
                 data: {
-                    message: finalMessage,
+                    message: this.getErrorMessage(errorObj, fallbackKey),
                     title: this.translate.instant('@errorOccurred'),
                 },
-            });
-            dialogRef.afterClosed().subscribe(() => {
-                resolve();
-            });
+            }).afterClosed().subscribe(() => resolve());
         });
     }
-    /**
-     * Extracts the most meaningful error message from the error object
-     */
-    getErrorMessage(error) {
-        if (!error)
-            return '';
-        // 1. C# API / Backend Error Messages
-        if (error?.error?.message)
-            return error.error.message;
-        if (error?.error && typeof error.error === 'string')
-            return error.error;
-        if (error?.details && typeof error.details === 'string')
-            return error.details;
-        if (error?.message && typeof error.message === 'string' && !error.message.startsWith('@'))
-            return error.message;
-        /// 2. Localization Keys (starting with @)
-        if (typeof error === 'string' && error.startsWith('@'))
-            return this.translate.instant(error);
-        if (error?.message && typeof error.message === 'string' && error.message.startsWith('@'))
-            return this.translate.instant(error.message);
-        return typeof error === 'string' ? error : JSON.stringify(error);
+    getErrorMessage(errorObj, fallbackKey) {
+        if (!errorObj) {
+            return fallbackKey ? this.translate.instant(fallbackKey) : this.translate.instant('@errorOccurred');
+        }
+        const data = errorObj.error ?? errorObj;
+        const isStr = typeof data === 'string';
+        const backendMessage = isStr ? data : (data?.message || data?.details || JSON.stringify(data));
+        const isMeaningful = isStr ? !data.startsWith('<') : !!(data?.message || data?.details);
+        if (fallbackKey) {
+            return isMeaningful ? backendMessage : this.translate.instant(fallbackKey);
+        }
+        return backendMessage;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: AlertService, deps: [{ token: i1$2.MatSnackBar }, { token: i1.MatDialog }, { token: i1$1.TranslateService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.2", ngImport: i0, type: AlertService, providedIn: 'root' });