OpenConceptLab/ocl_issues#1131 | cascade | not using uuid

OpenConceptLab · Nov 1, 2022 · e559fd9 · e559fd9
1 parent cdf08c3
commit e559fd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/concepts/ConceptHierarchyTree.jsx b/src/components/concepts/ConceptHierarchyTree.jsx
@@ -225,7 +225,7 @@ class ConceptHierarchyTree extends React.Component {
           const sourceHeader = targetSource ? `<div><span class='gray'>Source: </span><span><b>${targetSource}</b></span></div> ` : '';
           let terminalHeader = '';
           if(!d.data.cascade_target_concept_code && isEmpty(d.data.children)) {
-            if(d.data.uuid === d.parent.data.uuid)
+            if(d.data.url === d.parent.data.url)
               terminalHeader = '<div class="gray-italics-small">(Same As Parent)</div> ';
             else if(d.data.terminal === false)
               terminalHeader = '<div class="gray-italics-small">(not terminal - cascaded elsewhere)</div> ';
@@ -295,7 +295,7 @@ class ConceptHierarchyTree extends React.Component {
             name = d.data.cascade_target_concept_code
         else {
           name = d.data.display_name
-          if(isEmpty(d.data.children) && d.data.uuid !== d.parent.data.uuid) {
+          if(isEmpty(d.data.children) && d.data.url !== d.parent.data.url) {
             if(d.data.terminal === false)
               name += '⁺'
             else if (d.data.terminal === null)

diff --git a/src/components/mappings/ConceptHomeMappingsTableRows.jsx b/src/components/mappings/ConceptHomeMappingsTableRows.jsx
@@ -79,7 +79,7 @@ const ConceptHomeMappingsTableRows = ({ concept, mappings, mapType, isIndirect,
           const cursor = targetURL ? 'pointer' : 'not-allowed'
           return (
             <TableRow
-              hover key={mapping.uuid} onClick={event => onDefaultClick(event, targetURL)} style={{cursor: cursor}} className={targetURL ? 'underline-text' : ''}>
+              hover key={mapping.url} onClick={event => onDefaultClick(event, targetURL)} style={{cursor: cursor}} className={targetURL ? 'underline-text' : ''}>
               <TableCell align='left' className='ellipsis-text' style={{maxWidth: '200px'}}>
                 <span className='flex-vertical-center' style={{paddingTop: '7px'}}>
                   <span className='flex-vertical-center' style={{marginRight: '4px'}}>