From d1833a995bef48f4aac994e130ba5d84729955ea Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 1 Oct 2019 12:40:05 -0700 Subject: [PATCH 1/3] SHIBUI-1511 Fixed issue with filters showing for providers --- .../metadata-comparison.component.html | 43 ++++++++----------- .../metadata-comparison.component.ts | 11 ++--- 2 files changed, 23 insertions(+), 31 deletions(-) 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 effbefb0a..2c6415052 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -25,32 +25,27 @@

- -
-

- Metadata Filter -

-
- - - - - -
- -
- + +
+

+ Metadata Filter +

+ + + + + +
+ +
+ +
+ -
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 e8a905b0d..8fb4a817b 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts @@ -20,14 +20,15 @@ export class MetadataComparisonComponent implements OnDestroy { limiter: BehaviorSubject = new BehaviorSubject(false); - versions$: Observable; - numVersions$: Observable; - type$: Observable; + versions$: Observable = this.store.select(fromReducer.getLimitedComparisonConfigurations); + numVersions$: Observable = this.store.select(getComparisonConfigurationCount); + type$: Observable = this.store.select(fromReducer.getConfigurationModelType); loading$: Observable = this.store.select(fromReducer.getComparisonLoading); limited$: Observable = this.store.select(fromReducer.getViewChangedOnly); sub: Subscription; filters$: Observable = this.store.select(fromReducer.getComparisonFilterConfiguration); filterCompare$: Observable = this.store.select(fromReducer.getLimitedFilterComparisonConfiguration); + isProvider$: Observable = this.type$.pipe(map(t => t !== 'resolver')); constructor( private store: Store, @@ -39,10 +40,6 @@ export class MetadataComparisonComponent implements OnDestroy { map(versions => new CompareVersionRequest(versions)) ).subscribe(this.store); - this.versions$ = this.store.select(fromReducer.getLimitedComparisonConfigurations); - this.numVersions$ = this.store.select(getComparisonConfigurationCount); - this.type$ = this.store.select(fromReducer.getConfigurationModelType); - this.sub = this.limiter.pipe( withLatestFrom(this.limited$), map(([compare, limit]) => new ViewChanged(!limit)) From c316358f1cb5e42a8f70fa4473bf1a92620fbe49 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 1 Oct 2019 13:46:13 -0700 Subject: [PATCH 2/3] SHIBUI-1511 --- .../configuration/container/metadata-comparison.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a12fb59c5..01617fc64 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -53,7 +53,7 @@


- +
-
+
+

No Filters

+

No filters have been added to this Metadata Provider

+
+
-
-

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/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index 6214c37d2..df06cc729 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -37,9 +37,4 @@

- - -

\ No newline at end of file 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 01617fc64..a3505ae44 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -39,28 +39,13 @@


- +
- - - - - -
- -
- -
- diff --git a/ui/src/app/metadata/configuration/reducer/utilities.ts b/ui/src/app/metadata/configuration/reducer/utilities.ts index f2481e99c..dfcad151e 100644 --- a/ui/src/app/metadata/configuration/reducer/utilities.ts +++ b/ui/src/app/metadata/configuration/reducer/utilities.ts @@ -44,7 +44,15 @@ export const assignValueToProperties = (models, properties, definition: any): an if (!array) { return false; } - return JSON.stringify(model[prop.id]) !== JSON.stringify(array[0][prop.id]); + let prop1 = model[prop.id]; + let prop2 = array[0][prop.id]; + if (prop1 && prop1.modifiedDate) { + let { checkedModifiedDate, checkedProp } = prop1; + let { firstModifiedDate, firstProp } = prop2; + prop1 = checkedProp; + prop2 = firstProp; + } + return JSON.stringify(prop1) !== JSON.stringify(prop2); }); const widget = prop.type === 'array' && prop.widget && prop.widget.data ? ({ diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.html b/ui/src/app/metadata/provider/container/provider-wizard.component.html index 58766e536..366bb70d5 100644 --- a/ui/src/app/metadata/provider/container/provider-wizard.component.html +++ b/ui/src/app/metadata/provider/container/provider-wizard.component.html @@ -19,7 +19,11 @@ - + + diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts index f501f7cb8..e812527d5 100644 --- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts +++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts @@ -63,7 +63,7 @@ export class ProviderWizardComponent implements OnDestroy { this.summary$ = combineLatest( this.store.select(fromWizard.getWizardDefinition), - this.store.select(fromWizard.getSchemaObject), + this.store.select(fromWizard.getParsedSchema), this.store.select(fromProvider.getEntityChanges) ).pipe( map(([ definition, schema, model ]) => ({ definition, schema, model }))