http-request-manager 18.11.22 → 18.11.23

package/README.md

@@ -128,7 +128,7 @@ export class UsersComponent {
 
   ngOnInit() {
     this.httpManager.getRequest(
-      ApiRequest.adapt({ path: ['users'] })
+      ApiRequest.adapt({ path: ['users'], displaySuccess: true, successMessage: 'Loaded users!' })
     ).subscribe();
   }
 }
@@ -219,7 +219,8 @@ export class AppModule { }
 | `stream` | `boolean` | Enable streaming by default | `false` |
 | `displayError` | `boolean` | Show toast errors by default | `false` |
 | `displaySuccess` | `boolean` | Show toast on success by default | `false` |
-| `successMessage` | `string` | Custom success toast message | `'OK'` |
+| `successMessage` | `string` | Custom success toast message (optional) | `undefined` |
+| `errorMessage` | `string` | Custom error toast message (optional, overrides default) | `undefined` |
 
 #### Local Storage Options (`LocalStorageOptions`)
 

package/fesm2022/http-request-manager.mjs

@@ -2935,17 +2935,17 @@ class RetryOptions {
 }
 
 class BatchOptions {
-    constructor(mode = 'sequential', stopOnError = false, concurrency = 3, ignoreErrors = false, logErrors = true, displaySuccess, successMessage) {
+    constructor(mode = 'sequential', stopOnError = false, concurrency = 3, ignoreErrors = false, logErrors = true, displaySuccess, displayError) {
         this.mode = mode;
         this.stopOnError = stopOnError;
         this.concurrency = concurrency;
         this.ignoreErrors = ignoreErrors;
         this.logErrors = logErrors;
         this.displaySuccess = displaySuccess;
-        this.successMessage = successMessage;
+        this.displayError = displayError;
     }
     static adapt(item) {
-        return new BatchOptions(item?.mode ?? 'sequential', item?.stopOnError ?? false, item?.concurrency ?? 3, item?.ignoreErrors ?? false, item?.logErrors !== false, item?.displaySuccess ?? false, item?.successMessage);
+        return new BatchOptions(item?.mode ?? 'sequential', item?.stopOnError ?? false, item?.concurrency ?? 3, item?.ignoreErrors ?? false, item?.logErrors !== false, item?.displaySuccess ?? false, item?.displayError ?? false);
     }
 }
 
@@ -2990,7 +2990,7 @@ var DataType;
 })(DataType || (DataType = {}));
 
 class ConfigHTTPOptions {
-    constructor(server = '', path, headers, polling, retry, stream, displayError, displaySuccess, successMessage) {
+    constructor(server = '', path, headers, polling, retry, stream, displayError, displaySuccess) {
         this.server = server;
         this.path = path;
         this.headers = headers;
@@ -2999,12 +2999,11 @@ class ConfigHTTPOptions {
         this.stream = stream;
         this.displayError = displayError;
         this.displaySuccess = displaySuccess;
-        this.successMessage = successMessage;
     }
     static adapt(item) {
         const server = Array.isArray(item?.server) ? item.server.join('/') : item?.server || '';
         const retryOptions = item?.retry ? RetryOptions.adapt(item.retry) : RetryOptions.adapt();
-        return new ConfigHTTPOptions(server, (item?.path) ? item.path : [], (item?.headers) ? item.headers : {}, item?.polling ? Math.floor(item.polling) : 0, retryOptions, (item?.stream) ? item.stream : false, (item?.displayError) ? item.displayError : false, (item?.displaySuccess) ? item.displaySuccess : false, item?.successMessage);
+        return new ConfigHTTPOptions(server, (item?.path) ? item.path : [], (item?.headers) ? item.headers : {}, item?.polling ? Math.floor(item.polling) : 0, retryOptions, (item?.stream) ? item.stream : false, (item?.displayError) ? item.displayError : false, (item?.displaySuccess) ? item.displaySuccess : false);
     }
 }
 
@@ -3628,7 +3627,7 @@ class HTTPManagerService extends RequestService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         })).pipe(finalize(() => this.isPending.next(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage || err?.message);
             this.isPending.next(false);
             return this.handleError(err);
         }));
@@ -3645,7 +3644,7 @@ class HTTPManagerService extends RequestService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.next(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage || err?.message);
             this.isPending.next(false);
             return this.handleError(err);
         }));
@@ -3662,7 +3661,7 @@ class HTTPManagerService extends RequestService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.next(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage || err?.message);
             this.isPending.next(false);
             return this.handleError(err);
         }));
@@ -3679,7 +3678,7 @@ class HTTPManagerService extends RequestService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.next(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage || err?.message);
             this.isPending.next(false);
             return this.handleError(err);
         }));
@@ -3768,9 +3767,9 @@ class HTTPManagerService extends RequestService {
         this.error.next(error.message || `${error.status} - ${error.statusText}`);
         return throwError(() => error);
     }
