From 6611a46975078d21ed7318346c3818f889dfc838 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Mon, 25 Oct 2021 12:16:44 -0700 Subject: [PATCH] Added enabled properties to version comparison --- .../domain/filter/definition/BaseFilterDefinition.js | 5 ++++- .../filter/definition/EntityAttributesFilterDefinition.js | 3 ++- .../domain/filter/definition/NameIdFilterDefinition.js | 3 ++- .../domain/provider/definition/BaseProviderDefinition.js | 3 +++ .../definition/DynamicHttpMetadataProviderDefinition.js | 3 ++- .../FileBackedHttpMetadataProviderDefinition.js | 3 ++- .../definition/FileSystemMetadataProviderDefinition.js | 3 ++- .../definition/LocalDynamicMetadataProviderDefinition.js | 1 + .../metadata/domain/source/definition/SourceDefinition.js | 8 ++++++-- ui/src/testing/uiSchema.js | 3 +++ 10 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js index 8bdf9bfab..f23d6ad6e 100644 --- a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js @@ -38,7 +38,10 @@ export const BaseFilterDefinition = { '@type': { 'ui:widget': 'hidden' }, - 'resourceId': { + resourceId: { + 'ui:widget': 'hidden' + }, + filterEnabled: { 'ui:widget': 'hidden' } } diff --git a/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js index 7ef0e08a9..b12d476e9 100644 --- a/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/EntityAttributesFilterDefinition.js @@ -75,7 +75,8 @@ export const EntityAttributesFilterEditor= { 'name', '@type', 'resourceId', - 'entityAttributesFilterTarget' + 'entityAttributesFilterTarget', + 'filterEnabled' ] }, { diff --git a/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js index 358b51b34..d7f1492b9 100644 --- a/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js +++ b/ui/src/app/metadata/domain/filter/definition/NameIdFilterDefinition.js @@ -42,7 +42,8 @@ export const NameIDFilterEditor = { 'name', '@type', 'resourceId', - 'nameIdFormatFilterTarget' + 'nameIdFormatFilterTarget', + 'filterEnabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js index 207eb0a2e..e67d53fc2 100644 --- a/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/BaseProviderDefinition.js @@ -80,6 +80,9 @@ export const BaseProviderDefinition = { uiSchema: { name: { 'ui:help': 'message.must-be-unique' + }, + enabled: { + 'ui:widget': 'hidden' } }, steps: [ diff --git a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js index 84b694e9a..ada2f8458 100644 --- a/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/DynamicHttpMetadataProviderDefinition.js @@ -199,7 +199,8 @@ export const DynamicHttpMetadataProviderEditor = { 'xmlId', 'metadataRequestURLConstructionScheme', 'requireValidMetadata', - 'failFastInitialization' + 'failFastInitialization', + 'enabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js index 5001895ce..106edfa55 100644 --- a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js @@ -198,7 +198,8 @@ export const FileBackedHttpMetadataProviderEditor = { 'requireValidMetadata', 'failFastInitialization', 'useDefaultPredicateRegistry', - 'satisfyAnyPredicates' + 'satisfyAnyPredicates', + 'enabled' ] }, { diff --git a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js index 57d3447af..d97b8e041 100644 --- a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js @@ -107,7 +107,8 @@ export const FileSystemMetadataProviderEditor = { 'xmlId', '@type', 'metadataFile', - 'doInitialization' + 'doInitialization', + 'enabled' ], override: { '@type': { diff --git a/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js index eea5d3541..66b48d6c4 100644 --- a/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js +++ b/ui/src/app/metadata/domain/provider/definition/LocalDynamicMetadataProviderDefinition.js @@ -119,6 +119,7 @@ export const LocalDynamicMetadataProviderEditor = { '@type', 'xmlId', 'sourceDirectory', + 'enabled' ], override: { '@type': { diff --git a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js index 6e2abdee3..70e686ed7 100644 --- a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js +++ b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js @@ -12,7 +12,7 @@ export const SourceBase = { type: '@MetadataProvider', steps: [], schema: `${API_BASE_PATH}/ui/MetadataSources`, - //schema: `/assets/schema/source/metadata-source.json`, + // schema: `/assets/schema/source/metadata-source.json`, parser: (data) => removeNull(data, true), @@ -158,6 +158,9 @@ export const SourceBase = { } ] }, + serviceEnabled: { + 'ui:widget': 'hidden' + }, contacts: { "ui:options": { orderable: false @@ -307,7 +310,8 @@ export const SourceEditor = { 'serviceProviderName', 'entityId', 'organization', - 'contacts' + 'contacts', + 'serviceEnabled' ] }, { diff --git a/ui/src/testing/uiSchema.js b/ui/src/testing/uiSchema.js index c1af6f4fa..8da257247 100644 --- a/ui/src/testing/uiSchema.js +++ b/ui/src/testing/uiSchema.js @@ -65,6 +65,9 @@ const schema = { ], "ui:widget": "hidden" }, + "serviceEnabled": { + "ui:widget": "hidden" + }, "contacts": { "ui:options": { "orderable": false