chore: import js rename obj to element

rdmorganiser · Jan 19, 2024 · 67c9dfe · 67c9dfe
1 parent 95801e7
commit 67c9dfe
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git 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 (
     <li className="list-group-item">
       <div className="pull-right">
-        <WarningLink element={instance} onClick={showFields} />
-        <ErrorLink element={instance} onClick={showFields} />
-        <ShowLink element={instance} onClick={showFields} />
+        <WarningLink element={element} onClick={showFields} />
+        <ErrorLink element={element} onClick={showFields} />
+        <ShowLink element={element} onClick={showFields} />
         {
-          instance.updated && !isEmpty(instance.updated_and_changed) && !instance.created &&
+          element.updated && !isEmpty(element.updated_and_changed) && !element.created &&
           <p className="element-link fa fa-pencil"></p>
         }
       </div>
       <div className="checkbox">
         <label className="mr-5">
-          <input type="checkbox" checked={instance.import} onChange={toggleImport} />
-          <strong>{verboseNames[instance.model]}{' '}</strong>
+          <input type="checkbox" checked={element.import} onChange={toggleImport} />
+          <strong>{verboseNames[element.model]}{' '}</strong>
         </label>
-        <CodeLink className={codeClass[instance.model]} uri={instance.uri} onClick={showFields} />
+        <CodeLink className={codeClass[element.model]} uri={element.uri} onClick={showFields} />
       </div>
       {
-        instance.show && <>
-          <Form config={config} element={instance} updateElement={updateInstance} />
-          <Fields element={instance} />
-          <Warnings element={instance} />
-          <Errors element={instance} />
+        element.show && <>
+          <Form config={config} element={element} updateElement={updateElement} />
+          <Fields element={element} />
+          <Warnings element={element} />
+          <Errors element={element} />
         </>
       }
     </li>
@@ -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
@@ -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 (
     <li className="list-group-item">
       <p>
-        <strong>{verboseNames[instance.model]}{' '}</strong>
-        <code className={codeClass[instance.model]}>{instance.uri}</code>
-        {instance.created && <span className="text-success">{' '}{gettext('created')}  </span> && <span className="muted element-link fa fa-plus"></span>}
-        {instance.updated && <span className="text-info">{' '}{gettext('updated')} </span> && <span className="muted element-link fa fa-pencil"></span>}
+        <strong>{verboseNames[element.model]}{' '}</strong>
+        <code className={codeClass[element.model]}>{element.uri}</code>
+        {element.created && <span className="text-success">{' '}{gettext('created')}  </span> && <span className="muted element-link fa fa-plus"></span>}
+        {element.updated && <span className="text-info">{' '}{gettext('updated')} </span> && <span className="muted element-link fa fa-pencil"></span>}
         {
-          !isEmpty(instance.errors) && !(instance.created || instance.updated) &&
+          !isEmpty(element.errors) && !(element.created || element.updated) &&
           <span className="text-danger">{' '}{gettext('could not be imported')}</span>
         }
         {
-          !isEmpty(instance.errors) && (instance.created || instance.updated) &&
+          !isEmpty(element.errors) && (element.created || element.updated) &&
           <>{', '}<span className="text-danger">{gettext('but could not be added to parent element')}</span></>
         }
         {'.'}
       </p>
-      {instance.warnings.map(message => <p key={uniqueId()} className="text-warning">{message}</p>)}
-      {instance.errors.map(message => <p key={uniqueId()} className="text-danger">{message}</p>)}
+      {element.warnings.map(message => <p key={uniqueId()} className="text-warning">{message}</p>)}
+      {element.errors.map(message => <p key={uniqueId()} className="text-danger">{message}</p>)}
     </li>
   )
 }
 
 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
@@ -61,9 +61,9 @@ const Import = ({ config, imports, importActions }) => {
       {
         elements.map((element, index) => {
           if (success) {
-            return <ImportSuccesElement key={index} instance={element}/>
+            return <ImportSuccesElement key={index} element={element}/>
           } else {
-              return <ImportElement key={index} config={config} instance={element} importActions={importActions} />
+              return <ImportElement key={index} config={config} element={element} importActions={importActions} />
           }
         })
       }