diff --git a/ui/src/app/metadata/copy/CopySource.js b/ui/src/app/metadata/copy/CopySource.js index 2a7a6b183..0fc9d953d 100644 --- a/ui/src/app/metadata/copy/CopySource.js +++ b/ui/src/app/metadata/copy/CopySource.js @@ -47,6 +47,8 @@ export function CopySource({ copy, onNext }) { const target = watch('target'); + const form = watch(); + const { errors, isValid } = formState; React.useEffect(() => { @@ -57,6 +59,8 @@ export function CopySource({ copy, onNext }) { const sections = useMetadataSourceSections(); + React.useEffect(() => console.log(form), [form]); + return ( <>
diff --git a/ui/src/app/metadata/copy/SaveCopy.js b/ui/src/app/metadata/copy/SaveCopy.js index 9381d662a..423f3040f 100644 --- a/ui/src/app/metadata/copy/SaveCopy.js +++ b/ui/src/app/metadata/copy/SaveCopy.js @@ -12,11 +12,16 @@ import { MetadataConfiguration } from '../component/MetadataConfiguration'; import Translate from '../../i18n/components/translate'; export function useCopiedModel (copy) { + const { properties, target, serviceProviderName, entityId } = copy; - const copied = removeNull(properties.reduce((c, section) => ({ ...c, ...{ [section]: target[section] } }), {})); + const { protocol } = target; + + let copied = removeNull(properties.reduce((c, section) => ({ ...c, ...{ [section]: target[section] } }), {})); + const model = { serviceProviderName, entityId, + protocol, ...copied }; return model; @@ -31,6 +36,7 @@ export function SaveCopy ({ copy, saving, onSave, onBack }) { const schema = React.useContext(MetadataSchemaContext); const model = useCopiedModel(copy); + const configuration = useCopiedConfiguration(model, schema, definition); const { handleSubmit } = useForm({ diff --git a/ui/src/app/metadata/hoc/MetadataSelector.js b/ui/src/app/metadata/hoc/MetadataSelector.js index 54a49d4df..5518cd7cd 100644 --- a/ui/src/app/metadata/hoc/MetadataSelector.js +++ b/ui/src/app/metadata/hoc/MetadataSelector.js @@ -39,7 +39,6 @@ export function MetadataSelector({ children, ...props }) { function reload() { setLoading(true); loadMetadata(id); - } React.useEffect(() => reload(), [id]); diff --git a/ui/src/app/metadata/view/MetadataCopy.js b/ui/src/app/metadata/view/MetadataCopy.js index 5a529387d..29df9ef3b 100644 --- a/ui/src/app/metadata/view/MetadataCopy.js +++ b/ui/src/app/metadata/view/MetadataCopy.js @@ -47,7 +47,7 @@ export function MetadataCopy ({ onShowNav }) { return ( {!confirm && - + } {confirm && copy &&