add name_eq and genome_build_eq filters to HistoryFilters

galaxyproject · Jan 30, 2024 · 99994a3 · 99994a3
1 parent 24b90be
commit 99994a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/client/src/components/History/HistoryFilters.js b/client/src/components/History/HistoryFilters.js
@@ -7,6 +7,7 @@ const states = Object.keys(STATES).filter((state) => !excludeStates.includes(sta
 
 const validFilters = {
     name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
+    name_eq: { handler: equals("name"), menuItem: false },
     extension: { placeholder: "extension", type: String, handler: equals("extension"), menuItem: true },
     tag: { placeholder: "tag", type: String, handler: contains("tags", "tag", expandNameTag), menuItem: true },
     state: {
@@ -18,6 +19,7 @@ const validFilters = {
         menuItem: true,
     },
     genome_build: { placeholder: "database", type: String, handler: contains("genome_build"), menuItem: true },
+    genome_build_eq: { handler: equals("genome_build"), menuItem: false },
     related: { placeholder: "related", type: Number, handler: equals("related"), menuItem: true },
     hid: { placeholder: "index", type: Number, handler: equals("hid"), isRangeInput: true, menuItem: true },
     hid_ge: { handler: compare("hid", "ge"), menuItem: false },

diff --git a/client/src/utils/filtering.test.js b/client/src/utils/filtering.test.js
@@ -85,6 +85,8 @@ describe("filtering", () => {
         expect(HistoryFilters.getFilterValue(filterTexts[1], "create_time_gt", true)).toBe(1609459200);
         expect(HistoryFilters.getFilterValue("", "deleted")).toBe(false);
         expect(HistoryFilters.getFilterValue("", "visible")).toBe(true);
+        expect(HistoryFilters.getFilterValue("name_eq:Select", "name")).toBe(undefined);
+        expect(HistoryFilters.getFilterValue("name_eq:Select", "name_eq")).toBe("select");
     });
     test("parse get valid filters and settings", () => {
         sampleFilters.forEach((sample) => {
@@ -115,6 +117,9 @@ describe("filtering", () => {
             expect(filters[8][1]).toBe("false");
             expect(filters[9][0]).toBe("visible");
             expect(filters[9][1]).toBe("true");
+            const filters_eq = HistoryFilters.getFiltersForText('genome_build_eq:"hg19"');
+            expect(filters_eq[0][0]).toBe("genome_build_eq");
+            expect(filters_eq[0][1]).toBe("hg19");
         });
     });
     test("parse filter text as query dictionary", () => {
@@ -131,6 +136,8 @@ describe("filtering", () => {
             expect(queryDict["deleted"]).toBe(false);
             expect(queryDict["visible"]).toBe(true);
         });
+        const queryDict = HistoryFilters.getQueryDict("name_eq:'name of item'");
+        expect(queryDict["name-eq"]).toBe("name of item");
     });
     test("apply valid filters to existing filterText", () => {
         expect(HistoryFilters.applyFiltersToText(sampleFilters[0].filters, "")).toEqual("deleted:true visible:true");