fix: bugs fixed

apps/app/pages/projects/[projectId]/cycles/[cycleId].tsx

@@ -1,7 +1,6 @@
 // react
 import React, { useState } from "react";
 // next
-import Link from "next/link";
 import { useRouter } from "next/router";
 // swr
 import useSWR, { mutate } from "swr";
@@ -12,6 +11,9 @@ import AppLayout from "layouts/app-layout";
 // components
 import CyclesListView from "components/project/cycles/list-view";
 import CyclesBoardView from "components/project/cycles/board-view";
+import CreateUpdateIssuesModal from "components/project/issues/create-update-issue-modal";
+import CycleIssuesListModal from "components/project/cycles/cycle-issues-list-modal";
+import ConfirmIssueDeletion from "components/project/issues/confirm-issue-deletion";
 // services
 import issuesServices from "lib/services/issues.service";
 import cycleServices from "lib/services/cycles.service";
@@ -28,23 +30,11 @@ import { BreadcrumbItem, Breadcrumbs, CustomMenu } from "ui";
 import { Squares2X2Icon } from "@heroicons/react/20/solid";
 import { ArrowPathIcon, ChevronDownIcon, ListBulletIcon } from "@heroicons/react/24/outline";
 // types
-import {
-  CycleIssueResponse,
-  IIssue,
-  IssueResponse,
-  NestedKeyOf,
-  Properties,
-  SelectIssue,
-  SelectSprintType,
-} from "types";
+import { CycleIssueResponse, IIssue, NestedKeyOf, Properties, SelectIssue } from "types";
 // fetch-keys
-import { CYCLE_ISSUES, PROJECT_ISSUES_LIST, PROJECT_MEMBERS } from "constants/fetch-keys";
-// constants
+import { CYCLE_ISSUES, PROJECT_MEMBERS } from "constants/fetch-keys";
+// common
 import { classNames, replaceUnderscoreIfSnakeCase } from "constants/common";
-import CreateUpdateIssuesModal from "components/project/issues/create-update-issue-modal";
-import CycleIssuesListModal from "components/project/cycles/cycle-issues-list-modal";
-import ConfirmCycleDeletion from "components/project/cycles/confirm-cycle-deletion";
-import ConfirmIssueDeletion from "components/project/issues/confirm-issue-deletion";
 
 const groupByOptions: Array<{ name: string; key: NestedKeyOf<IIssue> | null }> = [
   { name: "State", key: "state_detail.name" },
@@ -77,15 +67,16 @@ const filterIssueOptions: Array<{
   },
 ];
 
-type Props = {};
-
-const SingleCycle: React.FC<Props> = () => {
+const SingleCycle: React.FC = () => {
   const [isIssueModalOpen, setIsIssueModalOpen] = useState(false);
-  const [selectedCycle, setSelectedCycle] = useState<SelectSprintType>();
   const [selectedIssues, setSelectedIssues] = useState<SelectIssue>();
   const [cycleIssuesListModal, setCycleIssuesListModal] = useState(false);
   const [deleteIssue, setDeleteIssue] = useState<string | undefined>(undefined);
 
+  const [preloadedData, setPreloadedData] = useState<
+    (Partial<IIssue> & { actionType: "createIssue" | "edit" | "delete" }) | undefined
+  >(undefined);
+
   const { activeWorkspace, activeProject, cycles, issues } = useUser();
 
   const router = useRouter();
@@ -149,15 +140,8 @@ const SingleCycle: React.FC<Props> = () => {
     issue?: IIssue,
     actionType: "create" | "edit" | "delete" = "create"
   ) => {
-    const cycle = cycles?.find((cycle) => cycle.id === cycleId);
-    if (cycle) {
-      setSelectedCycle({
-        ...cycle,
-        actionType: "create-issue",
-      });
-      if (issue) setSelectedIssues({ ...issue, actionType });
-      setIsIssueModalOpen(true);
-    }
+    if (issue) setSelectedIssues({ ...issue, actionType });
+    setIsIssueModalOpen(true);
   };
 
   const openIssuesListModal = () => {
@@ -229,13 +213,9 @@ const SingleCycle: React.FC<Props> = () => {
   return (
     <>
       <CreateUpdateIssuesModal
-        isOpen={
-          isIssueModalOpen &&
-          selectedCycle?.actionType === "create-issue" &&
-          selectedIssues?.actionType !== "delete"
-        }
+        isOpen={isIssueModalOpen && selectedIssues?.actionType !== "delete"}
         data={selectedIssues}
-        prePopulateData={{ sprints: selectedCycle?.id }}
+        prePopulateData={{ sprints: cycleId as string, ...preloadedData }}
         setIsOpen={setIsIssueModalOpen}
         projectId={activeProject?.id}
       />
@@ -429,6 +409,7 @@ const SingleCycle: React.FC<Props> = () => {
             openCreateIssueModal={openCreateIssueModal}
             openIssuesListModal={openIssuesListModal}
             removeIssueFromCycle={removeIssueFromCycle}
+            setPreloadedData={setPreloadedData}
           />
         ) : (
           <div className="h-screen">
@@ -442,6 +423,7 @@ const SingleCycle: React.FC<Props> = () => {
               openIssuesListModal={openIssuesListModal}
               handleDeleteIssue={setDeleteIssue}
               partialUpdateIssue={partialUpdateIssue}
+              setPreloadedData={setPreloadedData}
             />
           </div>
         )}

apps/app/pages/projects/[projectId]/cycles/index.tsx

@@ -106,7 +106,13 @@ const ProjectSprints: NextPage = () => {
                   </span>
                 }
                 Icon={PlusIcon}
-                action={() => setCreateUpdateCycleModal(true)}
+                action={() => {
+                  const e = new KeyboardEvent("keydown", {
+                    ctrlKey: true,
+                    key: "q",
+                  });
+                  document.dispatchEvent(e);
+                }}
               />
             </EmptySpace>
           </div>

apps/app/pages/projects/[projectId]/issues/[issueId].tsx

@@ -94,7 +94,7 @@ const IssueDetail: NextPage = () => {
       blockers_list: [],
       blocked_list: [],
       target_date: new Date().toString(),
-      cycle: "",
+      issue_cycle: null,
       labels_list: [],
     },
   });
@@ -171,6 +171,7 @@ const IssueDetail: NextPage = () => {
         assignees_list:
           issueDetail.assignees_list ?? issueDetail.assignee_details?.map((user) => user.id),
         labels_list: issueDetail.labels_list ?? issueDetail.labels?.map((label) => label),
+        labels: issueDetail.labels_list ?? issueDetail.labels?.map((label) => label),
       });
   }, [issueDetail, reset]);
 
