Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add name_eq and genome_build_eq filters to HistoryFilters #17389

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/src/components/History/HistoryFilters.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 },
Expand Down
7 changes: 7 additions & 0 deletions client/src/utils/filtering.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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", () => {
Expand All @@ -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");
Expand Down
Loading