Pluralize dropdown label

a46d0bbb · Alfredo Sumaran · b7ff3b3b · a46d0bbb
Commit a46d0bbb authored Aug 19, 2016 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

app/assets/javascripts/protected_branch_access_dropdown.js.es6 ...ssets/javascripts/protected_branch_access_dropdown.js.es6 +6 -4

No files found.
--- a/app/assets/javascripts/protected_branch_access_dropdown.js.es6
+++ b/app/assets/javascripts/protected_branch_access_dropdown.js.es6
@@ -51,12 +51,14 @@
      let types = _.groupBy(currentItems, (item) => { return item.dataset.type; });
      let label = [];
-      if (_.isEmpty(types)) {
+      if (currentItems.length) {
-        label.push(this.defaultLabel);
-      } else {
        Object.keys(types).map((type) => {
-          label.push(`${types[type].length} ${type}`);
+          let numberOfTypes = types[type].length;
+          let text = numberOfTypes === 1 ? type : `${type}s`;
+          label.push(`${numberOfTypes} ${text}`);
        });
+      } else {
+        label.push(this.defaultLabel);
      }
      return label.join(' and ');