Rework Add Indexer Modal

frontend/src/Store/Actions/Settings/indexerOptions.js

@@ -1,64 +0,0 @@
-import { createAction } from 'redux-actions';
-import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
-import createSaveHandler from 'Store/Actions/Creators/createSaveHandler';
-import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
-import { createThunk } from 'Store/thunks';
-
-//
-// Variables
-
-const section = 'settings.indexerOptions';
-
-//
-// Actions Types
-
-export const FETCH_INDEXER_OPTIONS = 'settings/indexerOptions/fetchIndexerOptions';
-export const SAVE_INDEXER_OPTIONS = 'settings/indexerOptions/saveIndexerOptions';
-export const SET_INDEXER_OPTIONS_VALUE = 'settings/indexerOptions/setIndexerOptionsValue';
-
-//
-// Action Creators
-
-export const fetchIndexerOptions = createThunk(FETCH_INDEXER_OPTIONS);
-export const saveIndexerOptions = createThunk(SAVE_INDEXER_OPTIONS);
-export const setIndexerOptionsValue = createAction(SET_INDEXER_OPTIONS_VALUE, (payload) => {
-  return {
-    section,
-    ...payload
-  };
-});
-
-//
-// Details
-
-export default {
-
-  //
-  // State
-
-  defaultState: {
-    isFetching: false,
-    isPopulated: false,
-    error: null,
-    pendingChanges: {},
-    isSaving: false,
-    saveError: null,
-    item: {}
-  },
-
-  //
-  // Action Handlers
-
-  actionHandlers: {
-    [FETCH_INDEXER_OPTIONS]: createFetchHandler(section, '/config/indexer'),
-    [SAVE_INDEXER_OPTIONS]: createSaveHandler(section, '/config/indexer')
-  },
-
-  //
-  // Reducers
-
-  reducers: {
-    [SET_INDEXER_OPTIONS_VALUE]: createSetSettingValueReducer(section)
-  }
-
-};

frontend/src/Store/Actions/indexerActions.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { createAction } from 'redux-actions';
+import { sortDirections } from 'Helpers/Props';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
-import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler';
 import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
@@ -12,11 +12,13 @@ import { createThunk, handleThunks } from 'Store/thunks';
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
 import createHandleActions from './Creators/createHandleActions';
+import createSetClientSideCollectionSortReducer from './Creators/Reducers/createSetClientSideCollectionSortReducer';
 
 //
 // Variables
 
 export const section = 'indexers';
+const schemaSection = `${section}.schema`;
 
 //
 // State
@@ -25,17 +27,22 @@ export const defaultState = {
   isFetching: false,
   isPopulated: false,
   error: null,
-  isSchemaFetching: false,
-  isSchemaPopulated: false,
-  schemaError: null,
-  schema: [],
   selectedSchema: {},
   isSaving: false,
   saveError: null,
   isTesting: false,
   isTestingAll: false,
   items: [],
-  pendingChanges: {}
+  pendingChanges: {},
+
+  schema: {
+    isFetching: false,
+    isPopulated: false,
+    error: null,
+    sortKey: 'name',
+    sortDirection: sortDirections.ASCENDING,
+    items: []
+  }
 };
 
 //
