OpenConceptLab/ocl_issues#991 | fixing counts

OpenConceptLab · Oct 6, 2021 · 593c6d3 · 593c6d3
1 parent a7fa2d8
commit 593c6d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/components/concepts/ConceptHierarchyRow.jsx b/src/components/concepts/ConceptHierarchyRow.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import {
   TableRow, TableCell, Chip
 } from '@material-ui/core';
-import { map } from 'lodash';
+import { map, get } from 'lodash';
 
 const ConceptHierarchyRow = ({ mapType, concepts, source }) => {
   const onDefaultClick = (event, concept) => {
@@ -11,12 +11,14 @@ const ConceptHierarchyRow = ({ mapType, concepts, source }) => {
     window.location.hash = concept.url
   }
 
+  const count = get(concepts, 'length') || 0
+
   return (
     <React.Fragment>
       {
         mapType &&
         <TableRow hover>
-          <TableCell align='left' rowSpan={concepts.length + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingTop: '7px'}}>
+          <TableCell align='left' rowSpan={count + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingTop: '7px'}}>
               <Chip
                 size='small'
                 variant='outlined'

diff --git a/src/components/concepts/LocalizedTextRow.jsx b/src/components/concepts/LocalizedTextRow.jsx
@@ -14,11 +14,12 @@ const LocalizedTextRow = ({concept, locale, localizedTexts, isDescription}) => {
   const nameAttr = isDescription ? 'description' : 'name'
   const urlAttr = isDescription ? 'descriptions' : 'names'
   const onCopyClick = localizedTextId => copyURL(toFullAPIURL(concept.url + urlAttr + '/' + localizedTextId + '/'))
+  const count = get(localizedTexts, 'length') || 0
 
   return (
     <React.Fragment key={locale}>
       <TableRow hover>
-        <TableCell align='left' rowSpan={localizedTexts.length + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingLeft: '15px', width: '50px', paddingTop: '5px'}}>
+        <TableCell align='left' rowSpan={count + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingLeft: '15px', width: '50px', paddingTop: '5px'}}>
           <div className='gray-italics-small flex-vertical-center'>
             {`[${locale}]`}
           </div>

diff --git a/src/components/mappings/ConceptHomeMappingsTableRows.jsx b/src/components/mappings/ConceptHomeMappingsTableRows.jsx
@@ -26,12 +26,14 @@ const ConceptHomeMappingsTableRows = ({ mapType, mappings, isIndirect }) => {
     return get(mapping, `${attr.split('_name')[0]}.display_name`)
   }
 
+  const count = get(mappings, 'length') || 0
+
   return (
     <React.Fragment>
       {
         mapType &&
         <TableRow hover>
-          <TableCell align='left' rowSpan={mappings.length + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingTop: '7px'}}>
+          <TableCell align='left' rowSpan={count + 1} style={{paddingRight: '5px', verticalAlign: 'top', paddingTop: '7px'}}>
             <Tooltip title={isIndirect ? 'Inverse Mappings' : 'Direct Mappings'}>
               <Chip
                 size='small'