Merge pull request #638 from sipcapture/bugfix/notifications-in-preferences

adubovikov · web-flow · commit decf85021018 · 2024-06-28T19:19:32.000+02:00
Bugfix/notifications in preferences
diff --git a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html
@@ -87,7 +87,7 @@
             {{ password?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }}
           </mat-error>
           <mat-error *ngIf="password?.errors?.['missingCharacters'] && !password?.errors?.['maxlength'] && !password?.errors?.['minlength'] && !password?.errors?.['required']">
-            {{'validators.pattern' | translate }} [aA-Zz], [0-9] and "~!@#$%^&*()_"]
+            {{'validators.pattern' | translate }} [aA-zZ] and [0-9]
           </mat-error>
           <mat-icon matSuffix
             style="cursor: pointer"
@@ -117,7 +117,7 @@
             {{ password2?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }}
           </mat-error>
           <mat-error *ngIf="password2?.errors?.['missingCharacters'] && !password2?.errors?.['maxlength'] && !password2?.errors?.['minlength'] && !password?.errors?.['required']">
-            {{'validators.pattern' | translate }} [aA-Zz], [0-9] and "~!@#$%^&*()_"]
+            {{'validators.pattern' | translate }} [aA-zZ] and [0-9]
           </mat-error>
         </mat-form-field>
 </div>
diff --git a/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.ts b/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.ts
@@ -118,8 +118,12 @@ export class PageAdvancedSettingsComponent implements OnInit, AfterViewInit, OnD
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                })
         };
         if (item) {
             item.type = type;
diff --git a/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.ts b/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.ts
@@ -123,8 +123,12 @@ export class PageAgentSubscriptionsComponent implements OnInit, AfterViewInit, O
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         this.openDialog(DialogAgentsubComponent, item, onOpenDialog, isCopy);
diff --git a/src/app/components/preference/pages/page-alias/page-alias.component.ts b/src/app/components/preference/pages/page-alias/page-alias.component.ts
@@ -133,8 +133,12 @@ export class PageAliasComponent implements OnInit, OnDestroy, AfterViewInit {
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
         if (item) {
             item.actionType = type;
diff --git a/src/app/components/preference/pages/page-api-auth/page-api-auth.component.ts b/src/app/components/preference/pages/page-api-auth/page-api-auth.component.ts
@@ -135,6 +135,7 @@ export class PageApiAuthComponent implements OnInit, AfterViewInit, OnDestroy {
                 );
             }
             this.updateData();
+            this.alertService.success(`${this.page} Successfully ${(_result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
         };
 
         const onOpenDialog = (result) => {
@@ -145,8 +146,9 @@ export class PageApiAuthComponent implements OnInit, AfterViewInit, OnDestroy {
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(onServiceRes);
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(onServiceRes, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         this.openDialog(DialogAuthKeyComponent, item, onOpenDialog, isCopy);
diff --git a/src/app/components/preference/pages/page-mapping/page-mapping.component.ts b/src/app/components/preference/pages/page-mapping/page-mapping.component.ts
@@ -121,7 +121,12 @@ export class PageMappingComponent implements OnInit, AfterViewInit, OnDestroy {
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
             this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
         };
 
diff --git a/src/app/components/preference/pages/page-profile/page-profile.component.ts b/src/app/components/preference/pages/page-profile/page-profile.component.ts
@@ -206,7 +206,9 @@ export class PageProfileComponent implements OnInit {
             }
             this.alertService.success(`${this.page} Successfully  Updated`);
 
-         });
+        }, () => {
+            this.alertService.error(`Failed to Update ${this.page}`)
+        });
     } else {
         this.username.markAsTouched();
         this.usergroup.markAsTouched();
diff --git a/src/app/components/preference/pages/page-scripts/page-scripts.component.ts b/src/app/components/preference/pages/page-scripts/page-scripts.component.ts
@@ -123,8 +123,9 @@ export class PageScriptsComponent implements OnInit, AfterViewInit, OnDestroy {
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => this.updateData(), () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         this.openDialog(DialogScriptsComponent, Functions.cloneObject(item), onOpenDialog, isCopy);
diff --git a/src/app/components/preference/pages/page-system-overview/page-system-overview.component.ts b/src/app/components/preference/pages/page-system-overview/page-system-overview.component.ts
@@ -186,8 +186,12 @@ export class PageSystemOverviewComponent implements OnInit, AfterViewInit, OnDes
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         this.openDialog(DialogUsersComponent, item, onOpenDialog, isCopy);
diff --git a/src/app/components/preference/pages/page-user-settings/page-user-settings.component.ts b/src/app/components/preference/pages/page-user-settings/page-user-settings.component.ts
@@ -123,8 +123,12 @@ export class PageUserSettingsComponent implements OnInit, OnDestroy, AfterViewIn
             result.isCopy = isCopy;
             this.service[result.isnew ? 'add' : (isCopy ? 'copy' : 'update')](result.data)
                 .toPromise()
-                .then(() => this.updateData());
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                .then(() => {
+                    this.updateData();
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         if (item) {
diff --git a/src/app/components/preference/pages/page-users/page-users.component.ts b/src/app/components/preference/pages/page-users/page-users.component.ts
@@ -135,8 +135,11 @@ export class PageUsersComponent implements OnInit, OnDestroy, AfterViewInit {
                         this.authenticationService.logout();
                         this.router.navigate([{ outlets: { primary: null, system: 'login' } }]);
                     }
-                 });
-            this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+                    this.alertService.success(`${this.page} Successfully ${(result.isnew ? 'Added' : (isCopy ? 'Copied' : 'Updated'))}`);
+
+                }, () => {
+                    this.alertService.error(`Failed to ${(result.isnew ? 'Add' : (isCopy ? 'Copy' : 'Update'))} ${this.page}`)
+                });
         };
 
         this.openDialog(DialogUsersComponent, Functions.cloneObject(item), onOpenDialog, isCopy);
