Fixed: (AvistaZ) Improve message for failed logins

ignore-downstream

Co-authored-by: Appoxo <appoxo@appoxo.de>
Co-authored-by: David Molero <contact@dolvem.com>
Co-authored-by: Havok Dan <havokdan@yahoo.com.br>
Co-authored-by: Patatra <patrice.chevreau@gmail.com>
Co-authored-by: Zalhera <tobias.bechen@gmail.com>
Co-authored-by: liimee <git.taaa@fedora.email>
Co-authored-by: resi23 <x-resistant-x@gmx.de>
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/de/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/es/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/fr/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/id/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pt_BR/
Translation: Servarr/Prowlarr

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
+description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
 labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes

.github/label-actions.yml

@@ -4,8 +4,7 @@
   comment: >
     :wave: @{issue-author}, we use the issue tracker exclusively
     for bug reports and feature requests. However, this issue appears
-    to be a support request. Please hop over onto our [Discord](https://prowlarr.com/discord) 
-    or [Subreddit](https://reddit.com/r/prowlarr)
+    to be a support request. Please hop over onto our [Discord](https://prowlarr.com/discord).
   close: true
   close-reason: 'not planned'
 

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://dev.azure.com/Prowlarr/Prowlarr/_apis/build/status/Prowlarr.Prowlarr?branchName=develop)](https://dev.azure.com/Prowlarr/Prowlarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/prowlarr/svg-badge.svg)](https://translate.servarr.com/engage/prowlarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation#docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hotio/prowlarr.svg)](https://wiki.servarr.com/prowlarr/installation/docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Prowlarr/Prowlarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Prowlarr/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/Prowlarr/sponsors/badge.svg)](#sponsors)

azure-pipelines.yml

@@ -9,13 +9,13 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.8.4'
+  majorVersion: '1.11.0'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.408'
+  dotnetVersion: '6.0.417'
   nodeVersion: '16.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'

frontend/babel.config.js

@@ -4,14 +4,14 @@ module.exports = {
   plugins: [
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-proposal-optional-chaining', { loose }],
-    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-transform-optional-chaining', { loose }],
+    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
 
     // Stage 2
-    '@babel/plugin-proposal-export-namespace-from',
+    '@babel/plugin-transform-export-namespace-from',
 
     // Stage 3
-    ['@babel/plugin-proposal-class-properties', { loose }],
+    ['@babel/plugin-transform-class-properties', { loose }],
     '@babel/plugin-syntax-dynamic-import'
   ],
   env: {

frontend/src/App/AppUpdatedModalContent.js

@@ -65,12 +65,12 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('AppUpdated', { appName: 'Prowlarr' })}
+        {translate('AppUpdated')}
       </ModalHeader>
 
       <ModalBody>
         <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Prowlarr', version })} blockClassName={styles.version} />
+          <InlineMarkdown data={translate('AppUpdatedVersion', { version })} blockClassName={styles.version} />
         </div>
 
         {

frontend/src/App/ConnectionLostModal.js

@@ -28,11 +28,11 @@ function ConnectionLostModal(props) {
 
         <ModalBody>
           <div>
-            {translate('ConnectionLostToBackend', { appName: 'Prowlarr' })}
+            {translate('ConnectionLostToBackend')}
           </div>
 
           <div className={styles.automatic}>
-            {translate('ConnectionLostReconnect', { appName: 'Prowlarr' })}
+            {translate('ConnectionLostReconnect')}
           </div>
         </ModalBody>
         <ModalFooter>

frontend/src/App/State/AppState.ts

@@ -1,5 +1,7 @@
 import CommandAppState from './CommandAppState';
+import HistoryAppState from './HistoryAppState';
 import IndexerAppState, {
+  IndexerHistoryAppState,
   IndexerIndexAppState,
   IndexerStatusAppState,
 } from './IndexerAppState';
@@ -42,6 +44,8 @@ export interface CustomFilter {
 
 interface AppState {
   commands: CommandAppState;
+  history: HistoryAppState;
+  indexerHistory: IndexerHistoryAppState;
   indexerIndex: IndexerIndexAppState;
   indexerStats: IndexerStatsAppState;
   indexerStatus: IndexerStatusAppState;

frontend/src/App/State/HistoryAppState.ts

@@ -0,0 +1,10 @@
+import AppSectionState from 'App/State/AppSectionState';
+import Column from 'Components/Table/Column';
+import History from 'typings/History';
+
+interface HistoryAppState extends AppSectionState<History> {
+  pageSize: number;
+  columns: Column[];
+}
+
+export default HistoryAppState;

frontend/src/App/State/IndexerAppState.ts

@@ -1,6 +1,7 @@
 import Column from 'Components/Table/Column';
 import SortDirection from 'Helpers/Props/SortDirection';
 import Indexer, { IndexerStatus } from 'Indexer/Indexer';
+import History from 'typings/History';
 import AppSectionState, {
   AppSectionDeleteState,
   AppSectionSaveState,
@@ -34,4 +35,6 @@ interface IndexerAppState
 
 export type IndexerStatusAppState = AppSectionState<IndexerStatus>;
 
+export type IndexerHistoryAppState = AppSectionState<History>;
+
 export default IndexerAppState;

frontend/src/App/State/IndexerStatsAppState.ts

@@ -1,9 +1,11 @@
 import { AppSectionItemState } from 'App/State/AppSectionState';
-import { Filter } from 'App/State/AppState';
+import { Filter, FilterBuilderProp } from 'App/State/AppState';
+import Indexer from 'Indexer/Indexer';
 import { IndexerStats } from 'typings/IndexerStats';
 
 export interface IndexerStatsAppState
   extends AppSectionItemState<IndexerStats> {
+  filterBuilderProps: FilterBuilderProp<Indexer>[];
   selectedFilterKey: string;
   filters: Filter[];
 }

frontend/src/Components/Chart/BarChart.js

@@ -2,6 +2,7 @@ import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { kinds } from 'Helpers/Props';
+import { defaultFontFamily } from 'Styles/Variables/fonts';
 
 function getColors(kind) {
 
@@ -39,7 +40,15 @@ class BarChart extends Component {
         plugins: {
           title: {
             display: true,
-            text: this.props.title
+            align: 'start',
+            text: this.props.title,
+            padding: {
+              bottom: 30
+            },
+            font: {
+              size: 14,
+              family: defaultFontFamily
+            }
           },
           legend: {
             display: this.props.legend

frontend/src/Components/Chart/DoughnutChart.js

@@ -1,6 +1,7 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { defaultFontFamily } from 'Styles/Variables/fonts';
 
 function getColors(kind) {
 
@@ -22,7 +23,15 @@ class DoughnutChart extends Component {
         plugins: {
           title: {
             display: true,
-            text: this.props.title
+            align: 'start',
+            text: this.props.title,
+            padding: {
+              bottom: 30
+            },
+            font: {
+              size: 14,
+              family: defaultFontFamily
+            }
           },
           legend: {
             position: 'bottom'

frontend/src/Components/Chart/StackedBarChart.js

@@ -1,6 +1,7 @@
 import Chart from 'chart.js/auto';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { defaultFontFamily } from 'Styles/Variables/fonts';
 
 function getColors(index) {
 
@@ -36,7 +37,15 @@ class StackedBarChart extends Component {
         plugins: {
           title: {
             display: true,
-            text: this.props.title
+            align: 'start',
+            text: this.props.title,
+            padding: {
+              bottom: 30
+            },
+            font: {
+              size: 14,
+              family: defaultFontFamily
+            }
           }
         }
       },

frontend/src/Components/Filter/Builder/PrivacyFilterBuilderRowValue.js

@@ -3,9 +3,24 @@ import translate from 'Utilities/String/translate';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 const privacyTypes = [
-  { id: 'public', name: translate('Public') },
-  { id: 'private', name: translate('Private') },
-  { id: 'semiPrivate', name: translate('SemiPrivate') }
+  {
+    id: 'public',
+    get name() {
+      return translate('Public');
+    }
+  },
+  {
+    id: 'private',
+    get name() {
+      return translate('Private');
+    }
+  },
+  {
+    id: 'semiPrivate',
+    get name() {
+      return translate('SemiPrivate');
+    }
+  }
 ];
 
 function PrivacyFilterBuilderRowValue(props) {

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -9,6 +9,10 @@
   &:hover {
     background-color: var(--inputHoverBackgroundColor);
   }
+
+  &.isDisabled {
+    cursor: not-allowed;
+  }
 }
 
 .optionCheck {

frontend/src/Components/Form/FormLabel.css

@@ -2,8 +2,10 @@
   display: flex;
   justify-content: flex-end;
   margin-right: $formLabelRightMarginWidth;
+  padding-top: 8px;
+  min-height: 35px;
+  text-align: end;
   font-weight: bold;
-  line-height: 35px;
 }
 
 .hasError {

frontend/src/Components/Form/InfoInput.css

@@ -0,0 +1,13 @@
+.message {
+  composes: alert from '~Components/Alert.css';
+
+  a {
+    color: var(--linkColor);
+    text-decoration: none;
+
+    &:hover {
+      color: var(--linkHoverColor);
+      text-decoration: underline;
+    }
+  }
+}

frontend/src/Components/Form/InfoInput.css.d.ts

@@ -1,7 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'markAsFailedButton': string;
+  'message': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Components/Form/InfoInput.js

@@ -1,5 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
+import { kinds } from 'Helpers/Props';
+import styles from './InfoInput.css';
 
 class InfoInput extends Component {
 
@@ -7,12 +10,15 @@ class InfoInput extends Component {
   // Render
 
   render() {
-    const {
-      value
-    } = this.props;
+    const { value } = this.props;
 
     return (
-      <span dangerouslySetInnerHTML={{ __html: value }} />
+      <Alert
+        kind={kinds.INFO}
+        className={styles.message}
+      >
+        <span dangerouslySetInnerHTML={{ __html: value }} />
+      </Alert>
     );
   }
 }

frontend/src/Components/Modal/ModalContent.js

@@ -3,6 +3,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './ModalContent.css';
 
 function ModalContent(props) {
@@ -28,6 +29,7 @@ function ModalContent(props) {
             <Icon
               name={icons.CLOSE}
               size={18}
+              title={translate('Close')}
             />
           </Link>
       }

frontend/src/Components/Page/Header/PageHeader.js

@@ -78,6 +78,7 @@ class PageHeader extends Component {
             aria-label="Donate"
             to="https://prowlarr.com/donate"
             size={14}
+            title={translate('Donate')}
           />
           <IconButton
             className={styles.translate}

frontend/src/Components/Page/Header/PageHeaderActionsMenu.js

@@ -24,6 +24,7 @@ function PageHeaderActionsMenu(props) {
         <MenuButton className={styles.menuButton} aria-label="Menu Button">
           <Icon
             name={icons.INTERACTIVE}
+            title={translate('Menu')}
           />
         </MenuButton>
 

frontend/src/Components/Table/Cells/RelativeDateCell.js

@@ -1,58 +1,66 @@
 import PropTypes from 'prop-types';
-import React, { PureComponent } from 'react';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import TableRowCell from './TableRowCell';
 import styles from './RelativeDateCell.css';
 
-class RelativeDateCell extends PureComponent {
+function createRelativeDateCellSelector() {
+  return createSelector(createUISettingsSelector(), (uiSettings) => {
+    return {
+      showRelativeDates: uiSettings.showRelativeDates,
+      shortDateFormat: uiSettings.shortDateFormat,
+      longDateFormat: uiSettings.longDateFormat,
+      timeFormat: uiSettings.timeFormat
+    };
+  });
+}
 
+function RelativeDateCell(props) {
   //
   // Render
 
-  render() {
-    const {
-      className,
-      date,
-      includeSeconds,
-      showRelativeDates,
-      shortDateFormat,
-      longDateFormat,
-      timeFormat,
-      component: Component,
-      dispatch,
-      ...otherProps
-    } = this.props;
+  const {
+    className,
+    date,
+    includeSeconds,
+    component: Component,
+    dispatch,
+    ...otherProps
+  } = props;
 
-    if (!date) {
-      return (
-        <Component
-          className={className}
-          {...otherProps}
-        />
-      );
-    }
+  const { showRelativeDates, shortDateFormat, longDateFormat, timeFormat } =
+    useSelector(createRelativeDateCellSelector());
 
-    return (
-      <Component
-        className={className}
-        title={formatDateTime(date, longDateFormat, timeFormat, { includeSeconds, includeRelativeDay: !showRelativeDates })}
-        {...otherProps}
-      >
-        {getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds, timeForToday: true })}
-      </Component>
-    );
+  if (!date) {
+    return <Component className={className} {...otherProps} />;
   }
+
+  return (
+    <Component
+      className={className}
+      title={formatDateTime(date, longDateFormat, timeFormat, {
+        includeSeconds,
+        includeRelativeDay: !showRelativeDates
+      })}
+      {...otherProps}
+    >
+      {getRelativeDate(date, shortDateFormat, showRelativeDates, {
+        timeFormat,
+        includeSeconds,
+        timeForToday: true
+      })}
+    </Component>
+  );
 }
 
 RelativeDateCell.propTypes = {
   className: PropTypes.string.isRequired,
   date: PropTypes.string,
   includeSeconds: PropTypes.bool.isRequired,
-  showRelativeDates: PropTypes.bool.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
   component: PropTypes.elementType,
   dispatch: PropTypes.func
 };

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -192,7 +192,7 @@ class TableOptionsModal extends Component {
                                       <TableOptionsColumnDragSource
                                         key={name}
                                         name={name}
-                                        label={label || columnLabel}
+                                        label={columnLabel || label}
                                         isVisible={isVisible}
                                         isModifiable={true}
                                         index={index}
@@ -210,7 +210,7 @@ class TableOptionsModal extends Component {
                                     <TableOptionsColumn
                                       key={name}
                                       name={name}
-                                      label={label || columnLabel}
+                                      label={columnLabel || label}
                                       isVisible={isVisible}
                                       index={index}
                                       isModifiable={false}

frontend/src/Components/keyboardShortcuts.js

@@ -6,37 +6,51 @@ import translate from 'Utilities/String/translate';
 export const shortcuts = {
   OPEN_KEYBOARD_SHORTCUTS_MODAL: {
     key: '?',
-    name: translate('OpenThisModal')
+    get name() {
+      return translate('OpenThisModal');
+    }
   },
 
   CLOSE_MODAL: {
     key: 'Esc',
-    name: translate('CloseCurrentModal')
+    get name() {
+      return translate('CloseCurrentModal');
+    }
   },
 
   ACCEPT_CONFIRM_MODAL: {
     key: 'Enter',
-    name: translate('AcceptConfirmationModal')
+    get name() {
+      return translate('AcceptConfirmationModal');
+    }
   },
 
   MOVIE_SEARCH_INPUT: {
     key: 's',
-    name: translate('FocusSearchBox')
+    get name() {
+      return translate('FocusSearchBox');
+    }
   },
 
   SAVE_SETTINGS: {
     key: 'mod+s',
-    name: translate('SaveSettings')
+    get name() {
+      return translate('SaveSettings');
+    }
   },
 
   SCROLL_TOP: {
     key: 'mod+home',
-    name: translate('MovieIndexScrollTop')
+    get name() {
+      return translate('MovieIndexScrollTop');
+    }
   },
 
   SCROLL_BOTTOM: {
     key: 'mod+end',
-    name: translate('MovieIndexScrollBottom')
+    get name() {
+      return translate('MovieIndexScrollBottom');
+    }
   }
 };
 

frontend/src/FirstRun/AuthenticationRequiredModalContent.js

@@ -11,7 +11,7 @@ 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 { authenticationMethodOptions, authenticationRequiredOptions, authenticationRequiredWarning } from 'Settings/General/SecuritySettings';
+import { authenticationMethodOptions, authenticationRequiredOptions } from 'Settings/General/SecuritySettings';
 import translate from 'Utilities/String/translate';
 import styles from './AuthenticationRequiredModalContent.css';
 
@@ -34,7 +34,8 @@ function AuthenticationRequiredModalContent(props) {
     authenticationMethod,
     authenticationRequired,
     username,
-    password
+    password,
+    passwordConfirmation
   } = settings;
 
   const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
@@ -63,71 +64,75 @@ function AuthenticationRequiredModalContent(props) {
           className={styles.authRequiredAlert}
           kind={kinds.WARNING}
         >
-          {authenticationRequiredWarning}
+          {translate('AuthenticationRequiredWarning')}
         </Alert>
 
         {
           isPopulated && !error ?
             <div>
               <FormGroup>
-                <FormLabel>{translate('Authentication')}</FormLabel>
+                <FormLabel>{translate('AuthenticationMethod')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.SELECT}
                   name="authenticationMethod"
                   values={authenticationMethodOptions}
                   helpText={translate('AuthenticationMethodHelpText')}
+                  helpTextWarning={authenticationMethod.value === 'none' ? translate('AuthenticationMethodHelpTextWarning') : undefined}
+                  helpLink="https://wiki.servarr.com/prowlarr/faq#forced-authentication"
                   onChange={onInputChange}
                   {...authenticationMethod}
                 />
               </FormGroup>
 
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('AuthenticationRequired')}</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('AuthenticationRequired')}</FormLabel>
 
-                    <FormInputGroup
-                      type={inputTypes.SELECT}
-                      name="authenticationRequired"
-                      values={authenticationRequiredOptions}
-                      helpText={translate('AuthenticationRequiredHelpText')}
-                      onChange={onInputChange}
-                      {...authenticationRequired}
-                    />
-                  </FormGroup> :
-                  null
-              }
+                <FormInputGroup
+                  type={inputTypes.SELECT}
+                  name="authenticationRequired"
+                  values={authenticationRequiredOptions}
+                  helpText={translate('AuthenticationRequiredHelpText')}
+                  onChange={onInputChange}
+                  {...authenticationRequired}
+                />
+              </FormGroup>
 
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('Username')}</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('Username')}</FormLabel>
 
-                    <FormInputGroup
-                      type={inputTypes.TEXT}
-                      name="username"
-                      onChange={onInputChange}
-                      {...username}
-                    />
-                  </FormGroup> :
-                  null
-              }
+                <FormInputGroup
+                  type={inputTypes.TEXT}
+                  name="username"
+                  onChange={onInputChange}
+                  helpTextWarning={username?.value ? undefined : translate('AuthenticationRequiredUsernameHelpTextWarning')}
+                  {...username}
+                />
+              </FormGroup>
 
-              {
-                authenticationEnabled ?
-                  <FormGroup>
-                    <FormLabel>{translate('Password')}</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('Password')}</FormLabel>
 
-                    <FormInputGroup
-                      type={inputTypes.PASSWORD}
-                      name="password"
-                      onChange={onInputChange}
-                      {...password}
-                    />
-                  </FormGroup> :
-                  null
-              }
+                <FormInputGroup
+                  type={inputTypes.PASSWORD}
+                  name="password"
+                  onChange={onInputChange}
+                  helpTextWarning={password?.value ? undefined : translate('AuthenticationRequiredPasswordHelpTextWarning')}
+                  {...password}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.PASSWORD}
+                  name="passwordConfirmation"
+                  onChange={onInputChange}
+                  helpTextWarning={passwordConfirmation?.value ? undefined : translate('AuthenticationRequiredPasswordConfirmationHelpTextWarning')}
+                  {...passwordConfirmation}
+                />
+              </FormGroup>
             </div> :
             null
         }

frontend/src/History/Details/HistoryDetailsModal.css

@@ -1,5 +0,0 @@
-.markAsFailedButton {
-  composes: button from '~Components/Link/Button.css';
-
-  margin-right: auto;
-}

frontend/src/History/Details/HistoryDetailsModal.js

@@ -1,16 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
-import SpinnerButton from 'Components/Link/SpinnerButton';
 import Modal from 'Components/Modal/Modal';
 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 translate from 'Utilities/String/translate';
 import HistoryDetails from './HistoryDetails';
-import styles from './HistoryDetailsModal.css';
 
 function getHeaderTitle(eventType) {
   switch (eventType) {
@@ -33,10 +30,8 @@ function HistoryDetailsModal(props) {
     eventType,
     indexer,
     data,
-    isMarkingAsFailed,
     shortDateFormat,
     timeFormat,
-    onMarkAsFailedPress,
     onModalClose
   } = props;
 
@@ -61,18 +56,6 @@ function HistoryDetailsModal(props) {
         </ModalBody>
 
         <ModalFooter>
-          {
-            eventType === 'grabbed' &&
-              <SpinnerButton
-                className={styles.markAsFailedButton}
-                kind={kinds.DANGER}
-                isSpinning={isMarkingAsFailed}
-                onPress={onMarkAsFailedPress}
-              >
-                Mark as Failed
-              </SpinnerButton>
-          }
-
           <Button
             onPress={onModalClose}
           >
@@ -89,10 +72,8 @@ HistoryDetailsModal.propTypes = {
   eventType: PropTypes.string.isRequired,
   indexer: PropTypes.object.isRequired,
   data: PropTypes.object.isRequired,
-  isMarkingAsFailed: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
-  onMarkAsFailedPress: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/History/HistoryRow.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
@@ -14,24 +14,79 @@ import HistoryEventTypeCell from './HistoryEventTypeCell';
 import HistoryRowParameter from './HistoryRowParameter';
 import styles from './HistoryRow.css';
 
-const historyParameters = [
+export const historyParameters = [
   { key: historyDataTypes.IMDB_ID, title: 'IMDb' },
   { key: historyDataTypes.TMDB_ID, title: 'TMDb' },
   { key: historyDataTypes.TVDB_ID, title: 'TVDb' },
   { key: historyDataTypes.TRAKT_ID, title: 'Trakt' },
   { key: historyDataTypes.R_ID, title: 'TvRage' },
   { key: historyDataTypes.TVMAZE_ID, title: 'TvMaze' },
-  { key: historyDataTypes.SEASON, title: translate('Season') },
-  { key: historyDataTypes.EPISODE, title: translate('Episode') },
-  { key: historyDataTypes.ARTIST, title: translate('Artist') },
-  { key: historyDataTypes.ALBUM, title: translate('Album') },
-  { key: historyDataTypes.LABEL, title: translate('Label') },
-  { key: historyDataTypes.TRACK, title: translate('Track') },
-  { key: historyDataTypes.YEAR, title: translate('Year') },
-  { key: historyDataTypes.GENRE, title: translate('Genre') },
-  { key: historyDataTypes.AUTHOR, title: translate('Author') },
-  { key: historyDataTypes.TITLE, title: translate('Title') },
-  { key: historyDataTypes.PUBLISHER, title: translate('Publisher') }
+  {
+    key: historyDataTypes.SEASON,
+    get title() {
+      return translate('Season');
+    }
+  },
+  {
+    key: historyDataTypes.EPISODE,
+    get title() {
+      return translate('Episode');
+    }
+  },
+  {
+    key: historyDataTypes.ARTIST,
+    get title() {
+      return translate('Artist');
+    }
+  },
+  {
+    key: historyDataTypes.ALBUM,
+    get title() {
+      return translate('Album');
+    }
+  },
+  {
+    key: historyDataTypes.LABEL,
+    get title() {
+      return translate('Label');
+    }
+  },
+  {
+    key: historyDataTypes.TRACK,
+    get title() {
+      return translate('Track');
+    }
+  },
+  {
+    key: historyDataTypes.YEAR,
+    get title() {
+      return translate('Year');
+    }
+  },
+  {
+    key: historyDataTypes.GENRE,
+    get title() {
+      return translate('Genre');
+    }
+  },
+  {
+    key: historyDataTypes.AUTHOR,
+    get title() {
+      return translate('Author');
+    }
+  },
+  {
+    key: historyDataTypes.TITLE,
+    get title() {
+      return translate('Title');
+    }
+  },
+  {
+    key: historyDataTypes.PUBLISHER,
+    get title() {
+      return translate('Publisher');
+    }
+  }
 ];
 
 class HistoryRow extends Component {
@@ -298,7 +353,7 @@ class HistoryRow extends Component {
 
             if (name === 'date') {
               return (
-                <RelativeDateCellConnector
+                <RelativeDateCell
                   key={name}
                   date={date}
                   className={styles.date}

frontend/src/History/HistoryRowParameter.js

@@ -1,43 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import styles from './HistoryRowParameter.css';
-
-class HistoryRowParameter extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      title,
-      value
-    } = this.props;
-
-    return (
-      <div className={styles.parameter}>
-        <div className={styles.info}>
-          <span>
-            {
-              title
-            }
-          </span>
-        </div>
-
-        <div
-          className={styles.value}
-        >
-          {
-            value
-          }
-        </div>
-      </div>
-    );
-  }
-}
-
-HistoryRowParameter.propTypes = {
-  title: PropTypes.string.isRequired,
-  value: PropTypes.string.isRequired
-};
-
-export default HistoryRowParameter;

frontend/src/History/HistoryRowParameter.tsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import Link from 'Components/Link/Link';
+import styles from './HistoryRowParameter.css';
+
+interface HistoryRowParameterProps {
+  title: string;
+  value: string;
+}
+
+function HistoryRowParameter(props: HistoryRowParameterProps) {
+  const { title, value } = props;
+
+  const type = title.toLowerCase();
+
+  let link = null;
+
+  if (type === 'imdb') {
+    link = <Link to={`https://imdb.com/title/${value}/`}>{value}</Link>;
+  } else if (type === 'tmdb') {
+    link = (
+      <Link to={`https://www.themoviedb.org/movie/${value}`}>{value}</Link>
+    );
+  } else if (type === 'tvdb') {
+    link = (
+      <Link to={`https://www.thetvdb.com/?tab=series&id=${value}`}>
+        {value}
+      </Link>
+    );
+  } else if (type === 'tvmaze') {
+    link = <Link to={`https://www.tvmaze.com/shows/${value}/_`}>{value}</Link>;
+  }
+
+  return (
+    <div className={styles.parameter}>
+      <div className={styles.info}>
+        <span>{title}</span>
+      </div>
+
+      <div className={styles.value}>{link ? link : value}</div>
+    </div>
+  );
+}
+
+export default HistoryRowParameter;

frontend/src/Indexer/Add/AddIndexerModal.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
 import AddIndexerModalContentConnector from './AddIndexerModalContentConnector';
 import styles from './AddIndexerModal.css';
 
@@ -8,6 +9,7 @@ function AddIndexerModal({ isOpen, onModalClose, onSelectIndexer, ...otherProps
   return (
     <Modal
       isOpen={isOpen}
+      size={sizes.EXTRA_LARGE}
       onModalClose={onModalClose}
       className={styles.modal}
     >

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -16,7 +16,7 @@ import TableBody from 'Components/Table/TableBody';
 import { kinds, scrollDirections } from 'Helpers/Props';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
-import SelectIndexerRowConnector from './SelectIndexerRowConnector';
+import SelectIndexerRow from './SelectIndexerRow';
 import styles from './AddIndexerModalContent.css';
 
 const columns = [
@@ -49,6 +49,12 @@ const columns = [
     label: () => translate('Privacy'),
     isSortable: true,
     isVisible: true
+  },
+  {
+    name: 'categories',
+    label: () => translate('Categories'),
+    isSortable: false,
+    isVisible: true
   }
 ];
 
@@ -260,7 +266,7 @@ class AddIndexerModalContent extends Component {
                   <TableBody>
                     {
                       filteredIndexers.map((indexer) => (
-                        <SelectIndexerRowConnector
+                        <SelectIndexerRow
                           key={`${indexer.implementation}-${indexer.name}`}
                           implementation={indexer.implementation}
                           implementationName={indexer.implementationName}

frontend/src/Indexer/Add/AddIndexerModalContentConnector.js

@@ -1,15 +1,18 @@
+import { some } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchIndexerSchema, selectIndexerSchema, setIndexerSchemaSort } from 'Store/Actions/indexerActions';
+import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import AddIndexerModalContent from './AddIndexerModalContent';
 
 function createMapStateToProps() {
   return createSelector(
     createClientSideCollectionSelector('indexers.schema'),
-    (indexers) => {
+    createAllIndexersSelector(),
+    (indexers, allIndexers) => {
       const {
         isFetching,
         isPopulated,
@@ -19,11 +22,19 @@ function createMapStateToProps() {
         sortKey
       } = indexers;
 
+      const indexerList = items.map((item) => {
+        const { definitionName } = item;
+        return {
+          ...item,
+          isExistingIndexer: some(allIndexers, { definitionName })
+        };
+      });
+
       return {
         isFetching,
         isPopulated,
         error,
-        indexers: items,
+        indexers: indexerList,
         sortKey,
         sortDirection
       };

frontend/src/Indexer/Add/SelectIndexerRow.js

@@ -1,90 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Icon from 'Components/Icon';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableRowButton from 'Components/Table/TableRowButton';
-import { icons } from 'Helpers/Props';
-import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
-import firstCharToUpper from 'Utilities/String/firstCharToUpper';
-import translate from 'Utilities/String/translate';
-import styles from './SelectIndexerRow.css';
-
-class SelectIndexerRow extends Component {
-
-  //
-  // Listeners
-
-  onPress = () => {
-    const {
-      implementation,
-      implementationName,
-      name
-    } = this.props;
-
-    this.props.onIndexerSelect({ implementation, implementationName, name });
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      protocol,
-      privacy,
-      name,
-      language,
-      description,
-      isExistingIndexer
-    } = this.props;
-
-    return (
-      <TableRowButton onPress={this.onPress}>
-        <TableRowCell className={styles.protocol}>
-          <ProtocolLabel
-            protocol={protocol}
-          />
-        </TableRowCell>
-
-        <TableRowCell>
-          {name}
-          {
-            isExistingIndexer ?
-              <Icon
-                className={styles.alreadyExistsIcon}
-                name={icons.CHECK_CIRCLE}
-                size={15}
-                title={translate('IndexerAlreadySetup')}
-              /> :
-              null
-          }
-        </TableRowCell>
-
-        <TableRowCell>
-          {language}
-        </TableRowCell>
-
-        <TableRowCell>
-          {description}
-        </TableRowCell>
-
-        <TableRowCell>
-          {translate(firstCharToUpper(privacy))}
-        </TableRowCell>
-      </TableRowButton>
-    );
-  }
-}
-
-SelectIndexerRow.propTypes = {
-  name: PropTypes.string.isRequired,
-  protocol: PropTypes.string.isRequired,
-  privacy: PropTypes.string.isRequired,
-  language: PropTypes.string.isRequired,
-  description: PropTypes.string.isRequired,
-  implementation: PropTypes.string.isRequired,
-  implementationName: PropTypes.string.isRequired,
-  onIndexerSelect: PropTypes.func.isRequired,
-  isExistingIndexer: PropTypes.bool.isRequired
-};
-
-export default SelectIndexerRow;

frontend/src/Indexer/Add/SelectIndexerRow.tsx

@@ -0,0 +1,75 @@
+import React, { useCallback } from 'react';
+import Icon from 'Components/Icon';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRowButton from 'Components/Table/TableRowButton';
+import { icons } from 'Helpers/Props';
+import CapabilitiesLabel from 'Indexer/Index/Table/CapabilitiesLabel';
+import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
+import { IndexerCapabilities } from 'Indexer/Indexer';
+import firstCharToUpper from 'Utilities/String/firstCharToUpper';
+import translate from 'Utilities/String/translate';
+import styles from './SelectIndexerRow.css';
+
+interface SelectIndexerRowProps {
+  name: string;
+  protocol: string;
+  privacy: string;
+  language: string;
+  description: string;
+  capabilities: IndexerCapabilities;
+  implementation: string;
+  implementationName: string;
+  isExistingIndexer: boolean;
+  onIndexerSelect(...args: unknown[]): void;
+}
+
+function SelectIndexerRow(props: SelectIndexerRowProps) {
+  const {
+    name,
+    protocol,
+    privacy,
+    language,
+    description,
+    capabilities,
+    implementation,
+    implementationName,
+    isExistingIndexer,
+    onIndexerSelect,
+  } = props;
+
+  const onPress = useCallback(() => {
+    onIndexerSelect({ implementation, implementationName, name });
+  }, [implementation, implementationName, name, onIndexerSelect]);
+
+  return (
+    <TableRowButton onPress={onPress}>
+      <TableRowCell className={styles.protocol}>
+        <ProtocolLabel protocol={protocol} />
+      </TableRowCell>
+
+      <TableRowCell>
+        {name}
+        {isExistingIndexer ? (
+          <Icon
+            className={styles.alreadyExistsIcon}
+            name={icons.CHECK_CIRCLE}
+            size={15}
+            title={translate('IndexerAlreadySetup')}
+          />
+        ) : null}
+      </TableRowCell>
+
+      <TableRowCell>{language}</TableRowCell>
+
+      <TableRowCell>{description}</TableRowCell>
+
+      <TableRowCell>{translate(firstCharToUpper(privacy))}</TableRowCell>
+
+      <TableRowCell>
+        <CapabilitiesLabel capabilities={capabilities} />
+      </TableRowCell>
+    </TableRowButton>
+  );
+}
+
+export default SelectIndexerRow;

frontend/src/Indexer/Add/SelectIndexerRowConnector.js

@@ -1,18 +0,0 @@
-
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import createExistingIndexerSelector from 'Store/Selectors/createExistingIndexerSelector';
-import SelectIndexerRow from './SelectIndexerRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    createExistingIndexerSelector(),
-    (isExistingIndexer, dimensions) => {
-      return {
-        isExistingIndexer
-      };
-    }
-  );
-}
-
-export default connect(createMapStateToProps)(SelectIndexerRow);

frontend/src/Indexer/Edit/EditIndexerModalContent.js

@@ -187,6 +187,7 @@ function EditIndexerModalContent(props) {
                   type={inputTypes.TAG}
                   name="tags"
                   helpText={translate('IndexerTagsHelpText')}
+                  helpTextWarning={translate('IndexerTagsHelpTextWarning')}
                   {...tags}
                   onChange={onInputChange}
                 />

frontend/src/Indexer/Index/IndexerIndex.tsx

@@ -22,7 +22,7 @@ import AddIndexerModal from 'Indexer/Add/AddIndexerModal';
 import EditIndexerModalConnector from 'Indexer/Edit/EditIndexerModalConnector';
 import NoIndexer from 'Indexer/NoIndexer';
 import { executeCommand } from 'Store/Actions/commandActions';
-import { testAllIndexers } from 'Store/Actions/indexerActions';
+import { cloneIndexer, testAllIndexers } from 'Store/Actions/indexerActions';
 import {
   setIndexerFilter,
   setIndexerSort,
@@ -98,6 +98,15 @@ const IndexerIndex = withScrollPosition((props: IndexerIndexProps) => {
     setIsEditIndexerModalOpen(false);
   }, [setIsEditIndexerModalOpen]);
 
+  const onCloneIndexerPress = useCallback(
+    (id: number) => {
+      dispatch(cloneIndexer({ id }));
+
+      setIsEditIndexerModalOpen(true);
+    },
+    [dispatch, setIsEditIndexerModalOpen]
+  );
+
   const onAppIndexerSyncPress = useCallback(() => {
     dispatch(
       executeCommand({
@@ -303,6 +312,7 @@ const IndexerIndex = withScrollPosition((props: IndexerIndexProps) => {
                   jumpToCharacter={jumpToCharacter}
                   isSelectMode={isSelectMode}
                   isSmallScreen={isSmallScreen}
+                  onCloneIndexerPress={onCloneIndexerPress}
                 />
 
                 <IndexerIndexFooter />

frontend/src/Indexer/Index/Table/CapabilitiesLabel.tsx

@@ -1,3 +1,4 @@
+import { uniqBy } from 'lodash';
 import React from 'react';
 import Label from 'Components/Label';
 import { IndexerCapabilities } from 'Indexer/Indexer';
@@ -23,14 +24,18 @@ function CapabilitiesLabel(props: CapabilitiesLabelProps) {
     );
   }
 
-  const nameList = Array.from(
-    new Set(filteredList.map((item) => item.name).sort())
+  const indexerCategories = uniqBy(filteredList, 'id').sort(
+    (a, b) => a.id - b.id
   );
 
   return (
     <span>
-      {nameList.map((category) => {
-        return <Label key={category}>{category}</Label>;
+      {indexerCategories.map((category) => {
+        return (
+          <Label key={category.id} title={`${category.id}`}>
+            {category.name}
+          </Label>
+        );
       })}
 
       {filteredList.length === 0 ? <Label>{'None'}</Label> : null}

frontend/src/Indexer/Index/Table/IndexerIndexRow.tsx

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { useSelect } from 'App/SelectContext';
 import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
 import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
 import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
 import Column from 'Components/Table/Column';
@@ -27,10 +27,11 @@ interface IndexerIndexRowProps {
   sortKey: string;
   columns: Column[];
   isSelectMode: boolean;
+  onCloneIndexerPress(id: number): void;
 }
 
 function IndexerIndexRow(props: IndexerIndexRowProps) {
-  const { indexerId, columns, isSelectMode } = props;
+  const { indexerId, columns, isSelectMode, onCloneIndexerPress } = props;
 
   const { indexer, appProfile, status, longDateFormat, timeFormat } =
     useSelector(createIndexerIndexItemSelector(props.indexerId));
@@ -153,6 +154,7 @@ function IndexerIndexRow(props: IndexerIndexRowProps) {
               <IndexerTitleLink
                 indexerId={indexerId}
                 indexerName={indexerName}
+                onCloneIndexerPress={onCloneIndexerPress}
               />
             </VirtualTableRowCell>
           );
@@ -202,7 +204,7 @@ function IndexerIndexRow(props: IndexerIndexRowProps) {
           return (
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore ts(2739)
-            <RelativeDateCellConnector
+            <RelativeDateCell
               key={name}
               className={styles[name]}
               date={added.toString()}
@@ -215,7 +217,7 @@ function IndexerIndexRow(props: IndexerIndexRowProps) {
           return (
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore ts(2739)
-            <RelativeDateCellConnector
+            <RelativeDateCell
               key={name}
               className={styles[name]}
               date={vipExpiration}

frontend/src/Indexer/Index/Table/IndexerIndexTable.tsx

@@ -26,6 +26,7 @@ interface RowItemData {
   sortKey: string;
   columns: Column[];
   isSelectMode: boolean;
+  onCloneIndexerPress(id: number): void;
 }
 
 interface IndexerIndexTableProps {
@@ -37,6 +38,7 @@ interface IndexerIndexTableProps {
   scrollerRef: RefObject<HTMLElement>;
   isSelectMode: boolean;
   isSmallScreen: boolean;
+  onCloneIndexerPress(id: number): void;
 }
 
 const columnsSelector = createSelector(
@@ -49,7 +51,7 @@ const Row: React.FC<ListChildComponentProps<RowItemData>> = ({
   style,
   data,
 }) => {
-  const { items, sortKey, columns, isSelectMode } = data;
+  const { items, sortKey, columns, isSelectMode, onCloneIndexerPress } = data;
 
   if (index >= items.length) {
     return null;
@@ -71,6 +73,7 @@ const Row: React.FC<ListChildComponentProps<RowItemData>> = ({
         sortKey={sortKey}
         columns={columns}
         isSelectMode={isSelectMode}
+        onCloneIndexerPress={onCloneIndexerPress}
       />
     </div>
   );
@@ -89,6 +92,7 @@ function IndexerIndexTable(props: IndexerIndexTableProps) {
     isSelectMode,
     isSmallScreen,
     scrollerRef,
+    onCloneIndexerPress,
   } = props;
 
   const columns = useSelector(columnsSelector);
@@ -198,6 +202,7 @@ function IndexerIndexTable(props: IndexerIndexTableProps) {
             sortKey,
             columns,
             isSelectMode,
+            onCloneIndexerPress,
           }}
         >
           {Row}

frontend/src/Indexer/IndexerTitleLink.tsx

@@ -7,10 +7,11 @@ import styles from './IndexerTitleLink.css';
 interface IndexerTitleLinkProps {
   indexerName: string;
   indexerId: number;
+  onCloneIndexerPress(id: number): void;
 }
 
 function IndexerTitleLink(props: IndexerTitleLinkProps) {
-  const { indexerName, indexerId } = props;
+  const { indexerName, indexerId, onCloneIndexerPress } = props;
 
   const [isIndexerInfoModalOpen, setIsIndexerInfoModalOpen] = useState(false);
 
@@ -32,6 +33,7 @@ function IndexerTitleLink(props: IndexerTitleLinkProps) {
         indexerId={indexerId}
         isOpen={isIndexerInfoModalOpen}
         onModalClose={onIndexerInfoModalClose}
+        onCloneIndexerPress={onCloneIndexerPress}
       />
     </div>
   );

frontend/src/Indexer/Info/History/IndexerHistory.tsx

@@ -0,0 +1,139 @@
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import { IndexerHistoryAppState } from 'App/State/IndexerAppState';
+import Alert from 'Components/Alert';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { kinds } from 'Helpers/Props';
+import Indexer from 'Indexer/Indexer';
+import {
+  clearIndexerHistory,
+  fetchIndexerHistory,
+} from 'Store/Actions/indexerHistoryActions';
+import { createIndexerSelectorForHook } from 'Store/Selectors/createIndexerSelector';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import translate from 'Utilities/String/translate';
+import IndexerHistoryRow from './IndexerHistoryRow';
+
+const columns = [
+  {
+    name: 'eventType',
+    isVisible: true,
+  },
+  {
+    name: 'query',
+    label: () => translate('Query'),
+    isVisible: true,
+  },
+  {
+    name: 'parameters',
+    label: () => translate('Parameters'),
+    isVisible: true,
+  },
+  {
+    name: 'date',
+    label: () => translate('Date'),
+    isVisible: true,
+  },
+  {
+    name: 'source',
+    label: () => translate('Source'),
+    isVisible: true,
+  },
+  {
+    name: 'details',
+    label: () => translate('Details'),
+    isVisible: true,
+  },
+];
+
+function createIndexerHistorySelector() {
+  return createSelector(
+    (state: AppState) => state.indexerHistory,
+    createUISettingsSelector(),
+    (state: AppState) => state.history.pageSize,
+    (indexerHistory: IndexerHistoryAppState, uiSettings, pageSize) => {
+      return {
+        ...indexerHistory,
+        shortDateFormat: uiSettings.shortDateFormat,
+        timeFormat: uiSettings.timeFormat,
+        pageSize,
+      };
+    }
+  );
+}
+
+interface IndexerHistoryProps {
+  indexerId: number;
+}
+
+function IndexerHistory(props: IndexerHistoryProps) {
+  const {
+    isFetching,
+    isPopulated,
+    error,
+    items,
+    shortDateFormat,
+    timeFormat,
+    pageSize,
+  } = useSelector(createIndexerHistorySelector());
+
+  const indexer = useSelector(
+    createIndexerSelectorForHook(props.indexerId)
+  ) as Indexer;
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(
+      fetchIndexerHistory({ indexerId: props.indexerId, limit: pageSize })
+    );
+
+    return () => {
+      dispatch(clearIndexerHistory());
+    };
+  }, [props, pageSize, dispatch]);
+
+  const hasItems = !!items.length;
+
+  if (isFetching) {
+    return <LoadingIndicator />;
+  }
+
+  if (!isFetching && !!error) {
+    return (
+      <Alert kind={kinds.DANGER}>{translate('IndexerHistoryLoadError')}</Alert>
+    );
+  }
+
+  if (isPopulated && !hasItems && !error) {
+    return <Alert kind={kinds.INFO}>{translate('NoIndexerHistory')}</Alert>;
+  }
+
+  if (isPopulated && hasItems && !error) {
+    return (
+      <Table columns={columns}>
+        <TableBody>
+          {items.map((item) => {
+            return (
+              <IndexerHistoryRow
+                key={item.id}
+                indexer={indexer}
+                shortDateFormat={shortDateFormat}
+                timeFormat={timeFormat}
+                {...item}
+              />
+            );
+          })}
+        </TableBody>
+      </Table>
+    );
+  }
+
+  return null;
+}
+
+export default IndexerHistory;

frontend/src/Indexer/Info/History/IndexerHistoryRow.css

@@ -0,0 +1,23 @@
+.query {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 120px;
+}
+
+.elapsedTime,
+.source {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 150px;
+}
+
+.details {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 70px;
+}
+
+.parametersContent {
+  display: flex;
+  flex-wrap: wrap;
+}

frontend/src/Indexer/Info/History/IndexerHistoryRow.css.d.ts

@@ -0,0 +1,11 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'details': string;
+  'elapsedTime': string;
+  'parametersContent': string;
+  'query': string;
+  'source': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/Indexer/Info/History/IndexerHistoryRow.tsx

@@ -0,0 +1,104 @@
+import React, { useCallback, useState } from 'react';
+import IconButton from 'Components/Link/IconButton';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRow from 'Components/Table/TableRow';
+import { icons } from 'Helpers/Props';
+import HistoryDetailsModal from 'History/Details/HistoryDetailsModal';
+import HistoryEventTypeCell from 'History/HistoryEventTypeCell';
+import { historyParameters } from 'History/HistoryRow';
+import HistoryRowParameter from 'History/HistoryRowParameter';
+import Indexer from 'Indexer/Indexer';
+import { HistoryData } from 'typings/History';
+import translate from 'Utilities/String/translate';
+import styles from './IndexerHistoryRow.css';
+
+interface IndexerHistoryRowProps {
+  data: HistoryData;
+  date: string;
+  eventType: string;
+  successful: boolean;
+  indexer: Indexer;
+  shortDateFormat: string;
+  timeFormat: string;
+}
+
+function IndexerHistoryRow(props: IndexerHistoryRowProps) {
+  const {
+    data,
+    date,
+    eventType,
+    successful,
+    indexer,
+    shortDateFormat,
+    timeFormat,
+  } = props;
+
+  const [isDetailsModalOpen, setIsDetailsModalOpen] = useState(false);
+
+  const onDetailsModalPress = useCallback(() => {
+    setIsDetailsModalOpen(true);
+  }, [setIsDetailsModalOpen]);
+
+  const onDetailsModalClose = useCallback(() => {
+    setIsDetailsModalOpen(false);
+  }, [setIsDetailsModalOpen]);
+
+  const parameters = historyParameters.filter(
+    (parameter) =>
+      parameter.key in data && data[parameter.key as keyof HistoryData]
+  );
+
+  return (
+    <TableRow>
+      <HistoryEventTypeCell
+        indexer={indexer}
+        eventType={eventType}
+        data={data}
+        successful={successful}
+      />
+
+      <TableRowCell className={styles.query}>{data.query}</TableRowCell>
+
+      <TableRowCell>
+        <div className={styles.parametersContent}>
+          {parameters.map((parameter) => {
+            return (
+              <HistoryRowParameter
+                key={parameter.key}
+                title={parameter.title}
+                value={data[parameter.key as keyof HistoryData].toString()}
+              />
+            );
+          })}
+        </div>
+      </TableRowCell>
+
+      <RelativeDateCell date={date} />
+
+      <TableRowCell className={styles.source}>
+        {data.source ? data.source : null}
+      </TableRowCell>
+
+      <TableRowCell className={styles.details}>
+        <IconButton
+          name={icons.INFO}
+          onPress={onDetailsModalPress}
+          title={translate('HistoryDetails')}
+        />
+      </TableRowCell>
+
+      <HistoryDetailsModal
+        isOpen={isDetailsModalOpen}
+        eventType={eventType}
+        data={data}
+        indexer={indexer}
+        shortDateFormat={shortDateFormat}
+        timeFormat={timeFormat}
+        onModalClose={onDetailsModalClose}
+      />
+    </TableRow>
+  );
+}
+
+export default IndexerHistoryRow;

frontend/src/Indexer/Info/IndexerInfoModal.tsx

@@ -7,16 +7,18 @@ interface IndexerInfoModalProps {
   isOpen: boolean;
   indexerId: number;
   onModalClose(): void;
+  onCloneIndexerPress(id: number): void;
 }
 
 function IndexerInfoModal(props: IndexerInfoModalProps) {
-  const { isOpen, onModalClose, indexerId } = props;
+  const { isOpen, indexerId, onModalClose, onCloneIndexerPress } = props;
 
   return (
-    <Modal size={sizes.MEDIUM} isOpen={isOpen} onModalClose={onModalClose}>
+    <Modal size={sizes.LARGE} isOpen={isOpen} onModalClose={onModalClose}>
       <IndexerInfoModalContent
         indexerId={indexerId}
         onModalClose={onModalClose}
+        onCloneIndexerPress={onCloneIndexerPress}
       />
     </Modal>
   );

frontend/src/Indexer/Info/IndexerInfoModalContent.css

@@ -9,3 +9,47 @@
 
   margin-right: auto;
 }
+
+.tabs {
+  margin-top: -32px;
+}
+
+.tabList {
+  margin: 0;
+  padding: 0;
+}
+
+.tab {
+  position: relative;
+  bottom: -1px;
+  display: inline-block;
+  padding: 6px 12px;
+  border: 1px solid transparent;
+  border-top: none;
+  list-style: none;
+  cursor: pointer;
+}
+
+.selectedTab {
+  border-color: var(--borderColor);
+  border-radius: 0 0 5px 5px;
+  background-color: rgba(239, 239, 239, 0.4);
+  color: var(--black);
+}
+
+.tabContent {
+  margin-top: 20px;
+}
+
+.modalFooter {
+  composes: modalFooter from '~Components/Modal/ModalFooter.css';
+
+  justify-content: space-between;
+}
+
+@media only screen and (max-width: $breakpointExtraSmall) {
+  .modalFooter {
+    flex-direction: column;
+    gap: 10px;
+  }
+}

frontend/src/Indexer/Info/IndexerInfoModalContent.css.d.ts

@@ -3,6 +3,12 @@
 interface CssExports {
   'deleteButton': string;
   'description': string;
+  'modalFooter': string;
+  'selectedTab': string;
+  'tab': string;
+  'tabContent': string;
+  'tabList': string;
+  'tabs': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Indexer/Info/IndexerInfoModalContent.tsx

@@ -1,7 +1,9 @@
 import { uniqBy } from 'lodash';
 import React, { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
+import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import { createSelector } from 'reselect';
+import Alert from 'Components/Alert';
 import DescriptionList from 'Components/DescriptionList/DescriptionList';
 import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
 import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription';
@@ -22,9 +24,10 @@ import TagListConnector from 'Components/TagListConnector';
 import { kinds } from 'Helpers/Props';
 import DeleteIndexerModal from 'Indexer/Delete/DeleteIndexerModal';
 import EditIndexerModalConnector from 'Indexer/Edit/EditIndexerModalConnector';
-import Indexer from 'Indexer/Indexer';
+import Indexer, { IndexerCapabilities } from 'Indexer/Indexer';
 import { createIndexerSelectorForHook } from 'Store/Selectors/createIndexerSelector';
 import translate from 'Utilities/String/translate';
+import IndexerHistory from './History/IndexerHistory';
 import styles from './IndexerInfoModalContent.css';
 
 function createIndexerInfoItemSelector(indexerId: number) {
@@ -38,15 +41,18 @@ function createIndexerInfoItemSelector(indexerId: number) {
   );
 }
 
+const tabs = ['details', 'categories', 'history', 'stats'];
+
 interface IndexerInfoModalContentProps {
   indexerId: number;
   onModalClose(): void;
+  onCloneIndexerPress(id: number): void;
 }
 
 function IndexerInfoModalContent(props: IndexerInfoModalContentProps) {
-  const { indexer } = useSelector(
-    createIndexerInfoItemSelector(props.indexerId)
-  );
+  const { indexerId, onCloneIndexerPress } = props;
+
+  const { indexer } = useSelector(createIndexerInfoItemSelector(indexerId));
 
   const {
     id,
@@ -58,7 +64,7 @@ function IndexerInfoModalContent(props: IndexerInfoModalContentProps) {
     fields,
     tags,
     protocol,
-    capabilities,
+    capabilities = {} as IndexerCapabilities,
   } = indexer as Indexer;
 
   const { onModalClose } = props;
@@ -70,10 +76,19 @@ function IndexerInfoModalContent(props: IndexerInfoModalContentProps) {
   const vipExpiration =
     fields.find((field) => field.name === 'vipExpiration')?.value ?? undefined;
 
+  const [selectedTab, setSelectedTab] = useState(tabs[0]);
   const [isEditIndexerModalOpen, setIsEditIndexerModalOpen] = useState(false);
   const [isDeleteIndexerModalOpen, setIsDeleteIndexerModalOpen] =
     useState(false);
 
+  const onTabSelect = useCallback(
+    (index: number) => {
+      const selectedTab = tabs[index];
+      setSelectedTab(selectedTab);
+    },
+    [setSelectedTab]
+  );
+
   const onEditIndexerPress = useCallback(() => {
     setIsEditIndexerModalOpen(true);
   }, [setIsEditIndexerModalOpen]);
@@ -92,220 +107,269 @@ function IndexerInfoModalContent(props: IndexerInfoModalContentProps) {
     onModalClose();
   }, [setIsDeleteIndexerModalOpen, onModalClose]);
 
+  const onCloneIndexerPressWrapper = useCallback(() => {
+    onCloneIndexerPress(id);
+    onModalClose();
+  }, [id, onCloneIndexerPress, onModalClose]);
+
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>{`${name}`}</ModalHeader>
 
       <ModalBody>
-        <FieldSet legend={translate('IndexerDetails')}>
-          <div>
-            <DescriptionList>
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Id')}
-                data={id}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Description')}
-                data={description ? description : '-'}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Encoding')}
-                data={encoding ? encoding : '-'}
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('Language')}
-                data={language ?? '-'}
-              />
-              {vipExpiration ? (
-                <DescriptionListItem
-                  descriptionClassName={styles.description}
-                  title={translate('VipExpiration')}
-                  data={vipExpiration}
-                />
-              ) : null}
-              <DescriptionListItemTitle>
-                {translate('IndexerSite')}
-              </DescriptionListItemTitle>
-              <DescriptionListItemDescription>
-                {baseUrl ? (
-                  <Link to={baseUrl}>
-                    {baseUrl.replace(/(:\/\/)api\./, '$1')}
-                  </Link>
-                ) : (
-                  '-'
-                )}
-              </DescriptionListItemDescription>
-              <DescriptionListItemTitle>
-                {protocol === 'usenet'
-                  ? translate('NewznabUrl')
-                  : translate('TorznabUrl')}
-              </DescriptionListItemTitle>
-              <DescriptionListItemDescription>
-                {`${window.location.origin}${window.Prowlarr.urlBase}/${id}/api`}
-              </DescriptionListItemDescription>
-              {tags.length > 0 ? (
-                <>
-                  <DescriptionListItemTitle>
-                    {translate('Tags')}
-                  </DescriptionListItemTitle>
-                  <DescriptionListItemDescription>
-                    <TagListConnector tags={tags} />
-                  </DescriptionListItemDescription>
-                </>
-              ) : null}
-            </DescriptionList>
-          </div>
-        </FieldSet>
+        <Tabs
+          className={styles.tabs}
+          selectedIndex={tabs.indexOf(selectedTab)}
+          onSelect={onTabSelect}
+        >
+          <TabList className={styles.tabList}>
+            <Tab className={styles.tab} selectedClassName={styles.selectedTab}>
+              {translate('Details')}
+            </Tab>
 
-        <FieldSet legend={translate('SearchCapabilities')}>
-          <div>
-            <DescriptionList>
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('RawSearchSupported')}
-                data={
-                  capabilities.supportsRawSearch
-                    ? translate('Yes')
-                    : translate('No')
-                }
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('SearchTypes')}
-                data={
-                  capabilities.searchParams.length === 0 ? (
-                    translate('NotSupported')
-                  ) : (
-                    <Label kind={kinds.PRIMARY}>
-                      {capabilities.searchParams[0]}
-                    </Label>
-                  )
-                }
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('TVSearchTypes')}
-                data={
-                  capabilities.tvSearchParams.length === 0
-                    ? translate('NotSupported')
-                    : capabilities.tvSearchParams.map((p) => {
-                        return (
-                          <Label key={p} kind={kinds.PRIMARY}>
-                            {p}
-                          </Label>
-                        );
-                      })
-                }
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('MovieSearchTypes')}
-                data={
-                  capabilities.movieSearchParams.length === 0
-                    ? translate('NotSupported')
-                    : capabilities.movieSearchParams.map((p) => {
-                        return (
-                          <Label key={p} kind={kinds.PRIMARY}>
-                            {p}
-                          </Label>
-                        );
-                      })
-                }
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('BookSearchTypes')}
-                data={
-                  capabilities.bookSearchParams.length === 0
-                    ? translate('NotSupported')
-                    : capabilities.bookSearchParams.map((p) => {
-                        return (
-                          <Label key={p} kind={kinds.PRIMARY}>
-                            {p}
-                          </Label>
-                        );
-                      })
-                }
-              />
-              <DescriptionListItem
-                descriptionClassName={styles.description}
-                title={translate('MusicSearchTypes')}
-                data={
-                  capabilities.musicSearchParams.length === 0
-                    ? translate('NotSupported')
-                    : capabilities.musicSearchParams.map((p) => {
-                        return (
-                          <Label key={p} kind={kinds.PRIMARY}>
-                            {p}
-                          </Label>
-                        );
-                      })
-                }
-              />
-            </DescriptionList>
-          </div>
-        </FieldSet>
+            <Tab className={styles.tab} selectedClassName={styles.selectedTab}>
+              {translate('Categories')}
+            </Tab>
 
-        {capabilities?.categories?.length > 0 ? (
-          <FieldSet legend={translate('IndexerCategories')}>
-            <Table
-              columns={[
-                {
-                  name: 'id',
-                  label: translate('Id'),
-                  isVisible: true,
-                },
-                {
-                  name: 'name',
-                  label: translate('Name'),
-                  isVisible: true,
-                },
-              ]}
-            >
-              {uniqBy(capabilities.categories, 'id')
-                .sort((a, b) => a.id - b.id)
-                .map((category) => {
-                  return (
-                    <TableBody key={category.id}>
-                      <TableRow key={category.id}>
-                        <TableRowCell>{category.id}</TableRowCell>
-                        <TableRowCell>{category.name}</TableRowCell>
-                      </TableRow>
-                      {category?.subCategories?.length > 0
-                        ? uniqBy(category.subCategories, 'id')
-                            .sort((a, b) => a.id - b.id)
-                            .map((subCategory) => {
+            <Tab className={styles.tab} selectedClassName={styles.selectedTab}>
+              {translate('History')}
+            </Tab>
+          </TabList>
+          <TabPanel>
+            <div className={styles.tabContent}>
+              <FieldSet legend={translate('IndexerDetails')}>
+                <div>
+                  <DescriptionList>
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('Id')}
+                      data={id}
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('Description')}
+                      data={description ? description : '-'}
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('Encoding')}
+                      data={encoding ? encoding : '-'}
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('Language')}
+                      data={language ?? '-'}
+                    />
+                    {vipExpiration ? (
+                      <DescriptionListItem
+                        descriptionClassName={styles.description}
+                        title={translate('VipExpiration')}
+                        data={vipExpiration}
+                      />
+                    ) : null}
+                    <DescriptionListItemTitle>
+                      {translate('IndexerSite')}
+                    </DescriptionListItemTitle>
+                    <DescriptionListItemDescription>
+                      {baseUrl ? (
+                        <Link to={baseUrl}>
+                          {baseUrl.replace(/(:\/\/)api\./, '$1')}
+                        </Link>
+                      ) : (
+                        '-'
+                      )}
+                    </DescriptionListItemDescription>
+                    <DescriptionListItemTitle>
+                      {protocol === 'usenet'
+                        ? translate('NewznabUrl')
+                        : translate('TorznabUrl')}
+                    </DescriptionListItemTitle>
+                    <DescriptionListItemDescription>
+                      {`${window.location.origin}${window.Prowlarr.urlBase}/${id}/api`}
+                    </DescriptionListItemDescription>
+                    {tags.length > 0 ? (
+                      <>
+                        <DescriptionListItemTitle>
+                          {translate('Tags')}
+                        </DescriptionListItemTitle>
+                        <DescriptionListItemDescription>
+                          <TagListConnector tags={tags} />
+                        </DescriptionListItemDescription>
+                      </>
+                    ) : null}
+                  </DescriptionList>
+                </div>
+              </FieldSet>
+
+              <FieldSet legend={translate('SearchCapabilities')}>
+                <div>
+                  <DescriptionList>
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('RawSearchSupported')}
+                      data={
+                        capabilities?.supportsRawSearch
+                          ? translate('Yes')
+                          : translate('No')
+                      }
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('SearchTypes')}
+                      data={
+                        capabilities?.searchParams?.length > 0 ? (
+                          <Label kind={kinds.PRIMARY}>
+                            {capabilities.searchParams[0]}
+                          </Label>
+                        ) : (
+                          translate('NotSupported')
+                        )
+                      }
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('TVSearchTypes')}
+                      data={
+                        capabilities?.tvSearchParams?.length > 0
+                          ? capabilities.tvSearchParams.map((p) => {
                               return (
-                                <TableRow key={subCategory.id}>
-                                  <TableRowCell>{subCategory.id}</TableRowCell>
-                                  <TableRowCell>
-                                    {subCategory.name}
-                                  </TableRowCell>
-                                </TableRow>
+                                <Label key={p} kind={kinds.PRIMARY}>
+                                  {p}
+                                </Label>
                               );
                             })
-                        : null}
-                    </TableBody>
-                  );
-                })}
-            </Table>
-          </FieldSet>
-        ) : null}
+                          : translate('NotSupported')
+                      }
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('MovieSearchTypes')}
+                      data={
+                        capabilities?.movieSearchParams?.length > 0
+                          ? capabilities.movieSearchParams.map((p) => {
+                              return (
+                                <Label key={p} kind={kinds.PRIMARY}>
+                                  {p}
+                                </Label>
+                              );
+                            })
+                          : translate('NotSupported')
+                      }
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('BookSearchTypes')}
+                      data={
+                        capabilities?.bookSearchParams?.length > 0
+                          ? capabilities.bookSearchParams.map((p) => {
+                              return (
+                                <Label key={p} kind={kinds.PRIMARY}>
+                                  {p}
+                                </Label>
+                              );
+                            })
+                          : translate('NotSupported')
+                      }
+                    />
+                    <DescriptionListItem
+                      descriptionClassName={styles.description}
+                      title={translate('MusicSearchTypes')}
+                      data={
+                        capabilities?.musicSearchParams?.length > 0
+                          ? capabilities.musicSearchParams.map((p) => {
+                              return (
+                                <Label key={p} kind={kinds.PRIMARY}>
+                                  {p}
+                                </Label>
+                              );
+                            })
+                          : translate('NotSupported')
+                      }
+                    />
+                  </DescriptionList>
+                </div>
+              </FieldSet>
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div className={styles.tabContent}>
+              {capabilities?.categories?.length > 0 ? (
+                <FieldSet legend={translate('IndexerCategories')}>
+                  <Table
+                    columns={[
+                      {
+                        name: 'id',
+                        label: translate('Id'),
+                        isVisible: true,
+                      },
+                      {
+                        name: 'name',
+                        label: translate('Name'),
+                        isVisible: true,
+                      },
+                    ]}
+                  >
+                    {uniqBy(capabilities.categories, 'id')
+                      .sort((a, b) => a.id - b.id)
+                      .map((category) => {
+                        return (
+                          <TableBody key={category.id}>
+                            <TableRow key={category.id}>
+                              <TableRowCell>{category.id}</TableRowCell>
+                              <TableRowCell>{category.name}</TableRowCell>
+                            </TableRow>
+                            {category?.subCategories?.length > 0
+                              ? uniqBy(category.subCategories, 'id')
+                                  .sort((a, b) => a.id - b.id)
+                                  .map((subCategory) => {
+                                    return (
+                                      <TableRow key={subCategory.id}>
+                                        <TableRowCell>
+                                          {subCategory.id}
+                                        </TableRowCell>
+                                        <TableRowCell>
+                                          {subCategory.name}
+                                        </TableRowCell>
+                                      </TableRow>
+                                    );
+                                  })
+                              : null}
+                          </TableBody>
+                        );
+                      })}
+                  </Table>
+                </FieldSet>
+              ) : (
+                <Alert kind={kinds.INFO}>
+                  {translate('NoIndexerCategories')}
+                </Alert>
+              )}
+            </div>
+          </TabPanel>
+          <TabPanel>
+            <div className={styles.tabContent}>
+              <IndexerHistory indexerId={id} />
+            </div>
+          </TabPanel>
+        </Tabs>
       </ModalBody>
-      <ModalFooter>
-        <Button
-          className={styles.deleteButton}
-          kind={kinds.DANGER}
-          onPress={onDeleteIndexerPress}
-        >
-          {translate('Delete')}
-        </Button>
-        <Button onPress={onEditIndexerPress}>{translate('Edit')}</Button>
-        <Button onPress={onModalClose}>{translate('Close')}</Button>
+      <ModalFooter className={styles.modalFooter}>
+        <div>
+          <Button
+            className={styles.deleteButton}
+            kind={kinds.DANGER}
+            onPress={onDeleteIndexerPress}
+          >
+            {translate('Delete')}
+          </Button>
+          <Button onPress={onCloneIndexerPressWrapper}>
+            {translate('Clone')}
+          </Button>
+        </div>
+        <div>
+          <Button onPress={onEditIndexerPress}>{translate('Edit')}</Button>
+          <Button onPress={onModalClose}>{translate('Close')}</Button>
+        </div>
       </ModalFooter>
 
       <EditIndexerModalConnector

frontend/src/Indexer/Stats/IndexerStats.css

@@ -1,22 +1,52 @@
 .fullWidthChart {
   display: inline-block;
-  padding: 15px 25px;
   width: 100%;
-  height: 300px;
 }
 
 .halfWidthChart {
   display: inline-block;
-  padding: 15px 25px;
   width: 50%;
+}
+
+.quarterWidthChart {
+  display: inline-block;
+  width: 25%;
+}
+
+.chartContainer {
+  margin: 5px;
+  padding: 15px 25px;
   height: 300px;
+  border-radius: 10px;
+  background-color: var(--chartBackgroundColor);
+}
+
+.statContainer {
+  margin: 5px;
+  padding: 15px 25px;
+  height: 150px;
+  border-radius: 10px;
+  background-color: var(--chartBackgroundColor);
+}
+
+.statTitle {
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.stat {
+  font-weight: bold;
+  font-size: 60px;
 }
 
 @media only screen and (max-width: $breakpointSmall) {
   .halfWidthChart {
     display: inline-block;
-    padding: 15px 25px;
     width: 100%;
-    height: 300px;
+  }
+
+  .quarterWidthChart {
+    display: inline-block;
+    width: 100%;
   }
 }

frontend/src/Indexer/Stats/IndexerStats.css.d.ts

@@ -1,8 +1,13 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'chartContainer': string;
   'fullWidthChart': string;
   'halfWidthChart': string;
+  'quarterWidthChart': string;
+  'stat': string;
+  'statContainer': string;
+  'statTitle': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Indexer/Stats/IndexerStats.tsx

@@ -8,6 +8,7 @@ import BarChart from 'Components/Chart/BarChart';
 import DoughnutChart from 'Components/Chart/DoughnutChart';
 import StackedBarChart from 'Components/Chart/StackedBarChart';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -17,14 +18,16 @@ import {
   fetchIndexerStats,
   setIndexerStatsFilter,
 } from 'Store/Actions/indexerStatsActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import {
   IndexerStatsHost,
   IndexerStatsIndexer,
   IndexerStatsUserAgent,
 } from 'typings/IndexerStats';
+import abbreviateNumber from 'Utilities/Number/abbreviateNumber';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
-import IndexerStatsFilterMenu from './IndexerStatsFilterMenu';
+import IndexerStatsFilterModal from './IndexerStatsFilterModal';
 import styles from './IndexerStats.css';
 
 function getAverageResponseTimeData(indexerStats: IndexerStatsIndexer[]) {
@@ -165,15 +168,26 @@ function getHostQueryData(indexerStats: IndexerStatsHost[]) {
 const indexerStatsSelector = () => {
   return createSelector(
     (state: AppState) => state.indexerStats,
-    (indexerStats: IndexerStatsAppState) => {
-      return indexerStats;
+    createCustomFiltersSelector('indexerStats'),
+    (indexerStats: IndexerStatsAppState, customFilters) => {
+      return {
+        ...indexerStats,
+        customFilters,
+      };
     }
   );
 };
 
 function IndexerStats() {
-  const { isFetching, isPopulated, item, error, filters, selectedFilterKey } =
-    useSelector(indexerStatsSelector());
+  const {
+    isFetching,
+    isPopulated,
+    item,
+    error,
+    filters,
+    customFilters,
+    selectedFilterKey,
+  } = useSelector(indexerStatsSelector());
   const dispatch = useDispatch();
 
   useEffect(() => {
@@ -188,15 +202,33 @@ function IndexerStats() {
   );
 
   const isLoaded = !error && isPopulated;
+  const indexerCount = item.indexers?.length ?? 0;
+  const userAgentCount = item.userAgents?.length ?? 0;
+  const queryCount =
+    item.indexers?.reduce((total, indexer) => {
+      return (
+        total +
+        indexer.numberOfQueries +
+        indexer.numberOfRssQueries +
+        indexer.numberOfAuthQueries
+      );
+    }, 0) ?? 0;
+  const grabCount =
+    item.indexers?.reduce((total, indexer) => {
+      return total + indexer.numberOfGrabs;
+    }, 0) ?? 0;
 
   return (
     <PageContent>
       <PageToolbar>
         <PageToolbarSection alignContent={align.RIGHT} collapseButtons={false}>
-          <IndexerStatsFilterMenu
+          <FilterMenu
+            alignMenu={align.RIGHT}
             selectedFilterKey={selectedFilterKey}
             filters={filters}
+            customFilters={customFilters}
             onFilterSelect={onFilterSelect}
+            filterModalConnectorComponent={IndexerStatsFilterModal}
             isDisabled={false}
           />
         </PageToolbarSection>
@@ -212,58 +244,110 @@ function IndexerStats() {
 
         {isLoaded && (
           <div>
-            <div className={styles.fullWidthChart}>
-              <BarChart
-                data={getAverageResponseTimeData(item.indexers)}
-                title={translate('AverageResponseTimesMs')}
-              />
+            <div className={styles.quarterWidthChart}>
+              <div className={styles.statContainer}>
+                <div className={styles.statTitle}>
+                  {translate('ActiveIndexers')}
+                </div>
+                <div className={styles.stat}>{indexerCount}</div>
+              </div>
+            </div>
+            <div className={styles.quarterWidthChart}>
+              <div className={styles.statContainer}>
+                <div className={styles.statTitle}>
+                  {translate('TotalQueries')}
+                </div>
+                <div className={styles.stat}>
+                  {abbreviateNumber(queryCount)}
+                </div>
+              </div>
+            </div>
+            <div className={styles.quarterWidthChart}>
+              <div className={styles.statContainer}>
+                <div className={styles.statTitle}>
+                  {translate('TotalGrabs')}
+                </div>
+                <div className={styles.stat}>{abbreviateNumber(grabCount)}</div>
+              </div>
+            </div>
+            <div className={styles.quarterWidthChart}>
+              <div className={styles.statContainer}>
+                <div className={styles.statTitle}>
+                  {translate('ActiveApps')}
+                </div>
+                <div className={styles.stat}>{userAgentCount}</div>
+              </div>
             </div>
             <div className={styles.fullWidthChart}>
-              <BarChart
-                data={getFailureRateData(item.indexers)}
-                title={translate('IndexerFailureRate')}
-                kind={kinds.WARNING}
-              />
+              <div className={styles.chartContainer}>
+                <BarChart
+                  data={getAverageResponseTimeData(item.indexers)}
+                  title={translate('AverageResponseTimesMs')}
+                  stepSize={100}
+                />
+              </div>
+            </div>
+            <div className={styles.fullWidthChart}>
+              <div className={styles.chartContainer}>
+                <BarChart
+                  data={getFailureRateData(item.indexers)}
+                  title={translate('IndexerFailureRate')}
+                  stepSize={0.1}
+                  kind={kinds.WARNING}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <StackedBarChart
-                data={getTotalRequestsData(item.indexers)}
-                title={translate('TotalIndexerQueries')}
-              />
+              <div className={styles.chartContainer}>
+                <StackedBarChart
+                  data={getTotalRequestsData(item.indexers)}
+                  title={translate('TotalIndexerQueries')}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <BarChart
-                data={getNumberGrabsData(item.indexers)}
-                title={translate('TotalIndexerSuccessfulGrabs')}
-              />
+              <div className={styles.chartContainer}>
+                <BarChart
+                  data={getNumberGrabsData(item.indexers)}
+                  title={translate('TotalIndexerSuccessfulGrabs')}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <BarChart
-                data={getUserAgentQueryData(item.userAgents)}
-                title={translate('TotalUserAgentQueries')}
-                horizontal={true}
-              />
+              <div className={styles.chartContainer}>
+                <BarChart
+                  data={getUserAgentQueryData(item.userAgents)}
+                  title={translate('TotalUserAgentQueries')}
+                  horizontal={true}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <BarChart
-                data={getUserAgentGrabsData(item.userAgents)}
-                title={translate('TotalUserAgentGrabs')}
-                horizontal={true}
-              />
+              <div className={styles.chartContainer}>
+                <BarChart
+                  data={getUserAgentGrabsData(item.userAgents)}
+                  title={translate('TotalUserAgentGrabs')}
+                  horizontal={true}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <DoughnutChart
-                data={getHostQueryData(item.hosts)}
-                title={translate('TotalHostQueries')}
-                horizontal={true}
-              />
+              <div className={styles.chartContainer}>
+                <DoughnutChart
+                  data={getHostQueryData(item.hosts)}
+                  title={translate('TotalHostQueries')}
+                  horizontal={true}
+                />
+              </div>
             </div>
             <div className={styles.halfWidthChart}>
-              <DoughnutChart
-                data={getHostGrabsData(item.hosts)}
-                title={translate('TotalHostGrabs')}
-                horizontal={true}
-              />
+              <div className={styles.chartContainer}>
+                <DoughnutChart
+                  data={getHostGrabsData(item.hosts)}
+                  title={translate('TotalHostGrabs')}
+                  horizontal={true}
+                />
+              </div>
             </div>
           </div>
         )}

frontend/src/Indexer/Stats/IndexerStatsFilterMenu.tsx

@@ -1,27 +0,0 @@
-import React from 'react';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import { align } from 'Helpers/Props';
-
-interface IndexerStatsFilterMenuProps {
-  selectedFilterKey: string | number;
-  filters: object[];
-  isDisabled: boolean;
-  onFilterSelect(filterName: string): unknown;
-}
-
-function IndexerStatsFilterMenu(props: IndexerStatsFilterMenuProps) {
-  const { selectedFilterKey, filters, isDisabled, onFilterSelect } = props;
-
-  return (
-    <FilterMenu
-      alignMenu={align.RIGHT}
-      isDisabled={isDisabled}
-      selectedFilterKey={selectedFilterKey}
-      filters={filters}
-      customFilters={[]}
-      onFilterSelect={onFilterSelect}
-    />
-  );
-}
-
-export default IndexerStatsFilterMenu;

frontend/src/Indexer/Stats/IndexerStatsFilterModal.tsx

@@ -0,0 +1,56 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setIndexerStatsFilter } from 'Store/Actions/indexerStatsActions';
+
+function createIndexerStatsSelector() {
+  return createSelector(
+    (state: AppState) => state.indexerStats.item,
+    (indexerStats) => {
+      return indexerStats;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.indexerStats.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface IndexerStatsFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function IndexerStatsFilterModal(
+  props: IndexerStatsFilterModalProps
+) {
+  const sectionItems = [useSelector(createIndexerStatsSelector())];
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'indexerStats';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setIndexerStatsFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Search/Table/CategoryLabel.js

@@ -1,43 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Label from 'Components/Label';
-import Tooltip from 'Components/Tooltip/Tooltip';
-import { kinds, tooltipPositions } from 'Helpers/Props';
-
-function CategoryLabel({ categories }) {
-  const sortedCategories = categories.filter((cat) => cat.name !== undefined).sort((c) => c.id);
-
-  if (categories?.length === 0) {
-    return (
-      <Tooltip
-        anchor={<Label kind={kinds.DANGER}>Unknown</Label>}
-        tooltip="Please report this issue to the GitHub as this shouldn't be happening"
-        position={tooltipPositions.LEFT}
-      />
-    );
-  }
-
-  return (
-    <span>
-      {
-        sortedCategories.map((category) => {
-          return (
-            <Label key={category.name}>
-              {category.name}
-            </Label>
-          );
-        })
-      }
-    </span>
-  );
-}
-
-CategoryLabel.defaultProps = {
-  categories: []
-};
-
-CategoryLabel.propTypes = {
-  categories: PropTypes.arrayOf(PropTypes.object).isRequired
-};
-
-export default CategoryLabel;

frontend/src/Search/Table/CategoryLabel.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import Label from 'Components/Label';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { kinds, tooltipPositions } from 'Helpers/Props';
+import { IndexerCategory } from 'Indexer/Indexer';
+import translate from 'Utilities/String/translate';
+
+interface CategoryLabelProps {
+  categories: IndexerCategory[];
+}
+
+function CategoryLabel({ categories = [] }: CategoryLabelProps) {
+  if (categories?.length === 0) {
+    return (
+      <Tooltip
+        anchor={<Label kind={kinds.DANGER}>{translate('Unknown')}</Label>}
+        tooltip="Please report this issue to the GitHub as this shouldn't be happening"
+        position={tooltipPositions.LEFT}
+      />
+    );
+  }
+
+  const sortedCategories = categories
+    .filter((cat) => cat.name !== undefined)
+    .sort((a, b) => a.id - b.id);
+
+  return (
+    <span>
+      {sortedCategories.map((category) => {
+        return <Label key={category.id}>{category.name}</Label>;
+      })}
+    </span>
+  );
+}
+
+export default CategoryLabel;

frontend/src/Settings/Applications/Applications/EditApplicationModalContent.js

@@ -133,7 +133,8 @@ function EditApplicationModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.TAG}
                   name="tags"
-                  helpText={translate('TagsHelpText')}
+                  helpText={translate('ApplicationTagsHelpText')}
+                  helpTextWarning={translate('ApplicationTagsHelpTextWarning')}
                   {...tags}
                   onChange={onInputChange}
                 />

frontend/src/Settings/General/SecuritySettings.js

@@ -11,24 +11,69 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
 import { icons, inputTypes, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 
-export const authenticationRequiredWarning = translate('AuthenticationRequiredWarning');
-
 export const authenticationMethodOptions = [
-  { key: 'none', value: 'None', isDisabled: true },
-  { key: 'external', value: 'External', isHidden: true },
-  { key: 'basic', value: 'Basic (Browser Popup)' },
-  { key: 'forms', value: 'Forms (Login Page)' }
+  {
+    key: 'none',
+    get value() {
+      return translate('None');
+    },
+    isDisabled: true
+  },
+  {
+    key: 'external',
+    get value() {
+      return translate('External');
+    },
+    isHidden: true
+  },
+  {
+    key: 'basic',
+    get value() {
+      return translate('AuthBasic');
+    }
+  },
+  {
+    key: 'forms',
+    get value() {
+      return translate('AuthForm');
+    }
+  }
 ];
 
 export const authenticationRequiredOptions = [
-  { key: 'enabled', value: 'Enabled' },
-  { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' }
+  {
+    key: 'enabled',
+    get value() {
+      return translate('Enabled');
+    }
+  },
+  {
+    key: 'disabledForLocalAddresses',
+    get value() {
+      return translate('DisabledForLocalAddresses');
+    }
+  }
 ];
 
 const certificateValidationOptions = [
-  { key: 'enabled', value: 'Enabled' },
-  { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' },
-  { key: 'disabled', value: 'Disabled' }
+  {
+    key: 'enabled',
+    get value() {
+      return translate('Enabled');
+    }
+  },
+  {
+    key: 'disabledForLocalAddresses',
+    get value() {
+      return translate('DisabledForLocalAddresses');
+    }
+  },
+  {
+    key: 'disabled',
+    get value() {
+      return translate('Disabled');
+    }
+  }
 ];
 
 class SecuritySettings extends Component {
@@ -79,6 +124,7 @@ class SecuritySettings extends Component {
       authenticationRequired,
       username,
       password,
+      passwordConfirmation,
       apiKey,
       certificateValidation
     } = settings;
@@ -95,7 +141,7 @@ class SecuritySettings extends Component {
             name="authenticationMethod"
             values={authenticationMethodOptions}
             helpText={translate('AuthenticationMethodHelpText')}
-            helpTextWarning={authenticationRequiredWarning}
+            helpTextWarning={translate('AuthenticationRequiredWarning')}
             onChange={onInputChange}
             {...authenticationMethod}
           />
@@ -148,6 +194,21 @@ class SecuritySettings extends Component {
             null
         }
 
+        {
+          authenticationEnabled ?
+            <FormGroup>
+              <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.PASSWORD}
+                name="passwordConfirmation"
+                onChange={onInputChange}
+                {...passwordConfirmation}
+              />
+            </FormGroup> :
+            null
+        }
+
         <FormGroup>
           <FormLabel>{translate('ApiKey')}</FormLabel>
 
@@ -155,6 +216,7 @@ class SecuritySettings extends Component {
             type={inputTypes.TEXT}
             name="apiKey"
             readOnly={true}
+            helpTextWarning={translate('RestartRequiredHelpTextWarning')}
             buttons={[
               <ClipboardButton
                 key="copy"
@@ -196,7 +258,7 @@ class SecuritySettings extends Component {
           isOpen={this.state.isConfirmApiKeyResetModalOpen}
           kind={kinds.DANGER}
           title={translate('ResetAPIKey')}
-          message={translate('AreYouSureYouWantToResetYourAPIKey')}
+          message={translate('ResetAPIKeyMessageText')}
           confirmLabel={translate('Reset')}
           onConfirm={this.onConfirmResetApiKey}
           onCancel={this.onCloseResetApiKeyModal}

frontend/src/Settings/UI/UISettings.js

@@ -176,6 +176,13 @@ class UISettings extends Component {
                       helpTextWarning={translate('UILanguageHelpTextWarning')}
                       onChange={onInputChange}
                       {...settings.uiLanguage}
+                      errors={
+                        languages.some((language) => language.key === settings.uiLanguage.value) ?
+                          settings.uiLanguage.errors :
+                          [
+                            ...settings.uiLanguage.errors,
+                            { message: translate('InvalidUILanguage') }
+                          ]}
                     />
                   </FormGroup>
                 </FieldSet>

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

@@ -7,6 +7,7 @@ import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/create
 import { createThunk } from 'Store/thunks';
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
+import translate from 'Utilities/String/translate';
 
 //
 // Variables
@@ -87,7 +88,7 @@ export default {
       const pendingChanges = { ...item, id: 0 };
       delete pendingChanges.id;
 
-      pendingChanges.name = `${pendingChanges.name} - Copy`;
+      pendingChanges.name = translate('DefaultNameCopiedProfile', { name: pendingChanges.name });
       newState.pendingChanges = pendingChanges;
 
       return updateSectionState(state, section, newState);

frontend/src/Store/Actions/index.js

@@ -4,6 +4,7 @@ import * as commands from './commandActions';
 import * as customFilters from './customFilterActions';
 import * as history from './historyActions';
 import * as indexers from './indexerActions';
+import * as indexerHistory from './indexerHistoryActions';
 import * as indexerIndex from './indexerIndexActions';
 import * as indexerStats from './indexerStatsActions';
 import * as indexerStatus from './indexerStatusActions';
@@ -28,6 +29,7 @@ export default [
   releases,
   localization,
   indexers,
+  indexerHistory,
   indexerIndex,
   indexerStats,
   indexerStatus,

frontend/src/Store/Actions/indexerActions.js

@@ -210,7 +210,7 @@ export const reducers = createHandleActions({
 
     // Set the name in pendingChanges
     newState.pendingChanges = {
-      name: `${item.name} - Copy`
+      name: translate('DefaultNameCopiedProfile', { name: item.name })
     };
 
     return updateSectionState(state, section, newState);

frontend/src/Store/Actions/indexerHistoryActions.js

@@ -0,0 +1,81 @@
+import { createAction } from 'redux-actions';
+import { batchActions } from 'redux-batched-actions';
+import { createThunk, handleThunks } from 'Store/thunks';
+import createAjaxRequest from 'Utilities/createAjaxRequest';
+import { set, update } from './baseActions';
+import createHandleActions from './Creators/createHandleActions';
+
+//
+// Variables
+
+export const section = 'indexerHistory';
+
+//
+// State
+
+export const defaultState = {
+  isFetching: false,
+  isPopulated: false,
+  error: null,
+  items: []
+};
+
+//
+// Actions Types
+
+export const FETCH_INDEXER_HISTORY = 'indexerHistory/fetchIndexerHistory';
+export const CLEAR_INDEXER_HISTORY = 'indexerHistory/clearIndexerHistory';
+
+//
+// Action Creators
+
+export const fetchIndexerHistory = createThunk(FETCH_INDEXER_HISTORY);
+export const clearIndexerHistory = createAction(CLEAR_INDEXER_HISTORY);
+
+//
+// Action Handlers
+
+export const actionHandlers = handleThunks({
+
+  [FETCH_INDEXER_HISTORY]: function(getState, payload, dispatch) {
+    dispatch(set({ section, isFetching: true }));
+
+    const promise = createAjaxRequest({
+      url: '/history/indexer',
+      data: payload
+    }).request;
+
+    promise.done((data) => {
+      dispatch(batchActions([
+        update({ section, data }),
+
+        set({
+          section,
+          isFetching: false,
+          isPopulated: true,
+          error: null
+        })
+      ]));
+    });
+
+    promise.fail((xhr) => {
+      dispatch(set({
+        section,
+        isFetching: false,
+        isPopulated: false,
+        error: xhr
+      }));
+    });
+  }
+});
+
+//
+// Reducers
+
+export const reducers = createHandleActions({
+
+  [CLEAR_INDEXER_HISTORY]: (state) => {
+    return Object.assign({}, state, defaultState);
+  }
+
+}, defaultState, section);

frontend/src/Store/Actions/indexerStatsActions.js

@@ -3,6 +3,7 @@ import { batchActions } from 'redux-batched-actions';
 import { filterBuilderTypes, filterBuilderValueTypes } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
+import findSelectedFilters from 'Utilities/Filter/findSelectedFilters';
 import translate from 'Utilities/String/translate';
 import { set, update } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
@@ -55,19 +56,26 @@ export const defaultState = {
 
   filterBuilderProps: [
     {
-      name: 'startDate',
-      label: 'Start Date',
-      type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.DATE
+      name: 'indexers',
+      label: () => translate('Indexers'),
+      type: filterBuilderTypes.CONTAINS,
+      valueType: filterBuilderValueTypes.INDEXER
     },
     {
-      name: 'endDate',
-      label: 'End Date',
+      name: 'protocols',
+      label: () => translate('Protocols'),
       type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.DATE
+      valueType: filterBuilderValueTypes.PROTOCOL
+    },
+    {
+      name: 'tags',
+      label: () => translate('Tags'),
+      type: filterBuilderTypes.CONTAINS,
+      valueType: filterBuilderValueTypes.TAG
     }
   ],
-  selectedFilterKey: 'all'
+  selectedFilterKey: 'all',
+  customFilters: []
 };
 
 export const persistState = [
@@ -81,6 +89,10 @@ export const persistState = [
 export const FETCH_INDEXER_STATS = 'indexerStats/fetchIndexerStats';
 export const SET_INDEXER_STATS_FILTER = 'indexerStats/setIndexerStatsFilter';
 
+function getCustomFilters(state, type) {
+  return state.customFilters.items.filter((customFilter) => customFilter.type === type);
+}
+
 //
 // Action Creators
 
@@ -94,23 +106,39 @@ export const actionHandlers = handleThunks({
   [FETCH_INDEXER_STATS]: function(getState, payload, dispatch) {
     const state = getState();
     const indexerStats = state.indexerStats;
+    const customFilters = getCustomFilters(state, section);
+    const selectedFilters = findSelectedFilters(indexerStats.selectedFilterKey, indexerStats.filters, customFilters);
 
     const requestParams = {
       endDate: moment().toISOString()
     };
 
+    selectedFilters.forEach((selectedFilter) => {
+      if (selectedFilter.key === 'indexers') {
+        requestParams.indexers = selectedFilter.value.join(',');
+      }
+
+      if (selectedFilter.key === 'protocols') {
+        requestParams.protocols = selectedFilter.value.join(',');
+      }
+
+      if (selectedFilter.key === 'tags') {
+        requestParams.tags = selectedFilter.value.join(',');
+      }
+    });
+
     if (indexerStats.selectedFilterKey !== 'all') {
-      let dayCount = 7;
+      if (indexerStats.selectedFilterKey === 'lastSeven') {
+        requestParams.startDate = moment().add(-7, 'days').endOf('day').toISOString();
+      }
 
       if (indexerStats.selectedFilterKey === 'lastThirty') {
-        dayCount = 30;
+        requestParams.startDate = moment().add(-30, 'days').endOf('day').toISOString();
       }
 
       if (indexerStats.selectedFilterKey === 'lastNinety') {
-        dayCount = 90;
+        requestParams.startDate = moment().add(-90, 'days').endOf('day').toISOString();
       }
-
-      requestParams.startDate = moment().add(-dayCount, 'days').endOf('day').toISOString();
     }
 
     const basesAttrs = {

frontend/src/Store/Actions/releaseActions.js

@@ -1,7 +1,9 @@
 import $ from 'jquery';
+import React from 'react';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
-import { filterBuilderTypes, filterBuilderValueTypes, sortDirections } from 'Helpers/Props';
+import Icon from 'Components/Icon';
+import { filterBuilderTypes, filterBuilderValueTypes, filterTypePredicates, icons, sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import getSectionState from 'Utilities/State/getSectionState';
@@ -110,7 +112,11 @@ export const defaultState = {
     },
     {
       name: 'indexerFlags',
-      columnLabel: 'Indexer Flags',
+      columnLabel: () => translate('IndexerFlags'),
+      label: React.createElement(Icon, {
+        name: icons.FLAG,
+        title: () => translate('IndexerFlags')
+      }),
       isSortable: true,
       isVisible: true
     },
@@ -163,6 +169,18 @@ export const defaultState = {
     }
   ],
 
+  filterPredicates: {
+    peers: function(item, filterValue, type) {
+      const predicate = filterTypePredicates[type];
+
+      const seeders = item.seeders || 0;
+      const leechers = item.leechers || 0;
+      const peers = seeders + leechers;
+
+      return predicate(peers, filterValue);
+    }
+  },
+
   filterBuilderProps: [
     {
       name: 'title',

frontend/src/Styles/Themes/dark.js

@@ -187,6 +187,7 @@ module.exports = {
   //
   // Charts
 
+  chartBackgroundColor: '#262626',
   failedColors: ['#ffbeb2', '#feb4a6', '#fdab9b', '#fca290', '#fb9984', '#fa8f79', '#f9856e', '#f77b66', '#f5715d', '#f36754', '#f05c4d', '#ec5049', '#e74545', '#e13b42', '#da323f', '#d3293d', '#ca223c', '#c11a3b', '#b8163a', '#ae123a'],
   chartColorsDiversified: ['#90caf9', '#f4d166', '#ff8a65', '#ce93d8', '#80cba9', '#ffab91', '#8097ea', '#bcaaa4', '#a57583', '#e4e498', '#9e96af', '#c6ab81', '#6972c6', '#619fc6', '#81ad81', '#f48fb1', '#82afca', '#b5b071', '#8b959b', '#7ec0b4'],
   chartColors: ['#f4d166', '#f6c760', '#f8bc58', '#f8b252', '#f7a84a', '#f69e41', '#f49538', '#f38b2f', '#f28026', '#f0751e', '#eb6c1c', '#e4641e', '#de5d1f', '#d75521', '#cf4f22', '#c64a22', '#bc4623', '#b24223', '#a83e24', '#9e3a26']

frontend/src/Styles/Themes/light.js

@@ -187,6 +187,7 @@ module.exports = {
   //
   // Charts
 
+  chartBackgroundColor: '#fff',
   failedColors: ['#ffbeb2', '#feb4a6', '#fdab9b', '#fca290', '#fb9984', '#fa8f79', '#f9856e', '#f77b66', '#f5715d', '#f36754', '#f05c4d', '#ec5049', '#e74545', '#e13b42', '#da323f', '#d3293d', '#ca223c', '#c11a3b', '#b8163a', '#ae123a'],
   chartColorsDiversified: ['#90caf9', '#f4d166', '#ff8a65', '#ce93d8', '#80cba9', '#ffab91', '#8097ea', '#bcaaa4', '#a57583', '#e4e498', '#9e96af', '#c6ab81', '#6972c6', '#619fc6', '#81ad81', '#f48fb1', '#82afca', '#b5b071', '#8b959b', '#7ec0b4'],
   chartColors: ['#f4d166', '#f6c760', '#f8bc58', '#f8b252', '#f7a84a', '#f69e41', '#f49538', '#f38b2f', '#f28026', '#f0751e', '#eb6c1c', '#e4641e', '#de5d1f', '#d75521', '#cf4f22', '#c64a22', '#bc4623', '#b24223', '#a83e24', '#9e3a26']

frontend/src/System/Backup/BackupRow.js

@@ -4,7 +4,7 @@ import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
@@ -110,7 +110,7 @@ class BackupRow extends Component {
           {formatBytes(size)}
         </TableRowCell>
 
-        <RelativeDateCellConnector
+        <RelativeDateCell
           date={time}
         />
 

frontend/src/System/Events/LogsTableRow.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Icon from 'Components/Icon';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRowButton from 'Components/Table/TableRowButton';
 import { icons } from 'Helpers/Props';
@@ -98,7 +98,7 @@ class LogsTableRow extends Component {
 
             if (name === 'time') {
               return (
-                <RelativeDateCellConnector
+                <RelativeDateCell
                   key={name}
                   date={time}
                 />

frontend/src/System/Logs/Files/LogFilesTableRow.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Link from 'Components/Link/Link';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import styles from './LogFilesTableRow.css';
@@ -22,7 +22,7 @@ class LogFilesTableRow extends Component {
       <TableRow>
         <TableRowCell>{filename}</TableRowCell>
 
-        <RelativeDateCellConnector
+        <RelativeDateCell
           date={lastWriteTime}
         />
 

frontend/src/System/Updates/Updates.js

@@ -114,7 +114,7 @@ class Updates extends Component {
                 />
 
                 <div className={styles.message}>
-                  {translate('TheLatestVersionIsAlreadyInstalled', { appName: 'Prowlarr' })}
+                  {translate('TheLatestVersionIsAlreadyInstalled')}
                 </div>
 
                 {

frontend/src/Utilities/Number/abbreviateNumber.js

@@ -0,0 +1,19 @@
+export default function abbreviateNumber(num, decimalPlaces) {
+  if (num === null) {
+    return null;
+  }
+
+  if (num === 0) {
+    return '0';
+  }
+
+  decimalPlaces = (!decimalPlaces || decimalPlaces < 0) ? 0 : decimalPlaces;
+
+  const b = (num).toPrecision(2).split('e');
+  const k = b.length === 1 ? 0 : Math.floor(Math.min(b[1].slice(1), 14) / 3);
+  const c = k < 1 ? num.toFixed(0 + decimalPlaces) : (num / Math.pow(10, k * 3) ).toFixed(1 + decimalPlaces);
+  const d = c < 0 ? c : Math.abs(c);
+  const e = d + ['', 'K', 'M', 'B', 'T'][k];
+
+  return e;
+}

frontend/src/Utilities/String/translate.ts

@@ -25,20 +25,18 @@ export async function fetchTranslations(): Promise<boolean> {
 
 export default function translate(
   key: string,
-  tokens?: Record<string, string | number | boolean>
+  tokens: Record<string, string | number | boolean> = {}
 ) {
   const translation = translations[key] || key;
 
-  if (tokens) {
-    // Fallback to the old behaviour for translations not yet updated to use named tokens
-    Object.values(tokens).forEach((value, index) => {
-      tokens[index] = value;
-    });
+  tokens.appName = 'Prowlarr';
 
-    return translation.replace(/\{([a-z0-9]+?)\}/gi, (match, tokenMatch) =>
-      String(tokens[tokenMatch] ?? match)
-    );
-  }
+  // Fallback to the old behaviour for translations not yet updated to use named tokens
+  Object.values(tokens).forEach((value, index) => {
+    tokens[index] = value;
+  });
 
-  return translation;
+  return translation.replace(/\{([a-z0-9]+?)\}/gi, (match, tokenMatch) =>
+    String(tokens[tokenMatch] ?? match)
+  );
 }

frontend/src/typings/History.ts

@@ -0,0 +1,21 @@
+import ModelBase from 'App/ModelBase';
+
+export interface HistoryData {
+  source: string;
+  host: string;
+  limit: number;
+  offset: number;
+  elapsedTime: number;
+  query: string;
+  queryType: string;
+}
+
+interface History extends ModelBase {
+  indexerId: number;
+  date: string;
+  successful: boolean;
+  eventType: string;
+  data: HistoryData;
+}
+
+export default History;

package.json

@@ -29,7 +29,7 @@
     "@fortawesome/free-solid-svg-icons": "6.4.0",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@juggle/resize-observer": "3.4.0",
-    "@microsoft/signalr": "6.0.16",
+    "@microsoft/signalr": "6.0.25",
     "@sentry/browser": "7.51.2",
     "@sentry/integrations": "7.51.2",
     "@types/node": "18.15.11",
@@ -71,6 +71,7 @@
     "react-redux": "7.2.4",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
+    "react-tabs": "4.3.0",
     "react-text-truncate": "0.19.0",
     "react-use-measure": "2.1.1",
     "react-virtualized": "9.21.1",
@@ -85,17 +86,13 @@
     "typescript": "5.0.4"
   },
   "devDependencies": {
-    "@babel/core": "7.22.9",
-    "@babel/eslint-parser": "7.22.9",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/core": "7.22.11",
+    "@babel/eslint-parser": "7.22.11",
     "@babel/plugin-proposal-export-default-from": "7.22.5",
-    "@babel/plugin-proposal-export-namespace-from": "7.18.9",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/preset-env": "7.22.9",
+    "@babel/preset-env": "7.22.14",
     "@babel/preset-react": "7.22.5",
-    "@babel/preset-typescript": "7.22.5",
+    "@babel/preset-typescript": "7.22.11",
     "@types/lodash": "4.14.194",
     "@types/react-router-dom": "5.3.3",
     "@types/react-text-truncate": "0.14.1",
@@ -108,7 +105,7 @@
     "babel-loader": "9.1.3",
     "babel-plugin-inline-classnames": "2.0.1",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "core-js": "3.31.1",
+    "core-js": "3.33.0",
     "css-loader": "6.7.3",
     "css-modules-typescript-loader": "4.0.1",
     "eslint": "8.45.0",
@@ -125,7 +122,7 @@
     "html-webpack-plugin": "5.5.1",
     "loader-utils": "^3.2.1",
     "mini-css-extract-plugin": "2.7.5",
-    "postcss": "8.4.23",
+    "postcss": "8.4.31",
     "postcss-color-function": "4.1.0",
     "postcss-loader": "7.3.0",
     "postcss-mixins": "9.0.4",
@@ -144,7 +141,7 @@
     "ts-loader": "9.4.2",
     "typescript-plugin-css-modules": "5.0.1",
     "url-loader": "4.1.1",
-    "webpack": "5.88.1",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
     "webpack-livereload-plugin": "3.0.2"
   }

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -128,6 +128,16 @@ namespace NzbDrone.Common.Test.Http
             response.Content.Should().NotBeNullOrWhiteSpace();
         }
 
+        [Test]
+        public void should_throw_timeout_request()
+        {
+            var request = new HttpRequest($"https://{_httpBinHost}/delay/10");
+
+            request.RequestTimeout = new TimeSpan(0, 0, 5);
+
+            Assert.ThrowsAsync<WebException>(async () => await Subject.ExecuteAsync(request));
+        }
+
         [Test]
         public void should_execute_https_get()
         {

src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -89,8 +89,16 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         // Download Station
         [TestCase(@"webapi/entry.cgi?api=(removed)&version=2&method=login&account=01233210&passwd=mySecret&format=sid&session=DownloadStation")]
 
-        // Tracker Responses
-        [TestCase(@"tracker"":""http://xxx.yyy/announce.php?passkey=9pr04sg601233210imaveql2tyu8xyui"",""info"":""http://xxx.yyy/info?a=b""")]
+        // Announce URLs (passkeys) Magnet & Tracker
+        [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210IMAveQL2tyu8xyui%2fannounce""}")]
+        [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2ftracker.php%2f9pr04sg601233210IMAveQL2tyu8xyui%2fannounce""}")]
+        [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2fannounce%2f9pr04sg601233210IMAveQL2tyu8xyui""}")]
+        [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2fannounce.php%3fpasskey%3d9pr04sg601233210IMAveQL2tyu8xyui""}")]
+        [TestCase(@"tracker"":""https://xxx.yyy/9pr04sg601233210IMAveQL2tyu8xyui/announce""}")]
+        [TestCase(@"tracker"":""https://xxx.yyy/tracker.php/9pr04sg601233210IMAveQL2tyu8xyui/announce""}")]
+        [TestCase(@"tracker"":""https://xxx.yyy/announce/9pr04sg601233210IMAveQL2tyu8xyui""}")]
+        [TestCase(@"tracker"":""https://xxx.yyy/announce.php?passkey=9pr04sg601233210IMAveQL2tyu8xyui""}")]
+        [TestCase(@"tracker"":""http://xxx.yyy/announce.php?passkey=9pr04sg601233210IMAveQL2tyu8xyui"",""info"":""http://xxx.yyy/info?a=b""")]
 
         // BroadcastheNet
         [TestCase(@"method: ""getTorrents"", ""params"": [ ""mySecret"",")]
@@ -104,6 +112,9 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         // RSS
         [TestCase(@"<atom:link href = ""https://api.nzb.su/api?t=search&amp;extended=1&amp;cat=3030&apikey=mySecret&amp;q=Diggers"" rel=""self"" type=""application/rss+xml"" />")]
 
+        // Applications
+        [TestCase(@"""name"":""apiKey"",""value"":""mySecret""")]
+
         // Internal
         [TestCase(@"[Info] MigrationController: *** Migrating Database=prowlarr-main;Host=postgres14;Username=mySecret;Password=mySecret;Port=5432;Enlist=False ***")]
         [TestCase("/readarr/signalr/messages/negotiate?access_token=1234530f422f4aacb6b301233210aaaa&negotiateVersion=1")]

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -160,7 +160,7 @@ namespace NzbDrone.Common.Extensions
         {
             if (text.IsNullOrWhiteSpace())
             {
-                throw new ArgumentNullException("text");
+                throw new ArgumentNullException(nameof(text));
             }
 
             return text.IndexOfAny(Path.GetInvalidPathChars()) >= 0;

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -107,52 +107,59 @@ namespace NzbDrone.Common.Http.Dispatchers
 
             sw.Start();
 
-            using var responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
+            try
             {
-                byte[] data = null;
-
-                try
+                using var responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cts.Token);
                 {
-                    if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
+                    byte[] data = null;
+
+                    try
                     {
-                        await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
-                    }
-                    else
-                    {
-                        data = responseMessage.Content.ReadAsByteArrayAsync(cts.Token).GetAwaiter().GetResult();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
-                }
-
-                var headers = responseMessage.Headers.ToNameValueCollection();
-
-                headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
-
-                var responseCookies = new CookieContainer();
-
-                if (responseMessage.Headers.TryGetValues("Set-Cookie", out var cookieHeaders))
-                {
-                    foreach (var responseCookieHeader in cookieHeaders)
-                    {
-                        try
+                        if (request.ResponseStream != null && responseMessage.StatusCode == HttpStatusCode.OK)
                         {
-                            cookies.SetCookies(responseMessage.RequestMessage.RequestUri, responseCookieHeader);
+                            await responseMessage.Content.CopyToAsync(request.ResponseStream, null, cts.Token);
                         }
-                        catch
+                        else
                         {
-                            // Ignore invalid cookies
+                            data = await responseMessage.Content.ReadAsByteArrayAsync(cts.Token);
                         }
                     }
+                    catch (Exception ex)
+                    {
+                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, null);
+                    }
+
+                    var headers = responseMessage.Headers.ToNameValueCollection();
+
+                    headers.Add(responseMessage.Content.Headers.ToNameValueCollection());
+
+                    var responseCookies = new CookieContainer();
+
+                    if (responseMessage.Headers.TryGetValues("Set-Cookie", out var cookieHeaders))
+                    {
+                        foreach (var responseCookieHeader in cookieHeaders)
+                        {
+                            try
+                            {
+                                cookies.SetCookies(responseMessage.RequestMessage.RequestUri, responseCookieHeader);
+                            }
+                            catch
+                            {
+                                // Ignore invalid cookies
+                            }
+                        }
+                    }
+
+                    var cookieCollection = cookies.GetCookies(responseMessage.RequestMessage.RequestUri);
+
+                    sw.Stop();
+
+                    return new HttpResponse(request, new HttpHeader(headers), cookieCollection, data, sw.ElapsedMilliseconds, responseMessage.StatusCode, responseMessage.Version);
                 }
-
-                var cookieCollection = cookies.GetCookies(responseMessage.RequestMessage.RequestUri);
-
-                sw.Stop();
-
-                return new HttpResponse(request, new HttpHeader(headers), cookieCollection, data, sw.ElapsedMilliseconds, responseMessage.StatusCode, responseMessage.Version);
+            }
+            catch (OperationCanceledException ex) when (cts.IsCancellationRequested)
+            {
+                throw new WebException("Http request timed out", ex.InnerException, WebExceptionStatus.Timeout, null);
             }
         }
 

src/NzbDrone.Common/Http/HttpClient.cs

@@ -221,11 +221,18 @@ namespace NzbDrone.Common.Http
                             };
                         }
 
-                        sourceContainer.Add((Uri)request.Url, cookie);
-
-                        if (request.StoreRequestCookie)
+                        try
                         {
-                            presistentContainer.Add((Uri)request.Url, cookie);
+                            sourceContainer.Add((Uri)request.Url, cookie);
+
+                            if (request.StoreRequestCookie)
+                            {
+                                presistentContainer.Add((Uri)request.Url, cookie);
+                            }
+                        }
+                        catch (CookieException ex)
+                        {
+                            _logger.Debug(ex, "Invalid cookie in {0}", (Uri)request.Url);
                         }
                     }
                 }
@@ -260,7 +267,14 @@ namespace NzbDrone.Common.Http
                         };
                     }
 
-                    sourceContainer.Add((Uri)request.Url, cookie);
+                    try
+                    {
+                        sourceContainer.Add((Uri)request.Url, cookie);
+                    }
+                    catch (CookieException ex)
+                    {
+                        _logger.Debug(ex, "Invalid cookie in {0}", (Uri)request.Url);
+                    }
                 }
             }
 

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -30,7 +30,7 @@ namespace NzbDrone.Common.Instrumentation
             new (@"""/(home|Users)/(?<secret>[^/""]+?)(/|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
             // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory
-            new (@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce"),
+            new (@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?<secret>[a-z0-9]{16,})|(?<secret>[a-z0-9]{16,})(/|%2f)announce", RegexOptions.Compiled | RegexOptions.IgnoreCase),
 
             // NzbGet
             new (@"""Name""\s*:\s*""[^""]*(username|password)""\s*,\s*""Value""\s*:\s*""(?<secret>[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
@@ -58,6 +58,9 @@ namespace NzbDrone.Common.Instrumentation
             new (@"(?:avistaz|exoticaz|cinemaz|privatehd)\.[a-z]{2,3}/rss/download/(?<secret>[^&=]+?)/(?<secret>[^&=]+?)\.torrent", RegexOptions.Compiled | RegexOptions.IgnoreCase),
             new (@"(?:animebytes)\.[a-z]{2,3}/torrent/[0-9]+/download/(?<secret>[^&=]+?)[""]", RegexOptions.Compiled | RegexOptions.IgnoreCase),
             new (@"""(info_hash|token|((pass|rss)[- _]?key))"":""(?<secret>[^&=]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+
+            // Applications
+            new (@"""name"":""apikey"",""value"":""(?<secret>[^&=]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase),
         };
 
         private static readonly Regex CleanseRemoteIPRegex = new (@"(?:Auth-\w+(?<!Failure|Unauthorized) ip|from) (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", RegexOptions.Compiled);

src/NzbDrone.Common/Prowlarr.Common.csproj

@@ -4,13 +4,13 @@
     <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.4" />
+    <PackageReference Include="DryIoc.dll" Version="5.4.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.2.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
+    <PackageReference Include="Npgsql" Version="7.0.6" />
     <PackageReference Include="Sentry" Version="3.29.1" />
     <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
@@ -19,7 +19,7 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="EnsureThat\Resources\ExceptionMessages.Designer.cs">

src/NzbDrone.Common/Serializer/System.Text.Json/BooleanConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace NzbDrone.Common.Serializer;
+
+public class BooleanConverter : JsonConverter<bool>
+{
+    public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return reader.TokenType switch
+        {
+            JsonTokenType.True => true,
+            JsonTokenType.False => false,
+            JsonTokenType.Number => reader.GetInt64() switch
+            {
+                1 => true,
+                0 => false,
+                _ => throw new JsonException()
+            },
+            _ => throw new JsonException()
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
+    {
+        writer.WriteBooleanValue(value);
+    }
+}

src/NzbDrone.Common/Serializer/System.Text.Json/STJson.cs

@@ -36,6 +36,7 @@ namespace NzbDrone.Common.Serializer
             serializerSettings.Converters.Add(new STJTimeSpanConverter());
             serializerSettings.Converters.Add(new STJUtcConverter());
             serializerSettings.Converters.Add(new DictionaryStringObjectConverter());
+            serializerSettings.Converters.Add(new BooleanConverter());
         }
 
         public static T Deserialize<T>(string json)

src/NzbDrone.Common/TPL/DebounceManager.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace NzbDrone.Common.TPL
+{
+    public interface IDebounceManager
+    {
+        Debouncer CreateDebouncer(Action action, TimeSpan debounceDuration);
+    }
+
+    public class DebounceManager : IDebounceManager
+    {
+        public Debouncer CreateDebouncer(Action action, TimeSpan debounceDuration)
+        {
+            return new Debouncer(action, debounceDuration);
+        }
+    }
+}

src/NzbDrone.Common/TPL/Debouncer.cs

@@ -4,11 +4,11 @@ namespace NzbDrone.Common.TPL
 {
     public class Debouncer
     {
-        private readonly Action _action;
-        private readonly System.Timers.Timer _timer;
+        protected readonly Action _action;
+        protected readonly System.Timers.Timer _timer;
 
-        private volatile int _paused;
-        private volatile bool _triggered;
+        protected volatile int _paused;
+        protected volatile bool _triggered;
 
         public Debouncer(Action action, TimeSpan debounceDuration)
         {
@@ -27,7 +27,7 @@ namespace NzbDrone.Common.TPL
             }
         }
 
-        public void Execute()
+        public virtual void Execute()
         {
             lock (_timer)
             {
@@ -39,7 +39,7 @@ namespace NzbDrone.Common.TPL
             }
         }
 
-        public void Pause()
+        public virtual void Pause()
         {
             lock (_timer)
             {
@@ -48,7 +48,7 @@ namespace NzbDrone.Common.TPL
             }
         }
 
-        public void Resume()
+        public virtual void Resume()
         {
             lock (_timer)
             {

src/NzbDrone.Core.Test/HealthCheck/HealthCheckServiceFixture.cs

@@ -1,10 +1,14 @@
+using System;
 using System.Collections.Generic;
 using FluentAssertions;
+using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Messaging;
+using NzbDrone.Common.TPL;
 using NzbDrone.Core.HealthCheck;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.HealthCheck
 {
@@ -19,10 +23,10 @@ namespace NzbDrone.Core.Test.HealthCheck
 
             Mocker.SetConstant<IEnumerable<IProvideHealthCheck>>(new[] { _healthCheck });
             Mocker.SetConstant<ICacheManager>(Mocker.Resolve<CacheManager>());
+            Mocker.SetConstant<IDebounceManager>(Mocker.Resolve<DebounceManager>());
 
-            Mocker.GetMock<IServerSideNotificationService>()
-                .Setup(v => v.GetServerChecks())
-                .Returns(new List<Core.HealthCheck.HealthCheck>());
+            Mocker.GetMock<IDebounceManager>().Setup(s => s.CreateDebouncer(It.IsAny<Action>(), It.IsAny<TimeSpan>()))
+                .Returns<Action, TimeSpan>((a, t) => new MockDebouncer(a, t));
         }
 
         [Test]

src/NzbDrone.Core.Test/IndexerStatsTests/IndexerStatisticsServiceFixture.cs

@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.IndexerStatsTests
                 .Setup(o => o.Between(It.IsAny<DateTime>(), It.IsAny<DateTime>()))
                 .Returns<DateTime, DateTime>((s, f) => history);
 
-            var statistics = Subject.IndexerStatistics(DateTime.UtcNow.AddMonths(-1), DateTime.UtcNow);
+            var statistics = Subject.IndexerStatistics(DateTime.UtcNow.AddMonths(-1), DateTime.UtcNow, new List<int> { 5 });
 
             statistics.IndexerStatistics.Count.Should().Be(1);
             statistics.IndexerStatistics.First().AverageResponseTime.Should().Be(0);

src/NzbDrone.Core.Test/IndexerTests/AnimeBytesTests/AnimeBytesFixture.cs

@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AnimeBytesTests
                 .Setup(o => o.ExecuteProxiedAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get), Subject.Definition))
                 .Returns<HttpRequest, IndexerDefinition>((r, d) => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, new CookieCollection(), recentFeed)));
 
-            var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 2000, 5000 } })).Releases;
+            var releases = (await Subject.Fetch(new BasicSearchCriteria { SearchTerm = "test", Categories = new[] { 2000, 5000 } })).Releases;
 
             releases.Should().HaveCount(33);
             releases.First().Should().BeOfType<TorrentInfo>();

src/NzbDrone.Core.Test/IndexerTests/AvistazTests/AvistazFixture.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://avistaz.to/torrent/187240-japan-sinks-people-of-hope-2021-s01e05-720p-nf-web-dl-ddp20-x264-seikel");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-14 21:26:21"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-11-14 22:26:21"));
             torrentInfo.Size.Should().Be(935127615);
             torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
             torrentInfo.MagnetUrl.Should().Be(null);

src/NzbDrone.Core.Test/IndexerTests/AvistazTests/ExoticazFixture.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://exoticaz.to/torrent/64040-ssis-419-my-first-experience-is-yua-mikami-from-the-day-i-lost-my-virginity-i-was-devoted-to-sex");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-06-11 15:04:50"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2022-06-11 10:04:50"));
             torrentInfo.Size.Should().Be(7085405541);
             torrentInfo.InfoHash.Should().Be("asdjfiasdf54asd7f4a2sdf544asdf");
             torrentInfo.MagnetUrl.Should().Be(null);

src/NzbDrone.Core.Test/IndexerTests/AvistazTests/PrivateHDFixture.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AvistazTests
             torrentInfo.InfoUrl.Should().Be("https://privatehd.to/torrent/78506-godzilla-2014-2160p-uhd-bluray-remux-hdr-hevc-atmos-triton");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-03-21 04:24:49"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2021-03-21 05:24:49"));
             torrentInfo.Size.Should().Be(69914591044);
             torrentInfo.InfoHash.Should().Be("a879261d4e6e792402f92401141a21de70d51bf2");
             torrentInfo.MagnetUrl.Should().Be(null);

src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs

@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
             torrentInfo.InfoUrl.Should().Be("https://filelist.io/details.php?id=665873");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
             torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 19:20:19"));
+            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2020-01-25 20:20:19"));
             torrentInfo.Size.Should().Be(8300512414);
             torrentInfo.InfoHash.Should().Be(null);
             torrentInfo.MagnetUrl.Should().Be(null);

src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs

@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
             var first = torrents.First() as TorrentInfo;
 
             first.Guid.Should().Be("HDBits-257142");
-            first.Title.Should().Be("Supernatural S10E17 1080p WEB-DL DD5.1 H.264-ECI");
+            first.Title.Should().Be("Supernatural.S10E17.1080p.WEB-DL.DD5.1.H.264-ECI");
             first.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
             first.DownloadUrl.Should().Be("https://hdbits.org/download.php?id=257142&passkey=fakekey");
             first.InfoUrl.Should().Be("https://hdbits.org/details.php?id=257142");

src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs

@@ -68,5 +68,16 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             VerifyNoUpdate();
         }
+
+        [Test]
+        public void should_not_record_failure_for_unknown_provider()
+        {
+            Subject.RecordFailure(0);
+
+            Mocker.GetMock<IIndexerStatusRepository>()
+                .Verify(v => v.FindByProviderId(1), Times.Never);
+
+            VerifyNoUpdate();
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs

@@ -19,6 +19,11 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
         [SetUp]
         public void SetUp()
         {
+            Subject.Definition = new IndexerDefinition
+            {
+                Name = "Newznab"
+            };
+
             Subject.Settings = new NewznabSettings()
             {
                 BaseUrl = "http://127.0.0.1:1234/",

src/NzbDrone.Core.Test/IndexerTests/OrpheusTests/OrpheusFixture.cs

@@ -9,8 +9,8 @@ using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Definitions;
-using NzbDrone.Core.Indexers.Definitions.Gazelle;
 using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
@@ -39,12 +39,12 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
 
             var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 3000 } })).Releases;
 
-            releases.Should().HaveCount(65);
-            releases.First().Should().BeOfType<GazelleInfo>();
+            releases.Should().HaveCount(50);
+            releases.First().Should().BeOfType<TorrentInfo>();
 
-            var torrentInfo = releases.First() as GazelleInfo;
+            var torrentInfo = releases.First() as TorrentInfo;
 
-            torrentInfo.Title.Should().Be("The Beatles - Abbey Road [1969] [Album] [2.0 Mix 2019] [MP3 V2 (VBR)] [BD]");
+            torrentInfo.Title.Should().Be("The Beatles - Abbey Road [1969] [Album] [2.0 Mix 2019] [MP3 V2 (VBR) / BD]");
             torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
             torrentInfo.DownloadUrl.Should().Be("https://orpheus.network/ajax.php?action=download&id=1902448");
             torrentInfo.InfoUrl.Should().Be("https://orpheus.network/torrents.php?id=466&torrentid=1902448");