From a5958553b9f20da0f55e6930058e5ff1e6765502 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 30 Apr 2018 17:19:06 +0000
Subject: [PATCH] Merged in bugfix/SHIBUI-458 (pull request #64)

Bugfix/SHIBUI-458

* Fixed issue with preview section disappearing during save

* Fixed issue with dashboard filters expanding more than one with same entity id

* Fixed issue with search modal not populating field

Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../container/dashboard.component.html        |  2 +-
 .../container/dashboard.component.ts          |  3 +-
 .../container/edit-filter.component.html      |  2 +-
 .../container/edit-filter.component.ts        | 53 +++++++++++--------
 .../container/new-filter.component.ts         | 17 +++---
 .../metadata-filter/reducer/filter.reducer.ts |  2 +-
 6 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/ui/src/app/dashboard/container/dashboard.component.html b/ui/src/app/dashboard/container/dashboard.component.html
index d72a179a3..69780c0e3 100644
--- a/ui/src/app/dashboard/container/dashboard.component.html
+++ b/ui/src/app/dashboard/container/dashboard.component.html
@@ -47,7 +47,7 @@
                 <li *ngFor="let entity of limited$ | async; index as i" [ngClass]="{'mt-2': i > 0}" aria-label="Provider Item Accordion. Press Spacebar to open">
                     <entity-item
                         [entity]="entity"
-                        [isOpen]="(entitiesOpen$ | async)[entity.entityId]"
+                        [isOpen]="(entitiesOpen$ | async)[entity.id || entity.entityId]"
                         (select)="edit(entity)"
                         (toggle)="toggleProvider(entity)"
                         (preview)="openPreviewDialog(entity)"
diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts
index 8ac942f96..79a0c8525 100644
--- a/ui/src/app/dashboard/container/dashboard.component.ts
+++ b/ui/src/app/dashboard/container/dashboard.component.ts
@@ -88,7 +88,8 @@ export class DashboardComponent implements OnInit {
     }
 
     toggleProvider(entity: MetadataEntity): void {
-        this.store.dispatch(new ToggleEntityDisplay(entity.entityId));
+        let id = entity.id ? entity.id : entity.entityId;
+        this.store.dispatch(new ToggleEntityDisplay(id));
     }
 
     openPreviewDialog(entity: MetadataEntity): void {
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.html b/ui/src/app/metadata-filter/container/edit-filter.component.html
index 7c9a4edaa..dd7ba29f7 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata-filter/container/edit-filter.component.html
@@ -105,7 +105,7 @@
                             <ng-container i18n="@@action--save-changes">Preview XML</ng-container>
                         </button>
                         <button
-                            (click)="this.save()"
+                            (click)="this.save($event)"
                             type="submit"
                             class="btn btn-primary"
                             [disabled]="form.invalid || (isSaving$ | async)">
diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata-filter/container/edit-filter.component.ts
index f3bc80385..b1101bc4a 100644
--- a/ui/src/app/metadata-filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata-filter/container/edit-filter.component.ts
@@ -50,7 +50,10 @@ export class EditFilterComponent implements OnInit, OnDestroy {
     isSaving$: Observable<boolean>;
 
     form: FormGroup = this.fb.group({
-        entityId: ['', [Validators.required]],
+        entityId: [
+            '',
+            [Validators.required]
+        ],
         filterName: ['', [Validators.required]],
         filterEnabled: [false]
     });
@@ -81,18 +84,20 @@ export class EditFilterComponent implements OnInit, OnDestroy {
 
         this.entityIds$.subscribe(ids => this.ids = ids);
 
-        this.filter$.subscribe(filter => {
-            let { entityId, filterName, filterEnabled } = new Filter(filter);
-            this.form.reset({
-                entityId,
-                filterName,
-                filterEnabled
-            });
-            this.filter = filter;
-            this.filterEntity = new Filter(filter);
+        this.filter$
+            .withLatestFrom(this.isSaving$)
+            .subscribe(([filter, saving]) => {
+                let { entityId, filterName, filterEnabled } = new Filter(filter);
+                this.form.reset({
+                    entityId,
+                    filterName,
+                    filterEnabled
+                });
+                this.filter = filter;
+                this.filterEntity = new Filter(filter);
 
-            this.store.dispatch(new SelectId(entityId));
-        });
+                this.store.dispatch(new SelectId(entityId));
+            });
     }
 
     ngOnInit(): void {
@@ -116,14 +121,19 @@ export class EditFilterComponent implements OnInit, OnDestroy {
 
         this.form.get('entityId').disable();
 
-        id
-        .valueChanges
-        .distinctUntilChanged()
-        .subscribe(entityId => {
-            if (id.valid) {
-                this.store.dispatch(new SelectId(entityId));
-            }
-        });
+        id.valueChanges
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                if (id.valid) {
+                    this.store.dispatch(new SelectId(entityId));
+                }
+            });
+
+        this.selected$
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                id.setValue(entityId);
+            });
     }
 
     ngOnDestroy(): void {
@@ -163,7 +173,8 @@ export class EditFilterComponent implements OnInit, OnDestroy {
         this.isValid = status === 'VALID';
     }
 
-    save(): void {
+    save($event): void {
+        $event.preventDefault();
         this.store.dispatch(new UpdateFilterRequest({...this.filter, ...this.changes.serialize()}));
     }
 
diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts
index f83ad5efd..2571e17d8 100644
--- a/ui/src/app/metadata-filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata-filter/container/new-filter.component.ts
@@ -104,21 +104,18 @@ export class NewFilterComponent implements OnInit, OnDestroy {
             .startWith(this.form.value)
             .subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
 
-        /*this.statusEmitSubscription = this.form
-            .statusChanges
-            .takeUntil(this.ngUnsubscribe)
-            .startWith(this.form.status)
-            .subscribe(status => this.onStatusChange.emit(status));*/
-
-
-            id
-            .valueChanges
+        id.valueChanges
             .distinctUntilChanged()
             .subscribe(entityId => {
                 if (id.valid) {
                     this.store.dispatch(new SelectId(entityId));
                 }
             });
+        this.selected$
+            .distinctUntilChanged()
+            .subscribe(entityId => {
+                id.setValue(entityId);
+            });
     }
 
     ngOnDestroy(): void {
@@ -127,7 +124,7 @@ export class NewFilterComponent implements OnInit, OnDestroy {
     }
 
     searchEntityIds(term: string): void {
-        if (term.length >= 4 && this.ids.indexOf(term) < 0) {
+        if (term && term.length >= 4 && this.ids.indexOf(term) < 0) {
             this.store.dispatch(new QueryEntityIds({
                 term,
                 limit: 10
diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.ts
index 4b36bff38..c99a325f1 100644
--- a/ui/src/app/metadata-filter/reducer/filter.reducer.ts
+++ b/ui/src/app/metadata-filter/reducer/filter.reducer.ts
@@ -51,7 +51,7 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol
         case FilterCollectionActionTypes.ADD_FILTER:
         case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: {
             return {
-                ...initialState,
+                ...state,
                 saving: true
             };
         }