Skip to content

[WEB-1671] fix: expired snooze issues fixed #5270

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

Merged
SatishGandham merged 2 commits into from
Jul 31, 2024
Merged

[WEB-1671] fix: expired snooze issues fixed #5270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a31f15
fix: expired snooze issues fixed
gakshita Jul 30, 2024
5554621
fix: refactored
gakshita Jul 31, 2024
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
2 changes: 1 addition & 1 deletion web/core/components/inbox/inbox-issue-status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export const InboxIssueStatus: React.FC<Props> = observer((props) => {
const { inboxIssue, iconSize = 16, showDescription = false } = props;
// derived values
const 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 ?? ""));

Expand Down
21 changes: 19 additions & 2 deletions web/core/store/inbox/project-inbox.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -294,8 +310,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`
Expand Down