Merge pull request #116 from webdev-dev/master

 Update CollapsibleFilter for CBW

Author: kmiyauchi

lib/CollapsibleFilter/CollapsibleFilter.js

@@ -98,8 +98,14 @@ var CollapsibleFilter = function (_React$Component) {
                 textMore = _props2.textMore,
                 textLess = _props2.textLess;
 
-            // Filter by search
 
+            var sortedFilter = filters[type].filter(function (a) {
+                return a._id;
+            }).sort(function (a, b) {
+                return a._id.localeCompare(b._id);
+            });
+
+            // Filter by search
             var filteredItems = search.all ? items : items.filter(function (job) {
                 return search.results.includes(job.permalink);
             }) || [];
@@ -109,11 +115,7 @@ var CollapsibleFilter = function (_React$Component) {
                 { className: 'wfui-filter-group' },
                 _react2.default.createElement(_FilterItems2.default, {
                     label: label,
-                    filterItems: filterItems || filters[type].filter(function (a) {
-                        return a._id;
-                    }).sort(function (a, b) {
-                        return a._id.localeCompare(b._id);
-                    }).map(function (item) {
+                    filterItems: filterItems || sortedFilter.map(function (item) {
                         return { _id: item._id, key: item._key || item._id, count: item.count };
                     }),
                     type: type,

src/CollapsibleFilter/CollapsibleFilter.jsx

@@ -40,14 +40,16 @@ class CollapsibleFilter extends React.Component {
     render() {
         const { label, type, filters, search, filterItems, items, category, filter, defaultExpand, numCollapse, textMore, textLess } = this.props;
 
+        const sortedFilter = filters[type].filter((a) => (a._id)).sort((a, b) => (a._id.localeCompare(b._id)));
+
         // Filter by search
         const filteredItems = search.all ? items : items.filter(job => search.results.includes(job.permalink)) || [];
 
         return (
             <div className="wfui-filter-group">
                 <FilterItems
                     label={label}
-                    filterItems={filterItems || filters[type].filter((a) => (a._id)).sort((a, b) => (a._id.localeCompare(b._id))).map(item => ({ _id: item._id, key: item._key || item._id, count: item.count }))}
+                    filterItems={filterItems || sortedFilter.map(item => ({ _id: item._id, key: item._key || item._id, count: item.count }))}
                     type={type}
                     category={category}
                     onHandleClick={this.onHandleClick}