Skip to content
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
15 changes: 6 additions & 9 deletions app/javascript/controllers/wunderbaum_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class extends Controller {
currentFilterPredicate = null;
currentFilterOpts = null;
currentQuery = "";
filterMode = "dim";
filterMode = "hide";
folderCache = new Map();
assetCache = new Map();
loadedFolders = new Set();
Expand Down Expand Up @@ -536,18 +536,15 @@ export default class extends Controller {
_updateFilterModeButton() {
const btn = document.getElementById("filter-mode-toggle");
if (!btn) return;
const hasActiveFilter = Boolean(this.currentFilterPredicate);
btn.disabled = !hasActiveFilter;
btn.classList.toggle("active", hasActiveFilter && this.filterMode === "hide");
btn.setAttribute("title", this.filterMode === "hide" ? "Hide unmatched nodes" : "Dim unmatched nodes");
const icon = btn.querySelector("i");
const isHideMode = this.filterMode === "hide";

btn.classList.toggle("active", isHideMode);
btn.setAttribute("title", isHideMode ? "Hide unmatched nodes" : "Dim unmatched nodes");

if (icon) {
icon.classList.remove("bi-filter-square", "bi-filter-square-fill");
if (this.filterMode === "hide") {
icon.classList.add("bi-filter-square-fill");
} else {
icon.classList.add("bi-filter-square");
}
}
}

Expand Down
17 changes: 8 additions & 9 deletions spec/system/file_tree_column_filter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,20 @@
expect(page).to have_selector(".wb-popup", count: 1)
end

it "allows switching between dim and hide filter modes" do
expect(page).to have_selector("#filter-mode-toggle[disabled]")
it "allows switching between hide and dim filter modes" do
expect(page).to have_no_selector("#filter-mode-toggle[disabled]")

fill_in "tree-filter", with: match_asset.isilon_name

expect(page).to have_selector("#tree.wb-ext-filter-dim")
expect(page).to have_no_selector("#filter-mode-toggle[disabled]", wait: 10)

find("#filter-mode-toggle").click
expect(page).to have_selector("#tree.wb-ext-filter-hide")
expect(page).to have_selector("#filter-mode-toggle.active")

find("#filter-mode-toggle").click
expect(page).to have_no_selector("#tree.wb-ext-filter-hide")
expect(page).to have_selector("#tree.wb-ext-filter-dim")
expect(page).to have_no_selector("#filter-mode-toggle.active")

find("#filter-mode-toggle").click
expect(page).to have_selector("#tree.wb-ext-filter-hide")
expect(page).to have_no_selector("#tree.wb-ext-filter-dim")
end

it "clears column filter indicators when clearing all filters at once" do
Expand All @@ -94,7 +93,7 @@
click_button "Clear All Filters"

expect(page).to have_no_selector(".wb-header [data-command='filter'].wb-helper-invalid", wait: 10)
expect(page).to have_selector("#filter-mode-toggle[disabled]", wait: 10)
expect(page).to have_no_selector("#filter-mode-toggle[disabled]", wait: 10)
expect(page).to have_no_selector("#tree.wb-ext-filter-dim", wait: 10)
end
end