refactor(js, import): rename to buildPathForAttribute and remove extras

Signed-off-by: David Wallace <[email protected]>
rdmorganiser · Jul 3, 2024 · 550aeb5 · 550aeb5
1 parent b5a0353
commit 550aeb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/rdmo/management/assets/js/reducers/importsReducer.js b/rdmo/management/assets/js/reducers/importsReducer.js
@@ -2,7 +2,7 @@ import isArray from 'lodash/isArray'
 import isNil from 'lodash/isNil'
 import isUndefined from 'lodash/isUndefined'
 
-import { buildUri, buildPath } from '../utils/elements'
+import { buildUri, buildPathForAttribute } from '../utils/elements'
 import processElementDiffs from '../utils/processElementDiffs'
 
 
@@ -49,7 +49,7 @@ export default function importsReducer(state = initialState, action) {
         const elements = [...state.elements]
         elements[index] = {...elements[index], ...action.values}
         if (elements[index].model === 'domain.attribute') {
-          elements[index].path = buildPath(elements[index].key, elements[index].parent ? elements[index].parent.uri : null, elements)
+          elements[index].path = buildPathForAttribute(elements[index].key, elements[index].parent ? elements[index].parent.uri : null)
         }
         elements[index].uri = buildUri(elements[index])
         return {...state, elements}

diff --git a/rdmo/management/assets/js/utils/elements.js b/rdmo/management/assets/js/utils/elements.js
@@ -174,16 +174,11 @@ const buildUri = (element) => {
   return uri
 }
 
-const buildPath = (key, parentUri, elements) => {
-
+const buildPathForAttribute = (key, parentUri) => {
   let path = key
   if (parentUri) {
-    const parentElement = elements.find(element => element.uri === parentUri)
-    if (parentElement) {
-      const parentPath = parentElement.path
-      path = parentPath ? `${parentPath}/${key}` : key
-    } else if (parentUri.includes('/domain/')) {
-      // If parentElement is not found, construct the path using parentUri directly
+     if (parentUri.includes('/domain/')) {
+      // construct the path using parentUri directly
       const parentPath = parentUri.split('/domain/')[1]
       path = parentPath ? `${parentPath}/${key}` : key
     }
@@ -194,4 +189,4 @@ const buildPath = (key, parentUri, elements) => {
 
 
 
-export { compareElements, updateElement, resetElement, canMoveElement, moveElement, findDescendants, buildUri, buildPath }
+export { compareElements, updateElement, resetElement, canMoveElement, moveElement, findDescendants, buildUri, buildPathForAttribute }