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..4047f7483 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.html @@ -0,0 +1,110 @@ + +
+ Order + Option + + {{ date | date:'medium' }} + +
+ +
+ +
+
+ {{ i + 1 }} +
+
+
+

{{ filter.name }}

+

{{ filter.type }}

+
+ +
+
+
+
+
+ +
+
+ +
+ Type + EntityAttributesFilter + EntityAttributesFilter +
+
+ Name + Test Filter 1 + Renamed Filter +
+
+ Target Type + Entity ID + Entity ID +
+
+ Target Value + http://idp.unicon.net/idp/shibboleth + http://idp.unicon.net/idp/shibboleth +
+
+ Enabled? + false + true +
+
+ +
+
+
+
+

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..2411aa872 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.ts @@ -0,0 +1,73 @@ +import { Component } from '@angular/core'; + +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', + templateUrl: './filter-version-list.component.html' +}) +export class FilterVersionListComponent { + + filters = data; + selected: string; + comparing: string; + + constructor() { + + } + + compare(id: string): void { + this.comparing = id; + } + + get width(): string { + const columns = this.filters.dates.length; + return `${Math.floor(100 / (columns + 1))}`; + } +} diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts index ae332ddf3..19f967fd1 100644 --- a/ui/src/app/metadata/configuration/configuration.module.ts +++ b/ui/src/app/metadata/configuration/configuration.module.ts @@ -44,6 +44,7 @@ import { RestoreEditComponent } from './container/restore-edit.component'; import { RestoreEditStepComponent } from './container/restore-edit-step.component'; import { IndexResolver } from './service/index-resolver.service'; +import { FilterVersionListComponent } from './component/filter-version-list.component'; @NgModule({ declarations: [ @@ -67,7 +68,8 @@ import { IndexResolver } from './service/index-resolver.service'; VersionOptionsComponent, MetadataEditorComponent, RestoreEditComponent, - RestoreEditStepComponent + RestoreEditStepComponent, + 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 5c93f5ec7..fd990d79e 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -25,6 +25,7 @@

+
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 06f821633..78fc1bcf6 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts @@ -8,6 +8,7 @@ import { CompareVersionRequest, ClearVersions, ViewChanged } from '../action/com import { MetadataConfiguration } from '../model/metadata-configuration'; import * as fromReducer from '../reducer'; + @Component({ selector: 'metadata-comparison', changeDetection: ChangeDetectionStrategy.OnPush, @@ -25,6 +26,7 @@ export class MetadataComparisonComponent implements OnDestroy { limited$: Observable = this.store.select(fromReducer.getViewChangedOnly); sub: Subscription; + constructor( private store: Store, private activatedRoute: ActivatedRoute @@ -39,8 +41,6 @@ export class MetadataComparisonComponent implements OnDestroy { this.numVersions$ = this.store.select(getComparisonConfigurationCount); this.type$ = this.store.select(fromReducer.getConfigurationModelType); - this.versions$.subscribe(console.log); - this.sub = this.limiter.pipe( withLatestFrom(this.limited$), map(([compare, limit]) => new ViewChanged(!limit)) diff --git a/ui/src/theme/utility.scss b/ui/src/theme/utility.scss index 0f8bea642..4fc7539cc 100644 --- a/ui/src/theme/utility.scss +++ b/ui/src/theme/utility.scss @@ -6,6 +6,10 @@ background: #FAFAFA !important; } +.bg-primary-light { + background: lighten($brand-primary, 75%); +} + .w-15 { width: 15%; }