Skip to content

Commit 4fc9eb2

Browse files
committed
Hide legacy groups criterion option
1 parent ef2231f commit 4fc9eb2

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

ui/v2.5/src/components/List/EditFilterDialog.tsx

+7-5
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,13 @@ export const EditFilterDialog: React.FC<IEditFilterProps> = ({
243243
}, [currentFilter.mode]);
244244

245245
const criterionOptions = useMemo(() => {
246-
return [...filterOptions.criterionOptions].sort((a, b) => {
247-
return intl
248-
.formatMessage({ id: a.messageID })
249-
.localeCompare(intl.formatMessage({ id: b.messageID }));
250-
});
246+
return [...filterOptions.criterionOptions]
247+
.filter((c) => !c.hidden)
248+
.sort((a, b) => {
249+
return intl
250+
.formatMessage({ id: a.messageID })
251+
.localeCompare(intl.formatMessage({ id: b.messageID }));
252+
});
251253
}, [intl, filterOptions.criterionOptions]);
252254

253255
const optionSelected = useCallback(

ui/v2.5/src/models/list-filter/criteria/criterion.ts

+6
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ interface ICriterionOptionsParams {
192192
modifierOptions?: CriterionModifier[];
193193
defaultModifier?: CriterionModifier;
194194
options?: Option[];
195+
hidden?: boolean;
195196
makeCriterion: (
196197
o: CriterionOption,
197198
config?: ConfigDataFragment
@@ -204,6 +205,10 @@ export class CriterionOption {
204205
public readonly defaultModifier: CriterionModifier;
205206
public readonly options: Option[] | undefined;
206207
public readonly inputType: InputType;
208+
209+
// used for legacy criteria that are not shown in the UI
210+
public readonly hidden: boolean = false;
211+
207212
public readonly makeCriterionFn: (
208213
o: CriterionOption,
209214
config?: ConfigDataFragment
@@ -216,6 +221,7 @@ export class CriterionOption {
216221
this.defaultModifier = options.defaultModifier ?? CriterionModifier.Equals;
217222
this.options = options.options;
218223
this.inputType = options.inputType;
224+
this.hidden = options.hidden ?? false;
219225
this.makeCriterionFn = options.makeCriterion;
220226
}
221227

ui/v2.5/src/models/list-filter/criteria/groups.ts

+1
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ export const LegacyMoviesCriterionOption = new CriterionOption({
5050
modifierOptions,
5151
defaultModifier,
5252
inputType,
53+
hidden: true,
5354
makeCriterion: () => new GroupsCriterion(GroupsCriterionOption),
5455
});

0 commit comments

Comments
 (0)