Unverified Commit 043c8eaf authored by Aysam Guerler's avatar Aysam Guerler Committed by GitHub
Browse files

Merge pull request #14092 from ahmedhamidawan/Fix_empty_filter 

Fix minor empty History Filter bug
parents 81c8a165 fca2d24c

client/src/components/History/CurrentHistory/HistoryFilters/filterConversion.js

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ export function getFilterText(filterSettings) { 
    let newFilterText = "";

    Object.entries(filterSettings).forEach(([key, value]) => {

        const skipDefault = hasDefaults && normalized[key] !== undefined;

        if (!skipDefault && value !== undefined) {

        if (!skipDefault && value !== undefined && value !== "") {

            if (newFilterText) {

                newFilterText += " ";

            }

client/src/components/History/CurrentHistory/HistoryFilters/filterConversion.test.js

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ describe("test filtering helpers to convert settings to filter text", () => { 
            "visible:": defaultFilters.visible,

            "other:": "other",

            "anything:": undefined,

            "value:": "",

        };

        expect(getFilterText(settings)).toBe("other:other");

        settings["visible:"] = !defaultFilters.visible;