✨ [PRTL-1612] add count in title in all cases (#2066)

NCI-GDC · Oct 30, 2017 · 01eab0b · 01eab0b
1 parent f875246
commit 01eab0b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "memoizee": "0.4.5",
     "moment": "2.17.1",
     "oncogrid": "2.0.1",
+    "pluralize": "7.0.0",
     "prop-types": "15.5.10",
     "query-string": "4.3.4",
     "queue": "4.2.1",

diff --git a/src/packages/@ncigdc/components/SetActions.js b/src/packages/@ncigdc/components/SetActions.js
@@ -12,6 +12,7 @@ import AppendSetModal from '@ncigdc/components/Modals/AppendSetModal';
 import RemoveSetModal from '@ncigdc/components/Modals/RemoveSetModal';
 import DropdownItem from '@ncigdc/uikit/DropdownItem';
 import { theme } from '@ncigdc/theme';
+import pluralize from '@ncigdc/utils/pluralize';
 
 const enhance = compose(
   connect(({ sets }) => ({ sets })),
@@ -34,7 +35,7 @@ export default enhance(
   }) => {
     const titleType = type.replace(/^./, m => m.toUpperCase());
     const total = selectedIds.length || props.total || 0;
-    const displayType = `${type}${total > 1 ? 's' : ''}`;
+    const countAndType = pluralize(titleType, total, true);
     const filters = selectedIds.length
       ? { op: 'in', content: { field, value: selectedIds } }
       : props.filters;
@@ -63,19 +64,16 @@ export default enhance(
               },
             }}
           >
-            {total.toLocaleString()}&nbsp;{displayType}
+            {countAndType}
           </DropdownItem>
           <DropdownItem
             style={{ lineHeight: '1.5', cursor: 'pointer' }}
             onClick={() => {
               dispatch(
                 setModal(
                   <SaveSetModal
-                    title={
-                      selectedIds.length
-                        ? `Save ${total.toLocaleString()} ${displayType} as new set`
-                        : `Save ${titleType} Set`
-                    }
+                    title={`Save ${countAndType} as New Set`}
+                    total={total}
                     filters={filters}
                     type={type}
                     CreateSetButton={CreateSetButton}
@@ -94,7 +92,7 @@ export default enhance(
                   setModal(
                     <AppendSetModal
                       field={field}
-                      title={`Add ${total.toLocaleString()} ${displayType} to existing set`}
+                      title={`Add ${countAndType} to Existing Set`}
                       filters={filters}
                       type={type}
                       CreateSetButton={CreateSetButton}
@@ -113,7 +111,7 @@ export default enhance(
                   setModal(
                     <RemoveSetModal
                       field={field}
-                      title={`Remove ${total.toLocaleString()} ${displayType} from existing set`}
+                      title={`Remove ${countAndType} from Existing Set`}
                       filters={filters}
                       type={type}
                       RemoveFromSetButton={RemoveFromSetButton}

diff --git a/src/packages/@ncigdc/utils/pluralize.js b/src/packages/@ncigdc/utils/pluralize.js
@@ -0,0 +1,3 @@
+import pluralize from 'pluralize';
+export default (word = '', count = 0, inclusive) =>
+  `${inclusive ? `${count.toLocaleString()} ` : ''}${pluralize(word, count)}`;