ngx-techlify-core 14.13.0 → 14.13.2

package/fesm2020/ngx-techlify-core.mjs

@@ -30,7 +30,7 @@ import { MatCardModule } from '@angular/material/card';
 import * as i1$4 from '@angular/forms';
 import { UntypedFormControl, Validators, ReactiveFormsModule, FormsModule, NG_VALUE_ACCESSOR, FormControl } from '@angular/forms';
 import * as i1$2 from '@angular/common/http';
-import { HttpResponse, HttpClient, HttpClientModule } from '@angular/common/http';
+import { HttpErrorResponse, HttpResponse, HttpClient, HttpClientModule } from '@angular/common/http';
 import { throwError, Observable, Subject, of, BehaviorSubject, map as map$1, from, fromEvent, interval } from 'rxjs';
 import * as i1$1 from '@angular/material/snack-bar';
 import { MAT_SNACK_BAR_DATA, MatSnackBarModule } from '@angular/material/snack-bar';
@@ -865,41 +865,51 @@ const log$6 = new Logger('ErrorHandlerInterceptor');
  * Adds a default error handler to all requests.
  */
 class ErrorHandlerInterceptor {
-    constructor(configService, errorHandler) {
+    constructor(configService, errorHandler, alertService) {
         this.configService = configService;
         this.errorHandler = errorHandler;
+        this.alertService = alertService;
     }
     intercept(request, next) {
         return next.handle(request).pipe(catchError(error => this.handleError(error)));
     }
     // Customize the default error handler here if needed
     handleError(error) {
-        let errorMessage = '';
-        if (error.error instanceof ErrorEvent) {
-            // client-side error
-            errorMessage = `Client Error: ${this.configService?.getProjectKey()}: ${error.error.message}`;
+        if (this.checkNoNetworkConnection(error)) {
+            this.alertService.addAlert('Internet connection not available, try later', 'warning');
+            return throwError(error);
         }
-        else {
-            // server-side error
-            errorMessage = `Server Error: ${this.configService?.getProjectKey()}`;
-            try {
-                this.errorHandler.handleError(error, 'Unexpected Server Error, try later or contact service team');
-            }
-            catch (e) {
-                console.log("Unable to handle server error", e);
-            }
+        try {
+            this.errorHandler.handleError(error, 'Unexpected Server Error, try later or contact service team');
+        }
+        catch (e) {
+            console.log("Unable to handle server error", e);
         }
         return throwError(error);
     }
-}
-ErrorHandlerInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ErrorHandlerInterceptor, deps: [{ token: ConfigService }, { token: ErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+    /**
+   * Helper function to check if an error is likely due to a network connection issue.
+   *
+   * @param error The error object to check.
+   * @returns `true` if it's likely a network error, `false` otherwise.
+   */
+    checkNoNetworkConnection(error) {
+        return (error instanceof HttpErrorResponse
+            && !error.headers.keys().length
+            && !error.ok
+            && !error.status
+            && !error.error.loaded
+            && !error.error.total);
+    }
+}
+ErrorHandlerInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ErrorHandlerInterceptor, deps: [{ token: ConfigService }, { token: ErrorHandlerService }, { token: AlertService }], target: i0.ɵɵFactoryTarget.Injectable });
 ErrorHandlerInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ErrorHandlerInterceptor, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ErrorHandlerInterceptor, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: ConfigService }, { type: ErrorHandlerService }]; } });
+        }], ctorParameters: function () { return [{ type: ConfigService }, { type: ErrorHandlerService }, { type: AlertService }]; } });
 
 const log$5 = new Logger('HttpCacheService');
 /**
@@ -1291,6 +1301,8 @@ class EntityFileService extends TechlifyServiceBaseClass {
         formData.append("fileData", file, file.name);
         if (params?.entity_id) {
             formData.append('entity_id', params.entity_id);
+        }
+        if (params?.entity_type) {
             formData.append('entity_type', params.entity_type);
         }
         params?.disk ? formData.append('disk', params.disk) : null;
@@ -1815,7 +1827,7 @@ class EntityFileFormComponent {
     async fileChanged(event) {
         this.fileList = event;
         if (this.fileList.length > 0) {
-            const result = await this.entityFileService.uploadEntityFile(this.fileList[0]);
+            const result = await this.entityFileService.uploadEntityFile(this.fileList[0], { entity_type: this.entityFileGroup.get('entity_type').value });
             this.entityFileGroup.patchValue(result.item);
             ;
             this.fileList = [];
@@ -2327,7 +2339,7 @@ class CurrentUserService {
         if (!this.user) {
             return false;
         }
-        if (this.user.user_type_id == 1 || this.user.user_type_id == 2) {
+        if (this.user.user_type_id == 1) {
             return true;
         }
         else {