From e9ef6e26d284b8c2924479411a74d925ce73e062 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Thu, 26 Sep 2019 13:47:27 -0700 Subject: [PATCH] SHIBUI-1508 Fixed issues with configuration page --- .../component/metadata-configuration.component.ts | 2 +- ui/src/app/metadata/configuration/reducer/index.ts | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts index e2d75c4da..5bd277fbb 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -28,7 +28,7 @@ export class MetadataConfigurationComponent implements OnChanges { ) {} ngOnChanges(): void { - this.zero = this.configuration.sections.some(s => !s.properties.length); + this.zero = !this.configuration.sections.some(s => !!s.properties.length); } edit(id: string): void { diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 8deb962ec..26391abd0 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -104,9 +104,7 @@ export const assignValueToProperties = (models, properties, definition: any): an return { ...prop, differences, - value: models.map(model => { - return model[prop.id]; - }), + value: models.map(model => model[prop.id]), widget }; } @@ -153,7 +151,7 @@ export const getConfigurationModelEnabledFn = (config: Metadata) => config ? ('serviceEnabled' in config) ? config.serviceEnabled : config.enabled : false; export const getConfigurationModelNameFn = - (config: Metadata) => config ? ('serviceProviderName' in config) ? config.serviceProviderName : config.name : false; + (config: Metadata) => config ? ('serviceProviderName' in config) ? config.serviceProviderName : config.name : ''; export const getConfigurationModelTypeFn = (config: Metadata) => config ? ('@type' in config) ? config['@type'] : 'resolver' : null; @@ -163,8 +161,8 @@ export const isAdditionalFilter = (type) => filterPluginTypes.indexOf(type) === export const getVersionModelFiltersFn = (model, kind) => kind === 'provider' ? - model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) : - null; + model.metadataFilters ? model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) : + [] : null; // Version History