Skip to content

Commit

Permalink
Fix/inbox issue bugs (makeplane#3477)
Browse files Browse the repository at this point in the history
* fix: inbox pending_issue_count updation from the store

* fix: inbox list item overflow issue on issue title

* fix: inbox issue mutation

---------

Co-authored-by: gurusainath <[email protected]>
  • Loading branch information
prateekshourya29 and gurusainath authored Jan 25, 2024
1 parent ebc891b commit e78c1f2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion web/components/inbox/sidebar/inbox-list-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const InboxIssueListItem: FC<TInboxIssueListItem> = observer((props) => {
} ${inboxIssueDetail.status !== -2 ? "opacity-60" : ""}`}
>
<div className="flex items-center justify-between gap-x-2">
<div className="flex items-center gap-x-2">
<div className="relative flex items-center gap-x-2 overflow-hidden">
<p className="flex-shrink-0 text-xs text-custom-text-200">
{getProjectById(issue.project_id)?.identifier}-{issue.sequence_id}
</p>
Expand Down
11 changes: 9 additions & 2 deletions web/store/inbox/inbox_issue.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export class InboxIssue implements IInboxIssue {

runInAction(() => {
const { ["issue_inbox"]: issueInboxDetail, ...issue } = response;
this.rootStore.inbox.rootStore.issue.issues.addIssue([issue]);
this.rootStore.inbox.rootStore.issue.issues.updateIssue(issue.id, issue);
const { ["id"]: omittedId, ...inboxIssue } = issueInboxDetail[0];
set(this.inboxIssueMap, [inboxId, response.id], inboxIssue);
});
Expand Down Expand Up @@ -186,6 +186,7 @@ export class InboxIssue implements IInboxIssue {
this.rootStore.inbox.rootStore.issue.issues.addIssue([issue]);
const { ["id"]: omittedId, ...inboxIssue } = issueInboxDetail[0];
set(this.inboxIssueMap, [inboxId, response.id], inboxIssue);
update(this.rootStore.inbox.inbox.inboxMap, [inboxId, "pending_issue_count"], (count: number = 0) => count + 1);
});

runInAction(() => {
Expand Down Expand Up @@ -216,7 +217,7 @@ export class InboxIssue implements IInboxIssue {

runInAction(() => {
const { ["issue_inbox"]: issueInboxDetail, ...issue } = response;
this.rootStore.inbox.rootStore.issue.issues.addIssue([issue]);
this.rootStore.inbox.rootStore.issue.issues.updateIssue(issue.id, issue);
const { ["id"]: omittedId, ...inboxIssue } = issueInboxDetail[0];
set(this.inboxIssueMap, [inboxId, response.id], inboxIssue);
});
Expand All @@ -242,6 +243,8 @@ export class InboxIssue implements IInboxIssue {
runInAction(() => {
pull(this.inboxIssues[inboxId], inboxIssueId);
delete this.inboxIssueMap[inboxId][inboxIssueId];
this.rootStore.inbox.rootStore.issue.issues.removeIssue(inboxIssueId);
update(this.rootStore.inbox.inbox.inboxMap, [inboxId, "pending_issue_count"], (count: number = 0) => count - 1);
});

await this.rootStore.issue.issueDetail.fetchActivities(workspaceSlug, projectId, inboxIssueId);
Expand All @@ -267,11 +270,15 @@ export class InboxIssue implements IInboxIssue {
data
);

const pendingStatus = -2;
runInAction(() => {
const { ["issue_inbox"]: issueInboxDetail, ...issue } = response;
this.rootStore.inbox.rootStore.issue.issues.addIssue([issue]);
const { ["id"]: omittedId, ...inboxIssue } = issueInboxDetail[0];
set(this.inboxIssueMap, [inboxId, response.id], inboxIssue);
update(this.rootStore.inbox.inbox.inboxMap, [inboxId, "pending_issue_count"], (count: number = 0) =>
data.status === pendingStatus ? count + 1 : count - 1
);
});

runInAction(() => {
Expand Down

0 comments on commit e78c1f2

Please sign in to comment.