π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1671] fix: expired snooze issues fixed (#5270)
Akshita Goyal569b592711c2
diff --git a/web/core/components/inbox/inbox-issue-status.tsx b/web/core/components/inbox/inbox-issue-status.tsxindex 4077ba24ca..f74693f768 100644--- a/web/core/components/inbox/inbox-issue-status.tsx+++ b/web/core/components/inbox/inbox-issue-status.tsx@@ -17,9 +17,9 @@ export const InboxIssueStatus: React.FC<Props> = observer((props) => {const { inboxIssue, iconSize = 16, showDescription = false } = props;// derived valuesconst inboxIssueStatusDetail = INBOX_STATUS.find((s) => s.status === inboxIssue.status);- if (!inboxIssueStatusDetail) return <></>;const isSnoozedDatePassed = inboxIssue.status === 0 && new Date(inboxIssue.snoozed_till ?? "") < new Date();+ if (!inboxIssueStatusDetail || isSnoozedDatePassed) return <></>;const description = inboxIssueStatusDetail.description(new Date(inboxIssue.snoozed_till ?? ""));diff --git a/web/core/store/inbox/project-inbox.store.ts b/web/core/store/inbox/project-inbox.store.tsindex 37075bb126..dcf361d0b8 100644--- a/web/core/store/inbox/project-inbox.store.ts+++ b/web/core/store/inbox/project-inbox.store.ts@@ -156,8 +156,24 @@ export class ProjectInboxStore implements IProjectInboxStore {? [EInboxIssueStatus.PENDING, EInboxIssueStatus.SNOOZED]: [EInboxIssueStatus.ACCEPTED, EInboxIssueStatus.DECLINED, EInboxIssueStatus.DUPLICATE];appliedFilters = appliedFilters.filter((filter) => this.inboxFilters?.status?.includes(filter));+ const currentTime = new Date().getTime();- return this.inboxIssueIds.filter((id) => appliedFilters.includes(this.inboxIssues[id].status));+ return this.currentTab === EInboxIssueCurrentTab.OPEN+ ? this.inboxIssueIds.filter((id) => {+ if (appliedFilters.length == 2) return true;+ if (appliedFilters[0] === EInboxIssueStatus.SNOOZED)+ return (+ this.inboxIssues[id].status === EInboxIssueStatus.SNOOZED &&+ currentTime < new Date(this.inboxIssues[id].snoozed_till!).getTime()+ );+ if (appliedFilters[0] === EInboxIssueStatus.PENDING)+ return (+ appliedFilters.includes(this.inboxIssues[id].status) ||+ (this.inboxIssues[id].status === EInboxIssueStatus.SNOOZED &&+ currentTime > new Date(this.inboxIssues[id].snoozed_till!).getTime())+ );+ })+ : this.inboxIssueIds.filter((id) => appliedFilters.includes(this.inboxIssues[id].status));}getIssueInboxByIssueId = computedFn((issueId: string) => this.inboxIssues?.[issueId]);@@ -320,8 +336,9 @@ export class ProjectInboxStore implements IProjectInboxStore {else this.loader = "mutation-loading";if (loadingType) this.loader = loadingType;+ const status = this.inboxFilters.status && uniq([...this.inboxFilters.status, EInboxIssueStatus.SNOOZED]);const queryParams = this.inboxIssueQueryParams(- this.inboxFilters,+ { ...this.inboxFilters, status },this.inboxSorting,this.PER_PAGE_COUNT,`${this.PER_PAGE_COUNT}:0:0`