Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2025-12-25 08:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WEB-2107] fix: Default filters and sorting on the initial load, filter mutation on tab change (#5259)

Browse Source 
* chore: Default filters and sorting on the initial load, filter mutation on tab change

* Typo: changed method name in project intake store
This commit is contained in:
guru_sainath
2024-07-30 14:02:16 +05:30
committed by GitHub
parent 1adfb4dbe4
commit dc2e293058
2 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/core/components/inbox/root.tsx
View File

@@ -34,7 +34,7 @@ export const InboxIssueRoot: FC<TInboxIssueRoot> = observer((props) => {
if (navigationTab && navigationTab !== currentTab) {
handleCurrentTab(workspaceSlug, projectId, navigationTab);
} else {
fetchInboxIssues(workspaceSlug.toString(), projectId.toString());
fetchInboxIssues(workspaceSlug.toString(), projectId.toString(), undefined, navigationTab);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [inboxAccessible, workspaceSlug, projectId]);

68
web/core/store/inbox/project-inbox.store.ts
View File

@@ -55,11 +55,17 @@ export interface IProjectInboxStore {
paginationCursor: string
) => Partial<Record<keyof TInboxIssueFilter, string>>;
createOrUpdateInboxIssue: (inboxIssues: TInboxIssue[], workspaceSlug: string, projectId: string) => void;
initializeDefaultFilters: (projectId: string, tab: TInboxIssueCurrentTab) => void;
// actions
handleCurrentTab: (workspaceSlug: string, projectId: string, tab: TInboxIssueCurrentTab) => void;
handleInboxIssueFilters: <T extends keyof TInboxIssueFilter>(key: T, value: TInboxIssueFilter[T]) => void; // if user sends me undefined, I will remove the value from the filter key
handleInboxIssueSorting: <T extends keyof TInboxIssueSorting>(key: T, value: TInboxIssueSorting[T]) => void; // if user sends me undefined, I will remove the value from the filter key
fetchInboxIssues: (workspaceSlug: string, projectId: string, loadingType?: TLoader) => Promise<void>;
fetchInboxIssues: (
workspaceSlug: string,
projectId: string,
loadingType?: TLoader,
tab?: TInboxIssueCurrentTab | undefined
) => Promise<void>;
fetchInboxPaginationIssues: (workspaceSlug: string, projectId: string) => Promise<void>;
fetchInboxIssueById: (workspaceSlug: string, projectId: string, inboxIssueId: string) => Promise<TInboxIssue>;
createInboxIssue: (
@@ -121,11 +127,7 @@ export class ProjectInboxStore implements IProjectInboxStore {
get inboxFilters() {
const { projectId } = this.store.router;
if (!projectId) return {} as TInboxIssueFilter;
return isEmpty(this.filtersMap?.[projectId])
? this.currentTab === EInboxIssueCurrentTab.OPEN
? { status: [EInboxIssueStatus.PENDING] }
: { status: [EInboxIssueStatus.ACCEPTED, EInboxIssueStatus.DECLINED, EInboxIssueStatus.DUPLICATE] }
: this.filtersMap?.[projectId];
return this.filtersMap?.[projectId];
}
/**
@@ -134,9 +136,7 @@ export class ProjectInboxStore implements IProjectInboxStore {
get inboxSorting() {
const { projectId } = this.store.router;
if (!projectId) return {} as TInboxIssueSorting;
return isEmpty(this.sortingMap?.[projectId])
? ({ order_by: "issue__created_at", sort_by: "desc" } as TInboxIssueSorting)
: this.sortingMap?.[projectId];
return this.sortingMap?.[projectId];
}
get getAppliedFiltersCount() {
@@ -240,17 +240,21 @@ export class ProjectInboxStore implements IProjectInboxStore {
// actions
handleCurrentTab = (workspaceSlug: string, projectId: string, tab: TInboxIssueCurrentTab) => {
runInAction(() => {
set(this, "currentTab", tab);
set(this, ["inboxIssueIds"], []);
set(this, ["inboxIssuePaginationInfo"], undefined);
set(this, ["sorting", projectId, "order_by"], "issue__created_at");
set(this, ["sorting", projectId, "sort_by"], "desc");
set(this, "filters", undefined);
if (tab === "closed") set(this, ["filters", projectId, "status"], [-1, 1, 2]);
else set(this, ["filters", projectId, "status"], [-2]);
});
if (workspaceSlug && projectId) this.fetchInboxIssues(workspaceSlug, projectId, "filter-loading");
if (workspaceSlug && projectId) {
runInAction(() => {
set(this, "currentTab", tab);
set(this, ["inboxIssueIds"], []);
set(this, ["inboxIssuePaginationInfo"], undefined);
set(this.sortingMap, [projectId], { order_by: "issue__created_at", sort_by: "desc" });
set(this.filtersMap, [projectId], {
status:
tab === EInboxIssueCurrentTab.OPEN
? [EInboxIssueStatus.PENDING]
: [EInboxIssueStatus.ACCEPTED, EInboxIssueStatus.DECLINED, EInboxIssueStatus.DUPLICATE],
});
});
this.fetchInboxIssues(workspaceSlug, projectId, "filter-loading");
}
};
handleInboxIssueFilters = <T extends keyof TInboxIssueFilter>(key: T, value: TInboxIssueFilter[T]) => {
@@ -275,13 +279,35 @@ export class ProjectInboxStore implements IProjectInboxStore {
}
};
initializeDefaultFilters = (projectId: string, tab: TInboxIssueCurrentTab) => {
if (!projectId || !tab) return;
if (isEmpty(this.inboxFilters)) {
set(this.filtersMap, [projectId], {
status:
tab === EInboxIssueCurrentTab.OPEN
? [EInboxIssueStatus.PENDING]
: [EInboxIssueStatus.ACCEPTED, EInboxIssueStatus.DECLINED, EInboxIssueStatus.DUPLICATE],
});
}
if (isEmpty(this.inboxSorting)) {
set(this.sortingMap, [projectId], { order_by: "issue__created_at", sort_by: "desc" });
}
};
/**
* @description fetch intake issues with paginated data
* @param workspaceSlug
* @param projectId
*/
fetchInboxIssues = async (workspaceSlug: string, projectId: string, loadingType: TLoader = undefined) => {
fetchInboxIssues = async (
workspaceSlug: string,
projectId: string,
loadingType: TLoader = undefined,
tab: TInboxIssueCurrentTab | undefined = undefined
) => {
try {
if (loadingType === undefined && tab) this.initializeDefaultFilters(projectId, tab);
if (this.currentInboxProjectId != projectId) {
runInAction(() => {
set(this, ["currentInboxProjectId"], projectId);