Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-2228] fix: dashboard peek overview issue stats #5442 (#5560)

Anmol Singh Bhatia99a7867a5ec1
diff --git a/packages/types/src/dashboard.d.ts b/packages/types/src/dashboard.d.ts
index 47e37a6c6e..3b1c825a0a 100644
--- a/packages/types/src/dashboard.d.ts
+++ b/packages/types/src/dashboard.d.ts
@@ -109,6 +109,7 @@ export type TWidgetIssue = TIssue & {
project_id: string;
relation_type: TIssueRelationTypes;
sequence_id: number;
+ type_id: string | null;
}[];
};
diff --git a/web/core/components/dashboard/widgets/issue-panels/issue-list-item.tsx b/web/core/components/dashboard/widgets/issue-panels/issue-list-item.tsx
index bb897916de..c3dc06b1ec 100644
--- a/web/core/components/dashboard/widgets/issue-panels/issue-list-item.tsx
+++ b/web/core/components/dashboard/widgets/issue-panels/issue-list-item.tsx
@@ -67,12 +67,14 @@ export const AssignedUpcomingIssueListItem: React.FC<IssueListItemProps> = obser
? blockedByIssues.length > 1
? `${blockedByIssues.length} blockers`
: blockedByIssueProjectDetails && (
- <IssueIdentifier
- issueId={blockedByIssues[0]?.id}
- projectId={blockedByIssueProjectDetails?.id}
- textContainerClassName="text-xs text-custom-text-200 font-medium"
- />
- )
+ <IssueIdentifier
+ projectIdentifier={blockedByIssueProjectDetails?.identifier}
+ projectId={blockedByIssueProjectDetails?.id}
+ issueSequenceId={blockedByIssues[0]?.sequence_id}
+ issueTypeId={blockedByIssues[0]?.type_id}
+ textContainerClassName="text-xs text-custom-text-200 font-medium"
+ />
+ )
: "-"}
</div>
</ControlLink>
diff --git a/web/core/components/issues/peek-overview/root.tsx b/web/core/components/issues/peek-overview/root.tsx
index 3685767fd2..a55b0d5464 100644
--- a/web/core/components/issues/peek-overview/root.tsx
+++ b/web/core/components/issues/peek-overview/root.tsx
@@ -20,17 +20,10 @@ interface IIssuePeekOverview {
embedRemoveCurrentNotification?: () => void;
is_archived?: boolean;
is_draft?: boolean;
- shouldReplaceIssueOnFetch?: boolean;
}
export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
- const {
- embedIssue = false,
- embedRemoveCurrentNotification,
- is_archived = false,
- is_draft = false,
- shouldReplaceIssueOnFetch = true,
- } = props;
+ const { embedIssue = false, embedRemoveCurrentNotification, is_archived = false, is_draft = false } = props;
// router
const pathname = usePathname();
const {
@@ -67,8 +60,7 @@ export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {
workspaceSlug,
projectId,
issueId,
- is_archived ? "ARCHIVED" : is_draft ? "DRAFT" : "DEFAULT",
- shouldReplaceIssueOnFetch
+ is_archived ? "ARCHIVED" : is_draft ? "DRAFT" : "DEFAULT"
);
setLoader(false);
setError(false);
diff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.ts
index 186fab5090..871be85e02 100644
--- a/web/core/store/issue/issue-details/issue.store.ts
+++ b/web/core/store/issue/issue-details/issue.store.ts
@@ -13,8 +13,7 @@ export interface IIssueStoreActions {
workspaceSlug: string,
projectId: string,
issueId: string,
- issueType?: "DEFAULT" | "DRAFT" | "ARCHIVED",
- shouldReplace?: boolean
+ issueType?: "DEFAULT" | "DRAFT" | "ARCHIVED"
) => Promise<TIssue>;
updateIssue: (workspaceSlug: string, projectId: string, issueId: string, data: Partial<TIssue>) => Promise<void>;
removeIssue: (workspaceSlug: string, projectId: string, issueId: string) => Promise<void>;
@@ -62,13 +61,7 @@ export class IssueStore implements IIssueStore {
});
// actions
- fetchIssue = async (
- workspaceSlug: string,
- projectId: string,
- issueId: string,
- issueType = "DEFAULT",
- shouldReplace = true
- ) => {
+ fetchIssue = async (workspaceSlug: string, projectId: string, issueId: string, issueType = "DEFAULT") => {
const query = {
expand: "issue_reactions,issue_attachment,issue_link,parent",
};
@@ -114,7 +107,7 @@ export class IssueStore implements IIssueStore {
is_subscribed: issue?.is_subscribed,
};
- this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload], shouldReplace);
+ this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload]);
// store handlers from issue detail
// parent
diff --git a/web/core/store/issue/issue.store.ts b/web/core/store/issue/issue.store.ts
index 6b5154d570..f94188e641 100644
--- a/web/core/store/issue/issue.store.ts
+++ b/web/core/store/issue/issue.store.ts
@@ -1,3 +1,4 @@
+import update from "lodash/update";
import isEmpty from "lodash/isEmpty";
import set from "lodash/set";
import { action, makeObservable, observable, runInAction } from "mobx";
@@ -14,7 +15,7 @@ export type IIssueStore = {
issuesMap: Record<string, TIssue>; // Record defines issue_id as key and TIssue as value
// actions
getIssues(workspaceSlug: string, projectId: string, issueIds: string[]): Promise<TIssue[]>;
- addIssue(issues: TIssue[], shouldReplace?: boolean): void;
+ addIssue(issues: TIssue[]): void;
updateIssue(issueId: string, issue: Partial<TIssue>): void;
removeIssue(issueId: string): void;
// helper methods
@@ -47,11 +48,12 @@ export class IssueStore implements IIssueStore {
* @param {TIssue[]} issues
* @returns {void}
*/
- addIssue = (issues: TIssue[], shouldReplace = false) => {
+ addIssue = (issues: TIssue[]) => {
if (issues && issues.length <= 0) return;
runInAction(() => {
issues.forEach((issue) => {
- if (!this.issuesMap[issue.id] || shouldReplace) set(this.issuesMap, issue.id, issue);
+ if (!this.issuesMap[issue.id]) set(this.issuesMap, issue.id, issue);
+ else update(this.issuesMap, issue.id, (prevIssue) => ({ ...prevIssue, ...issue }));
});
});
};