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
new file mode 100644
index 000000000..57fa90864
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.html
@@ -0,0 +1,10 @@
+
0">
+ -
+ {{ filter | json }}
+
+
+
+
No Filters
+
No filters have been added to this Metadata Provider
+
\ No newline at end of file
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
new file mode 100644
index 000000000..1706cbcf5
--- /dev/null
+++ 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
index fa395529b..e2ec72d76 100644
--- 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
index d5b533716..eb122c2f2 100644
--- 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 @@
+
+
+
+
\ No newline at end of file
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 92019297d..8e02fe025 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -1,12 +1,14 @@
-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',
@@ -14,10 +16,17 @@ import { MetadataConfiguration } from '../model/metadata-configuration';
templateUrl: './metadata-comparison.component.html',
styleUrls: []
})
-export class MetadataComparisonComponent {
+export class MetadataComparisonComponent implements OnDestroy {
+
+ private ngUnsubscribe: Subject = new Subject();
versions$: Observable;
numVersions$: Observable;
+ filters$: Observable;
+ model$: Observable;
+
+ id: string;
+ kind: string;
constructor(
private store: Store,
@@ -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
index d99166c11..972e0e4da 100644
--- 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 @@
(onUpdateOrderDown)="updateOrderDown($event)"
(onUpdateOrderUp)="updateOrderUp($event)"
(onRemove)="removeFilter($event)"
- (preview)="onPreview($event)"
[filters]="filters$ | async">