SHIBUI-1365 stubbing filter comparison

TIER · Aug 1, 2019 · f26cda4 · f26cda4
1 parent 8f0f2fb
commit f26cda4
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 8 deletions.
diff --git a/ui/src/app/metadata/configuration/component/filter-version-list.component.html b/ui/src/app/metadata/configuration/component/filter-version-list.component.html
@@ -0,0 +1,10 @@
+<ul class="list-group list-group-flush" *ngIf="filters.length > 0">
+    <li *ngFor="let filter of filters; let i = index; first as isFirst; last as isLast;"
+        class="list-group-item">
+        {{ filter | json }}
+    </li>
+</ul>
+<div class="alert alert-info m-4" *ngIf="filters && filters.length < 1">
+    <h3 translate="message.no-filters">No Filters</h3>
+    <p translate="message.no-filters-added">No filters have been added to this Metadata Provider</p>
+</div>
diff --git a/ui/src/app/metadata/configuration/component/filter-version-list.component.ts b/ui/src/app/metadata/configuration/component/filter-version-list.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+import { FilterListComponent } from '../../filter/component/filter-list.component';
+
+@Component({
+    selector: 'filter-version-list',
+    templateUrl: './filter-version-list.component.html'
+})
+export class FilterVersionListComponent extends FilterListComponent { }
diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts
@@ -30,6 +30,7 @@ import { FilterConfigurationListComponent } from './component/filter-configurati
 import { FilterConfigurationListItemComponent } from './component/filter-configuration-list-item.component';
 import { SharedModule } from '../../shared/shared.module';
 import { FilterTargetPropertyComponent } from './component/filter-target-property.component';
+import { FilterVersionListComponent } from './component/filter-version-list.component';
 
 @NgModule({
     declarations: [
@@ -47,7 +48,8 @@ import { FilterTargetPropertyComponent } from './component/filter-target-propert
         MetadataComparisonComponent,
         FilterConfigurationListComponent,
         FilterConfigurationListItemComponent,
-        FilterTargetPropertyComponent
+        FilterTargetPropertyComponent,
+        FilterVersionListComponent
     ],
     entryComponents: [],
     imports: [

diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -9,4 +9,20 @@
         </a>
     </div>
     <metadata-configuration [configuration]="versions$ | async"></metadata-configuration>
+    <div *ngIf="kind === 'provider'" id="filters">
+        <div class="numbered-header d-flex justify-content-start bg-light align-items-center">
+            <h2 class="title h4 m-0 ml-2 flex-grow-1">
+                <span class="text" translate="label.filters">Filters</span>
+            </h2>
+            <div class="actions px-2">
+                <a class="btn btn-link edit-link change-view"
+                    [routerLink]="['/', 'metadata', 'provider', id, 'filter', 'new']">
+                    <i class="fa fa-gear"></i>&nbsp;
+                    <span translate="action.add-filter">Add Filter</span>
+                </a>
+            </div>
+        </div>
+        <filter-version-list
+            [filters]="filters$ | async"></filter-version-list>
+    </div>
 </div>
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -1,23 +1,32 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { ActivatedRoute } from '@angular/router';
-import { map } from 'rxjs/operators';
-import { ConfigurationState, getVersionConfigurations, getVersionConfigurationCount } from '../reducer';
+import { map, takeUntil, filter } from 'rxjs/operators';
+import { ConfigurationState, getVersionConfigurations, getVersionConfigurationCount, getConfigurationModel, getVersionsFilters } from '../reducer';
 import { Metadata } from '../../domain/domain.type';
 import { CompareVersionRequest } from '../action/compare.action';
 import { MetadataConfiguration } from '../model/metadata-configuration';
+import { getAdditionalFilters } from '../../filter/reducer';
+import { LoadFilterRequest } from '../../filter/action/collection.action';
 
 @Component({
     selector: 'metadata-comparison',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './metadata-comparison.component.html',
     styleUrls: []
 })
-export class MetadataComparisonComponent {
+export class MetadataComparisonComponent implements OnDestroy {
+
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
 
     versions$: Observable<MetadataConfiguration>;
     numVersions$: Observable<number>;
+    filters$: Observable<unknown[]>;
+    model$: Observable<Metadata>;
+
+    id: string;
+    kind: string;
 
     constructor(
         private store: Store<ConfigurationState>,
@@ -30,5 +39,25 @@ export class MetadataComparisonComponent {
 
         this.versions$ = this.store.select(getVersionConfigurations);
         this.numVersions$ = this.store.select(getVersionConfigurationCount);
+        this.model$ = this.store.select(getConfigurationModel);
+
+        this.model$
+            .pipe(
+                takeUntil(this.ngUnsubscribe),
+                filter(model => !!model)
+            )
+            .subscribe(p => this.setModel(p));
+
+        this.filters$ = this.store.select(getVersionsFilters);
+    }
+
+    setModel(data: Metadata): void {
+        this.id = 'resourceId' in data ? data.resourceId : data.id;
+        this.kind = '@type' in data ? 'provider' : 'resolver';
+    }
+
+    ngOnDestroy(): void {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
     }
 }
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -48,7 +48,6 @@ <h2 class="title h4 m-0 ml-2 flex-grow-1">
             (onUpdateOrderDown)="updateOrderDown($event)"
             (onUpdateOrderUp)="updateOrderUp($event)"
             (onRemove)="removeFilter($event)"
-            (preview)="onPreview($event)"
             [filters]="filters$ | async"></filter-configuration-list>
     </div>
     <button class="btn btn-link" (click)="onScrollTo('header')">

diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts
@@ -161,3 +161,9 @@ export const getVersionConfigurations = createSelector(
 );
 
 export const getVersionConfigurationCount = createSelector(getVersionConfigurations, (config) => config ? config.dates.length : 0);
+
+export const getVersionsFiltersFn = (versions) => {
+    console.log(versions);
+    return [];
+};
+export const getVersionsFilters = createSelector(getVersionModels, getVersionsFiltersFn);
diff --git a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
@@ -9,7 +9,7 @@
     <div *ngFor="let option of schema.oneOf; let i=index;" class="form-check form-check-inline">
         <label class="control-label">
             <input
-                [id]="formProperty._canonicalPath"
+                [id]="formProperty._canonicalPath + '.' + option.enum[0]"
                 [formControl]="control"
                 [name]="name"
                 [value]="option.enum[0]"