diff --git a/apps/app/components/project/issues/issue-detail/activity/index.tsx b/apps/app/components/project/issues/issue-detail/activity/index.tsx index 84085d7b1..9b105d2d3 100644 --- a/apps/app/components/project/issues/issue-detail/activity/index.tsx +++ b/apps/app/components/project/issues/issue-detail/activity/index.tsx @@ -1,5 +1,16 @@ +import React from "react"; // next +import { useRouter } from "next/router"; import Image from "next/image"; +// swr +import useSWR from "swr"; +// constants +import { PROJECT_ISSUES_ACTIVITY } from "constants/fetch-keys"; +import { addSpaceIfCamelCase, timeAgo } from "constants/common"; +// services +import issuesServices from "lib/services/issues.service"; +// hooks +import useUser from "lib/hooks/useUser"; // ui import { Spinner } from "ui"; // icons @@ -12,14 +23,6 @@ import { } from "@heroicons/react/24/outline"; // types import { IssueResponse, IState } from "types"; -// constants -import { addSpaceIfCamelCase, timeAgo } from "constants/common"; - -type Props = { - issueActivities: any[] | undefined; - states: IState[] | undefined; - issues: IssueResponse | undefined; -}; const activityIcons: { [key: string]: JSX.Element; @@ -32,7 +35,25 @@ const activityIcons: { parent: , }; -const IssueActivitySection: React.FC = ({ issueActivities, states, issues }) => { +const IssueActivitySection: React.FC = () => { + const router = useRouter(); + + const { issueId, projectId } = router.query; + + const { activeWorkspace, states, issues } = useUser(); + + const { data: issueActivities } = useSWR( + activeWorkspace && projectId && issueId ? PROJECT_ISSUES_ACTIVITY : null, + activeWorkspace && projectId && issueId + ? () => + issuesServices.getIssueActivities( + activeWorkspace.slug, + projectId as string, + issueId as string + ) + : null + ); + return ( <> {issueActivities ? ( diff --git a/apps/app/components/project/issues/issue-detail/comment/IssueCommentSection.tsx b/apps/app/components/project/issues/issue-detail/comment/IssueCommentSection.tsx index fe55bdbf5..d5f4b62ce 100644 --- a/apps/app/components/project/issues/issue-detail/comment/IssueCommentSection.tsx +++ b/apps/app/components/project/issues/issue-detail/comment/IssueCommentSection.tsx @@ -1,12 +1,16 @@ import React from "react"; +// router +import { useRouter } from "next/router"; // swr -import { mutate } from "swr"; +import useSWR from "swr"; // react hook form import { useForm } from "react-hook-form"; // services import issuesServices from "lib/services/issues.service"; // fetch keys import { PROJECT_ISSUES_COMMENTS } from "constants/fetch-keys"; +// hooks +import useUser from "lib/hooks/useUser"; // components import CommentCard from "components/project/issues/issue-detail/comment/IssueCommentCard"; // ui @@ -14,18 +18,11 @@ import { TextArea, Button, Spinner } from "ui"; // types import type { IIssueComment } from "types"; -type Props = { - comments?: IIssueComment[]; - workspaceSlug: string; - projectId: string; - issueId: string; -}; - const defaultValues: Partial = { comment: "", }; -const IssueCommentSection: React.FC = ({ comments, issueId, projectId, workspaceSlug }) => { +const IssueCommentSection: React.FC = () => { const { register, handleSubmit, @@ -34,15 +31,31 @@ const IssueCommentSection: React.FC = ({ comments, issueId, projectId, wo reset, } = useForm({ defaultValues }); + const router = useRouter(); + + let { issueId, projectId } = router.query; + + const { activeWorkspace } = useUser(); + + const { data: comments, mutate } = useSWR( + activeWorkspace && projectId && issueId ? PROJECT_ISSUES_COMMENTS(issueId as string) : null, + activeWorkspace && projectId && issueId + ? () => + issuesServices.getIssueComments( + activeWorkspace.slug, + projectId as string, + issueId as string + ) + : null + ); + const onSubmit = async (formData: IIssueComment) => { + if (!activeWorkspace || !projectId || !issueId || isSubmitting) return; await issuesServices - .createIssueComment(workspaceSlug, projectId, issueId, formData) + .createIssueComment(activeWorkspace.slug, projectId as string, issueId as string, formData) .then((response) => { console.log(response); - mutate(PROJECT_ISSUES_COMMENTS(issueId), (prevData) => [ - response, - ...(prevData ?? []), - ]); + mutate((prevData) => [response, ...(prevData ?? [])]); reset(defaultValues); }) .catch((error) => { @@ -51,26 +64,34 @@ const IssueCommentSection: React.FC = ({ comments, issueId, projectId, wo }; const onCommentUpdate = async (comment: IIssueComment) => { + if (!activeWorkspace || !projectId || !issueId || isSubmitting) return; await issuesServices - .patchIssueComment(workspaceSlug, projectId, issueId, comment.id, comment) + .patchIssueComment( + activeWorkspace.slug, + projectId as string, + issueId as string, + comment.id, + comment + ) .then((response) => { - console.log(response); - mutate(PROJECT_ISSUES_COMMENTS(issueId), (prevData) => { - const newData = prevData ?? []; - const index = newData.findIndex((comment) => comment.id === response.id); - newData[index] = response; - return [...newData]; + mutate((prevData) => { + const updatedComments = prevData?.map((c) => { + if (c.id === comment.id) { + return comment; + } + return c; + }); + return updatedComments; }); }); }; const onCommentDelete = async (commentId: string) => { + if (!activeWorkspace || !projectId || !issueId || isSubmitting) return; await issuesServices - .deleteIssueComment(workspaceSlug, projectId, issueId, commentId) + .deleteIssueComment(activeWorkspace.slug, projectId as string, issueId as string, commentId) .then((response) => { - mutate(PROJECT_ISSUES_COMMENTS(issueId), (prevData) => - (prevData ?? []).filter((c) => c.id !== commentId) - ); + mutate((prevData) => (prevData ?? []).filter((c) => c.id !== commentId)); console.log(response); }); }; @@ -124,7 +145,6 @@ const IssueCommentSection: React.FC = ({ comments, issueId, projectId, wo /> diff --git a/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/index.tsx b/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/index.tsx index 9fedbb757..88c1dadaf 100644 --- a/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/index.tsx +++ b/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/index.tsx @@ -1,6 +1,7 @@ import React, { useState } from "react"; // swr import useSWR from "swr"; +import dynamic from "next/dynamic"; // headless ui import { Listbox, Transition } from "@headlessui/react"; // react hook form @@ -14,6 +15,8 @@ import useToast from "lib/hooks/useToast"; import { PROJECT_ISSUE_LABELS } from "constants/fetch-keys"; // commons import { copyTextToClipboard } from "constants/common"; +// components +import ConfirmIssueDeletion from "components/project/issues/confirm-issue-deletion"; // ui import { Input, Button, Spinner } from "ui"; import { Popover } from "@headlessui/react"; @@ -30,7 +33,7 @@ import { } from "@heroicons/react/24/outline"; // types import type { Control } from "react-hook-form"; -import type { IIssue, IIssueLabels, NestedKeyOf } from "types"; +import type { ICycle, IIssue, IIssueLabels, NestedKeyOf } from "types"; import { TwitterPicker } from "react-color"; import { positionEditorElement } from "components/lexical/helpers/editor"; import SelectState from "./select-state"; @@ -46,7 +49,6 @@ type Props = { submitChanges: (formData: Partial) => void; issueDetail: IIssue | undefined; watch: UseFormWatch; - setDeleteIssueModal: React.Dispatch>; }; const defaultValues: Partial = { @@ -59,7 +61,6 @@ const IssueDetailSidebar: React.FC = ({ submitChanges, issueDetail, watch: watchIssue, - setDeleteIssueModal, }) => { const [createLabelForm, setCreateLabelForm] = useState(false); @@ -74,6 +75,8 @@ const IssueDetailSidebar: React.FC = ({ : null ); + const [deleteIssueModal, setDeleteIssueModal] = useState(false); + const { register, handleSubmit, @@ -97,15 +100,17 @@ const IssueDetailSidebar: React.FC = ({ }); }; - const handleCycleChange = (cycleId: string) => { - if (activeWorkspace && activeProject && issueDetail) + const handleCycleChange = (cycleDetail: ICycle) => { + if (activeWorkspace && activeProject && issueDetail) { + submitChanges({ cycle: cycleDetail.id, cycle_detail: cycleDetail }); issuesServices - .addIssueToCycle(activeWorkspace.slug, activeProject.id, cycleId, { + .addIssueToCycle(activeWorkspace.slug, activeProject.id, cycleDetail.id, { issues: [issueDetail.id], }) .then(() => { submitChanges({}); }); + } }; return ( @@ -420,6 +425,11 @@ const IssueDetailSidebar: React.FC = ({ )} + setDeleteIssueModal(false)} + isOpen={deleteIssueModal} + data={issueDetail} + /> ); }; diff --git a/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/select-cycle.tsx b/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/select-cycle.tsx index 0d8b32c65..21c18fa36 100644 --- a/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/select-cycle.tsx +++ b/apps/app/components/project/issues/issue-detail/issue-detail-sidebar/select-cycle.tsx @@ -9,13 +9,13 @@ import { Spinner, CustomSelect } from "ui"; // icons import { ArrowPathIcon } from "@heroicons/react/24/outline"; // types -import { IIssue } from "types"; +import { ICycle, IIssue } from "types"; // common import { classNames } from "constants/common"; type Props = { control: Control; - handleCycleChange: (cycleId: string) => void; + handleCycleChange: (cycle: ICycle) => void; }; const SelectCycle: React.FC = ({ control, handleCycleChange }) => { @@ -46,7 +46,7 @@ const SelectCycle: React.FC = ({ control, handleCycleChange }) => { } value={value} onChange={(value: any) => { - handleCycleChange(value); + handleCycleChange(cycles?.find((c) => c.id === value) as any); }} > {cycles ? ( diff --git a/apps/app/pages/projects/[projectId]/issues/[issueId].tsx b/apps/app/pages/projects/[projectId]/issues/[issueId].tsx index 5da9e6d1a..43adddc27 100644 --- a/apps/app/pages/projects/[projectId]/issues/[issueId].tsx +++ b/apps/app/pages/projects/[projectId]/issues/[issueId].tsx @@ -1,21 +1,17 @@ import React, { useCallback, useEffect, useState } from "react"; // next import Link from "next/link"; +import dynamic from "next/dynamic"; import type { NextPage } from "next"; import { useRouter } from "next/router"; -import dynamic from "next/dynamic"; // swr -import useSWR, { mutate } from "swr"; +import { mutate } from "swr"; // react hook form import { useForm } from "react-hook-form"; // headless ui import { Disclosure, Menu, Tab, Transition } from "@headlessui/react"; // fetch keys -import { - PROJECT_ISSUES_ACTIVITY, - PROJECT_ISSUES_COMMENTS, - PROJECT_ISSUES_LIST, -} from "constants/fetch-keys"; +import { PROJECT_ISSUES_LIST } from "constants/fetch-keys"; // services import issuesServices from "lib/services/issues.service"; // common @@ -27,14 +23,23 @@ import withAuth from "lib/hoc/withAuthWrapper"; // layouts import AppLayout from "layouts/app-layout"; // components -import CreateUpdateIssuesModal from "components/project/issues/create-update-issue-modal"; -import IssueCommentSection from "components/project/issues/issue-detail/comment/IssueCommentSection"; import AddAsSubIssue from "components/project/issues/issue-detail/add-as-sub-issue"; -import ConfirmIssueDeletion from "components/project/issues/confirm-issue-deletion"; +import CreateUpdateIssuesModal from "components/project/issues/create-update-issue-modal"; import IssueDetailSidebar from "components/project/issues/issue-detail/issue-detail-sidebar"; -import IssueActivitySection from "components/project/issues/issue-detail/activity"; +import IssueCommentSection from "components/project/issues/issue-detail/comment/IssueCommentSection"; +const IssueActivitySection = dynamic( + () => import("components/project/issues/issue-detail/activity"), + { + loading: () => ( +
+ +
+ ), + ssr: false, + } +); // ui -import { Spinner, TextArea, HeaderButton, Breadcrumbs, BreadcrumbItem, CustomMenu } from "ui"; +import { Spinner, TextArea, HeaderButton, Breadcrumbs } from "ui"; // icons import { ChevronLeftIcon, @@ -43,32 +48,51 @@ import { PlusIcon, } from "@heroicons/react/24/outline"; // types -import { IIssue, IIssueComment, IssueResponse } from "types"; +import { IIssue, IssueResponse } from "types"; const RichTextEditor = dynamic(() => import("components/lexical/editor"), { ssr: false, }); +const defaultValues = { + name: "", + description: "", + state: "", + assignees_list: [], + priority: "low", + blockers_list: [], + blocked_list: [], + target_date: new Date().toString(), + issue_cycle: null, + labels_list: [], +}; + const IssueDetail: NextPage = () => { - const [deleteIssueModal, setDeleteIssueModal] = useState(false); + const router = useRouter(); + + const { issueId, projectId } = router.query; + + const { activeWorkspace, activeProject, issues, mutateIssues } = useUser(); + + const issueDetail = issues?.results?.find((issue) => issue.id === issueId); + + 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 subIssues = (issues && issues.results.filter((i) => i.parent === issueId)) ?? []; + const siblingIssues = + issueDetail && + issues?.results.filter((i) => i.parent === issueDetail.parent && i.id !== issueId); const [isOpen, setIsOpen] = useState(false); const [isAddAsSubIssueOpen, setIsAddAsSubIssueOpen] = useState(false); - const [issueDetail, setIssueDetail] = useState(undefined); - const [preloadedData, setPreloadedData] = useState< (Partial & { actionType: "createIssue" | "edit" | "delete" }) | undefined >(undefined); const [issueDescriptionValue, setIssueDescriptionValue] = useState(""); - const router = useRouter(); - - const { issueId, projectId } = router.query; - - const { activeWorkspace, activeProject, issues, mutateIssues, states } = useUser(); - const handleDescriptionChange: any = (value: any) => { console.log(value); setIssueDescriptionValue(value); @@ -82,44 +106,9 @@ const IssueDetail: NextPage = () => { control, watch, } = useForm({ - defaultValues: { - name: "", - description: "", - state: "", - assignees_list: [], - priority: "low", - blockers_list: [], - blocked_list: [], - target_date: new Date().toString(), - issue_cycle: null, - labels_list: [], - }, + defaultValues, }); - const { data: issueActivities } = useSWR( - activeWorkspace && projectId && issueId ? PROJECT_ISSUES_ACTIVITY : null, - activeWorkspace && projectId && issueId - ? () => - issuesServices.getIssueActivities( - activeWorkspace.slug, - projectId as string, - issueId as string - ) - : null - ); - - const { data: issueComments } = useSWR( - activeWorkspace && projectId && issueId ? PROJECT_ISSUES_COMMENTS(issueId as string) : null, - activeWorkspace && projectId && issueId - ? () => - issuesServices.getIssueComments( - activeWorkspace.slug, - projectId as string, - issueId as string - ) - : null - ); - const submitChanges = useCallback( (formData: Partial) => { if (!activeWorkspace || !activeProject || !issueId) return; @@ -180,19 +169,6 @@ const IssueDetail: NextPage = () => { }); }, [issueDetail, reset]); - useEffect(() => { - const issueDetail = issues?.results.find((issue) => issue.id === issueId); - setIssueDetail(issueDetail); - }, [issueId, issues]); - - 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 subIssues = (issues && issues.results.filter((i) => i.parent === issueId)) ?? []; - const siblingIssues = - issueDetail && - issues?.results.filter((i) => i.parent === issueDetail.parent && i.id !== issueId); - const handleSubIssueRemove = (issueId: string) => { if (activeWorkspace && activeProject) { issuesServices @@ -215,19 +191,17 @@ const IssueDetail: NextPage = () => { } }; - console.log("Issue detail", issueDetail); - return ( - - { } > - - setDeleteIssueModal(false)} - isOpen={deleteIssueModal} - data={issueDetail} - /> - + {isOpen && ( + + )} + {isAddAsSubIssueOpen && ( + + )} {issueDetail && activeProject ? (
@@ -590,19 +563,10 @@ const IssueDetail: NextPage = () => { - + - + @@ -615,7 +579,6 @@ const IssueDetail: NextPage = () => { issueDetail={issueDetail} submitChanges={submitChanges} watch={watch} - setDeleteIssueModal={setDeleteIssueModal} />
diff --git a/apps/app/types/issues.d.ts b/apps/app/types/issues.d.ts index 2ffb77f2d..7e31282b2 100644 --- a/apps/app/types/issues.d.ts +++ b/apps/app/types/issues.d.ts @@ -72,6 +72,7 @@ export interface IIssue { blocked_issue_details: any[]; sprints: string | null; cycle: string | null; + cycle_detail: ICycle | null; issue_cycle: IIssueCycle; } diff --git a/apps/app/ui/Breadcrumbs/index.tsx b/apps/app/ui/Breadcrumbs/index.tsx index a485a21d2..c07808192 100644 --- a/apps/app/ui/Breadcrumbs/index.tsx +++ b/apps/app/ui/Breadcrumbs/index.tsx @@ -6,7 +6,7 @@ type BreadcrumbsProps = { children: any; }; -const Breadcrumbs: React.FC = ({ children }: BreadcrumbsProps) => { +const Breadcrumbs = ({ children }: BreadcrumbsProps) => { const router = useRouter(); return ( @@ -54,4 +54,6 @@ const BreadcrumbItem: React.FC = ({ title, link, icon }) => ); }; +Breadcrumbs.BreadcrumbItem = BreadcrumbItem; + export { Breadcrumbs, BreadcrumbItem };