diff --git a/apps/app/components/core/board-view/all-boards.tsx b/apps/app/components/core/board-view/all-boards.tsx index b81c3238f..88d303dc7 100644 --- a/apps/app/components/core/board-view/all-boards.tsx +++ b/apps/app/components/core/board-view/all-boards.tsx @@ -39,7 +39,7 @@ export const AllBoards: React.FC = ({ return ( <> {groupedByIssues ? ( -
+
{Object.keys(groupedByIssues).map((singleGroup, index) => { const currentState = diff --git a/apps/app/components/cycles/sidebar.tsx b/apps/app/components/cycles/sidebar.tsx index 51b3e6c71..8b5dc000d 100644 --- a/apps/app/components/cycles/sidebar.tsx +++ b/apps/app/components/cycles/sidebar.tsx @@ -246,7 +246,7 @@ export const CycleDetailsSidebar: React.FC = ({
-
+

{cycle.name}

diff --git a/apps/app/components/cycles/single-cycle-card.tsx b/apps/app/components/cycles/single-cycle-card.tsx index edbaa35c4..01f4f1d00 100644 --- a/apps/app/components/cycles/single-cycle-card.tsx +++ b/apps/app/components/cycles/single-cycle-card.tsx @@ -15,7 +15,13 @@ import { CustomMenu, LinearProgressIndicator, Tooltip } from "components/ui"; import { Disclosure, Transition } from "@headlessui/react"; // icons import { CalendarDaysIcon } from "@heroicons/react/20/solid"; -import { ChevronDownIcon, PencilIcon, StarIcon } from "@heroicons/react/24/outline"; +import { + ChevronDownIcon, + DocumentDuplicateIcon, + PencilIcon, + StarIcon, + TrashIcon, +} from "@heroicons/react/24/outline"; // helpers import { getDateRangeStatus, renderShortDateWithYearFormat } from "helpers/date-time.helper"; import { groupBy } from "helpers/array.helper"; @@ -232,7 +238,7 @@ export const SingleCycleCard: React.FC = (props) => {
diff --git a/apps/app/components/issues/my-issues-list-item.tsx b/apps/app/components/issues/my-issues-list-item.tsx index 740da34ba..be28022a0 100644 --- a/apps/app/components/issues/my-issues-list-item.tsx +++ b/apps/app/components/issues/my-issues-list-item.tsx @@ -20,22 +20,16 @@ import { CustomMenu, Tooltip } from "components/ui"; import { IIssue, Properties } from "types"; // fetch-keys import { USER_ISSUE } from "constants/fetch-keys"; -import { copyTextToClipboard } from "helpers/string.helper"; +import { copyTextToClipboard, truncateText } from "helpers/string.helper"; import useToast from "hooks/use-toast"; type Props = { issue: IIssue; properties: Properties; projectId: string; - handleDeleteIssue: () => void; }; -export const MyIssuesListItem: React.FC = ({ - issue, - properties, - projectId, - handleDeleteIssue, -}) => { +export const MyIssuesListItem: React.FC = ({ issue, properties, projectId }) => { const router = useRouter(); const { workspaceSlug } = router.query; const { setToastAlert } = useToast(); @@ -84,14 +78,8 @@ export const MyIssuesListItem: React.FC = ({ const isNotAllowed = false; return ( -
-
- +
+ -
- {properties.priority && ( - - )} - {properties.state && ( - - )} - {properties.due_date && ( - - )} - {properties.sub_issue_count && ( -
- {issue?.sub_issues_count} {issue?.sub_issues_count === 1 ? "sub-issue" : "sub-issues"} -
- )} - {properties.labels && ( -
- {issue.label_details.map((label) => ( - - - {label.name} - - ))} -
- )} - {properties.assignee && ( - 0 - ? issue.assignee_details - .map((assignee) => - assignee?.first_name !== "" ? assignee?.first_name : assignee?.email - ) - .join(", ") - : "No Assignee" - } - > -
- + +
+ {properties.priority && ( + + )} + {properties.state && ( + + )} + {properties.due_date && ( + + )} + {properties.sub_issue_count && ( +
+ {issue?.sub_issues_count} {issue?.sub_issues_count === 1 ? "sub-issue" : "sub-issues"}
- - )} - - Delete issue - Copy issue link - + )} + {properties.labels && issue.label_details.length > 0 ? ( +
+ {issue.label_details.map((label) => ( + + + {label.name} + + ))} +
+ ) : ( + "" + )} + {properties.assignee && ( + 0 + ? issue.assignee_details + .map((assignee) => + assignee?.first_name !== "" ? assignee?.first_name : assignee?.email + ) + .join(", ") + : "No Assignee" + } + > +
+ +
+
+ )} + + Copy issue link + +
); diff --git a/apps/app/components/modules/sidebar.tsx b/apps/app/components/modules/sidebar.tsx index 07e102ce0..72d705907 100644 --- a/apps/app/components/modules/sidebar.tsx +++ b/apps/app/components/modules/sidebar.tsx @@ -327,7 +327,7 @@ export const ModuleDetailsSidebar: React.FC = ({
-
+

{module.name}

diff --git a/apps/app/components/modules/single-module-card.tsx b/apps/app/components/modules/single-module-card.tsx index 2a48baac5..5a4785aae 100644 --- a/apps/app/components/modules/single-module-card.tsx +++ b/apps/app/components/modules/single-module-card.tsx @@ -15,7 +15,10 @@ import { AssigneesList, Avatar, CustomMenu, Tooltip } from "components/ui"; import User from "public/user.png"; import { CalendarDaysIcon, + DocumentDuplicateIcon, + PencilIcon, StarIcon, + TrashIcon, UserCircleIcon, UserGroupIcon, } from "@heroicons/react/24/outline"; @@ -255,12 +258,23 @@ export const SingleModuleCard: React.FC = ({ module, handleEditModule }) )} - Edit module + + + + Edit Module + + - Delete module + + + Delete Module + - Copy module link + + + Copy Module Link +
diff --git a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx index d5b8bbfaf..ccc5ea7df 100644 --- a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx +++ b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React from "react"; import { useRouter } from "next/router"; // headless ui @@ -17,16 +17,13 @@ import useIssuesProperties from "hooks/use-issue-properties"; // types import { IIssue, Properties } from "types"; // components -import { DeleteIssueModal, MyIssuesListItem } from "components/issues"; +import { MyIssuesListItem } from "components/issues"; // helpers import { replaceUnderscoreIfSnakeCase } from "helpers/string.helper"; // types import type { NextPage } from "next"; const MyIssuesPage: NextPage = () => { - const [deleteIssueModal, setDeleteIssueModal] = useState(false); - const [issueToDelete, setIssueToDelete] = useState(null); - const router = useRouter(); const { workspaceSlug } = router.query; @@ -38,18 +35,8 @@ const MyIssuesPage: NextPage = () => { undefined ); - const handleDeleteIssue = (issue: IIssue) => { - setDeleteIssueModal(true); - setIssueToDelete(issue); - }; - return ( <> - setDeleteIssueModal(false)} - isOpen={deleteIssueModal} - data={issueToDelete} - /> @@ -96,7 +83,7 @@ const MyIssuesPage: NextPage = () => { }`} onClick={() => setProperties(key as keyof Properties)} > - {replaceUnderscoreIfSnakeCase(key)} + {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)} ))}
@@ -129,8 +116,12 @@ const MyIssuesPage: NextPage = () => {
{({ open }) => ( -
-
+
+
@@ -141,7 +132,9 @@ const MyIssuesPage: NextPage = () => { />

My Issues

-

{myIssues.length}

+ + {myIssues.length} +
@@ -155,17 +148,14 @@ const MyIssuesPage: NextPage = () => { leaveTo="transform opacity-0" > -
- {myIssues.map((issue: IIssue) => ( - handleDeleteIssue(issue)} - /> - ))} -
+ {myIssues.map((issue: IIssue) => ( + + ))}