OpenConceptLab/ocl_issues#1458 | indirect mappings are not sortable

OpenConceptLab · Feb 22, 2023 · d530b21 · d530b21
1 parent f8032d9
commit d530b21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/concepts/HomeMappings.jsx b/src/components/concepts/HomeMappings.jsx
@@ -284,7 +284,6 @@ const HomeMappings = ({ source, concept, isLoadingMappings, sourceVersion, paren
                                     onRemoveMapping={onRemoveMapping}
                                     onReactivateMapping={onReactivateMapping}
                                     suggested={suggested}
-                                    onSortEnd={onSortEnd}
                                   />
                               }
                             </React.Fragment>

diff --git a/src/components/mappings/ConceptHomeMappingsTableRows.jsx b/src/components/mappings/ConceptHomeMappingsTableRows.jsx
@@ -166,10 +166,11 @@ const ConceptHomeMappingsTableRows = ({ concept, mappings, mapType, isIndirect,
                     const isUpdated = mapping._sort_weight !== mapping._initial_assigned_sort_weight
                     const bgColor = isUpdated ? 'rgba(51, 115, 170, 0.2)' : WHITE
                     const canAct = Boolean(onCreateNewMapping)
-                    const cursor = (targetURL || canAct) ? 'pointer' : 'not-allowed'
+                    const canSort = Boolean(onSortEnd)
+                    const cursor = (targetURL || canSort) ? 'pointer' : 'not-allowed'
                     const isLast = index == oMappings.length - 1
                     return (
-                      <Draggable key={mapping.url} draggableId={mapping.url} index={index} isDragDisabled={!canAct}>
+                      <Draggable key={mapping.url} draggableId={mapping.url} index={index} isDragDisabled={!canSort}>
                         {(provided) => (
                           <Table
                             key={mapping.url}
@@ -184,7 +185,7 @@ const ConceptHomeMappingsTableRows = ({ concept, mappings, mapType, isIndirect,
                                 <TableCell align='left' className='ellipsis-text' style={{width: '27%', borderBottom: isLast ? 'none' : '1px solid rgba(224, 224, 224, 1)', backgroundColor: bgColor}}>
                                   <span className='flex-vertical-center' style={{paddingTop: '7px'}}>
                                     {
-                                      canAct &&
+                                      canSort &&
                                         <span className='flex-vertical-center' style={{marginRight: '4px'}}>
                                           <DragIcon fontSize='small' style={{color: 'rgba(0, 0, 0, 0.54)'}} />
                                         </span>