@@ -211,7 +212,7 @@ const IssueDetail: NextPage = () => {
     }
   };
 
-  // console.log(issueDetail);
+  console.log(issueDetail);
 
   return (
     <AppLayout

apps/app/pages/projects/[projectId]/issues/index.tsx

@@ -49,7 +49,7 @@ import { PROJECT_ISSUES_LIST } from "constants/fetch-keys";
 const groupByOptions: Array<{ name: string; key: NestedKeyOf<IIssue> | null }> = [
   { name: "State", key: "state_detail.name" },
   { name: "Priority", key: "priority" },
-  { name: "Cycle", key: "issue_cycle.cycle_detail.name" },
+  // { name: "Cycle", key: "issue_cycle.cycle_detail.name" },
   { name: "Created By", key: "created_by" },
   { name: "None", key: null },
 ];

apps/app/pages/projects/[projectId]/modules/index.tsx

@@ -80,13 +80,17 @@ const ProjectModules: NextPage = () => {
                 title="Create a new module"
                 description={
                   <span>
-                    Use <pre className="inline bg-gray-100 px-2 py-1 rounded">Ctrl/Command + Q</pre>{" "}
+                    Use <pre className="inline bg-gray-100 px-2 py-1 rounded">Ctrl/Command + M</pre>{" "}
                     shortcut to create a new cycle
                   </span>
                 }
                 Icon={PlusIcon}
                 action={() => {
-                  return;
+                  const e = new KeyboardEvent("keydown", {
+                    ctrlKey: true,
+                    key: "m",
+                  });
+                  document.dispatchEvent(e);
                 }}
               />
             </EmptySpace>

apps/app/pages/projects/[projectId]/settings.tsx

@@ -27,22 +27,22 @@ import { Breadcrumbs, BreadcrumbItem } from "ui/Breadcrumbs";
 // types
 import type { IProject, IWorkspace } from "types";
 
-const GeneralSettings = dynamic(() => import("components/project/settings/GeneralSettings"), {
+const GeneralSettings = dynamic(() => import("components/project/settings/general"), {
   loading: () => <p>Loading...</p>,
   ssr: false,
 });
 
-const ControlSettings = dynamic(() => import("components/project/settings/ControlSettings"), {
+const ControlSettings = dynamic(() => import("components/project/settings/control"), {
   loading: () => <p>Loading...</p>,
   ssr: false,
 });
 
-const StatesSettings = dynamic(() => import("components/project/settings/StatesSettings"), {
+const StatesSettings = dynamic(() => import("components/project/settings/states"), {
   loading: () => <p>Loading...</p>,
   ssr: false,
 });
 
-const LabelsSettings = dynamic(() => import("components/project/settings/LabelsSettings"), {
+const LabelsSettings = dynamic(() => import("components/project/settings/labels"), {
   loading: () => <p>Loading...</p>,
   ssr: false,
 });