From cee492c8d2208e10756f2da6ea8ddae1eb5a56a8 Mon Sep 17 00:00:00 2001
From: alec_dev <acwhite211@gmail.com>
Date: Wed, 4 Dec 2024 10:59:15 -0600
Subject: [PATCH 1/2] fix simple search QueryField constructor call

---
 specifyweb/express_search/related.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/specifyweb/express_search/related.py b/specifyweb/express_search/related.py
index 42a681fc481..b09c1a7fe32 100644
--- a/specifyweb/express_search/related.py
+++ b/specifyweb/express_search/related.py
@@ -134,7 +134,8 @@ def build_related_query(self, session, config, terms, collection, user):
             negate=False,
             display=False,
             format_name=None,
-            sort_type=0)
+            sort_type=0,
+            strict=False)
 
         logger.debug("primary queryfield: %s", primary_field)
         logger.debug("display queryfields: %s", self.display_fields)

From 88d213d59b12e60b5292fdf6dc789d7fa5f0458d Mon Sep 17 00:00:00 2001
From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:29:54 +0000
Subject: [PATCH 2/2] Lint code with ESLint and Prettier

Triggered by f7522153ba56e5766cd101d51db3dc6279875ca9 on branch refs/heads/issue-5425
---
 specifyweb/frontend/js_src/lib/utils/cache/definitions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specifyweb/frontend/js_src/lib/utils/cache/definitions.ts b/specifyweb/frontend/js_src/lib/utils/cache/definitions.ts
index 19a0377c69a..853a745fe16 100644
--- a/specifyweb/frontend/js_src/lib/utils/cache/definitions.ts
+++ b/specifyweb/frontend/js_src/lib/utils/cache/definitions.ts
@@ -73,15 +73,15 @@ export type CacheDefinitions = {
     readonly applyAll: boolean;
   };
   readonly tree: {
-    readonly [key in `definition${AnyTree['tableName']}`]: number;
-  } & {
-    readonly [key in `focusPath${AnyTree['tableName']}`]: RA<number>;
-  } & {
     /** Collapsed ranks in a given tree */
     readonly [key in `collapsedRanks${AnyTree['tableName']}`]: RA<number>;
   } & {
     /** Open nodes in a given tree */
     readonly [key in `conformations${AnyTree['tableName']}`]: Conformations;
+  } & {
+    readonly [key in `definition${AnyTree['tableName']}`]: number;
+  } & {
+    readonly [key in `focusPath${AnyTree['tableName']}`]: RA<number>;
   } & {
     readonly hideEmptyNodes: boolean;
     readonly isSplit: boolean;