diff --git a/rdmo/management/assets/js/components/import/ImportElement.js b/rdmo/management/assets/js/components/import/ImportElement.js index c670272f44..3558f9b5b8 100644 --- a/rdmo/management/assets/js/components/import/ImportElement.js +++ b/rdmo/management/assets/js/components/import/ImportElement.js @@ -11,35 +11,35 @@ import Warnings from './common/Warnings' import { codeClass, verboseNames } from '../../constants/elements' import { isEmpty } from 'lodash' -const ImportElement = ({ config, instance, importActions }) => { - const showFields = () => importActions.updateElement(instance, {show: !instance.show}) - const toggleImport = () => importActions.updateElement(instance, {import: !instance.import}) - const updateInstance = (key, value) => importActions.updateElement(instance, {[key]: value}) +const ImportElement = ({ config, element, importActions }) => { + const showFields = () => importActions.updateElement(element, {show: !element.show}) + const toggleImport = () => importActions.updateElement(element, {import: !element.import}) + const updateElement = (key, value) => importActions.updateElement(element, {[key]: value}) return (
  • - - - + + + { - instance.updated && !isEmpty(instance.updated_and_changed) && !instance.created && + element.updated && !isEmpty(element.updated_and_changed) && !element.created &&

    }
    - +
    { - instance.show && <> -
    - - - + element.show && <> + + + + }
  • @@ -48,7 +48,7 @@ const ImportElement = ({ config, instance, importActions }) => { ImportElement.propTypes = { config: PropTypes.object.isRequired, - instance: PropTypes.object.isRequired, + element: PropTypes.object.isRequired, importActions: PropTypes.object.isRequired } diff --git a/rdmo/management/assets/js/components/import/ImportSuccessElement.js b/rdmo/management/assets/js/components/import/ImportSuccessElement.js index 20440e7dc9..4a8446db1d 100644 --- a/rdmo/management/assets/js/components/import/ImportSuccessElement.js +++ b/rdmo/management/assets/js/components/import/ImportSuccessElement.js @@ -5,32 +5,32 @@ import uniqueId from 'lodash/uniqueId' import { codeClass, verboseNames } from '../../constants/elements' import { isEmpty } from 'lodash' -const ImportSuccessElement = ({ instance }) => { +const ImportSuccessElement = ({ element }) => { return (
  • - {verboseNames[instance.model]}{' '} - {instance.uri} - {instance.created && {' '}{gettext('created')} && } - {instance.updated && {' '}{gettext('updated')} && } + {verboseNames[element.model]}{' '} + {element.uri} + {element.created && {' '}{gettext('created')} && } + {element.updated && {' '}{gettext('updated')} && } { - !isEmpty(instance.errors) && !(instance.created || instance.updated) && + !isEmpty(element.errors) && !(element.created || element.updated) && {' '}{gettext('could not be imported')} } { - !isEmpty(instance.errors) && (instance.created || instance.updated) && + !isEmpty(element.errors) && (element.created || element.updated) && <>{', '}{gettext('but could not be added to parent element')} } {'.'}

    - {instance.warnings.map(message =>

    {message}

    )} - {instance.errors.map(message =>

    {message}

    )} + {element.warnings.map(message =>

    {message}

    )} + {element.errors.map(message =>

    {message}

    )}
  • ) } ImportSuccessElement.propTypes = { - instance: PropTypes.object.isRequired, + element: PropTypes.object.isRequired, } export default ImportSuccessElement diff --git a/rdmo/management/assets/js/components/main/Import.js b/rdmo/management/assets/js/components/main/Import.js index 5b53ae903c..2a7c863a81 100644 --- a/rdmo/management/assets/js/components/main/Import.js +++ b/rdmo/management/assets/js/components/main/Import.js @@ -61,9 +61,9 @@ const Import = ({ config, imports, importActions }) => { { elements.map((element, index) => { if (success) { - return + return } else { - return + return } }) }