Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-03-03 11:48:48 +01:00
Code Issues Projects Releases Wiki Activity

Prevent creation of dupe filters (#2233)

Browse source
This commit is contained in:
InfiniteTF 2022-01-16 00:24:25 +01:00 committed by GitHub
parent 51bb602dc2
commit 4bbf511954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/v2.5/src/components/List/AddFilterDialog.tsx
View file

@ -37,6 +37,7 @@ interface IAddFilterProps {
onCancel: () => void;
filterOptions: ListFilterOptions;
editingCriterion?: Criterion<CriterionValue>;
existingCriterions: Criterion<CriterionValue>[];
}
export const AddFilterDialog: React.FC<IAddFilterProps> = ({
@ -44,6 +45,7 @@ export const AddFilterDialog: React.FC<IAddFilterProps> = ({
onCancel,
filterOptions,
editingCriterion,
existingCriterions,
}) => {
const defaultValue = useRef<string | number | undefined>();
@ -206,6 +208,10 @@ export const AddFilterDialog: React.FC<IAddFilterProps> = ({
const thisOptions = [NoneCriterionOption]
.concat(filterOptions.criterionOptions)
.filter(
(c) =>
!existingCriterions.find((ec) => ec.criterionOption.type === c.type)
)
.map((c) => {
return {
value: c.type,

1
ui/v2.5/src/hooks/ListHook.tsx
View file

@ -526,6 +526,7 @@ const RenderList = <
onAddCriterion={onAddCriterion}
onCancel={onCancelAddCriterion}
editingCriterion={editingCriterion}
existingCriterions={filter.criteria}
/>
)}
{newCriterion &&