From 69b6b67bf4dedc80046f14472047033566f2d9a8 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 16 Oct 2018 20:59:16 -0400
Subject: [PATCH] New: Sort by Status in Artist Index/Editor

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
---
 frontend/src/Artist/Editor/ArtistEditor.js       |  1 +
 .../Artist/Index/Menus/ArtistIndexSortMenu.js    |  9 +++++++++
 frontend/src/Store/Actions/artistActions.js      | 16 ++++++++++++++++
 .../src/Store/Actions/artistEditorActions.js     |  6 ++++--
 frontend/src/Store/Actions/artistIndexActions.js |  5 ++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Artist/Editor/ArtistEditor.js b/frontend/src/Artist/Editor/ArtistEditor.js
index d61c42dec..92e01c2f5 100644
--- a/frontend/src/Artist/Editor/ArtistEditor.js
+++ b/frontend/src/Artist/Editor/ArtistEditor.js
@@ -22,6 +22,7 @@ function getColumns(showLanguageProfile, showMetadataProfile) {
   return [
     {
       name: 'status',
+      isSortable: true,
       isVisible: true
     },
     {
diff --git a/frontend/src/Artist/Index/Menus/ArtistIndexSortMenu.js b/frontend/src/Artist/Index/Menus/ArtistIndexSortMenu.js
index 03ab811dd..fdc9e9ad2 100644
--- a/frontend/src/Artist/Index/Menus/ArtistIndexSortMenu.js
+++ b/frontend/src/Artist/Index/Menus/ArtistIndexSortMenu.js
@@ -19,6 +19,15 @@ function ArtistIndexSortMenu(props) {
       alignMenu={align.RIGHT}
     >
       <MenuContent>
+        <SortMenuItem
+          name="status"
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onPress={onSortSelect}
+        >
+          Monitored/Status
+        </SortMenuItem>
+
         <SortMenuItem
           name="sortName"
           sortKey={sortKey}
diff --git a/frontend/src/Store/Actions/artistActions.js b/frontend/src/Store/Actions/artistActions.js
index 5b82ae622..500c5e84c 100644
--- a/frontend/src/Store/Actions/artistActions.js
+++ b/frontend/src/Store/Actions/artistActions.js
@@ -120,6 +120,22 @@ export const filterPredicates = {
   }
 };
 
+export const sortPredicates = {
+  status: function(item) {
+    let result = 0;
+
+    if (item.monitored) {
+      result += 2;
+    }
+
+    if (item.status === 'continuing') {
+      result++;
+    }
+
+    return result;
+  }
+};
+
 //
 // State
 
diff --git a/frontend/src/Store/Actions/artistEditorActions.js b/frontend/src/Store/Actions/artistEditorActions.js
index 34cb0ef19..f54132ae1 100644
--- a/frontend/src/Store/Actions/artistEditorActions.js
+++ b/frontend/src/Store/Actions/artistEditorActions.js
@@ -7,7 +7,7 @@ import createSetClientSideCollectionSortReducer from './Creators/Reducers/create
 import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer';
 import createHandleActions from './Creators/createHandleActions';
 import { set, updateItem } from './baseActions';
-import { filters, filterPredicates } from './artistActions';
+import { filters, filterPredicates, sortPredicates } from './artistActions';
 
 //
 // Variables
@@ -77,7 +77,9 @@ export const defaultState = {
       type: filterBuilderTypes.ARRAY,
       valueType: filterBuilderValueTypes.TAG
     }
-  ]
+  ],
+
+  sortPredicates
 };
 
 export const persistState = [
diff --git a/frontend/src/Store/Actions/artistIndexActions.js b/frontend/src/Store/Actions/artistIndexActions.js
index efb787601..070e944a1 100644
--- a/frontend/src/Store/Actions/artistIndexActions.js
+++ b/frontend/src/Store/Actions/artistIndexActions.js
@@ -6,7 +6,7 @@ import createSetTableOptionReducer from './Creators/Reducers/createSetTableOptio
 import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetClientSideCollectionFilterReducer from './Creators/Reducers/createSetClientSideCollectionFilterReducer';
 import createHandleActions from './Creators/createHandleActions';
-import { filters, filterPredicates } from './artistActions';
+import { filters, filterPredicates, sortPredicates } from './artistActions';
 
 //
 // Variables
@@ -56,6 +56,7 @@ export const defaultState = {
     {
       name: 'status',
       columnLabel: 'Status',
+      isSortable: true,
       isVisible: true,
       isModifiable: false
     },
@@ -166,6 +167,8 @@ export const defaultState = {
   ],
 
   sortPredicates: {
+    ...sortPredicates,
+
     trackProgress: function(item) {
       const { statistics = {} } = item;