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.

Sign up for GitHub

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

Jump to bottom

Remove checkboxes from tags multi-select filters (members page) #1678

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Remove checkboxes from tags multi-select filters (members page) #1678

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33db278
Remove checkboxes from tags multi-select filters (members page)
peoray Oct 14, 2023
a01131a
Merge branch 'main' into multi-select-tags-member-filter
peoray Oct 19, 2023
0e64a06
Implement removal and re-addition of tags filter on members page
peoray Oct 19, 2023
8ff0590
Merge branch 'main' into multi-select-tags-member-filter
peoray Oct 19, 2023
c9760d1
Merge branch 'main' into multi-select-tags-member-filter
peoray Oct 26, 2023
533f574
Merge branch 'main' into multi-select-tags-member-filter
peoray Nov 21, 2023
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
30 changes: 28 additions & 2 deletions frontend/src/shared/modules/filters/components/filterTypes/MultiSelectAsyncFilter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
:value="option"
>
<div
v-if="config.id !== 'tags'"
class="h-4 el-checkbox filter-checkbox"
:class="{ 'is-checked': props.modelValue.value.includes(option.value) }"
>
Expand Down Expand Up @@ -113,7 +114,24 @@ watch(() => props.modelValue.value, (value?: string[]) => {
}
}, { immediate: true });

watch(() => data.value.selected, (value) => {
watch(() => data.value.selected, (value, oldValue) => {
if (props.config.id === 'tags') {
filteredOptions.value = filteredOptions.value.filter((option) => !value.map((v: any) => v.value).includes(option.value));

const removedOption: any = oldValue?.find((option: any) => !value.includes(option));

if (removedOption && !filteredOptions.value.some((option) => option.value === removedOption.value)) {
const position = oldValue.findIndex((option: any) => option.value === removedOption.value);

if (position >= 0) {
filteredOptions.value.splice(position, 0, {
label: removedOption.label,
value: removedOption.value,
});
}
}
}

emit('update:modelValue', {
...props.modelValue,
value: value.map((v) => v.value),
Expand All @@ -127,7 +145,15 @@ const searchOptions = (query: string) => {
loading.value = true;
props.remoteMethod(query)
.then((options) => {
filteredOptions.value = options;
if (props.config.id === 'tags') {
const mappedOptions = options.map((option) => ({
label: option.label,
value: option.value,
}));
filteredOptions.value = mappedOptions;
} else {
filteredOptions.value = options;
}
})
.finally(() => {
loading.value = false;
Expand Down
Loading