mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2025-09-17 17:14:18 +02:00
New: Identify indexers that are already setup in add list
This commit is contained in:
@@ -15,7 +15,7 @@ import TableBody from 'Components/Table/TableBody';
|
|||||||
import { kinds, scrollDirections } from 'Helpers/Props';
|
import { kinds, scrollDirections } from 'Helpers/Props';
|
||||||
import getErrorMessage from 'Utilities/Object/getErrorMessage';
|
import getErrorMessage from 'Utilities/Object/getErrorMessage';
|
||||||
import translate from 'Utilities/String/translate';
|
import translate from 'Utilities/String/translate';
|
||||||
import SelectIndexerRow from './SelectIndexerRow';
|
import SelectIndexerRowConnector from './SelectIndexerRowConnector';
|
||||||
import styles from './AddIndexerModalContent.css';
|
import styles from './AddIndexerModalContent.css';
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
@@ -219,7 +219,7 @@ class AddIndexerModalContent extends Component {
|
|||||||
<TableBody>
|
<TableBody>
|
||||||
{
|
{
|
||||||
filteredIndexers.map((indexer) => (
|
filteredIndexers.map((indexer) => (
|
||||||
<SelectIndexerRow
|
<SelectIndexerRowConnector
|
||||||
key={indexer.name}
|
key={indexer.name}
|
||||||
implementation={indexer.implementation}
|
implementation={indexer.implementation}
|
||||||
{...indexer}
|
{...indexer}
|
||||||
|
@@ -3,3 +3,9 @@
|
|||||||
|
|
||||||
width: 32px;
|
width: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.alreadyExistsIcon {
|
||||||
|
margin-left: 10px;
|
||||||
|
color: #37bc9b;
|
||||||
|
pointer-events: all;
|
||||||
|
}
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
import Icon from 'Components/Icon';
|
||||||
import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
import TableRowCell from 'Components/Table/Cells/TableRowCell';
|
||||||
import TableRowButton from 'Components/Table/TableRowButton';
|
import TableRowButton from 'Components/Table/TableRowButton';
|
||||||
|
import { icons } from 'Helpers/Props';
|
||||||
import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
|
import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
|
||||||
import firstCharToUpper from 'Utilities/String/firstCharToUpper';
|
import firstCharToUpper from 'Utilities/String/firstCharToUpper';
|
||||||
import translate from 'Utilities/String/translate';
|
import translate from 'Utilities/String/translate';
|
||||||
@@ -29,7 +31,8 @@ class SelectIndexerRow extends Component {
|
|||||||
protocol,
|
protocol,
|
||||||
privacy,
|
privacy,
|
||||||
name,
|
name,
|
||||||
language
|
language,
|
||||||
|
isExistingIndexer
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -42,6 +45,16 @@ class SelectIndexerRow extends Component {
|
|||||||
|
|
||||||
<TableRowCell>
|
<TableRowCell>
|
||||||
{name}
|
{name}
|
||||||
|
{
|
||||||
|
isExistingIndexer ?
|
||||||
|
<Icon
|
||||||
|
className={styles.alreadyExistsIcon}
|
||||||
|
name={icons.CHECK_CIRCLE}
|
||||||
|
size={15}
|
||||||
|
title={translate('IndexerAlreadySetup')}
|
||||||
|
/> :
|
||||||
|
null
|
||||||
|
}
|
||||||
</TableRowCell>
|
</TableRowCell>
|
||||||
|
|
||||||
<TableRowCell>
|
<TableRowCell>
|
||||||
@@ -62,7 +75,8 @@ SelectIndexerRow.propTypes = {
|
|||||||
privacy: PropTypes.string.isRequired,
|
privacy: PropTypes.string.isRequired,
|
||||||
language: PropTypes.string.isRequired,
|
language: PropTypes.string.isRequired,
|
||||||
implementation: PropTypes.string.isRequired,
|
implementation: PropTypes.string.isRequired,
|
||||||
onIndexerSelect: PropTypes.func.isRequired
|
onIndexerSelect: PropTypes.func.isRequired,
|
||||||
|
isExistingIndexer: PropTypes.bool.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
export default SelectIndexerRow;
|
export default SelectIndexerRow;
|
||||||
|
18
frontend/src/Indexer/Add/SelectIndexerRowConnector.js
Normal file
18
frontend/src/Indexer/Add/SelectIndexerRowConnector.js
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
|
||||||
|
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);
|
@@ -1,14 +0,0 @@
|
|||||||
import _ from 'lodash';
|
|
||||||
import { createSelector } from 'reselect';
|
|
||||||
|
|
||||||
function createExclusionMovieSelector() {
|
|
||||||
return createSelector(
|
|
||||||
(state, { tmdbId }) => tmdbId,
|
|
||||||
(state) => state.settings.importExclusions,
|
|
||||||
(tmdbId, importExclusions) => {
|
|
||||||
return _.some(importExclusions.items, { tmdbId });
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default createExclusionMovieSelector;
|
|
@@ -0,0 +1,15 @@
|
|||||||
|
import _ from 'lodash';
|
||||||
|
import { createSelector } from 'reselect';
|
||||||
|
import createAllIndexersSelector from './createAllIndexersSelector';
|
||||||
|
|
||||||
|
function createExistingIndexerSelector() {
|
||||||
|
return createSelector(
|
||||||
|
(state, { definitionName }) => definitionName,
|
||||||
|
createAllIndexersSelector(),
|
||||||
|
(definitionName, indexers) => {
|
||||||
|
return _.some(indexers, { definitionName });
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default createExistingIndexerSelector;
|
@@ -169,6 +169,7 @@
|
|||||||
"IllRestartLater": "I'll restart later",
|
"IllRestartLater": "I'll restart later",
|
||||||
"IncludeHealthWarningsHelpText": "Include Health Warnings",
|
"IncludeHealthWarningsHelpText": "Include Health Warnings",
|
||||||
"Indexer": "Indexer",
|
"Indexer": "Indexer",
|
||||||
|
"IndexerAlreadySetup": "At least one instace of indexer is already setup",
|
||||||
"IndexerAuth": "Indexer Auth",
|
"IndexerAuth": "Indexer Auth",
|
||||||
"IndexerFlags": "Indexer Flags",
|
"IndexerFlags": "Indexer Flags",
|
||||||
"IndexerHealthCheckNoIndexers": "No indexers enabled, Prowlarr will not return search results",
|
"IndexerHealthCheckNoIndexers": "No indexers enabled, Prowlarr will not return search results",
|
||||||
|
Reference in New Issue
Block a user