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-2388] chore: theme changes and workspace draft issue total count updated (#5805)

Anmol Singh Bhatiac9dbd1d5d17a
diff --git a/apiserver/plane/app/views/workspace/draft.py b/apiserver/plane/app/views/workspace/draft.py
index 5bd8c2dfae..8930e87170 100644
--- a/apiserver/plane/app/views/workspace/draft.py
+++ b/apiserver/plane/app/views/workspace/draft.py
@@ -210,7 +210,7 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
@allow_permission(
allowed_roles=[ROLE.ADMIN],
creator=True,
- model=Issue,
+ model=DraftIssue,
level="WORKSPACE",
)
def destroy(self, request, slug, pk=None):
diff --git a/packages/types/src/workspace-draft-issues/base.d.ts b/packages/types/src/workspace-draft-issues/base.d.ts
index f0272defd5..8090a9cb79 100644
--- a/packages/types/src/workspace-draft-issues/base.d.ts
+++ b/packages/types/src/workspace-draft-issues/base.d.ts
@@ -26,6 +26,8 @@ export type TWorkspaceDraftIssue = {
updated_by: string;
is_draft: boolean;
+
+ type_id: string;
};
export type TWorkspaceDraftPaginationInfo<T> = {
diff --git a/packages/ui/src/header/helper.tsx b/packages/ui/src/header/helper.tsx
index b6d76f8c6d..13fee8b479 100644
--- a/packages/ui/src/header/helper.tsx
+++ b/packages/ui/src/header/helper.tsx
@@ -10,9 +10,11 @@ export interface IHeaderProperties {
}
export const headerStyle: IHeaderProperties = {
[EHeaderVariant.PRIMARY]:
- "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 bg-custom-background-100 z-[18]",
- [EHeaderVariant.SECONDARY]: "!py-0 overflow-y-hidden border-b border-custom-border-200 justify-between bg-custom-background-100 z-[15]",
- [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2 border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
+ "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 bg-custom-sidebar-background-100 z-[18]",
+ [EHeaderVariant.SECONDARY]:
+ "!py-0 overflow-y-hidden border-b border-custom-border-200 justify-between bg-custom-background-100 z-[15]",
+ [EHeaderVariant.TERNARY]:
+ "flex flex-wrap justify-between py-2 border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
};
export const minHeights: IHeaderProperties = {
[EHeaderVariant.PRIMARY]: "",
diff --git a/web/app/[workspaceSlug]/(projects)/drafts/header.tsx b/web/app/[workspaceSlug]/(projects)/drafts/header.tsx
index 6f0b90717d..0c5b4ecc7f 100644
--- a/web/app/[workspaceSlug]/(projects)/drafts/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/drafts/header.tsx
@@ -44,7 +44,11 @@ export const WorkspaceDraftHeader: FC = observer(() => {
link={<BreadcrumbLink label={`Draft`} icon={<PenSquare className="h-4 w-4 text-custom-text-300" />} />}
/>
</Breadcrumbs>
- {paginationInfo?.count && paginationInfo?.count > 0 ? <CountChip count={paginationInfo?.count} /> : <></>}
+ {paginationInfo?.total_count && paginationInfo?.total_count > 0 ? (
+ <CountChip count={paginationInfo?.total_count} />
+ ) : (
+ <></>
+ )}
</div>
</Header.LeftItem>
diff --git a/web/ce/components/issues/issue-details/issue-identifier.tsx b/web/ce/components/issues/issue-details/issue-identifier.tsx
index c461e88fa3..fbd9439842 100644
--- a/web/ce/components/issues/issue-details/issue-identifier.tsx
+++ b/web/ce/components/issues/issue-details/issue-identifier.tsx
@@ -1,3 +1,4 @@
+import { FC } from "react";
import { observer } from "mobx-react";
// types
import { IIssueDisplayProperties } from "@plane/types";
@@ -28,6 +29,13 @@ type TIssueIdentifierWithDetails = TIssueIdentifierBaseProps & {
export type TIssueIdentifierProps = TIssueIdentifierFromStore | TIssueIdentifierWithDetails;
+type TIssueTypeIdentifier = {
+ issueTypeId: string;
+ size?: "xs" | "sm" | "md" | "lg";
+};
+
+export const IssueTypeIdentifier: FC<TIssueTypeIdentifier> = observer((props) => <></>);
+
type TIdentifierTextProps = {
identifier: string;
enableClickToCopyIdentifier?: boolean;
diff --git a/web/core/components/issues/workspace-draft/draft-issue-block.tsx b/web/core/components/issues/workspace-draft/draft-issue-block.tsx
index 8be73154d6..0e0561353f 100644
--- a/web/core/components/issues/workspace-draft/draft-issue-block.tsx
+++ b/web/core/components/issues/workspace-draft/draft-issue-block.tsx
@@ -8,7 +8,7 @@ import { cn } from "@/helpers/common.helper";
// hooks
import { useAppTheme, useProject, useWorkspaceDraftIssues } from "@/hooks/store";
// plane-web components
-import { IdentifierText } from "ce/components/issues";
+import { IdentifierText, IssueTypeIdentifier } from "@/plane-web/components/issues";
// local components
import { WorkspaceDraftIssueQuickActions } from "../issue-layouts";
import { DraftIssueProperties } from "./draft-issue-properties";
@@ -51,6 +51,7 @@ export const DraftIssueBlock: FC<Props> = observer((props) => {
<div className="flex-shrink-0">
{issue.project_id && (
<div className="flex items-center space-x-2">
+ {issue?.type_id && <IssueTypeIdentifier issueTypeId={issue.type_id} />}
<IdentifierText
identifier={projectIdentifier}
enableClickToCopyIdentifier