From d1833a995bef48f4aac994e130ba5d84729955ea Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 1 Oct 2019 12:40:05 -0700
Subject: [PATCH 1/2] SHIBUI-1511 Fixed issue with filters showing for
 providers

---
 .../metadata-comparison.component.html        | 43 ++++++++-----------
 .../metadata-comparison.component.ts          | 11 ++---
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
index effbefb0a..2c6415052 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -25,32 +25,27 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
     <metadata-configuration
         [configuration]="versions$ | async"
         [editable]="false"></metadata-configuration>
-    
-    <div class="numbered-header d-flex justify-content-start bg-light align-items-center py-1">
-        <h2 class="title h4 m-0 flex-grow-1">
-            <span class="text ml-2" translate="label.metadata-filter">Metadata Filter</span>
-        </h2>
-    </div>
-    <ng-container *ngIf="!(filterCompare$ | async)">
-        <filter-version-list
-            class="d-block p-2"
-            [filters]="filters$ | async"
-            (compare)="compareFilters($event)">
-        </filter-version-list>
-    </ng-container>
-    <ng-container *ngIf="(filterCompare$ | async)">
-        <br />
-        <metadata-configuration
-            [configuration]="filterCompare$ | async"
-            [editable]="false"></metadata-configuration>
-        <div class="d-flex justify-content-end my-2">
-            <button class="btn btn-success" (click)="resetCompareFilters()">
-                <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;
-                <translate-i18n key="label.filter-versions">Filter Versions</translate-i18n>
-            </button>
+    <ng-container *ngIf="isProvider$ | async">
+        <div class="numbered-header d-flex justify-content-start bg-light align-items-center py-1">
+            <h2 class="title h4 m-0 flex-grow-1">
+                <span class="text ml-2" translate="label.metadata-filter">Metadata Filter</span>
+            </h2>
         </div>
+        <ng-container *ngIf="!(filterCompare$ | async)">
+            <filter-version-list class="d-block p-2" [filters]="filters$ | async" (compare)="compareFilters($event)">
+            </filter-version-list>
+        </ng-container>
+        <ng-container *ngIf="(filterCompare$ | async)">
+            <br />
+            <metadata-configuration [configuration]="filterCompare$ | async" [editable]="false"></metadata-configuration>
+            <div class="d-flex justify-content-end my-2">
+                <button class="btn btn-success" (click)="resetCompareFilters()">
+                    <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;
+                    <translate-i18n key="label.filter-versions">Filter Versions</translate-i18n>
+                </button>
+            </div>
+        </ng-container>
     </ng-container>
-    
 </div>
 <div *ngIf="loading$ | async" class="d-flex justify-content-center">
     <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
index e8a905b0d..8fb4a817b 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -20,14 +20,15 @@ export class MetadataComparisonComponent implements OnDestroy {
 
     limiter: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
-    versions$: Observable<MetadataConfiguration>;
-    numVersions$: Observable<number>;
-    type$: Observable<string>;
+    versions$: Observable<MetadataConfiguration> = this.store.select(fromReducer.getLimitedComparisonConfigurations);
+    numVersions$: Observable<number> = this.store.select(getComparisonConfigurationCount);
+    type$: Observable<string> = this.store.select(fromReducer.getConfigurationModelType);
     loading$: Observable<boolean> = this.store.select(fromReducer.getComparisonLoading);
     limited$: Observable<boolean> = this.store.select(fromReducer.getViewChangedOnly);
     sub: Subscription;
     filters$: Observable<FilterConfiguration> = this.store.select(fromReducer.getComparisonFilterConfiguration);
     filterCompare$: Observable<MetadataConfiguration> = this.store.select(fromReducer.getLimitedFilterComparisonConfiguration);
+    isProvider$: Observable<boolean> = this.type$.pipe(map(t => t !== 'resolver'));
 
     constructor(
         private store: Store<ConfigurationState>,
@@ -39,10 +40,6 @@ export class MetadataComparisonComponent implements OnDestroy {
             map(versions => new CompareVersionRequest(versions))
         ).subscribe(this.store);
 
-        this.versions$ = this.store.select(fromReducer.getLimitedComparisonConfigurations);
-        this.numVersions$ = this.store.select(getComparisonConfigurationCount);
-        this.type$ = this.store.select(fromReducer.getConfigurationModelType);
-
         this.sub = this.limiter.pipe(
             withLatestFrom(this.limited$),
             map(([compare, limit]) => new ViewChanged(!limit))

From c316358f1cb5e42a8f70fa4473bf1a92620fbe49 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 1 Oct 2019 13:46:13 -0700
Subject: [PATCH 2/2] SHIBUI-1511

---
 .../configuration/container/metadata-comparison.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
index a12fb59c5..01617fc64 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -53,7 +53,7 @@ <h2 class="title h4 m-0 flex-grow-1">
             </ng-container>
             <ng-container *ngIf="(filterCompare$ | async)">
                 <br />
-                <metadata-configuration [configuration]="filterCompare$ | async" [editable]="false"></metadata-configuration>
+                <metadata-configuration [configuration]="filterCompare$ | async"></metadata-configuration>
                 <div class="d-flex justify-content-end my-2">
                     <button class="btn btn-success" (click)="resetCompareFilters()">
                         <i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp;