From 3b5e83670b844cf7c20bf7d744d9fbc96fde6902 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 11 Apr 2023 08:55:51 -0700 Subject: [PATCH] Appease linter --- .../AddSeries/ImportSeries/Import/ImportSeries.js | 14 ++++++++++++-- .../Index/Select/SeriesIndexSelectFooter.tsx | 12 ++++++++++-- frontend/src/Utilities/Table/getSelectedIds.ts | 12 +++--------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/frontend/src/AddSeries/ImportSeries/Import/ImportSeries.js b/frontend/src/AddSeries/ImportSeries/Import/ImportSeries.js index 6482ed2af..d576cee0f 100644 --- a/frontend/src/AddSeries/ImportSeries/Import/ImportSeries.js +++ b/frontend/src/AddSeries/ImportSeries/Import/ImportSeries.js @@ -1,9 +1,9 @@ +import { reduce } from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import PageContent from 'Components/Page/PageContent'; import PageContentBody from 'Components/Page/PageContentBody'; -import getSelectedIds from 'Utilities/Table/getSelectedIds'; import selectAll from 'Utilities/Table/selectAll'; import toggleSelected from 'Utilities/Table/toggleSelected'; import ImportSeriesFooterConnector from './ImportSeriesFooterConnector'; @@ -31,7 +31,17 @@ class ImportSeries extends Component { // Listeners getSelectedIds = () => { - return getSelectedIds(this.state.selectedState, { parseIds: false }); + return reduce( + this.state.selectedState, + (result, value, id) => { + if (value) { + result.push(id); + } + + return result; + }, + [] + ); }; onSelectAllChange = ({ value }) => { diff --git a/frontend/src/Series/Index/Select/SeriesIndexSelectFooter.tsx b/frontend/src/Series/Index/Select/SeriesIndexSelectFooter.tsx index ae9197d2f..3df2f53ac 100644 --- a/frontend/src/Series/Index/Select/SeriesIndexSelectFooter.tsx +++ b/frontend/src/Series/Index/Select/SeriesIndexSelectFooter.tsx @@ -23,6 +23,15 @@ import ChangeMonitoringModal from './SeasonPass/ChangeMonitoringModal'; import TagsModal from './Tags/TagsModal'; import styles from './SeriesIndexSelectFooter.css'; +interface SavePayload { + monitored?: boolean; + qualityProfileId?: number; + seriesType?: string; + seasonFolder?: boolean; + rootFolderPath?: string; + moveFiles?: boolean; +} + const seriesEditorSelector = createSelector( (state: AppState) => state.series, (series) => { @@ -74,7 +83,7 @@ function SeriesIndexSelectFooter() { }, [setIsEditModalOpen]); const onSavePress = useCallback( - (payload: any) => { + (payload: SavePayload) => { setIsSavingSeries(true); setIsEditModalOpen(false); @@ -161,7 +170,6 @@ function SeriesIndexSelectFooter() { useEffect(() => { if (previousIsDeleting && !isDeleting && !deleteError) { - selectDispatch({ type: 'unselectAll' }); } }, [previousIsDeleting, isDeleting, deleteError, selectDispatch]); diff --git a/frontend/src/Utilities/Table/getSelectedIds.ts b/frontend/src/Utilities/Table/getSelectedIds.ts index 13815b105..b84db6245 100644 --- a/frontend/src/Utilities/Table/getSelectedIds.ts +++ b/frontend/src/Utilities/Table/getSelectedIds.ts @@ -1,18 +1,12 @@ import { reduce } from 'lodash'; import { SelectedState } from 'Helpers/Hooks/useSelectState'; -// TODO: This needs to handle string IDs as well -function getSelectedIds( - selectedState: SelectedState, - { parseIds = true } = {} -): number[] { +function getSelectedIds(selectedState: SelectedState): number[] { return reduce( selectedState, - (result: any[], value, id) => { + (result: number[], value, id) => { if (value) { - const parsedId = parseIds ? parseInt(id) : id; - - result.push(parsedId); + result.push(parseInt(id)); } return result;