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
85 changes: 44 additions & 41 deletions frontend/src/ts/elements/account/result-filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,9 +794,14 @@ export function updateTagsDropdownOptions(): void {

let buttonsAppended = false;

export async function appendButtons(
export async function appendDropdowns(
selectChangeCallback: () => void
): Promise<void> {
//snapshot at this point is guaranteed to exist
const snapshot = DB.getSnapshot() as Snapshot;

tagDropdownUpdate(snapshot);

if (buttonsAppended) return;

selectChangeCallbackFn = selectChangeCallback;
Expand Down Expand Up @@ -864,60 +869,58 @@ export async function appendButtons(
},
});

//snapshot at this point is guaranteed to exist
const snapshot = DB.getSnapshot() as Snapshot;
void updateFilterPresets();
buttonsAppended = true;
}

function tagDropdownUpdate(snapshot: Snapshot): void {
const tagsSection = $(
".pageAccount .content .filterButtons .buttonsAndTitle.tags"
);

if (snapshot.tags.length === 0) {
tagsSection.addClass("hidden");
if (groupSelects["tags"]) {
groupSelects["tags"].destroy();
delete groupSelects["tags"];
}
setFilter("tags", "none", true);
} else {
tagsSection.removeClass("hidden");

updateTagsDropdownOptions();
const selectEl = document.querySelector(
".pageAccount .content .filterButtons .buttonsAndTitle.tags .select .tagsSelect"
);
if (selectEl) {
groupSelects["tags"] = new SlimSelect({
select: selectEl,
settings: {
showSearch: true,
placeholderText: "select a tag",
allowDeselect: true,
closeOnSelect: false,
},
events: {
beforeChange: (selectedOptions, oldSelectedOptions): boolean => {
return selectBeforeChangeFn(
"tags",
selectedOptions,
oldSelectedOptions
);

// Only create SlimSelect if it doesn't exist yet
if (!groupSelects["tags"]) {
const selectEl = document.querySelector(
".pageAccount .content .filterButtons .buttonsAndTitle.tags .select .tagsSelect"
);

if (selectEl) {
groupSelects["tags"] = new SlimSelect({
select: selectEl,
settings: {
showSearch: true,
placeholderText: "select a tag",
allowDeselect: true,
closeOnSelect: false,
},
beforeOpen: (): void => {
adjustScrollposition("tags");
events: {
beforeChange: (selectedOptions, oldSelectedOptions): boolean => {
return selectBeforeChangeFn(
"tags",
selectedOptions,
oldSelectedOptions
);
},
beforeOpen: (): void => {
adjustScrollposition("tags");
},
},
},
});
});
}
}
}

void updateFilterPresets();
buttonsAppended = true;
}

export function removeButtons(): void {
$(
".pageAccount .content .filterButtons .buttonsAndTitle.languages .buttons"
).empty();
$(
".pageAccount .content .filterButtons .buttonsAndTitle.funbox .buttons"
).empty();
$(
".pageAccount .content .filterButtons .buttonsAndTitle.tags .buttons"
).empty();
Comment on lines -911 to -920
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't do anything anymore. I guess the buttons were swapped out for SlimSelect at some point.

Also renamed appendButtons to appendDropdowns for consistency

}

$(".group.presetFilterButtons .filterBtns").on(
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/ts/pages/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1349,14 +1349,12 @@ export const page = new Page({
},
afterHide: async (): Promise<void> => {
reset();
ResultFilters.removeButtons();
Skeleton.remove("pageAccount");
},
beforeShow: async (): Promise<void> => {
Skeleton.append("pageAccount", "main");
const snapshot = DB.getSnapshot();
ResultFilters.updateTagsDropdownOptions();
await ResultFilters.appendButtons(update);
await ResultFilters.appendDropdowns(update);
ResultFilters.updateActive();
await Misc.sleep(0);

Expand Down