From 9809dcd6bc3f48067ffdd0932f322a0afd9925e6 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 9 Jun 2021 12:09:22 -0700 Subject: [PATCH] SHIBUI-1940 fixed id/name validation of providers --- ui/src/app/metadata/domain/source/SourceDefinition.js | 6 ++++-- ui/src/app/metadata/editor/MetadataEditorForm.js | 2 -- ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/src/app/metadata/domain/source/SourceDefinition.js b/ui/src/app/metadata/domain/source/SourceDefinition.js index f82662a58..070defb18 100644 --- a/ui/src/app/metadata/domain/source/SourceDefinition.js +++ b/ui/src/app/metadata/domain/source/SourceDefinition.js @@ -1,8 +1,10 @@ -import { defaults, merge, toNumber, uniq } from 'lodash'; +import { defaults } from 'lodash'; +import { merge } from 'lodash/merge'; +import { toNumber} from 'lodash/toNumber'; import defaultsDeep from 'lodash/defaultsDeep'; import API_BASE_PATH from '../../../App.constant'; import {removeNull} from '../../../core/utility/remove_null'; -import { updatedDiff, detailedDiff } from 'deep-object-diff'; +import { detailedDiff } from 'deep-object-diff'; export const SourceBase = { label: 'Metadata Source', diff --git a/ui/src/app/metadata/editor/MetadataEditorForm.js b/ui/src/app/metadata/editor/MetadataEditorForm.js index 1d2b7ecad..f8e9bd29c 100644 --- a/ui/src/app/metadata/editor/MetadataEditorForm.js +++ b/ui/src/app/metadata/editor/MetadataEditorForm.js @@ -8,8 +8,6 @@ import { templates } from '../../form/component'; import { useUiSchema } from '../hooks/schema'; import Alert from 'react-bootstrap/Alert'; -import { updatedDiff } from 'deep-object-diff'; - const invisErrors = ['const', 'oneOf'] function ErrorListTemplate () { diff --git a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js index ecb6e5c76..b90645309 100644 --- a/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js +++ b/ui/src/app/metadata/wizard/MetadataProviderTypeSelector.js @@ -12,7 +12,7 @@ export function MetadataProviderTypeSelector({ type, types = [], children}) { const translator = useTranslator(); - const { data = [] } = useMetadataProviders({}, []); + const { data = [] } = useMetadataProviders({cachePolicy: 'no-cache'}, []); const [showSelector, setShowSelector] = React.useState(true);