Merge pull request #414 from openITCOCKPIT/ITC-3617

ibering · web-flow · commit 06ac1f124f77 · 2025-11-03T10:20:57.000+01:00
ITC-3617 Refactor checking of duplicate service name to keep the last…
diff --git a/src/app/pages/hosts/hosts-add/hosts-add.component.html b/src/app/pages/hosts/hosts-add/hosts-add.component.html
@@ -166,7 +166,7 @@ <h5 cCardTitle>{{ t('Create new host') }}</h5>
                             <fa-icon [icon]="['fas', 'exclamation-triangle']"></fa-icon>
                             {{
                                 t('A host with the name {0} already exists. Duplicate host names could lead to confusion.', {
-                                    '0': post.name
+                                    '0': hostnameCheckedForDuplicates
                                 })
                             }}
 
diff --git a/src/app/pages/hosts/hosts-add/hosts-add.component.ts b/src/app/pages/hosts/hosts-add/hosts-add.component.ts
@@ -135,6 +135,9 @@ export class HostsAddComponent implements OnInit, OnDestroy {
         isHostnameInUse: false
     };
 
+    public hostnameCheckedForDuplicates: string = '';
+
+
     public hosttemplates: SelectKeyValue[] = [];
     public hostgroups: SelectKeyValue[] = [];
     public timeperiods: SelectKeyValue[] = [];
