Merge pull request #1141 from eclipse-tractusx/chore/#984-add-validat…

…ion-to-notification-hover chore(uux): 984 validation on notification save hover
eclipse-tractusx · Jul 3, 2024 · 5c403de · 5c403de
2 parents f59fb36 + 8bd03a6
commit 5c403de
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.html b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.html
@@ -32,7 +32,14 @@
   </div>
   <div class="detail--action">
     <div class="detail--action--button"
-         matTooltip="{{(isSaveButtonDisabled ? ( affectedPartIds.length < 1 ? 'requestNotification.noPartsSelected' : 'requestNotification.saveNotAllowed') : 'requestNotification.save') | i18n}}"
+         matTooltip="{{
+       isSaveButtonDisabled
+       ? (affectedPartIds.length < 1
+           ? ('requestNotification.noPartsSelected' | i18n)
+           : notificationFormGroup?.pristine
+             ? ('requestNotification.noChanges' | i18n)
+             : ('requestNotification.saveNotAllowed' | i18n))
+       : 'requestNotification.save' | i18n}}"
          matTooltipClass="table--header--tooltip"
          matTooltipPosition="above"
          [class.mdc-tooltip--multiline]="true"
@@ -51,6 +58,7 @@
         </div>
       </app-button>
     </div>
+
   </div>
 </div>
 

diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts
@@ -18,7 +18,7 @@
  ********************************************************************************/
 
 import { Location } from '@angular/common';
-import { Component, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Pagination } from '@core/model/pagination.model';
@@ -93,6 +93,7 @@ export class NotificationEditComponent implements OnDestroy {
     private readonly toastService: ToastService,
     private readonly sharedPartService: SharedPartService,
     private location: Location,
+    private readonly cdr: ChangeDetectorRef,
   ) {
     this.editMode = this.determineEditModeOrCreateMode();
 
@@ -178,6 +179,8 @@ export class NotificationEditComponent implements OnDestroy {
 
     this.notificationFormGroup = notificationFormGroup;
     this.isSaveButtonDisabled = (notificationFormGroup.invalid || this.affectedPartIds.length < 1) || !this.notificationFormGroup.dirty;
+    this.cdr.detectChanges();
+
     if (this.notificationFormGroup && this.notificationFormGroup.getRawValue().type === NotificationType.INVESTIGATION.valueOf() && !this.notificationFormGroup.getRawValue().bpn && this.sharedPartService.affectedParts && this.sharedPartService.affectedParts.length > 0) {
       this.notificationFormGroup.get('bpn').setValue(this.sharedPartService.affectedParts[0].businessPartner);
     }

diff --git a/.../modules/shared/components/request-notification-new/notification-new-request.component.ts b/.../modules/shared/components/request-notification-new/notification-new-request.component.ts
@@ -129,7 +129,6 @@ export class RequestNotificationNewComponent implements OnDestroy, OnInit {
     }
 
     this.allTouched?.subscribe(next => {
-      console.log(next);
       if (next === true) {
         this.formGroup.markAllAsTouched();
       }

diff --git a/frontend/src/assets/locales/de/common.json b/frontend/src/assets/locales/de/common.json
@@ -290,7 +290,8 @@
     "saveError": "Bei der Erstellung des Qualitätsthemas ist ein Fehler aufgetreten.",
     "saveEditSuccess": "Qualitätsthema wurde erfolgreich aktualisiert.",
     "saveEditError": "Bei der Aktualisierung des Qualitätsthemas ist ein Fehler aufgetreten.",
-    "save": "Qualitätsthema speichern"
+    "save" : "Qualitätsthema speichern",
+    "noChanges" : "Erfordert eine Änderung am Qualitätsthema"
   },
   "editNotification": {
     "saveButton": "Speichern",

diff --git a/frontend/src/assets/locales/en/common.json b/frontend/src/assets/locales/en/common.json
@@ -289,7 +289,8 @@
     "saveError": "An error occurred while creating the quality topic.",
     "saveEditSuccess": "Quality topic was updated successfully.",
     "saveEditError": "An error occurred while updating the quality topic.",
-    "save": "Save quality topic"
+    "save" : "Save quality topic",
+    "noChanges" : "Requires a change on the quality topic"
   },
   "editNotification": {
     "saveButton": "Save",