New: Per Indexer Proxies

Fixes #281
2025-09-17 17:14:18 +02:00 · 2021-07-31 16:30:41 -04:00
parent 31886e8d35
commit 7480ebea85
149 changed files with 2374 additions and 393 deletions
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -11,6 +11,7 @@ import ApplicationSettingsConnector from 'Settings/Applications/ApplicationSetti
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
+import IndexerSettings from 'Settings/Indexers/IndexerSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
@@ -90,6 +91,11 @@ function AppRoutes(props) {
        component={Settings}
      />

+      <Route
+        path="/settings/indexers"
+        component={IndexerSettings}
+      />
+
      <Route
        path="/settings/applications"
        component={ApplicationSettingsConnector}
--- a/frontend/src/Components/Form/InfoInput.js
+++ b/frontend/src/Components/Form/InfoInput.js
@@ -11,8 +11,6 @@ class InfoInput extends Component {
      value
    } = this.props;

-    console.log(this.props);
-
    return (
      <span dangerouslySetInnerHTML={{ __html: value }} />
    );
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -48,6 +48,10 @@ const links = [
    title: translate('Settings'),
    to: '/settings',
    children: [
+      {
+        title: translate('Indexers'),
+        to: '/settings/indexers'
+      },
      {
        title: translate('Apps'),
        to: '/settings/applications'
--- a/frontend/src/Indexer/Edit/EditIndexerModalContent.js
+++ b/frontend/src/Indexer/Edit/EditIndexerModalContent.js
@@ -45,6 +45,7 @@ function EditIndexerModalContent(props) {
    supportsRss,
    supportsRedirect,
    appProfileId,
+    tags,
    fields,
    priority
  } = item;
@@ -151,6 +152,18 @@ function EditIndexerModalContent(props) {
                  onChange={onInputChange}
                />
              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('Tags')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.TAG}
+                  name="tags"
+                  helpText="Use tags to specify default clients, specify Indexer Proxies, or just to organize your indexers."
+                  {...tags}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
            </Form>
        }
      </ModalBody>
--- a/frontend/src/Indexer/Edit/EditIndexerModalContentConnector.js
+++ b/frontend/src/Indexer/Edit/EditIndexerModalContentConnector.js
@@ -59,7 +59,6 @@ class EditIndexerModalContentConnector extends Component {
  }

  onAdvancedSettingsPress = () => {
-    console.log('settings');
    this.props.toggleAdvancedSettings();
  }

--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.css
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.css
@@ -0,0 +1,44 @@
+.indexerProxy {
+  composes: card from '~Components/Card.css';
+
+  position: relative;
+  width: 300px;
+  height: 100px;
+}
+
+.underlay {
+  @add-mixin cover;
+}
+
+.overlay {
+  @add-mixin linkOverlay;
+
+  padding: 10px;
+}
+
+.name {
+  text-align: center;
+  font-weight: lighter;
+  font-size: 24px;
+}
+
+.actions {
+  margin-top: 20px;
+  text-align: right;
+}
+
+.presetsMenu {
+  composes: menu from '~Components/Menu/Menu.css';
+
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.presetsMenuButton {
+  composes: button from '~Components/Link/Button.css';
+
+  &::after {
+    margin-left: 5px;
+    content: '\25BE';
+  }
+}
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js
@@ -0,0 +1,111 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import Link from 'Components/Link/Link';
+import Menu from 'Components/Menu/Menu';
+import MenuContent from 'Components/Menu/MenuContent';
+import { sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import AddIndexerProxyPresetMenuItem from './AddIndexerProxyPresetMenuItem';
+import styles from './AddIndexerProxyItem.css';
+
+class AddIndexerProxyItem extends Component {
+
+  //
+  // Listeners
+
+  onIndexerProxySelect = () => {
+    const {
+      implementation
+    } = this.props;
+
+    this.props.onIndexerProxySelect({ implementation });
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      implementation,
+      implementationName,
+      infoLink,
+      presets,
+      onIndexerProxySelect
+    } = this.props;
+
+    const hasPresets = !!presets && !!presets.length;
+
+    return (
+      <div
+        className={styles.indexerProxy}
+      >
+        <Link
+          className={styles.underlay}
+          onPress={this.onIndexerProxySelect}
+        />
+
+        <div className={styles.overlay}>
+          <div className={styles.name}>
+            {implementationName}
+          </div>
+
+          <div className={styles.actions}>
+            {
+              hasPresets &&
+                <span>
+                  <Button
+                    size={sizes.SMALL}
+                    onPress={this.onIndexerProxySelect}
+                  >
+                    Custom
+                  </Button>
+
+                  <Menu className={styles.presetsMenu}>
+                    <Button
+                      className={styles.presetsMenuButton}
+                      size={sizes.SMALL}
+                    >
+                      Presets
+                    </Button>
+
+                    <MenuContent>
+                      {
+                        presets.map((preset) => {
+                          return (
+                            <AddIndexerProxyPresetMenuItem
+                              key={preset.name}
+                              name={preset.name}
+                              implementation={implementation}
+                              onPress={onIndexerProxySelect}
+                            />
+                          );
+                        })
+                      }
+                    </MenuContent>
+                  </Menu>
+                </span>
+            }
+
+            <Button
+              to={infoLink}
+              size={sizes.SMALL}
+            >
+              {translate('MoreInfo')}
+            </Button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+AddIndexerProxyItem.propTypes = {
+  implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
+  infoLink: PropTypes.string.isRequired,
+  presets: PropTypes.arrayOf(PropTypes.object),
+  onIndexerProxySelect: PropTypes.func.isRequired
+};
+
+export default AddIndexerProxyItem;
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModal.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModal.js
@@ -0,0 +1,25 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import AddIndexerProxyModalContentConnector from './AddIndexerProxyModalContentConnector';
+
+function AddIndexerProxyModal({ isOpen, onModalClose, ...otherProps }) {
+  return (
+    <Modal
+      isOpen={isOpen}
+      onModalClose={onModalClose}
+    >
+      <AddIndexerProxyModalContentConnector
+        {...otherProps}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+AddIndexerProxyModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default AddIndexerProxyModal;
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.css
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.css
@@ -0,0 +1,5 @@
+.indexerProxies {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+}
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContent.js
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import translate from 'Utilities/String/translate';
+import AddIndexerProxyItem from './AddIndexerProxyItem';
+import styles from './AddIndexerProxyModalContent.css';
+
+class AddIndexerProxyModalContent extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isSchemaFetching,
+      isSchemaPopulated,
+      schemaError,
+      schema,
+      onIndexerProxySelect,
+      onModalClose
+    } = this.props;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+        <ModalHeader>
+          Add IndexerProxy
+        </ModalHeader>
+
+        <ModalBody>
+          {
+            isSchemaFetching &&
+              <LoadingIndicator />
+          }
+
+          {
+            !isSchemaFetching && !!schemaError &&
+              <div>
+                {translate('UnableToAddANewIndexerProxyPleaseTryAgain')}
+              </div>
+          }
+
+          {
+            isSchemaPopulated && !schemaError &&
+              <div>
+                <div className={styles.indexerProxies}>
+                  {
+                    schema.map((indexerProxy) => {
+                      return (
+                        <AddIndexerProxyItem
+                          key={indexerProxy.implementation}
+                          implementation={indexerProxy.implementation}
+                          {...indexerProxy}
+                          onIndexerProxySelect={onIndexerProxySelect}
+                        />
+                      );
+                    })
+                  }
+                </div>
+              </div>
+          }
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            onPress={onModalClose}
+          >
+            {translate('Close')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+AddIndexerProxyModalContent.propTypes = {
+  isSchemaFetching: PropTypes.bool.isRequired,
+  isSchemaPopulated: PropTypes.bool.isRequired,
+  schemaError: PropTypes.object,
+  schema: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onIndexerProxySelect: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default AddIndexerProxyModalContent;
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContentConnector.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyModalContentConnector.js
@@ -0,0 +1,70 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchIndexerProxySchema, selectIndexerProxySchema } from 'Store/Actions/settingsActions';
+import AddIndexerProxyModalContent from './AddIndexerProxyModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.indexerProxies,
+    (indexerProxies) => {
+      const {
+        isSchemaFetching,
+        isSchemaPopulated,
+        schemaError,
+        schema
+      } = indexerProxies;
+
+      return {
+        isSchemaFetching,
+        isSchemaPopulated,
+        schemaError,
+        schema
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  fetchIndexerProxySchema,
+  selectIndexerProxySchema
+};
+
+class AddIndexerProxyModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.fetchIndexerProxySchema();
+  }
+
+  //
+  // Listeners
+
+  onIndexerProxySelect = ({ implementation, name }) => {
+    this.props.selectIndexerProxySchema({ implementation, presetName: name });
+    this.props.onModalClose({ indexerProxySelected: true });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <AddIndexerProxyModalContent
+        {...this.props}
+        onIndexerProxySelect={this.onIndexerProxySelect}
+      />
+    );
+  }
+}
+
+AddIndexerProxyModalContentConnector.propTypes = {
+  fetchIndexerProxySchema: PropTypes.func.isRequired,
+  selectIndexerProxySchema: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(AddIndexerProxyModalContentConnector);
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyPresetMenuItem.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyPresetMenuItem.js
@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import MenuItem from 'Components/Menu/MenuItem';
+
+class AddIndexerProxyPresetMenuItem extends Component {
+
+  //
+  // Listeners
+
+  onPress = () => {
+    const {
+      name,
+      implementation
+    } = this.props;
+
+    this.props.onPress({
+      name,
+      implementation
+    });
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      name,
+      implementation,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <MenuItem
+        {...otherProps}
+        onPress={this.onPress}
+      >
+        {name}
+      </MenuItem>
+    );
+  }
+}
+
+AddIndexerProxyPresetMenuItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  implementation: PropTypes.string.isRequired,
+  onPress: PropTypes.func.isRequired
+};
+
+export default AddIndexerProxyPresetMenuItem;
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModal.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModal.js
@@ -0,0 +1,27 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import EditIndexerProxyModalContentConnector from './EditIndexerProxyModalContentConnector';
+
+function EditIndexerProxyModal({ isOpen, onModalClose, ...otherProps }) {
+  return (
+    <Modal
+      size={sizes.MEDIUM}
+      isOpen={isOpen}
+      onModalClose={onModalClose}
+    >
+      <EditIndexerProxyModalContentConnector
+        {...otherProps}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+EditIndexerProxyModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default EditIndexerProxyModal;
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalConnector.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalConnector.js
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import { cancelSaveIndexerProxy, cancelTestIndexerProxy } from 'Store/Actions/settingsActions';
+import EditIndexerProxyModal from './EditIndexerProxyModal';
+
+function createMapDispatchToProps(dispatch, props) {
+  const section = 'settings.indexerProxies';
+
+  return {
+    dispatchClearPendingChanges() {
+      dispatch(clearPendingChanges({ section }));
+    },
+
+    dispatchCancelTestIndexerProxy() {
+      dispatch(cancelTestIndexerProxy({ section }));
+    },
+
+    dispatchCancelSaveIndexerProxy() {
+      dispatch(cancelSaveIndexerProxy({ section }));
+    }
+  };
+}
+
+class EditIndexerProxyModalConnector extends Component {
+
+  //
+  // Listeners
+
+  onModalClose = () => {
+    this.props.dispatchClearPendingChanges();
+    this.props.dispatchCancelTestIndexerProxy();
+    this.props.dispatchCancelSaveIndexerProxy();
+    this.props.onModalClose();
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      dispatchClearPendingChanges,
+      dispatchCancelTestIndexerProxy,
+      dispatchCancelSaveIndexerProxy,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <EditIndexerProxyModal
+        {...otherProps}
+        onModalClose={this.onModalClose}
+      />
+    );
+  }
+}
+
+EditIndexerProxyModalConnector.propTypes = {
+  onModalClose: PropTypes.func.isRequired,
+  dispatchClearPendingChanges: PropTypes.func.isRequired,
+  dispatchCancelTestIndexerProxy: PropTypes.func.isRequired,
+  dispatchCancelSaveIndexerProxy: PropTypes.func.isRequired
+};
+
+export default connect(null, createMapDispatchToProps)(EditIndexerProxyModalConnector);
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.css
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.css
@@ -0,0 +1,11 @@
+.deleteButton {
+  composes: button from '~Components/Link/Button.css';
+
+  margin-right: auto;
+}
+
+.message {
+  composes: alert from '~Components/Alert.css';
+
+  margin-bottom: 30px;
+}
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js
@@ -0,0 +1,175 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Alert from 'Components/Alert';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
+import Button from 'Components/Link/Button';
+import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './EditIndexerProxyModalContent.css';
+
+function EditIndexerProxyModalContent(props) {
+  const {
+    advancedSettings,
+    isFetching,
+    error,
+    isSaving,
+    isTesting,
+    saveError,
+    item,
+    onInputChange,
+    onFieldChange,
+    onModalClose,
+    onSavePress,
+    onTestPress,
+    onDeleteIndexerProxyPress,
+    ...otherProps
+  } = props;
+
+  const {
+    id,
+    implementationName,
+    name,
+    tags,
+    fields,
+    message
+  } = item;
+
+  return (
+    <ModalContent onModalClose={onModalClose}>
+      <ModalHeader>
+        {`${id ? 'Edit' : 'Add'} Proxy - ${implementationName}`}
+      </ModalHeader>
+
+      <ModalBody>
+        {
+          isFetching &&
+            <LoadingIndicator />
+        }
+
+        {
+          !isFetching && !!error &&
+            <div>
+              {translate('UnableToAddANewIndexerProxyPleaseTryAgain')}
+            </div>
+        }
+
+        {
+          !isFetching && !error &&
+            <Form {...otherProps}>
+              {
+                !!message &&
+                  <Alert
+                    className={styles.message}
+                    kind={message.value.type}
+                  >
+                    {message.value.message}
+                  </Alert>
+              }
+
+              <FormGroup>
+                <FormLabel>{translate('Name')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.TEXT}
+                  name="name"
+                  {...name}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('Tags')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.TAG}
+                  name="tags"
+                  helpText={translate('TagsHelpText')}
+                  {...tags}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              {
+                fields.map((field) => {
+                  return (
+                    <ProviderFieldFormGroup
+                      key={field.name}
+                      advancedSettings={advancedSettings}
+                      provider="indexerProxy"
+                      providerData={item}
+                      section="settings.indexerProxies"
+                      {...field}
+                      onChange={onFieldChange}
+                    />
+                  );
+                })
+              }
+
+            </Form>
+        }
+      </ModalBody>
+      <ModalFooter>
+        {
+          id &&
+            <Button
+              className={styles.deleteButton}
+              kind={kinds.DANGER}
+              onPress={onDeleteIndexerProxyPress}
+            >
+              {translate('Delete')}
+            </Button>
+        }
+
+        <SpinnerErrorButton
+          isSpinning={isTesting}
+          error={saveError}
+          onPress={onTestPress}
+        >
+          {translate('Test')}
+        </SpinnerErrorButton>
+
+        <Button
+          onPress={onModalClose}
+        >
+          {translate('Cancel')}
+        </Button>
+
+        <SpinnerErrorButton
+          isSpinning={isSaving}
+          error={saveError}
+          onPress={onSavePress}
+        >
+          {translate('Save')}
+        </SpinnerErrorButton>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+EditIndexerProxyModalContent.propTypes = {
+  advancedSettings: PropTypes.bool.isRequired,
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  isSaving: PropTypes.bool.isRequired,
+  isTesting: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  item: PropTypes.object.isRequired,
+  onInputChange: PropTypes.func.isRequired,
+  onFieldChange: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired,
+  onSavePress: PropTypes.func.isRequired,
+  onTestPress: PropTypes.func.isRequired,
+  onDeleteIndexerProxyPress: PropTypes.func
+};
+
+export default EditIndexerProxyModalContent;
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContentConnector.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContentConnector.js
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { saveIndexerProxy, setIndexerProxyFieldValue, setIndexerProxyValue, testIndexerProxy } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
+import EditIndexerProxyModalContent from './EditIndexerProxyModalContent';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.advancedSettings,
+    createProviderSettingsSelector('indexerProxies'),
+    (advancedSettings, indexerProxy) => {
+      return {
+        advancedSettings,
+        ...indexerProxy
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  setIndexerProxyValue,
+  setIndexerProxyFieldValue,
+  saveIndexerProxy,
+  testIndexerProxy
+};
+
+class EditIndexerProxyModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
+      this.props.onModalClose();
+    }
+  }
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    this.props.setIndexerProxyValue({ name, value });
+  }
+
+  onFieldChange = ({ name, value }) => {
+    this.props.setIndexerProxyFieldValue({ name, value });
+  }
+
+  onSavePress = () => {
+    this.props.saveIndexerProxy({ id: this.props.id });
+  }
+
+  onTestPress = () => {
+    this.props.testIndexerProxy({ id: this.props.id });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EditIndexerProxyModalContent
+        {...this.props}
+        onSavePress={this.onSavePress}
+        onTestPress={this.onTestPress}
+        onInputChange={this.onInputChange}
+        onFieldChange={this.onFieldChange}
+      />
+    );
+  }
+}
+
+EditIndexerProxyModalContentConnector.propTypes = {
+  id: PropTypes.number,
+  isFetching: PropTypes.bool.isRequired,
+  isSaving: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  item: PropTypes.object.isRequired,
+  setIndexerProxyValue: PropTypes.func.isRequired,
+  setIndexerProxyFieldValue: PropTypes.func.isRequired,
+  saveIndexerProxy: PropTypes.func.isRequired,
+  testIndexerProxy: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EditIndexerProxyModalContentConnector);
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.css
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.css
@@ -0,0 +1,20 @@
+.indexerProxies {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.addIndexerProxy {
+  composes: indexerProxy from '~./IndexerProxy.css';
+
+  background-color: $cardAlternateBackgroundColor;
+  color: $gray;
+  text-align: center;
+}
+
+.center {
+  display: inline-block;
+  padding: 5px 20px 0;
+  border: 1px solid $borderColor;
+  border-radius: 4px;
+  background-color: $white;
+}
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxies.js
@@ -0,0 +1,121 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import FieldSet from 'Components/FieldSet';
+import Icon from 'Components/Icon';
+import PageSectionContent from 'Components/Page/PageSectionContent';
+import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import AddIndexerProxyModal from './AddIndexerProxyModal';
+import EditIndexerProxyModalConnector from './EditIndexerProxyModalConnector';
+import IndexerProxy from './IndexerProxy';
+import styles from './IndexerProxies.css';
+
+class IndexerProxies extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isAddIndexerProxyModalOpen: false,
+      isEditIndexerProxyModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onAddIndexerProxyPress = () => {
+    this.setState({ isAddIndexerProxyModalOpen: true });
+  }
+
+  onAddIndexerProxyModalClose = ({ indexerProxySelected = false } = {}) => {
+    this.setState({
+      isAddIndexerProxyModalOpen: false,
+      isEditIndexerProxyModalOpen: indexerProxySelected
+    });
+  }
+
+  onEditIndexerProxyModalClose = () => {
+    this.setState({ isEditIndexerProxyModalOpen: false });
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      items,
+      tagList,
+      indexerList,
+      onConfirmDeleteIndexerProxy,
+      ...otherProps
+    } = this.props;
+
+    const {
+      isAddIndexerProxyModalOpen,
+      isEditIndexerProxyModalOpen
+    } = this.state;
+
+    return (
+      <FieldSet legend={translate('Indexer Proxies')}>
+        <PageSectionContent
+          errorMessage={translate('UnableToLoadIndexerProxies')}
+          {...otherProps}
+        >
+          <div className={styles.indexerProxies}>
+            {
+              items.map((item) => {
+                return (
+                  <IndexerProxy
+                    key={item.id}
+                    {...item}
+                    tagList={tagList}
+                    indexerList={indexerList}
+                    onConfirmDeleteIndexerProxy={onConfirmDeleteIndexerProxy}
+                  />
+                );
+              })
+            }
+
+            <Card
+              className={styles.addIndexerProxy}
+              onPress={this.onAddIndexerProxyPress}
+            >
+              <div className={styles.center}>
+                <Icon
+                  name={icons.ADD}
+                  size={45}
+                />
+              </div>
+            </Card>
+          </div>
+
+          <AddIndexerProxyModal
+            isOpen={isAddIndexerProxyModalOpen}
+            onModalClose={this.onAddIndexerProxyModalClose}
+          />
+
+          <EditIndexerProxyModalConnector
+            isOpen={isEditIndexerProxyModalOpen}
+            onModalClose={this.onEditIndexerProxyModalClose}
+          />
+        </PageSectionContent>
+      </FieldSet>
+    );
+  }
+}
+
+IndexerProxies.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
+  indexerList: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onConfirmDeleteIndexerProxy: PropTypes.func.isRequired
+};
+
+export default IndexerProxies;
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { deleteIndexerProxy, fetchIndexerProxies } from 'Store/Actions/settingsActions';
+import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
+import createTagsSelector from 'Store/Selectors/createTagsSelector';
+import sortByName from 'Utilities/Array/sortByName';
+import IndexerProxies from './IndexerProxies';
+
+function createMapStateToProps() {
+  return createSelector(
+    createSortedSectionSelector('settings.indexerProxies', sortByName),
+    createSortedSectionSelector('indexers', sortByName),
+    createTagsSelector(),
+    (indexerProxies, indexers, tagList) => {
+      return {
+        ...indexerProxies,
+        indexerList: indexers.items,
+        tagList
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  fetchIndexerProxies,
+  deleteIndexerProxy
+};
+
+class IndexerProxiesConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    this.props.fetchIndexerProxies();
+  }
+
+  //
+  // Listeners
+
+  onConfirmDeleteIndexerProxy = (id) => {
+    this.props.deleteIndexerProxy({ id });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <IndexerProxies
+        {...this.props}
+        onConfirmDeleteIndexerProxy={this.onConfirmDeleteIndexerProxy}
+      />
+    );
+  }
+}
+
+IndexerProxiesConnector.propTypes = {
+  fetchIndexerProxies: PropTypes.func.isRequired,
+  deleteIndexerProxy: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(IndexerProxiesConnector);
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.css
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.css
@@ -0,0 +1,23 @@
+.indexerProxy {
+  composes: card from '~Components/Card.css';
+
+  width: 290px;
+}
+
+.name {
+  @add-mixin truncate;
+
+  margin-bottom: 20px;
+  font-weight: 300;
+  font-size: 24px;
+}
+
+.indexers {
+  flex: 1 0 auto;
+}
+
+.enabled {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 5px;
+}
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
@@ -0,0 +1,144 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Card from 'Components/Card';
+import Label from 'Components/Label';
+import ConfirmModal from 'Components/Modal/ConfirmModal';
+import TagList from 'Components/TagList';
+import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import EditIndexerProxyModalConnector from './EditIndexerProxyModalConnector';
+import styles from './IndexerProxy.css';
+
+class IndexerProxy extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isEditIndexerProxyModalOpen: false,
+      isDeleteIndexerProxyModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onEditIndexerProxyPress = () => {
+    this.setState({ isEditIndexerProxyModalOpen: true });
+  }
+
+  onEditIndexerProxyModalClose = () => {
+    this.setState({ isEditIndexerProxyModalOpen: false });
+  }
+
+  onDeleteIndexerProxyPress = () => {
+    this.setState({
+      isEditIndexerProxyModalOpen: false,
+      isDeleteIndexerProxyModalOpen: true
+    });
+  }
+
+  onDeleteIndexerProxyModalClose= () => {
+    this.setState({ isDeleteIndexerProxyModalOpen: false });
+  }
+
+  onConfirmDeleteIndexerProxy = () => {
+    this.props.onConfirmDeleteIndexerProxy(this.props.id);
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      id,
+      name,
+      tags,
+      tagList,
+      indexerList
+    } = this.props;
+
+    return (
+      <Card
+        className={styles.indexerProxy}
+        overlayContent={true}
+        onPress={this.onEditIndexerProxyPress}
+      >
+        <div className={styles.name}>
+          {name}
+        </div>
+
+        <TagList
+          tags={tags}
+          tagList={tagList}
+        />
+
+        <div className={styles.indexers}>
+          {
+            tags.map((t) => {
+              const indexers = _.filter(indexerList, { tags: [t] });
+
+              if (!indexers || indexers.length === 0) {
+                return null;
+              }
+
+              return indexers.map((i) => {
+                return (
+                  <Label
+                    key={i.name}
+                    kind={kinds.SUCCESS}
+                  >
+                    {i.name}
+                  </Label>
+                );
+              });
+            })
+          }
+        </div>
+
+        {
+          !tags || tags.length === 0 ?
+            <Label
+              kind={kinds.DISABLED}
+              outline={true}
+            >
+              Disabled
+            </Label> :
+            null
+        }
+
+        <EditIndexerProxyModalConnector
+          id={id}
+          isOpen={this.state.isEditIndexerProxyModalOpen}
+          onModalClose={this.onEditIndexerProxyModalClose}
+          onDeleteIndexerProxyPress={this.onDeleteIndexerProxyPress}
+        />
+
+        <ConfirmModal
+          isOpen={this.state.isDeleteIndexerProxyModalOpen}
+          kind={kinds.DANGER}
+          title={translate('DeleteIndexerProxy')}
+          message={translate('DeleteIndexerProxyMessageText', [name])}
+          confirmLabel={translate('Delete')}
+          onConfirm={this.onConfirmDeleteIndexerProxy}
+          onCancel={this.onDeleteIndexerProxyModalClose}
+        />
+      </Card>
+    );
+  }
+}
+
+IndexerProxy.propTypes = {
+  id: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  tags: PropTypes.arrayOf(PropTypes.number).isRequired,
+  tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
+  indexerList: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onConfirmDeleteIndexerProxy: PropTypes.func.isRequired
+};
+
+export default IndexerProxy;
--- a/frontend/src/Settings/Indexers/IndexerSettings.js
+++ b/frontend/src/Settings/Indexers/IndexerSettings.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import translate from 'Utilities/String/translate';
+import IndexerProxiesConnector from './IndexerProxies/IndexerProxiesConnector';
+
+function IndexerSettings() {
+  return (
+    <PageContent title={translate('Proxies')}>
+      <SettingsToolbarConnector
+        showSave={false}
+      />
+
+      <PageContentBody>
+        <IndexerProxiesConnector />
+      </PageContentBody>
+    </PageContent>
+  );
+}
+
+export default IndexerSettings;
--- a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js
@@ -1,47 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import titleCase from 'Utilities/String/titleCase';
-
-function TagDetailsDelayProfile(props) {
-  const {
-    preferredProtocol,
-    enableUsenet,
-    enableTorrent,
-    usenetDelay,
-    torrentDelay
-  } = props;
-
-  return (
-    <div>
-      <div>
-        Protocol: {titleCase(preferredProtocol)}
-      </div>
-
-      <div>
-        {
-          enableUsenet ?
-            `Usenet Delay: ${usenetDelay}` :
-            'Usenet disabled'
-        }
-      </div>
-
-      <div>
-        {
-          enableTorrent ?
-            `Torrent Delay: ${torrentDelay}` :
-            'Torrents disabled'
-        }
-      </div>
-    </div>
-  );
-}
-
-TagDetailsDelayProfile.propTypes = {
-  preferredProtocol: PropTypes.string.isRequired,
-  enableUsenet: PropTypes.bool.isRequired,
-  enableTorrent: PropTypes.bool.isRequired,
-  usenetDelay: PropTypes.number.isRequired,
-  torrentDelay: PropTypes.number.isRequired
-};
-
-export default TagDetailsDelayProfile;
--- a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
@@ -1,26 +1,22 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import FieldSet from 'Components/FieldSet';
-import Label from 'Components/Label';
 import Button from 'Components/Link/Button';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { kinds } from 'Helpers/Props';
-import split from 'Utilities/String/split';
 import translate from 'Utilities/String/translate';
-import TagDetailsDelayProfile from './TagDetailsDelayProfile';
 import styles from './TagDetailsModalContent.css';

 function TagDetailsModalContent(props) {
  const {
    label,
    isTagUsed,
-    movies,
-    delayProfiles,
+    indexers,
    notifications,
-    restrictions,
+    indexerProxies,
    onModalClose,
    onDeleteTagPress
  } = props;
@@ -40,13 +36,13 @@ function TagDetailsModalContent(props) {
        }

        {
-          !!movies.length &&
-            <FieldSet legend={translate('Movies')}>
+          !!indexers.length &&
+            <FieldSet legend={translate('Indexers')}>
              {
-                movies.map((item) => {
+                indexers.map((item) => {
                  return (
                    <div key={item.id}>
-                      {item.title}
+                      {item.name}
                    </div>
                  );
                })
@@ -54,35 +50,6 @@ function TagDetailsModalContent(props) {
            </FieldSet>
        }

-        {
-          !!delayProfiles.length &&
-            <FieldSet legend={translate('DelayProfile')}>
-              {
-                delayProfiles.map((item) => {
-                  const {
-                    id,
-                    preferredProtocol,
-                    enableUsenet,
-                    enableTorrent,
-                    usenetDelay,
-                    torrentDelay
-                  } = item;
-
-                  return (
-                    <TagDetailsDelayProfile
-                      key={id}
-                      preferredProtocol={preferredProtocol}
-                      enableUsenet={enableUsenet}
-                      enableTorrent={enableTorrent}
-                      usenetDelay={usenetDelay}
-                      torrentDelay={torrentDelay}
-                    />
-                  );
-                })
-              }
-            </FieldSet>
-        }
-
        {
          !!notifications.length &&
            <FieldSet legend={translate('Connections')}>
@@ -99,44 +66,13 @@ function TagDetailsModalContent(props) {
        }

        {
-          !!restrictions.length &&
-            <FieldSet legend={translate('Restrictions')}>
+          !!indexerProxies.length &&
+            <FieldSet legend={translate('Indexer Proxies')}>
              {
-                restrictions.map((item) => {
+                indexerProxies.map((item) => {
                  return (
-                    <div
-                      key={item.id}
-                      className={styles.restriction}
-                    >
-                      <div>
-                        {
-                          split(item.required).map((r) => {
-                            return (
-                              <Label
-                                key={r}
-                                kind={kinds.SUCCESS}
-                              >
-                                {r}
-                              </Label>
-                            );
-                          })
-                        }
-                      </div>
-
-                      <div>
-                        {
-                          split(item.ignored).map((i) => {
-                            return (
-                              <Label
-                                key={i}
-                                kind={kinds.DANGER}
-                              >
-                                {i}
-                              </Label>
-                            );
-                          })
-                        }
-                      </div>
+                    <div key={item.id}>
+                      {item.name}
                    </div>
                  );
                })
@@ -171,10 +107,9 @@ function TagDetailsModalContent(props) {
 TagDetailsModalContent.propTypes = {
  label: PropTypes.string.isRequired,
  isTagUsed: PropTypes.bool.isRequired,
-  movies: PropTypes.arrayOf(PropTypes.object).isRequired,
-  delayProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
+  indexers: PropTypes.arrayOf(PropTypes.object).isRequired,
  notifications: PropTypes.arrayOf(PropTypes.object).isRequired,
-  restrictions: PropTypes.arrayOf(PropTypes.object).isRequired,
+  indexerProxies: PropTypes.arrayOf(PropTypes.object).isRequired,
  onModalClose: PropTypes.func.isRequired,
  onDeleteTagPress: PropTypes.func.isRequired
 };
--- a/frontend/src/Settings/Tags/Details/TagDetailsModalContentConnector.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContentConnector.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
 import TagDetailsModalContent from './TagDetailsModalContent';

 function findMatchingItems(ids, items) {
@@ -9,35 +8,15 @@ function findMatchingItems(ids, items) {
  });
 }

-function createUnorderedMatchingMoviesSelector() {
+function createMatchingIndexersSelector() {
  return createSelector(
    (state, { indexerIds }) => indexerIds,
-    createAllIndexersSelector(),
+    (state) => state.indexers.items,
    findMatchingItems
  );
 }

-function createMatchingMoviesSelector() {
-  return createSelector(
-    createUnorderedMatchingMoviesSelector(),
-    (movies) => {
-      return movies.sort((movieA, movieB) => {
-        const sortTitleA = movieA.sortTitle;
-        const sortTitleB = movieB.sortTitle;
-
-        if (sortTitleA > sortTitleB) {
-          return 1;
-        } else if (sortTitleA < sortTitleB) {
-          return -1;
-        }
-
-        return 0;
-      });
-    }
-  );
-}
-
-function createMatchingNotificationsSelector() {
+function createMatchingIndexerProxiesSelector() {
  return createSelector(
    (state, { notificationIds }) => notificationIds,
    (state) => state.settings.notifications.items,
@@ -45,13 +24,23 @@ function createMatchingNotificationsSelector() {
  );
 }

+function createMatchingNotificationsSelector() {
+  return createSelector(
+    (state, { indexerProxyIds }) => indexerProxyIds,
+    (state) => state.settings.indexerProxies.items,
+    findMatchingItems
+  );
+}
+
 function createMapStateToProps() {
  return createSelector(
-    createMatchingMoviesSelector(),
+    createMatchingIndexersSelector(),
+    createMatchingIndexerProxiesSelector(),
    createMatchingNotificationsSelector(),
-    (movies, notifications) => {
+    (indexers, indexerProxies, notifications) => {
      return {
-        movies,
+        indexers,
+        indexerProxies,
        notifications
      };
    }
--- a/frontend/src/Settings/Tags/Tag.js
+++ b/frontend/src/Settings/Tags/Tag.js
@@ -53,11 +53,9 @@ class Tag extends Component {
  render() {
    const {
      label,
-      delayProfileIds,
      notificationIds,
-      restrictionIds,
-      importListIds,
-      movieIds
+      indexerIds,
+      indexerProxyIds
    } = this.props;

    const {
@@ -66,11 +64,9 @@ class Tag extends Component {
    } = this.state;

    const isTagUsed = !!(
-      delayProfileIds.length ||
+      indexerIds.length ||
      notificationIds.length ||
-      restrictionIds.length ||
-      importListIds.length ||
-      movieIds.length
+      indexerProxyIds.length
    );

    return (
@@ -87,16 +83,9 @@ class Tag extends Component {
          isTagUsed &&
            <div>
              {
-                !!movieIds.length &&
+                !!indexerIds.length &&
                  <div>
-                    {movieIds.length} movies
-                  </div>
-              }
-
-              {
-                !!delayProfileIds.length &&
-                  <div>
-                    {delayProfileIds.length} delay profile{delayProfileIds.length > 1 && 's'}
+                    {indexerIds.length} indexer{indexerIds.length > 1 && 's'}
                  </div>
              }

@@ -108,16 +97,9 @@ class Tag extends Component {
              }

              {
-                !!restrictionIds.length &&
+                !!indexerProxyIds.length &&
                  <div>
-                    {restrictionIds.length} restriction{restrictionIds.length > 1 && 's'}
-                  </div>
-              }
-
-              {
-                !!importListIds.length &&
-                  <div>
-                    {importListIds.length} list{importListIds.length > 1 && 's'}
+                    {indexerProxyIds.length} indexerProxy{indexerProxyIds.length > 1 && 's'}
                  </div>
              }
            </div>
@@ -133,11 +115,9 @@ class Tag extends Component {
        <TagDetailsModal
          label={label}
          isTagUsed={isTagUsed}
-          movieIds={movieIds}
-          delayProfileIds={delayProfileIds}
+          indexerIds={indexerIds}
          notificationIds={notificationIds}
-          restrictionIds={restrictionIds}
-          importListIds={importListIds}
+          indexerProxyIds={indexerProxyIds}
          isOpen={isDetailsModalOpen}
          onModalClose={this.onDetailsModalClose}
          onDeleteTagPress={this.onDeleteTagPress}
@@ -160,20 +140,16 @@ class Tag extends Component {
 Tag.propTypes = {
  id: PropTypes.number.isRequired,
  label: PropTypes.string.isRequired,
-  delayProfileIds: PropTypes.arrayOf(PropTypes.number).isRequired,
  notificationIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  restrictionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  importListIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  movieIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  indexerIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  indexerProxyIds: PropTypes.arrayOf(PropTypes.number).isRequired,
  onConfirmDeleteTag: PropTypes.func.isRequired
 };

 Tag.defaultProps = {
-  delayProfileIds: [],
+  indexerIds: [],
  notificationIds: [],
-  restrictionIds: [],
-  importListIds: [],
-  movieIds: []
+  indexerProxyIds: []
 };

 export default Tag;
--- a/frontend/src/Settings/Tags/TagsConnector.js
+++ b/frontend/src/Settings/Tags/TagsConnector.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { fetchNotifications } from 'Store/Actions/settingsActions';
+import { fetchIndexerProxies, fetchNotifications } from 'Store/Actions/settingsActions';
 import { fetchTagDetails } from 'Store/Actions/tagActions';
 import Tags from './Tags';

@@ -26,7 +26,8 @@ function createMapStateToProps() {

 const mapDispatchToProps = {
  dispatchFetchTagDetails: fetchTagDetails,
-  dispatchFetchNotifications: fetchNotifications
+  dispatchFetchNotifications: fetchNotifications,
+  dispatchFetchIndexerProxies: fetchIndexerProxies
 };

 class MetadatasConnector extends Component {
@@ -37,11 +38,13 @@ class MetadatasConnector extends Component {
  componentDidMount() {
    const {
      dispatchFetchTagDetails,
-      dispatchFetchNotifications
+      dispatchFetchNotifications,
+      dispatchFetchIndexerProxies
    } = this.props;

    dispatchFetchTagDetails();
    dispatchFetchNotifications();
+    dispatchFetchIndexerProxies();
  }

  //
@@ -58,7 +61,8 @@ class MetadatasConnector extends Component {

 MetadatasConnector.propTypes = {
  dispatchFetchTagDetails: PropTypes.func.isRequired,
-  dispatchFetchNotifications: PropTypes.func.isRequired
+  dispatchFetchNotifications: PropTypes.func.isRequired,
+  dispatchFetchIndexerProxies: PropTypes.func.isRequired
 };

 export default connect(createMapStateToProps, mapDispatchToProps)(MetadatasConnector);
--- a/frontend/src/Store/Actions/Settings/indexerProxies.js
+++ b/frontend/src/Store/Actions/Settings/indexerProxies.js
@@ -0,0 +1,110 @@
+import { createAction } from 'redux-actions';
+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 createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
+import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
+import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import { createThunk } from 'Store/thunks';
+import selectProviderSchema from 'Utilities/State/selectProviderSchema';
+
+//
+// Variables
+
+const section = 'settings.indexerProxies';
+
+//
+// Actions Types
+
+export const FETCH_INDEXER_PROXYS = 'settings/indexerProxies/fetchIndexerProxies';
+export const FETCH_INDEXER_PROXY_SCHEMA = 'settings/indexerProxies/fetchIndexerProxySchema';
+export const SELECT_INDEXER_PROXY_SCHEMA = 'settings/indexerProxies/selectIndexerProxySchema';
+export const SET_INDEXER_PROXY_VALUE = 'settings/indexerProxies/setIndexerProxyValue';
+export const SET_INDEXER_PROXY_FIELD_VALUE = 'settings/indexerProxies/setIndexerProxyFieldValue';
+export const SAVE_INDEXER_PROXY = 'settings/indexerProxies/saveIndexerProxy';
+export const CANCEL_SAVE_INDEXER_PROXY = 'settings/indexerProxies/cancelSaveIndexerProxy';
+export const DELETE_INDEXER_PROXY = 'settings/indexerProxies/deleteIndexerProxy';
+export const TEST_INDEXER_PROXY = 'settings/indexerProxies/testIndexerProxy';
+export const CANCEL_TEST_INDEXER_PROXY = 'settings/indexerProxies/cancelTestIndexerProxy';
+
+//
+// Action Creators
+
+export const fetchIndexerProxies = createThunk(FETCH_INDEXER_PROXYS);
+export const fetchIndexerProxySchema = createThunk(FETCH_INDEXER_PROXY_SCHEMA);
+export const selectIndexerProxySchema = createAction(SELECT_INDEXER_PROXY_SCHEMA);
+
+export const saveIndexerProxy = createThunk(SAVE_INDEXER_PROXY);
+export const cancelSaveIndexerProxy = createThunk(CANCEL_SAVE_INDEXER_PROXY);
+export const deleteIndexerProxy = createThunk(DELETE_INDEXER_PROXY);
+export const testIndexerProxy = createThunk(TEST_INDEXER_PROXY);
+export const cancelTestIndexerProxy = createThunk(CANCEL_TEST_INDEXER_PROXY);
+
+export const setIndexerProxyValue = createAction(SET_INDEXER_PROXY_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+export const setIndexerProxyFieldValue = createAction(SET_INDEXER_PROXY_FIELD_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+//
+// Details
+
+export default {
+
+  //
+  // State
+
+  defaultState: {
+    isFetching: false,
+    isPopulated: false,
+    error: null,
+    isSchemaFetching: false,
+    isSchemaPopulated: false,
+    schemaError: null,
+    schema: [],
+    selectedSchema: {},
+    isSaving: false,
+    saveError: null,
+    isTesting: false,
+    items: [],
+    pendingChanges: {}
+  },
+
+  //
+  // Action Handlers
+
+  actionHandlers: {
+    [FETCH_INDEXER_PROXYS]: createFetchHandler(section, '/indexerProxy'),
+    [FETCH_INDEXER_PROXY_SCHEMA]: createFetchSchemaHandler(section, '/indexerProxy/schema'),
+
+    [SAVE_INDEXER_PROXY]: createSaveProviderHandler(section, '/indexerProxy'),
+    [CANCEL_SAVE_INDEXER_PROXY]: createCancelSaveProviderHandler(section),
+    [DELETE_INDEXER_PROXY]: createRemoveItemHandler(section, '/indexerProxy'),
+    [TEST_INDEXER_PROXY]: createTestProviderHandler(section, '/indexerProxy'),
+    [CANCEL_TEST_INDEXER_PROXY]: createCancelTestProviderHandler(section)
+  },
+
+  //
+  // Reducers
+
+  reducers: {
+    [SET_INDEXER_PROXY_VALUE]: createSetSettingValueReducer(section),
+    [SET_INDEXER_PROXY_FIELD_VALUE]: createSetProviderFieldValueReducer(section),
+
+    [SELECT_INDEXER_PROXY_SCHEMA]: (state, { payload }) => {
+      return selectProviderSchema(state, section, payload, (selectedSchema) => {
+        return selectedSchema;
+      });
+    }
+  }
+
+};
--- a/frontend/src/Store/Actions/settingsActions.js
+++ b/frontend/src/Store/Actions/settingsActions.js
@@ -7,6 +7,7 @@ import development from './Settings/development';
 import downloadClients from './Settings/downloadClients';
 import general from './Settings/general';
 import indexerCategories from './Settings/indexerCategories';
+import indexerProxies from './Settings/indexerProxies';
 import languages from './Settings/languages';
 import notifications from './Settings/notifications';
 import ui from './Settings/ui';
@@ -14,6 +15,7 @@ import ui from './Settings/ui';
 export * from './Settings/downloadClients';
 export * from './Settings/general';
 export * from './Settings/indexerCategories';
+export * from './Settings/indexerProxies';
 export * from './Settings/languages';
 export * from './Settings/notifications';
 export * from './Settings/applications';
@@ -35,6 +37,7 @@ export const defaultState = {
  downloadClients: downloadClients.defaultState,
  general: general.defaultState,
  indexerCategories: indexerCategories.defaultState,
+  indexerProxies: indexerProxies.defaultState,
  languages: languages.defaultState,
  notifications: notifications.defaultState,
  applications: applications.defaultState,
@@ -64,6 +67,7 @@ export const actionHandlers = handleThunks({
  ...downloadClients.actionHandlers,
  ...general.actionHandlers,
  ...indexerCategories.actionHandlers,
+  ...indexerProxies.actionHandlers,
  ...languages.actionHandlers,
  ...notifications.actionHandlers,
  ...applications.actionHandlers,
@@ -84,6 +88,7 @@ export const reducers = createHandleActions({
  ...downloadClients.reducers,
  ...general.reducers,
  ...indexerCategories.reducers,
+  ...indexerProxies.reducers,
  ...languages.reducers,
  ...notifications.reducers,
  ...applications.reducers,