From 661d2f64bb97b0bdeda9b1e58635120ed9b6b3dc Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:47:45 +1000
Subject: [PATCH] Make path criterion default modifier includes instead of
 equals (#5968)

---
 .../src/models/list-filter/criteria/country.ts   | 10 +++++-----
 .../src/models/list-filter/criteria/criterion.ts | 16 +++++++---------
 ui/v2.5/src/models/list-filter/criteria/path.ts  | 12 +++++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ui/v2.5/src/models/list-filter/criteria/country.ts b/ui/v2.5/src/models/list-filter/criteria/country.ts
index 2430c2a59..e29ac97ff 100644
--- a/ui/v2.5/src/models/list-filter/criteria/country.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/country.ts
@@ -3,11 +3,11 @@ import { CriterionModifier } from "src/core/generated-graphql";
 import { getCountryByISO } from "src/utils/country";
 import { StringCriterion, StringCriterionOption } from "./criterion";
 
-export const CountryCriterionOption = new StringCriterionOption(
-  "country",
-  "country",
-  () => new CountryCriterion()
-);
+export const CountryCriterionOption = new StringCriterionOption({
+  messageID: "country",
+  type: "country",
+  makeCriterion: () => new CountryCriterion(),
+});
 
 export class CountryCriterion extends StringCriterion {
   constructor() {
diff --git a/ui/v2.5/src/models/list-filter/criteria/criterion.ts b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
index d06272c4c..a4d3a145c 100644
--- a/ui/v2.5/src/models/list-filter/criteria/criterion.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/criterion.ts
@@ -526,13 +526,12 @@ export class IHierarchicalLabeledIdCriterion extends ModifierCriterion<IHierarch
 
 export class StringCriterionOption extends ModifierCriterionOption {
   constructor(
-    messageID: string,
-    value: CriterionType,
-    makeCriterion?: () => ModifierCriterion<CriterionValue>
+    options: Partial<
+      Omit<IModifierCriterionOptionParams, "messageID" | "type">
+    > &
+      Pick<IModifierCriterionOptionParams, "messageID" | "type">
   ) {
     super({
-      messageID,
-      type: value,
       modifierOptions: [
         CriterionModifier.Equals,
         CriterionModifier.NotEquals,
@@ -545,9 +544,8 @@ export class StringCriterionOption extends ModifierCriterionOption {
       ],
       defaultModifier: CriterionModifier.Equals,
       inputType: "text",
-      makeCriterion: makeCriterion
-        ? makeCriterion
-        : () => new StringCriterion(this),
+      makeCriterion: () => new StringCriterion(this),
+      ...options,
     });
   }
 }
@@ -556,7 +554,7 @@ export function createStringCriterionOption(
   type: CriterionType,
   messageID?: string
 ) {
-  return new StringCriterionOption(messageID ?? type, type);
+  return new StringCriterionOption({ messageID: messageID ?? type, type });
 }
 
 export class MandatoryStringCriterionOption extends ModifierCriterionOption {
diff --git a/ui/v2.5/src/models/list-filter/criteria/path.ts b/ui/v2.5/src/models/list-filter/criteria/path.ts
index 2b57faf85..42a7789cf 100644
--- a/ui/v2.5/src/models/list-filter/criteria/path.ts
+++ b/ui/v2.5/src/models/list-filter/criteria/path.ts
@@ -1,10 +1,12 @@
+import { CriterionModifier } from "src/core/generated-graphql";
 import { StringCriterion, StringCriterionOption } from "./criterion";
 
-export const PathCriterionOption = new StringCriterionOption(
-  "path",
-  "path",
-  () => new PathCriterion()
-);
+export const PathCriterionOption = new StringCriterionOption({
+  messageID: "path",
+  type: "path",
+  defaultModifier: CriterionModifier.Includes,
+  makeCriterion: () => new PathCriterion(),
+});
 
 export class PathCriterion extends StringCriterion {
   constructor() {