@@ -417,6 +420,8 @@ export class HostsAddComponent implements OnInit, OnDestroy {
         this.subscriptions.add(this.HostsService.checkForDuplicateHostname(this.post.name)
             .subscribe((result) => {
                 this.data.isHostnameInUse = result;
+                // Ensure that the host name in the warning box will not change until the user changes the name again
+                this.hostnameCheckedForDuplicates = this.post.name;
                 this.cdr.markForCheck();
             })
         );
diff --git a/src/app/pages/hosts/hosts-edit/hosts-edit.component.html b/src/app/pages/hosts/hosts-edit/hosts-edit.component.html
@@ -204,7 +204,7 @@ <h5 cCardTitle>{{ t('Edit host:') }}
                             <fa-icon [icon]="['fas', 'exclamation-triangle']"></fa-icon>
                             {{
                                 t('A host with the name {0} already exists. Duplicate host names could lead to confusion.', {
-                                    '0': post.name
+                                    '0': hostnameCheckedForDuplicates
                                 })
                             }}
 
diff --git a/src/app/pages/hosts/hosts-edit/hosts-edit.component.ts b/src/app/pages/hosts/hosts-edit/hosts-edit.component.ts
@@ -1,26 +1,26 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnDestroy, OnInit } from '@angular/core';
 
 import {
-  AlertComponent,
-  CardBodyComponent,
-  CardComponent,
-  CardFooterComponent,
-  CardHeaderComponent,
-  CardTitleDirective,
-  DropdownComponent,
-  DropdownItemDirective,
-  DropdownMenuDirective,
-  DropdownToggleDirective,
-  FormCheckComponent,
-  FormCheckInputDirective,
-  FormCheckLabelDirective,
-  FormControlDirective,
-  FormDirective,
-  FormLabelDirective,
-  InputGroupComponent,
-  InputGroupTextDirective,
-  NavComponent,
-  NavItemComponent
+    AlertComponent,
+    CardBodyComponent,
+    CardComponent,
+    CardFooterComponent,
+    CardHeaderComponent,
+    CardTitleDirective,
+    DropdownComponent,
+    DropdownItemDirective,
+    DropdownMenuDirective,
+    DropdownToggleDirective,
+    FormCheckComponent,
+    FormCheckInputDirective,
+    FormCheckLabelDirective,
+    FormControlDirective,
+    FormDirective,
+    FormLabelDirective,
+    InputGroupComponent,
+    InputGroupTextDirective,
+    NavComponent,
+    NavItemComponent
 } from '@coreui/angular';
 import { BackButtonDirective } from '../../../directives/back-button.directive';
 import {
@@ -69,59 +69,59 @@ import { HistoryService } from '../../../history.service';
 @Component({
     selector: 'oitc-hosts-edit',
     imports: [
-    AlertComponent,
-    BackButtonDirective,
-    CardBodyComponent,
-    CardComponent,
-    CardFooterComponent,
-    CardHeaderComponent,
-    CardTitleDirective,
-    CheckAttemptsInputComponent,
-    DropdownComponent,
-    DropdownItemDirective,
-    DropdownMenuDirective,
-    DropdownToggleDirective,
-    FaIconComponent,
-    FormCheckComponent,
-    FormCheckInputDirective,
-    FormCheckLabelDirective,
-    FormControlDirective,
-    FormDirective,
-    FormErrorDirective,
-    FormFeedbackComponent,
-    FormLabelDirective,
-    FormsModule,
-    HumanTimeComponent,
-    InputGroupComponent,
-    InputGroupTextDirective,
-    IntervalInputComponent,
-    LabelLinkComponent,
-    MacrosComponent,
-    MultiSelectComponent,
-    NavComponent,
-    NavItemComponent,
-    NgForOf,
-    NgIf,
-    NgSelectModule,
-    PermissionDirective,
-    PriorityComponent,
-    ReactiveFormsModule,
-    RequiredIconComponent,
-    SelectComponent,
-    TemplateDiffBtnComponent,
-    TemplateDiffComponent,
-    TranslocoDirective,
-    TranslocoPipe,
-    TrueFalseDirective,
-    XsButtonDirective,
-    RouterLink,
-    ObjectUuidComponent,
-    NgClass,
-    FakeSelectComponent,
-    UiBlockerComponent,
-    FormLoaderComponent,
-    AsyncPipe
-],
+        AlertComponent,
+        BackButtonDirective,
+        CardBodyComponent,
+        CardComponent,
+        CardFooterComponent,
+        CardHeaderComponent,
+        CardTitleDirective,
+        CheckAttemptsInputComponent,
+        DropdownComponent,
+        DropdownItemDirective,
+        DropdownMenuDirective,
+        DropdownToggleDirective,
+        FaIconComponent,
+        FormCheckComponent,
+        FormCheckInputDirective,
+        FormCheckLabelDirective,
+        FormControlDirective,
+        FormDirective,
+        FormErrorDirective,
+        FormFeedbackComponent,
+        FormLabelDirective,
+        FormsModule,
+        HumanTimeComponent,
+        InputGroupComponent,
+        InputGroupTextDirective,
+        IntervalInputComponent,
+        LabelLinkComponent,
+        MacrosComponent,
+        MultiSelectComponent,
+        NavComponent,
+        NavItemComponent,
+        NgForOf,
+        NgIf,
+        NgSelectModule,
+        PermissionDirective,
+        PriorityComponent,
+        ReactiveFormsModule,
+        RequiredIconComponent,
+        SelectComponent,
+        TemplateDiffBtnComponent,
+        TemplateDiffComponent,
+        TranslocoDirective,
+        TranslocoPipe,
+        TrueFalseDirective,
+        XsButtonDirective,
+        RouterLink,
+        ObjectUuidComponent,
+        NgClass,
+        FakeSelectComponent,
+        UiBlockerComponent,
+        FormLoaderComponent,
+        AsyncPipe
+    ],
     templateUrl: './hosts-edit.component.html',
     styleUrl: './hosts-edit.component.css',
     changeDetection: ChangeDetectionStrategy.OnPush
@@ -155,6 +155,9 @@ export class HostsEditComponent implements OnInit, OnDestroy {
         disableInheritance: false
     };
 
+    public hostnameCheckedForDuplicates: string = '';
+
+
     public hosttemplates: SelectKeyValue[] = [];
     public hostgroups: SelectKeyValue[] = [];
     public timeperiods: SelectKeyValue[] = [];
@@ -410,6 +413,8 @@ export class HostsEditComponent implements OnInit, OnDestroy {
         this.subscriptions.add(this.HostsService.checkForDuplicateHostname(this.post.name, [this.id])
             .subscribe((result) => {
                 this.data.isHostnameInUse = result;
+                // Ensure that the host name in the warning box will not change until the user changes the name again
+                this.hostnameCheckedForDuplicates = this.post.name;
                 this.cdr.markForCheck();
             })
         );
diff --git a/src/app/pages/services/services-add/services-add.component.html b/src/app/pages/services/services-add/services-add.component.html
@@ -131,7 +131,7 @@ <h5 cCardTitle>{{ t('Create new service') }}</h5>
                             <fa-icon [icon]="['fas', 'exclamation-triangle']"></fa-icon>
                             {{
                                 t('A service with the name {0} already exists on this host. Duplicate service names could lead to confusion.', {
-                                    '0': post.name
+                                    '0': servicenameCheckedForDuplicates
                                 })
                             }}
 
diff --git a/src/app/pages/services/services-add/services-add.component.ts b/src/app/pages/services/services-add/services-add.component.ts
@@ -21,7 +21,6 @@ import { BackButtonDirective } from '../../../directives/back-button.directive';
 import {
     CheckAttemptsInputComponent
 } from '../../../layouts/coreui/check-attempts-input/check-attempts-input.component';
-import { CoreuiComponent } from '../../../layouts/coreui/coreui.component';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { FormErrorDirective } from '../../../layouts/coreui/form-error.directive';
 import { FormFeedbackComponent } from '../../../layouts/coreui/form-feedback/form-feedback.component';
@@ -136,6 +135,8 @@ export class ServicesAddComponent {
         areContactsInheritedFromServicetemplate: false,
     };
 
+    public servicenameCheckedForDuplicates: string = '';
+
     public servicetemplates: SelectKeyValue[] = [];
     public servicegroups: SelectKeyValue[] = [];
     public timeperiods: SelectKeyValue[] = [];
@@ -380,6 +381,8 @@ export class ServicesAddComponent {
     public checkForDuplicateServicename() {
         const existingServicesNames: string[] = Object.values(this.existingServices);
         this.data.isServicenameInUse = existingServicesNames.includes(this.post.name);
+        // Ensure that the service name in the warning box will not change until the user changes the name again
+        this.servicenameCheckedForDuplicates = this.post.name;
         this.cdr.markForCheck();
     }
 
diff --git a/src/app/pages/services/services-edit/services-edit.component.html b/src/app/pages/services/services-edit/services-edit.component.html
@@ -187,7 +187,7 @@ <h5 cCardTitle>
                             <fa-icon [icon]="['fas', 'exclamation-triangle']"></fa-icon>
                             {{
                                 t('A service with the name {0} already exists on this host. Duplicate service names could lead to confusion.', {
-                                    '0': post.name
+                                    '0': servicenameCheckedForDuplicates
                                 })
                             }}
 
diff --git a/src/app/pages/services/services-edit/services-edit.component.ts b/src/app/pages/services/services-edit/services-edit.component.ts
@@ -21,7 +21,6 @@ import { BackButtonDirective } from '../../../directives/back-button.directive';
 import {
     CheckAttemptsInputComponent
 } from '../../../layouts/coreui/check-attempts-input/check-attempts-input.component';
-import { CoreuiComponent } from '../../../layouts/coreui/coreui.component';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { FormErrorDirective } from '../../../layouts/coreui/form-error.directive';
 import { FormFeedbackComponent } from '../../../layouts/coreui/form-feedback/form-feedback.component';
@@ -142,14 +141,15 @@ export class ServicesEditComponent {
         areContactsInheritedFromHost: false,
         areContactsInheritedFromServicetemplate: false,
     };
+    public servicenameCheckedForDuplicates: string = '';
 
     public servicetemplates: SelectKeyValue[] = [];
     public servicegroups: SelectKeyValue[] = [];
     public timeperiods: SelectKeyValue[] = [];
     public checkperiods: SelectKeyValue[] = [];
     public contacts: SelectKeyValue[] = [];
     public contactgroups: SelectKeyValue[] = [];
-    public existingServices: object = {}
+    public existingServices: Record<number, string> = {};
     public isSlaHost: boolean = false;
 
     public errors: GenericValidationError | null = null;
@@ -326,8 +326,17 @@ export class ServicesEditComponent {
     }
 
     public checkForDuplicateServicename() {
+        // Remove current service from existing services to avoid false positive
+        const serviceId = this.post.id;
+        if (serviceId && this.existingServices) {
+            if (this.existingServices.hasOwnProperty(serviceId)) {
+                delete this.existingServices[serviceId];
+            }
+        }
+
         const existingServicesNames: string[] = Object.values(this.existingServices);
         this.data.isServicenameInUse = existingServicesNames.includes(this.post.name);
+        this.servicenameCheckedForDuplicates = this.post.name;
         this.cdr.markForCheck();
     }
 