@@ -44,6 +51,7 @@ export const defaultState = {
 export const FETCH_INDEXERS = 'indexers/fetchIndexers';
 export const FETCH_INDEXER_SCHEMA = 'indexers/fetchIndexerSchema';
 export const SELECT_INDEXER_SCHEMA = 'indexers/selectIndexerSchema';
+export const SET_INDEXER_SCHEMA_SORT = 'indexers/setIndexerSchemaSort';
 export const CLONE_INDEXER = 'indexers/cloneIndexer';
 export const SET_INDEXER_VALUE = 'indexers/setIndexerValue';
 export const SET_INDEXER_FIELD_VALUE = 'indexers/setIndexerFieldValue';
@@ -60,6 +68,7 @@ export const TEST_ALL_INDEXERS = 'indexers/testAllIndexers';
 export const fetchIndexers = createThunk(FETCH_INDEXERS);
 export const fetchIndexerSchema = createThunk(FETCH_INDEXER_SCHEMA);
 export const selectIndexerSchema = createAction(SELECT_INDEXER_SCHEMA);
+export const setIndexerSchemaSort = createAction(SET_INDEXER_SCHEMA_SORT);
 export const cloneIndexer = createAction(CLONE_INDEXER);
 
 export const saveIndexer = createThunk(SAVE_INDEXER);
@@ -104,7 +113,7 @@ function selectSchema(state, payload, schemaDefaults) {
     name
   } = payload;
 
-  const selectedImplementation = _.find(newState.schema, { implementation, name });
+  const selectedImplementation = _.find(newState.schema.items, { implementation, name });
 
   newState.selectedSchema = applySchemaDefaults(_.cloneDeep(selectedImplementation), schemaDefaults);
 
@@ -113,7 +122,7 @@ function selectSchema(state, payload, schemaDefaults) {
 
 export const actionHandlers = handleThunks({
   [FETCH_INDEXERS]: createFetchHandler(section, '/indexer'),
-  [FETCH_INDEXER_SCHEMA]: createFetchSchemaHandler(section, '/indexer/schema'),
+  [FETCH_INDEXER_SCHEMA]: createFetchHandler(schemaSection, '/indexer/schema'),
 
   [SAVE_INDEXER]: createSaveProviderHandler(section, '/indexer'),
   [CANCEL_SAVE_INDEXER]: createCancelSaveProviderHandler(section),
@@ -129,6 +138,7 @@ export const actionHandlers = handleThunks({
 export const reducers = createHandleActions({
   [SET_INDEXER_VALUE]: createSetSettingValueReducer(section),
   [SET_INDEXER_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
+  [SET_INDEXER_SCHEMA_SORT]: createSetClientSideCollectionSortReducer(schemaSection),
 
   [SELECT_INDEXER_SCHEMA]: (state, { payload }) => {
     return selectSchema(state, payload, (selectedSchema) => {

frontend/src/Store/Actions/settingsActions.js

@@ -5,7 +5,6 @@ import applications from './Settings/applications';
 import general from './Settings/general';
 import indexerCategories from './Settings/indexerCategories';
 import indexerFlags from './Settings/indexerFlags';
-import indexerOptions from './Settings/indexerOptions';
 import languages from './Settings/languages';
 import notifications from './Settings/notifications';
 import ui from './Settings/ui';
@@ -13,7 +12,6 @@ import ui from './Settings/ui';
 export * from './Settings/general';
 export * from './Settings/indexerCategories';
 export * from './Settings/indexerFlags';
-export * from './Settings/indexerOptions';
 export * from './Settings/languages';
 export * from './Settings/notifications';
 export * from './Settings/applications';
@@ -33,7 +31,6 @@ export const defaultState = {
   general: general.defaultState,
   indexerCategories: indexerCategories.defaultState,
   indexerFlags: indexerFlags.defaultState,
-  indexerOptions: indexerOptions.defaultState,
   languages: languages.defaultState,
   notifications: notifications.defaultState,
   applications: applications.defaultState,
@@ -61,7 +58,6 @@ export const actionHandlers = handleThunks({
   ...general.actionHandlers,
   ...indexerCategories.actionHandlers,
   ...indexerFlags.actionHandlers,
-  ...indexerOptions.actionHandlers,
   ...languages.actionHandlers,
   ...notifications.actionHandlers,
   ...applications.actionHandlers,
@@ -80,7 +76,6 @@ export const reducers = createHandleActions({
   ...general.reducers,
   ...indexerCategories.reducers,
   ...indexerFlags.reducers,
-  ...indexerOptions.reducers,
   ...languages.reducers,
   ...notifications.reducers,
   ...applications.reducers,