Merged in bugfix/SHIBUI-1511 (pull request #383)

SHIBUI-1511 Fixed issue with filters showing for providers Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Oct 1, 2019 · 013f42a · 013f42a
2 parents 6ca0950 + c316358
commit 013f42a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 29 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
@@ -24,30 +24,45 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
     </div>
     <metadata-configuration
         [configuration]="versions$ | async"></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"></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"></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 *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"></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>
     </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
@@ -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))