-    handleErrorWithSnackBar(error) {
+    handleErrorWithSnackBar(error, message) {
         const displayError = ToastDisplay.adapt({
-            message: error.message || `${error.status} - ${error.statusText}`,
+            message: message || error.message || `${error.status} - ${error.statusText}`,
             action: 'OK',
             color: ToastColors.ERROR,
             icon: 'error',
@@ -3780,7 +3779,7 @@ class HTTPManagerService extends RequestService {
     }
     handleSuccessWithSnackBar(message) {
         const displaySuccess = ToastDisplay.adapt({
-            message: message || 'OK',
+            message: message || 'Success',
             action: 'OK',
             color: ToastColors.SUCCESS,
             icon: 'check_circle',
@@ -3823,16 +3822,16 @@ class HTTPManagerService extends RequestService {
      * @param options Optional batch configuration
      * @returns Observable emitting array of data when all requests complete
      */
-    getSequentialRequest(requests, options) {
+    getSequentialRequest(requests, options, successMessage, errorMessage) {
         const batchOptions = BatchOptions.adapt(options);
         const results = new Array(requests.length);
         return from(requests).pipe(concatMap((req, index) => {
-            return this.getRequest(req).pipe(tap(data => {
+            return this.getRequest(req, undefined).pipe(tap(data => {
                 results[index] = data;
             }), catchError(error => this.handleSequentialError(req, error, index, batchOptions)));
         }), toArray(), tap(() => {
             if (batchOptions.displaySuccess)
-                this.handleSuccessWithSnackBar(batchOptions.successMessage);
+                this.handleSuccessWithSnackBar(successMessage);
         }), map(() => results));
     }
     /**
@@ -3841,17 +3840,17 @@ class HTTPManagerService extends RequestService {
      * @param options Optional batch configuration with concurrency limit
      * @returns Observable emitting array of data when all requests complete
      */
-    getParallelRequest(requests, options) {
+    getParallelRequest(requests, options, successMessage, errorMessage) {
         const batchOptions = BatchOptions.adapt(options);
         const concurrency = batchOptions.concurrency || 3;
         const results = new Array(requests.length);
         return from(requests).pipe(mergeMap((req, index) => {
-            return this.getRequest(req).pipe(tap(data => {
+            return this.getRequest(req, undefined).pipe(tap(data => {
                 results[index] = data;
             }), catchError(error => this.handleParallelError(req, error, index, batchOptions)));
         }, concurrency), toArray(), tap(() => {
             if (batchOptions.displaySuccess)
-                this.handleSuccessWithSnackBar(batchOptions.successMessage);
+                this.handleSuccessWithSnackBar(successMessage);
         }), map(() => results));
     }
     /**
@@ -4312,7 +4311,7 @@ class HTTPManagerSignalsService extends RequestSignalsService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.set(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage || err?.message);
             this.isPending.set(false);
             return this.handleError(err);
         }));
@@ -4329,7 +4328,7 @@ class HTTPManagerSignalsService extends RequestSignalsService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.set(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage);
             this.isPending.set(false);
             return this.handleError(err);
         }));
@@ -4346,7 +4345,7 @@ class HTTPManagerSignalsService extends RequestSignalsService {
                 this.handleSuccessWithSnackBar(updatedOptions.successMessage);
         }), finalize(() => this.isPending.set(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage);
             this.isPending.set(false);
             return this.handleError(err);
         }));
@@ -4357,9 +4356,13 @@ class HTTPManagerSignalsService extends RequestSignalsService {
         const updatedOptions = this.defineReqOptions(options, params);
         const func = this.deleteRecordRequest;
         const requests = this.createRequest(func, updatedOptions);
-        return this.createObservable(updatedOptions, requests, func.name).pipe(tap(data => this.data.set(data)), finalize(() => this.isPending.set(false)), catchError((err) => {
+        return this.createObservable(updatedOptions, requests, func.name).pipe(tap(data => {
+            this.data.set(data);
+            if (updatedOptions.displaySuccess)
+                this.handleSuccessWithSnackBar(updatedOptions.successMessage);
+        }), finalize(() => this.isPending.set(false)), catchError((err) => {
             if (updatedOptions.displayError)
-                this.handleErrorWithSnackBar(err);
+                this.handleErrorWithSnackBar(err, updatedOptions.errorMessage);
             this.isPending.set(false);
             return this.handleError(err);
         }));
@@ -4444,9 +4447,9 @@ class HTTPManagerSignalsService extends RequestSignalsService {
         this.error.set(error.message || `${error.status} - ${error.statusText}`);
         return throwError(() => error);
     }
-    handleErrorWithSnackBar(error) {
+    handleErrorWithSnackBar(error, message) {
         const displayError = ToastDisplay.adapt({
-            message: error.message || `${error.status} - ${error.statusText}`,
+            message: message || error.message || `${error.status} - ${error.statusText}`,
             action: 'OK',
             color: ToastColors.ERROR,
             icon: 'error',
@@ -4456,7 +4459,7 @@ class HTTPManagerSignalsService extends RequestSignalsService {
     }
     handleSuccessWithSnackBar(message) {
         const displaySuccess = ToastDisplay.adapt({
-            message: message || 'OK',
+            message: message || 'Success',
             action: 'OK',
             color: ToastColors.SUCCESS,
             icon: 'check_circle',
@@ -4499,16 +4502,16 @@ class HTTPManagerSignalsService extends RequestSignalsService {
      * @param options Optional batch configuration
      * @returns Observable emitting array of data when all requests complete
      */
-    getSequentialRequest(requests, options) {
+    getSequentialRequest(requests, options, successMessage, errorMessage) {
         const batchOptions = BatchOptions.adapt(options);
         const results = new Array(requests.length);
         return from(requests).pipe(concatMap((req, index) => {
-            return this.getRequest(req).pipe(tap(data => {
+            return this.getRequest(req, undefined).pipe(tap(data => {
                 results[index] = data;
             }), catchError(error => this.handleSequentialError(req, error, index, batchOptions)));
         }), toArray(), tap(() => {
             if (batchOptions.displaySuccess)
-                this.handleSuccessWithSnackBar(batchOptions.successMessage);
+                this.handleSuccessWithSnackBar(successMessage);
         }), map(() => results));
     }
     /**
@@ -4517,17 +4520,17 @@ class HTTPManagerSignalsService extends RequestSignalsService {
      * @param options Optional batch configuration with concurrency limit
      * @returns Observable emitting array of data when all requests complete
      */
-    getParallelRequest(requests, options) {
+    getParallelRequest(requests, options, successMessage, errorMessage) {
         const batchOptions = BatchOptions.adapt(options);
         const concurrency = batchOptions.concurrency || 3;
         const results = new Array(requests.length);
         return from(requests).pipe(mergeMap((req, index) => {
-            return this.getRequest(req).pipe(tap(data => {
+            return this.getRequest(req, undefined).pipe(tap(data => {
                 results[index] = data;
             }), catchError(error => this.handleParallelError(req, error, index, batchOptions)));
         }, concurrency), toArray(), tap(() => {
             if (batchOptions.displaySuccess)
-                this.handleSuccessWithSnackBar(batchOptions.successMessage);
+                this.handleSuccessWithSnackBar(successMessage);
         }), map(() => results));
     }
     /**
@@ -4632,7 +4635,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
                 }] }] });
 
 class ApiRequest {
-    constructor(server = '', path, headers, adapter, mapper, polling, retry, stream, streamType, displayError, displaySuccess, successMessage, saveAs, fileContentHeader, ws, env) {
+    constructor(server = '', path, headers, adapter, mapper, polling, retry, stream, streamType, displayError, displaySuccess, successMessage, errorMessage, saveAs, fileContentHeader, ws, env) {
         this.server = server;
         this.path = path;
         this.headers = headers;
@@ -4645,6 +4648,7 @@ class ApiRequest {
         this.displayError = displayError;
         this.displaySuccess = displaySuccess;
         this.successMessage = successMessage;
+        this.errorMessage = errorMessage;
         this.saveAs = saveAs;
         this.fileContentHeader = fileContentHeader;
         this.ws = ws;
@@ -4652,7 +4656,7 @@ class ApiRequest {
     }
     static adapt(item) {
         const server = Array.isArray(item?.server) ? item.server.join('/') : item?.server || '';
-        return new ApiRequest(server, (item?.path) ? item.path : [], (item?.headers) ? item.headers : {}, item?.adapter, item?.mapper, item?.polling ? Math.floor(item.polling) : 0, item?.retry ? RetryOptions.adapt(item.retry) : RetryOptions.adapt(), (item?.stream) ? item.stream : false, item?.streamType || StreamType.AI_STREAMING, (item?.displayError) ? item.displayError : false, (item?.displaySuccess) ? item.displaySuccess : false, item?.successMessage, item?.saveAs, item?.fileContentHeader, item?.ws, item?.env || 'dev');
+        return new ApiRequest(server, item?.path ? item.path : [], item?.headers ? item.headers : {}, item?.adapter, item?.mapper, item?.polling ? Math.floor(item.polling) : 0, item?.retry ? RetryOptions.adapt(item.retry) : RetryOptions.adapt(), item?.stream ? item.stream : false, item?.streamType || StreamType.AI_STREAMING, item?.displayError ? item.displayError : false, item?.displaySuccess ? item.displaySuccess : false, item?.successMessage, item?.errorMessage, item?.saveAs, item?.fileContentHeader, item?.ws, item?.env || 'dev');
     }
 }