feat(js,import): remove onClick from label text and add return null f…

…or builUri Signed-off-by: David Wallace <[email protected]>
rdmorganiser · Jul 12, 2024 · fb20c7e · fb20c7e
1 parent e717725
commit fb20c7e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/rdmo/management/assets/js/components/import/common/ImportSelectCheckbox.js b/rdmo/management/assets/js/components/import/common/ImportSelectCheckbox.js
@@ -15,9 +15,9 @@ const ImportSelectCheckbox = ({ element, toggleImport, updateShowField }) => {
     </label>
     <CodeLink className={codeClass[element.model]} uri={element.uri} onClick={updateShowField} />
 
-    <ChangedLabel text={changedLabelText} onClick={updateShowField} show={(element.changed && element.updated)} />
+    <ChangedLabel text={changedLabelText} show={(element.changed && element.updated)} />
 
-    <CreatedLabel text={createdLabelText} onClick={updateShowField} show={element.created} />
+    <CreatedLabel text={createdLabelText} show={element.created} />
   </div>
 )}
 

diff --git a/rdmo/management/assets/js/reducers/importsReducer.js b/rdmo/management/assets/js/reducers/importsReducer.js
@@ -51,7 +51,10 @@ export default function importsReducer(state = initialState, action) {
         if (elements[index].model === 'domain.attribute') {
           elements[index].path = buildPathForAttribute(elements[index].key, elements[index].parent ? elements[index].parent.uri : null)
         }
-        elements[index].uri = buildUri(elements[index])
+        const newUri = buildUri(elements[index])
+        if (!isNil(newUri)) {
+          elements[index].uri = newUri
+        }
         return {...state, elements}
       } else {
         return state
@@ -87,7 +90,10 @@ export default function importsReducer(state = initialState, action) {
         element.uri_prefix = action.uriPrefix
 
         // compute a new uri and store it in the elementMap
-        element.uri = elementsMap[element.uri] = buildUri(element)
+        const newUri = buildUri(element)
+        if (!isNil(newUri)) {
+          element.uri = elementsMap[element.uri] = newUri
+        }
 
         return element
       })

diff --git a/rdmo/management/assets/js/utils/elements.js b/rdmo/management/assets/js/utils/elements.js
@@ -162,13 +162,20 @@ function findDescendants(element, elementType) {
 }
 
 const buildUri = (element) => {
-  let uri = element.uri_prefix + '/' + elementModules[element.model] + '/'
+  if (isUndefined(element.uri_prefix) || isUndefined(element.model)) {
+    return null
+  }
+
+  let uri = `${element.uri_prefix}/${elementModules[element.model]}/`
+
   if (!isUndefined(element.uri_path) && !isNil(element.uri_path)) {
     uri += element.uri_path
   } else if (!isUndefined(element.path) && !isNil(element.path)) {
     uri += element.path
-  } else {
+  } else if (!isUndefined(element.key) && !isNil(element.key)) {
     uri += element.key
+  } else {
+    return null
   }
 
   return uri