Skip to content

Commit 06abccc

Browse files
authored
fix: reset basic default filters (#3611)
1 parent 9e6e6ff commit 06abccc

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

frontend/src/modules/member/pages/member-list-page.vue

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,35 @@
8181
</template>
8282

8383
<script setup lang="ts">
84+
import LfContributorAdd from '@/modules/contributor/components/edit/contributor-add.vue';
8485
import AppLfPageHeader from '@/modules/lf/layout/components/lf-page-header.vue';
86+
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
87+
import AppMemberListTable from '@/modules/member/components/list/member-list-table.vue';
88+
import { MemberService } from '@/modules/member/member-service';
89+
import { useMemberStore } from '@/modules/member/store/pinia';
8590
import AppPageWrapper from '@/shared/layout/page-wrapper.vue';
8691
import LfFilter from '@/shared/modules/filters/components/Filter.vue';
87-
import { useMemberStore } from '@/modules/member/store/pinia';
88-
import { storeToRefs } from 'pinia';
89-
import {
90-
ref, onMounted, computed,
91-
watch,
92-
} from 'vue';
93-
import { MemberService } from '@/modules/member/member-service';
94-
import { mapGetters } from '@/shared/vuex/vuex.helpers';
9592
import { FilterQuery } from '@/shared/modules/filters/types/FilterQuery';
96-
import LfSavedViews from '@/shared/modules/saved-views/components/SavedViews.vue';
97-
import AppMemberListTable from '@/modules/member/components/list/member-list-table.vue';
98-
import { useLfSegmentsStore } from '@/modules/lf/segments/store';
9993
import usePermissions from '@/shared/modules/permissions/helpers/usePermissions';
10094
import { LfPermission } from '@/shared/modules/permissions/types/Permissions';
101-
import LfContributorAdd from '@/modules/contributor/components/edit/contributor-add.vue';
102-
import allMembers from '@/modules/member/config/saved-views/views/all-members';
103-
import LfIcon from '@/ui-kit/icon/Icon.vue';
95+
import LfSavedViews from '@/shared/modules/saved-views/components/SavedViews.vue';
96+
import { TanstackKey } from '@/shared/types/tanstack';
97+
import { mapGetters } from '@/shared/vuex/vuex.helpers';
10498
import LfButton from '@/ui-kit/button/Button.vue';
99+
import LfIcon from '@/ui-kit/icon/Icon.vue';
105100
import { useQuery, useQueryClient } from '@tanstack/vue-query';
106-
import { TanstackKey } from '@/shared/types/tanstack';
101+
import { storeToRefs } from 'pinia';
102+
import {
103+
computed,
104+
onMounted,
105+
ref,
106+
watch,
107+
} from 'vue';
107108
import { memberFilters, memberSearchFilter } from '../config/filters/main';
108109
import { memberSavedViews, memberStaticViews } from '../config/saved-views/main';
110+
import { DEFAULT_MEMBER_FILTERS_NO_TEAM } from '../store/constants';
109111
112+
const getDefaultFilters = () => ({ and: DEFAULT_MEMBER_FILTERS_NO_TEAM });
110113
const memberStore = useMemberStore();
111114
const { filters, customAttributesFilter } = storeToRefs(memberStore);
112115
@@ -133,14 +136,12 @@ const pagination = ref({
133136
// Reactive state for query parameters
134137
const queryParams = ref({
135138
search: '',
136-
filter: {},
139+
filter: getDefaultFilters(),
137140
offset: 0,
138141
limit: 20,
139142
orderBy: 'activityCount_DESC',
140143
});
141144
142-
filters.value = { ...allMembers.config };
143-
144145
// Create a computed query key for members
145146
const membersQueryKey = computed(() => [
146147
TanstackKey.MEMBERS_LIST,
@@ -241,7 +242,7 @@ watch(
241242
// Reset query params for new project group
242243
queryParams.value = {
243244
search: '',
244-
filter: {},
245+
filter: getDefaultFilters(),
245246
offset: 0,
246247
limit: pagination.value.perPage,
247248
orderBy: 'activityCount_DESC',

frontend/src/modules/member/store/constants.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,17 @@ export const DEFAULT_MEMBER_FILTERS = [
1515
},
1616
},
1717
];
18+
19+
export const DEFAULT_MEMBER_FILTERS_NO_TEAM = [
20+
{
21+
isBot: {
22+
not: true,
23+
},
24+
},
25+
{
26+
isOrganization: {
27+
not: true,
28+
},
29+
},
30+
{},
31+
];

0 commit comments

Comments
 (0)