From 15d4ac8ba22c7db54857139868810c114c6c3e75 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 22 Apr 2025 08:02:55 -0700
Subject: [PATCH] Fixhancement: tag plus button should add tag to doc (#9762)

---
 .../app-frame/global-search/global-search.component.spec.ts  | 4 ++--
 .../components/common/edit-dialog/edit-dialog.component.ts   | 2 +-
 .../src/app/components/common/input/tags/tags.component.html | 2 +-
 .../src/app/components/common/input/tags/tags.component.ts   | 5 +++--
 src-ui/src/app/components/manage/mail/mail.component.spec.ts | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
index db407c228..4ff772eb9 100644
--- a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
+++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
@@ -405,7 +405,7 @@ describe('GlobalSearchComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
 
     // succeed
-    editDialog.succeeded.emit(true)
+    editDialog.succeeded.emit(object as any)
     expect(toastInfoSpy).toHaveBeenCalled()
   })
 
@@ -456,7 +456,7 @@ describe('GlobalSearchComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
 
     // succeed
-    editDialog.succeeded.emit(true)
+    editDialog.succeeded.emit(searchResults.tags[0] as any)
     expect(toastInfoSpy).toHaveBeenCalled()
   })
 
diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
index afbc6c73f..86f0fd4dd 100644
--- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts
@@ -47,7 +47,7 @@ export abstract class EditDialogComponent<
   object: T
 
   @Output()
-  succeeded = new EventEmitter()
+  succeeded = new EventEmitter<T>()
 
   @Output()
   failed = new EventEmitter()
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html
index ea3c233ca..862cf5494 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.html
+++ b/src-ui/src/app/components/common/input/tags/tags.component.html
@@ -33,7 +33,7 @@
           </ng-template>
         </ng-select>
         @if (allowCreate && !hideAddButton) {
-          <button class="btn btn-outline-secondary" type="button" (click)="createTag()" [disabled]="disabled">
+          <button class="btn btn-outline-secondary" type="button" (click)="createTag(null, true)" [disabled]="disabled">
             <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
           </button>
         }
diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts
index bfb11b748..50e221c39 100644
--- a/src-ui/src/app/components/common/input/tags/tags.component.ts
+++ b/src-ui/src/app/components/common/input/tags/tags.component.ts
@@ -130,7 +130,7 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  createTag(name: string = null) {
+  createTag(name: string = null, add: boolean = false) {
     var modal = this.modalService.open(TagEditDialogComponent, {
       backdrop: 'static',
     })
@@ -143,9 +143,10 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
     return firstValueFrom(
       (modal.componentInstance as TagEditDialogComponent).succeeded.pipe(
         first(),
-        tap(() => {
+        tap((newTag) => {
           this.tagService.listAll().subscribe((tags) => {
             this.tags = tags.results
+            add && this.addTag(newTag.id)
           })
         })
       )
diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts
index b9f02343d..4968f9d37 100644
--- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts
+++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts
@@ -188,7 +188,7 @@ describe('MailComponent', () => {
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     editDialog.failed.emit()
     expect(toastErrorSpy).toBeCalled()
-    editDialog.succeeded.emit(mailAccounts[0])
+    editDialog.succeeded.emit(mailAccounts[0] as any)
     expect(toastInfoSpy).toHaveBeenCalledWith(
       `Saved account "${mailAccounts[0].name}".`
     )
@@ -246,7 +246,7 @@ describe('MailComponent', () => {
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     editDialog.failed.emit()
     expect(toastErrorSpy).toBeCalled()
-    editDialog.succeeded.emit(mailRules[0])
+    editDialog.succeeded.emit(mailRules[0] as any)
     expect(toastInfoSpy).toHaveBeenCalledWith(
       `Saved rule "${mailRules[0].name}".`
     )