Skip to content

Commit 6635cbf

Browse files
[WEB-4774] fix: get teamspace project work item filters from local storage (#3996)
1 parent d197d6c commit 6635cbf

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

apps/web/ee/store/issue/team-project/filter.store.ts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,31 +129,25 @@ export class TeamProjectWorkItemsFilter extends IssueFilterHelperStore implement
129129

130130
fetchFilters = async (workspaceSlug: string, teamspaceId: string, projectId: string) => {
131131
try {
132-
const _filters = await this.teamspaceWorkItemFilterService.fetchTeamspaceWorkItemFilters(
132+
// current user details
133+
const currentUserId = this.rootIssueStore.currentUserId;
134+
135+
// fetching the filters from the local storage
136+
const _filters = this.handleIssuesLocalFilters.get(
137+
EIssuesStoreType.TEAM_PROJECT_WORK_ITEMS,
133138
workspaceSlug,
134-
teamspaceId
139+
projectId,
140+
currentUserId
135141
);
136142

143+
// computed filters
137144
const filters: IIssueFilterOptions = this.computedFilters(_filters?.filters);
138145
const displayFilters: IIssueDisplayFilterOptions = this.computedDisplayFilters(_filters?.display_filters);
139146
const displayProperties: IIssueDisplayProperties = this.computedDisplayProperties(_filters?.display_properties);
140-
141-
// fetching the kanban toggle helpers in the local storage
142147
const kanbanFilters = {
143-
group_by: [],
144-
sub_group_by: [],
148+
group_by: _filters?.kanban_filters?.group_by || [],
149+
sub_group_by: _filters?.kanban_filters?.sub_group_by || [],
145150
};
146-
const currentUserId = this.rootIssueStore.currentUserId;
147-
if (currentUserId) {
148-
const _kanbanFilters = this.handleIssuesLocalFilters.get(
149-
EIssuesStoreType.TEAM_PROJECT_WORK_ITEMS,
150-
workspaceSlug,
151-
projectId,
152-
currentUserId
153-
);
154-
kanbanFilters.group_by = _kanbanFilters?.kanban_filters?.group_by || [];
155-
kanbanFilters.sub_group_by = _kanbanFilters?.kanban_filters?.sub_group_by || [];
156-
}
157151

158152
runInAction(() => {
159153
set(this.filters, [projectId, "filters"], filters);

packages/constants/src/issue/filter-extended.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const ADDITIONAL_ISSUE_DISPLAY_FILTERS_BY_PAGE: {
138138
},
139139
},
140140
calendar: {
141-
filters: ["priority", "state_group", "assignees", "mentions", "created_by", "start_date", "team_project"],
141+
filters: ["priority", "state_group", "assignees", "mentions", "created_by", "start_date"],
142142
display_properties: ["key", "issue_type"],
143143
display_filters: {
144144
type: [null, "active", "backlog"],

0 commit comments

Comments
 (0)