Sort Custom Filters

(cherry picked from commit e4b5d559df2d5f3d55e16aae5922509e84f31e64)

frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js

@@ -30,22 +30,24 @@ function CustomFiltersModalContent(props) {
 
       <ModalBody>
         {
-          customFilters.map((customFilter) => {
+          customFilters
-            return (
+            .sort((a, b) => a.label.localeCompare(b.label))
-              <CustomFilter
+            .map((customFilter) => {
-                key={customFilter.id}
+              return (
-                id={customFilter.id}
+                <CustomFilter
-                label={customFilter.label}
+                  key={customFilter.id}
-                filters={customFilter.filters}
+                  id={customFilter.id}
-                selectedFilterKey={selectedFilterKey}
+                  label={customFilter.label}
-                isDeleting={isDeleting}
+                  filters={customFilter.filters}
-                deleteError={deleteError}
+                  selectedFilterKey={selectedFilterKey}
-                dispatchSetFilter={dispatchSetFilter}
+                  isDeleting={isDeleting}
-                dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
+                  deleteError={deleteError}
-                onEditPress={onEditCustomFilter}
+                  dispatchSetFilter={dispatchSetFilter}
-              />
+                  dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
-            );
+                  onEditPress={onEditCustomFilter}
-          })
+                />
+              );
+            })
         }
 
         <div className={styles.addButtonContainer}>

frontend/src/Components/Menu/FilterMenuContent.js

@@ -40,18 +40,26 @@ class FilterMenuContent extends Component {
         }
 
         {
-          customFilters.map((filter) => {
+          customFilters.length > 0 ?
-            return (
+            <MenuItemSeparator /> :
-              <FilterMenuItem
+            null
-                key={filter.id}
+        }
-                filterKey={filter.id}
+
-                selectedFilterKey={selectedFilterKey}
+        {
-                onPress={onFilterSelect}
+          customFilters
-              >
+            .sort((a, b) => a.label.localeCompare(b.label))
-                {filter.label}
+            .map((filter) => {
-              </FilterMenuItem>
+              return (
-            );
+                <FilterMenuItem
-          })
+                  key={filter.id}
+                  filterKey={filter.id}
+                  selectedFilterKey={selectedFilterKey}
+                  onPress={onFilterSelect}
+                >
+                  {filter.label}
+                </FilterMenuItem>
+              );
+            })
         }
 
         {