diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html
index 5278ed3bd..c6298feb8 100644
--- a/ui/src/app/metadata/configuration/component/metadata-header.component.html
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html
@@ -2,7 +2,7 @@
Saved:
- {{ version.modifiedDate | date:DATE_FORMAT }}
+ {{ (version.modifiedDate) | date:DATE_FORMAT }}
By:
{{ version.createdBy }}
@@ -15,4 +15,4 @@
Not Current
-
\ No newline at end of file
+
diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts
index 58e92562f..07224ddfc 100644
--- a/ui/src/app/metadata/configuration/reducer/index.ts
+++ b/ui/src/app/metadata/configuration/reducer/index.ts
@@ -78,7 +78,14 @@ export const isAdditionalFilter = (type) => filterPluginTypes.indexOf(type) ===
export const getVersionModelFiltersFn =
(model, kind) => kind === 'provider' ?
model.metadataFilters ? model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) :
- [] : null;
+ [] : null;
+
+export const getVersionModelFilterPluginsFn = (model, kind) => {
+ const filters = kind === 'provider' ?
+ model.metadataFilters ? model.metadataFilters.filter(filter => filterPluginTypes.indexOf(filter['@type']) > -1) :
+ [] : null;
+ return filters;
+};
// Version History
@@ -116,10 +123,15 @@ export const getComparisonModels = createSelector(getCompareState, fromCompare.g
export const getComparisonModelsLoaded = createSelector(getCompareState, fromCompare.getVersionModelsLoaded);
export const getComparisonFilterId = createSelector(getCompareState, fromCompare.getFilterId);
-export const getComparisonModelsFilteredFn = (models) => models.map((model) => ({
- ...model,
- metadataFilters: getVersionModelFiltersFn(model, model.type)
-}));
+export const getComparisonModelsFilteredFn = (models) => models.map((model) => {
+ return ({
+ ...model,
+ metadataFilters: getVersionModelFilterPluginsFn(
+ model,
+ model.hasOwnProperty('@type') ? model.hasOwnProperty('metadataFilters') ? 'provider' : 'filter' : 'resolver'
+ )
+ });
+});
export const getComparisonModelsFiltered = createSelector(getComparisonModels, getComparisonModelsFilteredFn);
@@ -134,14 +146,16 @@ export const getComparisonConfigurationCount = createSelector(getComparisonConfi
export const getViewChangedOnly = createSelector(getCompareState, fromCompare.getViewChangedOnly);
-export const getLimitedConfigurationsFn = (configurations, limited) => configurations ? ({
- ...configurations,
- sections: limited ? configurations.sections :
- configurations.sections.map(s => ({
- ...s,
- properties: getLimitedPropertiesFn(s.properties),
- }))
-}) : configurations;
+export const getLimitedConfigurationsFn = (configurations, limited) => {
+ return configurations ? ({
+ ...configurations,
+ sections: limited ? configurations.sections :
+ configurations.sections.map(s => ({
+ ...s,
+ properties: getLimitedPropertiesFn(s.properties),
+ }))
+ }) : configurations;
+};
export const getLimitedComparisonConfigurations = createSelector(
getComparisonConfigurations,