From a85bf2b6b22e15d862e6a50608f13c005034f80f Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 5 Aug 2019 10:12:07 -0700 Subject: [PATCH] SHIBUI-1365 Added mock-up of filter comparison --- .../filter-version-list.component.html | 48 ++++++++++++-- .../filter-version-list.component.ts | 64 ++++++++++++++++++- .../metadata-comparison.component.html | 11 +--- ui/src/theme/utility.scss | 4 ++ 4 files changed, 109 insertions(+), 18 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 index 57fa90864..95cb28700 100644 --- a/ui/src/app/metadata/configuration/component/filter-version-list.component.html +++ b/ui/src/app/metadata/configuration/component/filter-version-list.component.html @@ -1,10 +1,44 @@ - -
+ +
+ Order + + {{ date | date:'medium' }} + +
+
+ +
+
+ {{ i + 1 }} +
+
+
+

{{ filter.name }}

+

{{ filter.type }}

+
+ +
+
+
+
+
+ +
+
+

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 index 1706cbcf5..0781b8293 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,8 +1,68 @@ import { Component } from '@angular/core'; -import { FilterListComponent } from '../../filter/component/filter-list.component'; + +const data = { + dates: ['2019-08-02T12:50:54.282', '2019-08-02T12:12:54.282'], + 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 extends FilterListComponent { } +export class FilterVersionListComponent { + + filters = data; + selected: string; + + constructor() { + + } + + get width(): string { + const columns = this.filters.dates.length; + return `${Math.floor(100 / (columns + 1))}`; + } +} 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 eb122c2f2..d3fdab712 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -14,15 +14,8 @@

Filters

- +
- + \ No newline at end of file diff --git a/ui/src/theme/utility.scss b/ui/src/theme/utility.scss index 358b75b2c..0864a5447 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%; }