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 0ca03398d..8a8edd0b0 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,7 +1,7 @@
- Order - Option + Order + Option {{ date | date:DATE_FORMAT }} @@ -39,13 +39,13 @@
-
+
+

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 }))