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 index 2411aa872..034e20a41 100644 --- a/ui/src/app/metadata/configuration/component/filter-version-list.component.ts +++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.ts @@ -1,52 +1,7 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; +import { FilterConfiguration } from '../model/metadata-configuration'; + -const data = { - dates: ['2019-08-08T08:40:32.015', '2019-08-08T08:40:19.266'], - filters: [ - [ - { - id: '1', - name: 'Example Filter 1', - type: 'EntityAttributesFilter', - comparable: true - }, - { - id: '2', - name: 'Example Filter 2', - type: 'NameIdFilter', - comparable: true - } - ], - [ - { - id: '2', - name: 'Example Filter 2', - type: 'NameIdFilter', - comparable: true - }, - { - id: '1', - name: 'Example Filter 1', - type: 'EntityAttributesFilter', - comparable: true - } - ], - [ - { - id: '4', - name: 'Example Filter 4', - type: 'EntityAttributesFilter', - comparable: false - }, - { - id: '3', - name: 'Example Filter 3', - type: 'EntityAttributesFilter', - comparable: false - } - ] - ] -}; @Component({ selector: 'filter-version-list', @@ -54,7 +9,7 @@ const data = { }) export class FilterVersionListComponent { - filters = data; + @Input() filters: FilterConfiguration; selected: string; comparing: string; diff --git a/ui/src/app/metadata/configuration/model/history.ts b/ui/src/app/metadata/configuration/model/history.ts index 2fec132da..180502423 100644 --- a/ui/src/app/metadata/configuration/model/history.ts +++ b/ui/src/app/metadata/configuration/model/history.ts @@ -1,4 +1,4 @@ -import { MetadataVersion } from './version'; +import { MetadataVersion, FilterVersion } from './version'; export interface MetadataHistory { versions: MetadataVersion[]; diff --git a/ui/src/app/metadata/configuration/model/metadata-configuration.ts b/ui/src/app/metadata/configuration/model/metadata-configuration.ts index 13886d1a3..4a4114642 100644 --- a/ui/src/app/metadata/configuration/model/metadata-configuration.ts +++ b/ui/src/app/metadata/configuration/model/metadata-configuration.ts @@ -1,7 +1,12 @@ import { Section } from './section'; -import { Metadata } from '../../domain/domain.type'; +import { FilterVersion } from './version'; export interface MetadataConfiguration { sections: Section[]; dates: String[]; } + +export interface FilterConfiguration { + dates: ['2019-08-08T08:40:32.015', '2019-08-08T08:40:19.266']; + filters: FilterVersion[]; +} diff --git a/ui/src/app/metadata/configuration/model/version.ts b/ui/src/app/metadata/configuration/model/version.ts index 0eb7cb815..5d1e1dac5 100644 --- a/ui/src/app/metadata/configuration/model/version.ts +++ b/ui/src/app/metadata/configuration/model/version.ts @@ -3,3 +3,10 @@ export interface MetadataVersion { date: string; creator: string; } + +export interface FilterVersion { + id: string; + name: string; + type: string; + comparable: boolean; +}