Fix collapsedMaxWords

src/client/components/facet_results/ResultTable.js

@@ -173,22 +173,24 @@ class ResultTable extends React.Component {
     const expanded = this.state.expandedRows.has(row.id);
     let hasExpandableContent = false;
     const dataCells = this.props.data.tableColumns.map(column => {
-      const columnData = row[column.id];
+      const columnData = row[column.id] == null ? '-' : row[column.id];
       const isArray = Array.isArray(columnData);
       if (isArray) {
         hasExpandableContent = true;
       }
       if (!isArray
+        && columnData !== '-'
         && column.valueType === 'string'
         && column.collapsedMaxWords
-        && columnData.split(' ').length > column.collapsedMaxWords) {
+        && columnData.split(' ').length > column.collapsedMaxWords
+      ) {
         hasExpandableContent = true;
       }
       return (
         <ResultTableCell
           key={column.id}
           columnId={column.id}
-          data={row[column.id] == null ? '-' : row[column.id]}
+          data={columnData}
           valueType={column.valueType}
           makeLink={column.makeLink}
           externalLink={column.externalLink}

src/client/components/facet_results/StringList.js

@@ -31,9 +31,9 @@ const StringList = props => {
   const createFirstValue = (data, isArray) => {
     let firstValue = isArray ? data[0] : data;
     if (props.collapsedMaxWords) {
-      const wordCount = data.split(' ').length;
+      const wordCount = firstValue.split(' ').length;
       if (wordCount > props.collapsedMaxWords) {
-        firstValue = data.trim().split(' ').splice(0, props.collapsedMaxWords).join(' ');
+        firstValue = firstValue.trim().split(' ').splice(0, props.collapsedMaxWords).join(' ');
         firstValue = `${firstValue}...`;
       }
     } else if (isArray) {