From e7b950c24625703c646df0f48b52ce14cd185ae0 Mon Sep 17 00:00:00 2001
From: Chneemann <Andre-Ke@gmx.de>
Date: Sat, 18 May 2024 11:54:42 +0200
Subject: [PATCH] bugfixes

---
 .../contact-delete.component.html             |  2 +-
 .../contact-delete.component.ts               |  2 +-
 .../contact-edit-new.component.html           | 11 ++++-
 .../contact-form/contact-form.component.html  |  5 +-
 .../contact-form/contact-form.component.ts    | 47 +++++++++++++------
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/app/components/contacts/contact-delete/contact-delete.component.html b/src/app/components/contacts/contact-delete/contact-delete.component.html
index dad53c8..c1de291 100644
--- a/src/app/components/contacts/contact-delete/contact-delete.component.html
+++ b/src/app/components/contacts/contact-delete/contact-delete.component.html
@@ -5,7 +5,7 @@
     </p>
     <div class="btns">
       <div class="btn">
-        <div class="btn-cancle" (click)="deleteCancle()">
+        <div class="btn-cancle" (click)="cancelDeleteContact()">
           {{ "contactDeleteDialog.btnCancle" | translate }}
         </div>
       </div>
diff --git a/src/app/components/contacts/contact-delete/contact-delete.component.ts b/src/app/components/contacts/contact-delete/contact-delete.component.ts
index b1a05c0..c3394c7 100644
--- a/src/app/components/contacts/contact-delete/contact-delete.component.ts
+++ b/src/app/components/contacts/contact-delete/contact-delete.component.ts
@@ -43,7 +43,7 @@ export class ContactDeleteComponent {
     });
   }
 
-  deleteCancle() {
+  cancelDeleteContact() {
     this.sharedService.isDeleteContactDialogOpen = false;
     if (!this.sharedService.isEditContactDialogOpen) {
       this.sharedService.isAnyDialogOpen = false;
diff --git a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html
index e5f2011..a0f2068 100644
--- a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html
+++ b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html
@@ -18,12 +18,19 @@
           }"
         >
           <div class="initials">
-            {{ firebaseService.getUserDetails(currentUserId, "initials") }}
+            @if (!userInitials) {
+            {{ firebaseService.getUserDetails(currentUserId, "initials") }} }
+            @else {
+            {{ userInitials }}
+            }
           </div>
         </div>
       </div>
       <div class="form">
-        <app-contact-form [currentUserId]="currentUserId"></app-contact-form>
+        <app-contact-form
+          (inititalsEmitter)="inititalsEmitter($event)"
+          [currentUserId]="currentUserId"
+        ></app-contact-form>
       </div>
     </div>
   </div>
diff --git a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html
index 8bfcea2..ae6b373 100644
--- a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html
+++ b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html
@@ -84,8 +84,9 @@
       } @else { @if (email.touched &&
       !checkIfUserEmailIsValid(contactData.email)) {
       <p>{{ "contactDialogForm.invalidMail1" | translate }}</p>
-      } @else { @if (existEmailonServer(contactData.email).length > 0) {
-      <p>{{ "regiscontactDialogFormter.invalidMail2" | translate }}</p>
+      } @else { @if (existEmailonServer(contactData.email).length > 0 &&
+      !contactData.email) {
+      <p>{{ "contactDialogForm.invalidMail2" | translate }}</p>
       } } }
     </div>
     <input
diff --git a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts
index 64c56fd..fb3c587 100644
--- a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts
+++ b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts
@@ -38,6 +38,7 @@ export class ContactFormComponent implements OnInit, OnChanges {
     lastName: '',
     email: '',
     phone: '',
+    initials: '',
   };
 
   userData: User = {
@@ -69,10 +70,8 @@ export class ContactFormComponent implements OnInit, OnChanges {
   }
 
   updateFormData() {
-    if (!this.currentUserId) {
-      this.updateInitials();
-      this.updateUserData();
-    }
+    this.updateInitials();
+    this.updateUserData();
   }
 
   updateInitials() {
@@ -80,21 +79,36 @@ export class ContactFormComponent implements OnInit, OnChanges {
       ? this.contactData.firstName.slice(0, 1).toUpperCase() +
         this.contactData.lastName.slice(0, 1).toUpperCase()
       : '';
-    this.userData = {
-      ...this.userData,
-      initials: initials,
-    };
+    if (!this.currentUserId) {
+      this.userData = {
+        ...this.userData,
+        initials: initials,
+      };
+    } else {
+      this.contactData = {
+        ...this.contactData,
+        initials: initials,
+      };
+    }
     this.inititalsEmitter.emit(initials);
   }
 
   updateUserData() {
-    this.userData = {
-      ...this.userData,
-      firstName: this.capitalizeFirstLetter(this.contactData.firstName),
-      lastName: this.capitalizeFirstLetter(this.contactData.lastName),
-      email: this.contactData.email,
-      phone: this.contactData.phone,
-    };
+    if (!this.currentUserId) {
+      this.userData = {
+        ...this.userData,
+        firstName: this.capitalizeFirstLetter(this.contactData.firstName),
+        lastName: this.capitalizeFirstLetter(this.contactData.lastName),
+        email: this.contactData.email,
+        phone: this.contactData.phone,
+      };
+    } else {
+      this.contactData = {
+        ...this.contactData,
+        firstName: this.capitalizeFirstLetter(this.contactData.firstName),
+        lastName: this.capitalizeFirstLetter(this.contactData.lastName),
+      };
+    }
   }
 
   capitalizeFirstLetter(name: string) {
@@ -130,6 +144,9 @@ export class ContactFormComponent implements OnInit, OnChanges {
     this.contactData.phone = this.firebaseService
       .getUserDetails(this.currentUserId, 'phone')
       .join(', ');
+    this.contactData.initials = this.firebaseService
+      .getUserDetails(this.currentUserId, 'initials')
+      .join(', ');
   }
 
   onSubmit(ngForm: NgForm) {