Skip to content

refactor: issue details page #211

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
sriramveeraghanta merged 1 commit into from
Jan 31, 2023
Merged

refactor: issue details page #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 19 additions & 61 deletions apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,17 @@ import AddAsSubIssue from "components/project/issues/issue-detail/add-as-sub-iss
import IssueDetailSidebar from "components/project/issues/issue-detail/issue-detail-sidebar";
import AddIssueComment from "components/project/issues/issue-detail/comment/issue-comment-section";
import IssueActivitySection from "components/project/issues/issue-detail/activity";
import {
IssueDescriptionForm,
IssueDescriptionFormValues,
SubIssueList,
CreateUpdateIssueModal,
} from "components/issues";
import { IssueDescriptionForm, SubIssueList, CreateUpdateIssueModal } from "components/issues";
// ui
import { Loader, HeaderButton, CustomMenu } from "components/ui";
import { Loader, CustomMenu } from "components/ui";
import { Breadcrumbs } from "components/breadcrumbs";
// icons
import { ChevronLeftIcon, ChevronRightIcon, PlusIcon } from "@heroicons/react/24/outline";
import { PlusIcon } from "@heroicons/react/24/outline";
// types
import { IIssue } from "types";
import type { NextPage, NextPageContext } from "next";
// fetch-keys
import {
PROJECT_ISSUES_LIST,
PROJECT_ISSUES_ACTIVITY,
ISSUE_DETAILS,
SUB_ISSUES,
} from "constants/fetch-keys";
import { PROJECT_ISSUES_ACTIVITY, ISSUE_DETAILS, SUB_ISSUES } from "constants/fetch-keys";

const defaultValues = {
name: "",
Expand Down Expand Up @@ -81,15 +71,6 @@ const IssueDetailsPage: NextPage = () => {
: null
);

const { data: issues } = useSWR(
workspaceSlug && projectId
? PROJECT_ISSUES_LIST(workspaceSlug as string, projectId as string)
: null,
workspaceSlug && projectId
? () => issuesService.getIssues(workspaceSlug as string, projectId as string)
: null
);

const { data: issueActivities, mutate: mutateIssueActivities } = useSWR(
workspaceSlug && projectId && issueId ? PROJECT_ISSUES_ACTIVITY(issueId as string) : null,
workspaceSlug && projectId && issueId
Expand All @@ -102,17 +83,22 @@ const IssueDetailsPage: NextPage = () => {
: null
);

const { data: siblingIssues } = useSWR(
workspaceSlug && projectId && issueDetails?.parent ? SUB_ISSUES(issueDetails.parent) : null,
workspaceSlug && projectId && issueDetails?.parent
? () =>
issuesService.subIssues(
workspaceSlug as string,
projectId as string,
issueDetails.parent ?? ""
)
: null
);

const { reset, control, watch } = useForm<IIssue>({
defaultValues,
});

const prevIssue = issues?.results[issues?.results.findIndex((issue) => issue.id === issueId) - 1];
const nextIssue = issues?.results[issues?.results.findIndex((issue) => issue.id === issueId) + 1];

const siblingIssues =
issueDetails &&
issues?.results.filter((i) => i.parent === issueDetails.parent && i.id !== issueId);

useEffect(() => {
if (issueDetails) {
mutateIssueActivities();
Expand Down Expand Up @@ -191,32 +177,6 @@ const IssueDetailsPage: NextPage = () => {
/>
</Breadcrumbs>
}
right={
<div className="flex items-center gap-2">
<HeaderButton
Icon={ChevronLeftIcon}
label="Previous"
className={!prevIssue ? "cursor-not-allowed opacity-70" : ""}
onClick={() => {
if (!prevIssue) return;
router.push(`/${workspaceSlug}/projects/${prevIssue.project}/issues/${prevIssue.id}`);
}}
/>
<HeaderButton
Icon={ChevronRightIcon}
disabled={!nextIssue}
label="Next"
className={!nextIssue ? "cursor-not-allowed opacity-70" : ""}
onClick={() => {
if (!nextIssue) return;
router.push(
`/${workspaceSlug}/projects/${nextIssue.project}/issues/${nextIssue?.id}`
);
}}
position="reverse"
/>
</div>
}
>
{isOpen && (
<CreateUpdateIssueModal
Expand Down Expand Up @@ -254,19 +214,17 @@ const IssueDetailsPage: NextPage = () => {
/>
<span className="flex-shrink-0 text-gray-600">
{issueDetails.project_detail.identifier}-
{issues?.results.find((i) => i.id === issueDetails.parent)?.sequence_id}
{issueDetails.parent_detail?.sequence_id}
</span>
<span className="truncate font-medium">
{issues?.results
.find((i) => i.id === issueDetails.parent)
?.name.substring(0, 50)}
{issueDetails.parent_detail?.name.substring(0, 50)}
</span>
</a>
</Link>

<CustomMenu ellipsis optionsPosition="left">
{siblingIssues && siblingIssues.length > 0 ? (
siblingIssues.map((issue) => (
siblingIssues.map((issue: IIssue) => (
<CustomMenu.MenuItem key={issue.id}>
<Link
href={`/${workspaceSlug}/projects/${projectId as string}/issues/${
Expand Down
12 changes: 11 additions & 1 deletion apps/app/types/issues.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ export interface IIssueCycle {
workspace: string;
}

export interface IIssueParent {
description: any;
id: string;
name: string;
priority: string | null;
sequence_id: number;
start_date: string | null;
target_date: string | null;
}

export interface IIssue {
assignees: any[] | null;
assignee_details: IUser[];
Expand Down Expand Up @@ -77,7 +87,7 @@ export interface IIssue {
module: string | null;
name: string;
parent: string | null;
parent_detail: IProject | null;
parent_detail: IIssueParent | null;
priority: string | null;
project: string;
project_detail: IProject;
Expand Down