fix: merge conflicts resolved

2023-02-09 00:12:59 +05:30 · 2023-02-09 00:12:59 +05:30 · 7f406ceb39
commit 7f406ceb39
parent d3b73dc32f 56030b1c2c
36 changed files with 869 additions and 324 deletions
--- a/apps/app/components/account/github-login-button.tsx
+++ b/apps/app/components/account/github-login-button.tsx
@ -34,7 +34,7 @@ export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {

  return (
    <Link
-      href={`https://github.com/login/oauth/authorize?client_id=${NEXT_PUBLIC_GITHUB_ID}&redirect_uri=${loginCallBackURL}`}
+      href={`https://github.com/login/oauth/authorize?client_id=${NEXT_PUBLIC_GITHUB_ID}&redirect_uri=${loginCallBackURL}&scope=read:user,user:email`}
    >
      <button className="flex w-full items-center rounded bg-black px-3 py-2 text-sm text-white opacity-90 duration-300 hover:opacity-100">
        <Image
--- a/apps/app/components/core/board-view/all-boards.tsx
+++ b/apps/app/components/core/board-view/all-boards.tsx
@ -3,7 +3,6 @@ import { DragDropContext, DropResult } from "react-beautiful-dnd";
 // hooks
 import useIssueView from "hooks/use-issue-view";
 // components
-import StrictModeDroppable from "components/dnd/StrictModeDroppable";
 import { SingleBoard } from "components/core/board-view/single-board";
 // types
 import { IIssue, IProjectMember, IState, UserAuth } from "types";
--- a/apps/app/components/core/bulk-delete-issues-modal.tsx
+++ b/apps/app/components/core/bulk-delete-issues-modal.tsx
@ -148,12 +148,7 @@ export const BulkDeleteIssuesModal: React.FC<Props> = ({ isOpen, setIsOpen }) =>
                        "delete_issue_ids",
                        selectedIssues.filter((i) => i !== val)
                      );
-                    else {
-                      const newToDelete = selectedIssues;
-                      newToDelete.push(val);
-
-                      setValue("delete_issue_ids", newToDelete);
-                    }
+                    else setValue("delete_issue_ids", [...selectedIssues, val]);
                  }}
                >
                  <div className="relative m-1">
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@ -14,17 +14,12 @@ import modulesService from "services/modules.service";
 // hooks
 import useIssueView from "hooks/use-issue-view";
 // components
-import { AllLists, AllBoards, ExistingIssuesListModal } from "components/core";
+import { AllLists, AllBoards } from "components/core";
 import { CreateUpdateIssueModal, DeleteIssueModal } from "components/issues";
+// helpers
+import { getStatesList } from "helpers/state.helper";
 // types
-import {
-  CycleIssueResponse,
-  IIssue,
-  IssueResponse,
-  IState,
-  ModuleIssueResponse,
-  UserAuth,
-} from "types";
+import { CycleIssueResponse, IIssue, IssueResponse, ModuleIssueResponse, UserAuth } from "types";
 // fetch-keys
 import {
  CYCLE_ISSUES,
@ -68,12 +63,13 @@ export const IssuesView: React.FC<Props> = ({

  const { issueView, groupedByIssues, groupByProperty: selectedGroup } = useIssueView(issues);

-  const { data: states } = useSWR<IState[]>(
+  const { data: stateGroups } = useSWR(
    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
    workspaceSlug
      ? () => stateService.getStates(workspaceSlug as string, projectId as string)
      : null
  );
+  const states = getStatesList(stateGroups ?? {});

  const { data: members } = useSWR(
    projectId ? PROJECT_MEMBERS(projectId as string) : null,
--- a/apps/app/components/core/sidebar/sidebar-progress-stats.tsx
+++ b/apps/app/components/core/sidebar/sidebar-progress-stats.tsx
@ -0,0 +1,184 @@
+import React from "react";
+
+import Image from "next/image";
+import { useRouter } from "next/router";
+
+import useSWR from "swr";
+
+// headless ui
+import { Tab } from "@headlessui/react";
+// services
+import issuesServices from "services/issues.service";
+import projectService from "services/project.service";
+// components
+import SingleProgressStats from "components/core/sidebar/single-progress-stats";
+// ui
+import { Avatar } from "components/ui";
+// icons
+import User from "public/user.png";
+// types
+import { IIssue, IIssueLabels } from "types";
+// fetch-keys
+import { PROJECT_ISSUE_LABELS, PROJECT_MEMBERS } from "constants/fetch-keys";
+// types
+type Props = {
+  groupedIssues: any;
+  issues: IIssue[];
+};
+
+const stateGroupColours: {
+  [key: string]: string;
+} = {
+  backlog: "#3f76ff",
+  unstarted: "#ff9e9e",
+  started: "#d687ff",
+  cancelled: "#ff5353",
+  completed: "#096e8d",
+};
+
+const SidebarProgressStats: React.FC<Props> = ({ groupedIssues, issues }) => {
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+  const { data: issueLabels } = useSWR<IIssueLabels[]>(
+    workspaceSlug && projectId ? PROJECT_ISSUE_LABELS(projectId as string) : null,
+    workspaceSlug && projectId
+      ? () => issuesServices.getIssueLabels(workspaceSlug as string, projectId as string)
+      : null
+  );
+
+  const { data: members } = useSWR(
+    workspaceSlug && projectId ? PROJECT_MEMBERS(workspaceSlug as string) : null,
+    workspaceSlug && projectId
+      ? () => projectService.projectMembers(workspaceSlug as string, projectId as string)
+      : null
+  );
+  return (
+    <div className="flex flex-col items-center justify-center w-full gap-2 ">
+      <Tab.Group>
+        <Tab.List
+          as="div"
+          className="flex items-center justify-between w-full rounded bg-gray-100 text-xs"
+        >
+          <Tab
+            className={({ selected }) =>
+              `w-1/2 rounded py-1 ${selected ? "bg-gray-300" : "hover:bg-gray-200"}`
+            }
+          >
+            Assignees
+          </Tab>
+          <Tab
+            className={({ selected }) =>
+              `w-1/2 rounded py-1 ${selected ? "bg-gray-300 font-semibold" : "hover:bg-gray-200 "}`
+            }
+          >
+            Labels
+          </Tab>
+          <Tab
+            className={({ selected }) =>
+              `w-1/2 rounded py-1 ${selected ? "bg-gray-300 font-semibold" : "hover:bg-gray-200 "}`
+            }
+          >
+            States
+          </Tab>
+        </Tab.List>
+        <Tab.Panels className="flex items-center justify-between  w-full">
+          <Tab.Panel as="div" className="w-full flex flex-col ">
+            {members?.map((member, index) => {
+              const totalArray = issues?.filter((i) => i.assignees?.includes(member.member.id));
+              const completeArray = totalArray?.filter((i) => i.state_detail.group === "completed");
+              if (totalArray.length > 0) {
+                return (
+                  <SingleProgressStats
+                    key={index}
+                    title={
+                      <>
+                        <Avatar user={member.member} />
+                        <span>{member.member.first_name}</span>
+                      </>
+                    }
+                    completed={completeArray.length}
+                    total={totalArray.length}
+                  />
+                );
+              }
+            })}
+            {issues?.filter((i) => i.assignees?.length === 0).length > 0 ? (
+              <SingleProgressStats
+                title={
+                  <>
+                    <div className="h-5 w-5 rounded-full border-2 border-white bg-white">
+                      <Image
+                        src={User}
+                        height="100%"
+                        width="100%"
+                        className="rounded-full"
+                        alt="User"
+                      />
+                    </div>
+                    <span>No assignee</span>
+                  </>
+                }
+                completed={
+                  issues?.filter(
+                    (i) => i.state_detail.group === "completed" && i.assignees?.length === 0
+                  ).length
+                }
+                total={issues?.filter((i) => i.assignees?.length === 0).length}
+              />
+            ) : (
+              ""
+            )}
+          </Tab.Panel>
+          <Tab.Panel as="div" className="w-full flex flex-col ">
+            {issueLabels?.map((issue, index) => {
+              const totalArray = issues?.filter((i) => i.labels?.includes(issue.id));
+              const completeArray = totalArray?.filter((i) => i.state_detail.group === "completed");
+              if (totalArray.length > 0) {
+                return (
+                  <SingleProgressStats
+                    key={index}
+                    title={
+                      <>
+                        <span
+                          className="block h-2 w-2 rounded-full "
+                          style={{
+                            backgroundColor: issue.color,
+                          }}
+                        />
+                        <span className="text-xs capitalize">{issue.name}</span>
+                      </>
+                    }
+                    completed={completeArray.length}
+                    total={totalArray.length}
+                  />
+                );
+              }
+            })}
+          </Tab.Panel>
+          <Tab.Panel as="div" className="w-full flex flex-col ">
+            {Object.keys(groupedIssues).map((group, index) => (
+              <SingleProgressStats
+                key={index}
+                title={
+                  <>
+                    <span
+                      className="block h-2 w-2 rounded-full "
+                      style={{
+                        backgroundColor: stateGroupColours[group],
+                      }}
+                    />
+                    <span className="text-xs capitalize">{group}</span>
+                  </>
+                }
+                completed={groupedIssues[group].length}
+                total={issues.length}
+              />
+            ))}
+          </Tab.Panel>
+        </Tab.Panels>
+      </Tab.Group>
+    </div>
+  );
+};
+
+export default SidebarProgressStats;
--- a/apps/app/components/core/sidebar/single-progress-stats.tsx
+++ b/apps/app/components/core/sidebar/single-progress-stats.tsx
@ -0,0 +1,29 @@
+import React from "react";
+
+import { CircularProgressbar } from "react-circular-progressbar";
+
+type TSingleProgressStatsProps = {
+  title: any;
+  completed: number;
+  total: number;
+};
+
+const SingleProgressStats: React.FC<TSingleProgressStatsProps> = ({ title, completed, total }) => (
+  <>
+    <div className="flex items-center justify-between w-full py-3 text-xs border-b-[1px] border-gray-200">
+      <div className="flex items-center justify-start w-1/2 gap-2">{title}</div>
+      <div className="flex items-center justify-end w-1/2 gap-1 px-2">
+        <div className="flex h-5 justify-center items-center gap-1 ">
+          <span className="h-4 w-4 ">
+            <CircularProgressbar value={completed} maxValue={total} strokeWidth={10} />
+          </span>
+          <span className="w-8 text-right">{Math.floor((completed / total) * 100)}%</span>
+        </div>
+        <span>of</span>
+        <span>{total}</span>
+      </div>
+    </div>
+  </>
+);
+
+export default SingleProgressStats;
--- a/apps/app/components/issues/select/state.tsx
+++ b/apps/app/components/issues/select/state.tsx
@ -10,6 +10,8 @@ import stateService from "services/state.service";
 import { Squares2X2Icon, PlusIcon } from "@heroicons/react/24/outline";
 // icons
 import { Combobox, Transition } from "@headlessui/react";
+// helpers
+import { getStatesList } from "helpers/state.helper";
 // fetch keys
 import { STATE_LIST } from "constants/fetch-keys";

@ -27,12 +29,13 @@ export const IssueStateSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
  const router = useRouter();
  const { workspaceSlug } = router.query;

-  const { data: states } = useSWR(
+  const { data: stateGroups } = useSWR(
    workspaceSlug && projectId ? STATE_LIST(projectId) : null,
    workspaceSlug && projectId
      ? () => stateService.getStates(workspaceSlug as string, projectId)
      : null
  );
+  const states = getStatesList(stateGroups ?? {});

  const options = states?.map((state) => ({
    value: state.id,
--- a/apps/app/components/issues/sidebar-select/blocked.tsx
+++ b/apps/app/components/issues/sidebar-select/blocked.tsx
@ -183,12 +183,7 @@ export const SidebarBlockedSelect: React.FC<Props> = ({
                            "blocked_issue_ids",
                            selectedIssues.filter((i) => i !== val)
                          );
-                        else {
-                          const newBlocked = selectedIssues;
-                          newBlocked.push(val);
-
-                          setValue("blocked_issue_ids", newBlocked);
-                        }
+                        else setValue("blocked_issue_ids", [...selectedIssues, val]);
                      }}
                    >
                      <div className="relative m-1">
--- a/apps/app/components/issues/sidebar-select/blocker.tsx
+++ b/apps/app/components/issues/sidebar-select/blocker.tsx
@ -184,12 +184,7 @@ export const SidebarBlockerSelect: React.FC<Props> = ({
                          "blocker_issue_ids",
                          selectedIssues.filter((i) => i !== val)
                        );
-                      else {
-                        const newBlockers = selectedIssues;
-                        newBlockers.push(val);
-
-                        setValue("blocker_issue_ids", newBlockers);
-                      }
+                      else setValue("blocker_issue_ids", [...selectedIssues, val]);
                    }}
                  >
                    <div className="relative m-1">
--- a/apps/app/components/issues/sidebar-select/state.tsx
+++ b/apps/app/components/issues/sidebar-select/state.tsx
@ -4,13 +4,16 @@ import { useRouter } from "next/router";

 import useSWR from "swr";

+// react-hook-form
 import { Control, Controller } from "react-hook-form";
 // services
-import { Squares2X2Icon } from "@heroicons/react/24/outline";
 import stateService from "services/state.service";
 // ui
 import { Spinner, CustomSelect } from "components/ui";
 // icons
+import { Squares2X2Icon } from "@heroicons/react/24/outline";
+// helpers
+import { getStatesList } from "helpers/state.helper";
 // types
 import { IIssue, UserAuth } from "types";
 // constants
@ -26,12 +29,13 @@ export const SidebarStateSelect: React.FC<Props> = ({ control, submitChanges, us
  const router = useRouter();
  const { workspaceSlug, projectId } = router.query;

-  const { data: states } = useSWR(
+  const { data: stateGroups } = useSWR(
    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
    workspaceSlug && projectId
      ? () => stateService.getStates(workspaceSlug as string, projectId as string)
      : null
  );
+  const states = getStatesList(stateGroups ?? {});

  const isNotAllowed = userAuth.isGuest || userAuth.isViewer;

--- a/apps/app/components/issues/sub-issues-list-modal.tsx
+++ b/apps/app/components/issues/sub-issues-list-modal.tsx
@ -44,7 +44,7 @@ export const SubIssuesListModal: React.FC<Props> = ({ isOpen, handleClose, paren
      : issues?.results.filter((issue) => issue.name.toLowerCase().includes(query.toLowerCase())) ??
        [];

-  const handleCommandPaletteClose = () => {
+  const handleModalClose = () => {
    handleClose();
    setQuery("");
  };
@ -93,7 +93,7 @@ export const SubIssuesListModal: React.FC<Props> = ({ isOpen, handleClose, paren

  return (
    <Transition.Root show={isOpen} as={React.Fragment} afterLeave={() => setQuery("")} appear>
-      <Dialog as="div" className="relative z-20" onClose={handleCommandPaletteClose}>
+      <Dialog as="div" className="relative z-20" onClose={handleModalClose}>
        <Transition.Child
          as={React.Fragment}
          enter="ease-out duration-300"
--- a/apps/app/components/issues/view-select/state.tsx
+++ b/apps/app/components/issues/view-select/state.tsx
@ -8,8 +8,9 @@ import stateService from "services/state.service";
 import { CustomSelect } from "components/ui";
 // helpers
 import { addSpaceIfCamelCase } from "helpers/string.helper";
+import { getStatesList } from "helpers/state.helper";
 // types
-import { IIssue, IState } from "types";
+import { IIssue } from "types";
 // fetch-keys
 import { STATE_LIST } from "constants/fetch-keys";

@ -29,12 +30,11 @@ export const ViewStateSelect: React.FC<Props> = ({
  const router = useRouter();
  const { workspaceSlug, projectId } = router.query;

-  const { data: states } = useSWR<IState[]>(
-    workspaceSlug && projectId ? STATE_LIST(projectId as string) : null,
-    workspaceSlug
-      ? () => stateService.getStates(workspaceSlug as string, projectId as string)
-      : null
+  const { data: stateGroups } = useSWR(
+    workspaceSlug && projectId ? STATE_LIST(issue.project) : null,
+    workspaceSlug ? () => stateService.getStates(workspaceSlug as string, issue.project) : null
  );
+  const states = getStatesList(stateGroups ?? {});

  return (
    <CustomSelect
--- a/apps/app/components/labels/index.ts
+++ b/apps/app/components/labels/index.ts
@ -0,0 +1,2 @@
+export * from "./labels-list-modal";
+export * from "./single-label";
--- a/apps/app/components/labels/labels-list-modal.tsx
+++ b/apps/app/components/labels/labels-list-modal.tsx
@ -0,0 +1,180 @@
+import React, { useState } from "react";
+
+import { useRouter } from "next/router";
+
+import useSWR, { mutate } from "swr";
+
+// headless ui
+import { Combobox, Dialog, Transition } from "@headlessui/react";
+// icons
+import { RectangleStackIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline";
+// services
+import issuesService from "services/issues.service";
+// types
+import { IIssueLabels } from "types";
+// constants
+import { PROJECT_ISSUE_LABELS } from "constants/fetch-keys";
+
+type Props = {
+  isOpen: boolean;
+  handleClose: () => void;
+  parent: IIssueLabels | undefined;
+};
+
+export const LabelsListModal: React.FC<Props> = ({ isOpen, handleClose, parent }) => {
+  const [query, setQuery] = useState("");
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const { data: issueLabels, mutate } = useSWR<IIssueLabels[]>(
+    workspaceSlug && projectId ? PROJECT_ISSUE_LABELS(projectId as string) : null,
+    workspaceSlug && projectId
+      ? () => issuesService.getIssueLabels(workspaceSlug as string, projectId as string)
+      : null
+  );
+
+  const filteredLabels: IIssueLabels[] =
+    query === ""
+      ? issueLabels ?? []
+      : issueLabels?.filter((l) => l.name.toLowerCase().includes(query.toLowerCase())) ?? [];
+
+  const handleModalClose = () => {
+    handleClose();
+    setQuery("");
+  };
+
+  const addChildLabel = async (label: IIssueLabels) => {
+    if (!workspaceSlug || !projectId) return;
+
+    mutate(
+      (prevData) =>
+        prevData?.map((l) => {
+          if (l.id === label.id) return { ...l, parent: parent?.id ?? "" };
+
+          return l;
+        }),
+      false
+    );
+
+    await issuesService
+      .patchIssueLabel(workspaceSlug as string, projectId as string, label.id, {
+        parent: parent?.id ?? "",
+      })
+      .then((res) => {
+        console.log(res);
+        mutate();
+      });
+  };
+
+  return (
+    <Transition.Root show={isOpen} as={React.Fragment} afterLeave={() => setQuery("")} appear>
+      <Dialog as="div" className="relative z-20" onClose={handleModalClose}>
+        <Transition.Child
+          as={React.Fragment}
+          enter="ease-out duration-300"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="ease-in duration-200"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+        >
+          <div className="fixed inset-0 bg-gray-500 bg-opacity-25 transition-opacity" />
+        </Transition.Child>
+
+        <div className="fixed inset-0 z-20 overflow-y-auto p-4 sm:p-6 md:p-20">
+          <Transition.Child
+            as={React.Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0 scale-95"
+            enterTo="opacity-100 scale-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100 scale-100"
+            leaveTo="opacity-0 scale-95"
+          >
+            <Dialog.Panel className="relative mx-auto max-w-2xl transform divide-y divide-gray-500 divide-opacity-10 rounded-xl bg-white bg-opacity-80 shadow-2xl ring-1 ring-black ring-opacity-5 backdrop-blur backdrop-filter transition-all">
+              <Combobox>
+                <div className="relative m-1">
+                  <MagnifyingGlassIcon
+                    className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-gray-900 text-opacity-40"
+                    aria-hidden="true"
+                  />
+                  <Combobox.Input
+                    className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-gray-900 placeholder-gray-500 outline-none focus:ring-0 sm:text-sm"
+                    placeholder="Search..."
+                    onChange={(e) => setQuery(e.target.value)}
+                  />
+                </div>
+
+                <Combobox.Options
+                  static
+                  className="max-h-80 scroll-py-2 divide-y divide-gray-500 divide-opacity-10 overflow-y-auto"
+                >
+                  {filteredLabels.length > 0 && (
+                    <>
+                      <li className="p-2">
+                        {query === "" && (
+                          <h2 className="mt-4 mb-2 px-3 text-xs font-semibold text-gray-900">
+                            Labels
+                          </h2>
+                        )}
+                        <ul className="text-sm text-gray-700">
+                          {filteredLabels.map((label) => {
+                            const children = issueLabels?.filter((l) => l.parent === label.id);
+
+                            if (
+                              (label.parent === "" || label.parent === null) && // issue does not have any other parent
+                              label.id !== parent?.id && // issue is not itself
+                              children?.length === 0 // issue doesn't have any othe children
+                            )
+                              return (
+                                <Combobox.Option
+                                  key={label.id}
+                                  value={{
+                                    name: label.name,
+                                  }}
+                                  className={({ active }) =>
+                                    `flex cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 ${
+                                      active ? "bg-gray-900 bg-opacity-5 text-gray-900" : ""
+                                    }`
+                                  }
+                                  onClick={() => {
+                                    addChildLabel(label);
+                                    handleClose();
+                                  }}
+                                >
+                                  <span
+                                    className="block flex-shrink-0 h-1.5 w-1.5 rounded-full"
+                                    style={{
+                                      backgroundColor: label.color,
+                                    }}
+                                  />
+                                  {label.name}
+                                </Combobox.Option>
+                              );
+                          })}
+                        </ul>
+                      </li>
+                    </>
+                  )}
+                </Combobox.Options>
+
+                {query !== "" && filteredLabels.length === 0 && (
+                  <div className="py-14 px-6 text-center sm:px-14">
+                    <RectangleStackIcon
+                      className="mx-auto h-6 w-6 text-gray-900 text-opacity-40"
+                      aria-hidden="true"
+                    />
+                    <p className="mt-4 text-sm text-gray-900">
+                      We couldn{"'"}t find any label with that term. Please try again.
+                    </p>
+                  </div>
+                )}
+              </Combobox>
+            </Dialog.Panel>
+          </Transition.Child>
+        </div>
+      </Dialog>
+    </Transition.Root>
+  );
+};
--- a/apps/app/components/labels/single-label.tsx
+++ b/apps/app/components/labels/single-label.tsx
@ -0,0 +1,171 @@
+import React, { useState } from "react";
+
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
+// headless ui
+import { Disclosure, Transition } from "@headlessui/react";
+// services
+import issuesService from "services/issues.service";
+// components
+import { LabelsListModal } from "components/labels";
+// ui
+import { CustomMenu } from "components/ui";
+// icons
+import { ChevronDownIcon } from "@heroicons/react/24/outline";
+// types
+import { IIssueLabels } from "types";
+// fetch-keys
+import { PROJECT_ISSUE_LABELS } from "constants/fetch-keys";
+
+type Props = {
+  label: IIssueLabels;
+  issueLabels: IIssueLabels[];
+  editLabel: (label: IIssueLabels) => void;
+  handleLabelDelete: (labelId: string) => void;
+};
+
+export const SingleLabel: React.FC<Props> = ({
+  label,
+  issueLabels,
+  editLabel,
+  handleLabelDelete,
+}) => {
+  const [labelsListModal, setLabelsListModal] = useState(false);
+
+  const router = useRouter();
+  const { workspaceSlug, projectId } = router.query;
+
+  const children = issueLabels?.filter((l) => l.parent === label.id);
+
+  const removeFromGroup = (label: IIssueLabels) => {
+    if (!workspaceSlug || !projectId) return;
+
+    mutate<IIssueLabels[]>(
+      PROJECT_ISSUE_LABELS(projectId as string),
+      (prevData) =>
+        prevData?.map((l) => {
+          if (l.id === label.id) return { ...l, parent: null };
+
+          return l;
+        }),
+      false
+    );
+
+    issuesService
+      .patchIssueLabel(workspaceSlug as string, projectId as string, label.id, {
+        parent: null,
+      })
+      .then((res) => {
+        mutate(PROJECT_ISSUE_LABELS(projectId as string));
+      });
+  };
+
+  return (
+    <>
+      <LabelsListModal
+        isOpen={labelsListModal}
+        handleClose={() => setLabelsListModal(false)}
+        parent={label}
+      />
+      {children && children.length === 0 ? (
+        label.parent === "" || !label.parent ? (
+          <div className="gap-2 space-y-3 divide-y rounded-md border p-3 md:w-2/3">
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <span
+                  className="h-3 w-3 flex-shrink-0 rounded-full"
+                  style={{
+                    backgroundColor: label.color,
+                  }}
+                />
+                <h6 className="text-sm">{label.name}</h6>
+              </div>
+              <CustomMenu ellipsis>
+                <CustomMenu.MenuItem onClick={() => setLabelsListModal(true)}>
+                  Convert to group
+                </CustomMenu.MenuItem>
+                <CustomMenu.MenuItem onClick={() => editLabel(label)}>Edit</CustomMenu.MenuItem>
+                <CustomMenu.MenuItem onClick={() => handleLabelDelete(label.id)}>
+                  Delete
+                </CustomMenu.MenuItem>
+              </CustomMenu>
+            </div>
+          </div>
+        ) : null
+      ) : (
+        <Disclosure as="div" className="relative z-20 rounded-md border p-3 text-gray-900 md:w-2/3">
+          {({ open }) => (
+            <>
+              <div className="flex items-center justify-between gap-2 cursor-pointer">
+                <Disclosure.Button>
+                  <div className="flex items-center gap-2">
+                    <span>
+                      <ChevronDownIcon
+                        className={`h-4 w-4 text-gray-500 ${!open ? "-rotate-90 transform" : ""}`}
+                      />
+                    </span>
+                    <h6 className="text-sm">{label.name}</h6>
+                  </div>
+                </Disclosure.Button>
+                <CustomMenu ellipsis>
+                  <CustomMenu.MenuItem onClick={() => setLabelsListModal(true)}>
+                    Add more labels
+                  </CustomMenu.MenuItem>
+                  <CustomMenu.MenuItem onClick={() => editLabel(label)}>Edit</CustomMenu.MenuItem>
+                  <CustomMenu.MenuItem onClick={() => handleLabelDelete(label.id)}>
+                    Delete
+                  </CustomMenu.MenuItem>
+                </CustomMenu>
+              </div>
+              <Transition
+                show={open}
+                enter="transition duration-100 ease-out"
+                enterFrom="transform opacity-0"
+                enterTo="transform opacity-100"
+                leave="transition duration-75 ease-out"
+                leaveFrom="transform opacity-100"
+                leaveTo="transform opacity-0"
+              >
+                <Disclosure.Panel>
+                  <div className="mt-2 ml-4">
+                    {children.map((child) => (
+                      <div
+                        key={child.id}
+                        className="group pl-4 py-1 flex items-center justify-between rounded text-sm hover:bg-gray-100"
+                      >
+                        <h5 className="flex items-center gap-2">
+                          <span
+                            className="h-2 w-2 flex-shrink-0 rounded-full"
+                            style={{
+                              backgroundColor: child.color,
+                            }}
+                          />
+                          {child.name}
+                        </h5>
+                        <div className="opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto">
+                          <CustomMenu ellipsis>
+                            <CustomMenu.MenuItem onClick={() => removeFromGroup(child)}>
+                              Remove from group
+                            </CustomMenu.MenuItem>
+                            <CustomMenu.MenuItem onClick={() => editLabel(child)}>
+                              Edit
+                            </CustomMenu.MenuItem>
+                            <CustomMenu.MenuItem onClick={() => handleLabelDelete(child.id)}>
+                              Delete
+                            </CustomMenu.MenuItem>
+                          </CustomMenu>
+                        </div>
+                      </div>
+                    ))}
+                  </div>
+                </Disclosure.Panel>
+              </Transition>
+            </>
+          )}
+        </Disclosure>
+      )}
+    </>
+  );
+};
--- a/apps/app/components/modules/sidebar.tsx
+++ b/apps/app/components/modules/sidebar.tsx
@ -7,6 +7,16 @@ import { mutate } from "swr";

 // react-hook-form
 import { Controller, useForm } from "react-hook-form";
+// icons
+import {
+  CalendarDaysIcon,
+  ChartPieIcon,
+  LinkIcon,
+  PlusIcon,
+  TrashIcon,
+} from "@heroicons/react/24/outline";
+// progress-bar
+import { CircularProgressbar } from "react-circular-progressbar";
 // services
 import modulesService from "services/modules.service";
 // hooks
@ -18,27 +28,19 @@ import {
  SidebarMembersSelect,
  SidebarStatusSelect,
 } from "components/modules";
-// progress-bar
-import { CircularProgressbar } from "react-circular-progressbar";
+
 import "react-circular-progressbar/dist/styles.css";
 // ui
 import { CustomDatePicker, Loader } from "components/ui";
-// icons
-import {
-  CalendarDaysIcon,
-  ChartPieIcon,
-  LinkIcon,
-  PlusIcon,
-  TrashIcon,
-} from "@heroicons/react/24/outline";
 // helpers
 import { timeAgo } from "helpers/date-time.helper";
 import { copyTextToClipboard } from "helpers/string.helper";
 import { groupBy } from "helpers/array.helper";
 // types
-import { IModule, ModuleIssueResponse } from "types";
+import { IIssue, IModule, ModuleIssueResponse } from "types";
 // fetch-keys
 import { MODULE_DETAILS } from "constants/fetch-keys";
+import SidebarProgressStats from "components/core/sidebar/sidebar-progress-stats";

 const defaultValues: Partial<IModule> = {
  lead: "",
@ -49,6 +51,7 @@ const defaultValues: Partial<IModule> = {
 };

 type Props = {
+  issues: IIssue[];
  module?: IModule;
  isOpen: boolean;
  moduleIssues: ModuleIssueResponse[] | undefined;
@ -56,6 +59,7 @@ type Props = {
 };

 export const ModuleDetailsSidebar: React.FC<Props> = ({
+  issues,
  module,
  isOpen,
  moduleIssues,
@ -290,6 +294,9 @@ export const ModuleDetailsSidebar: React.FC<Props> = ({
                </div>
              </div>
            </div>
+            <div className="w-full">
+              <SidebarProgressStats issues={issues} groupedIssues={groupedIssues} />
+            </div>
          </>
        ) : (
          <Loader>
--- a/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
+++ b/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
@ -7,26 +7,29 @@ import { mutate } from "swr";

 // react-hook-form
 import { Controller, useForm } from "react-hook-form";
-// icons
-import { CalendarDaysIcon, ChartPieIcon, LinkIcon, UserIcon } from "@heroicons/react/24/outline";
-// services
-import cyclesService from "services/cycles.service";
-// hooks
-import useToast from "hooks/use-toast";
-// ui
-import { Loader, CustomDatePicker } from "components/ui";
-// progress-bar
+// react-circular-progressbar
 import { CircularProgressbar } from "react-circular-progressbar";
 import "react-circular-progressbar/dist/styles.css";
+// ui
+import { Loader, CustomDatePicker } from "components/ui";
+// hooks
+import useToast from "hooks/use-toast";
+// services
+import cyclesService from "services/cycles.service";
+// components
+import SidebarProgressStats from "components/core/sidebar/sidebar-progress-stats";
+// icons
+import { CalendarDaysIcon, ChartPieIcon, LinkIcon, UserIcon } from "@heroicons/react/24/outline";
 // helpers
 import { copyTextToClipboard } from "helpers/string.helper";
 import { groupBy } from "helpers/array.helper";
 // types
-import { CycleIssueResponse, ICycle } from "types";
+import { CycleIssueResponse, ICycle, IIssue } from "types";
 // fetch-keys
 import { CYCLE_DETAILS } from "constants/fetch-keys";

 type Props = {
+  issues: IIssue[];
  cycle: ICycle | undefined;
  isOpen: boolean;
  cycleIssues: CycleIssueResponse[];
@ -37,7 +40,7 @@ const defaultValues: Partial<ICycle> = {
  end_date: new Date().toString(),
 };

-const CycleDetailSidebar: React.FC<Props> = ({ cycle, isOpen, cycleIssues }) => {
+const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssues }) => {
  const router = useRouter();
  const { workspaceSlug, projectId, cycleId } = router.query;

@ -219,6 +222,9 @@ const CycleDetailSidebar: React.FC<Props> = ({ cycle, isOpen, cycleIssues }) =>
            </div>
            <div className="py-1" />
          </div>
+          <div className="w-full">
+            <SidebarProgressStats issues={issues} groupedIssues={groupedIssues} />
+          </div>
        </>
      ) : (
        <Loader>
--- a/apps/app/components/states/create-update-state-inline.tsx
+++ b/apps/app/components/states/create-update-state-inline.tsx
@ -15,7 +15,7 @@ import useToast from "hooks/use-toast";
 // ui
 import { Button, CustomSelect, Input } from "components/ui";
 // types
-import type { IState } from "types";
+import type { IState, StateResponse } from "types";
 // fetch-keys
 import { STATE_LIST } from "constants/fetch-keys";
 // constants
@ -85,7 +85,7 @@ export const CreateUpdateStateInline: React.FC<Props> = ({
      await stateService
        .createState(workspaceSlug, projectId, { ...payload })
        .then((res) => {
-          mutate<IState[]>(STATE_LIST(projectId), (prevData) => [...(prevData ?? []), res]);
+          mutate(STATE_LIST(projectId));
          handleClose();

          setToastAlert({
--- a/apps/app/components/states/create-update-state-modal.tsx
+++ b/apps/app/components/states/create-update-state-modal.tsx
@ -81,7 +81,7 @@ export const CreateUpdateStateModal: React.FC<Props> = ({
      await stateService
        .createState(workspaceSlug as string, projectId, payload)
        .then((res) => {
-          mutate<IState[]>(STATE_LIST(projectId), (prevData) => [...(prevData ?? []), res], false);
+          mutate(STATE_LIST(projectId));
          onClose();
        })
        .catch((err) => {
@ -95,19 +95,7 @@ export const CreateUpdateStateModal: React.FC<Props> = ({
      await stateService
        .updateState(workspaceSlug as string, projectId, data.id, payload)
        .then((res) => {
-          mutate<IState[]>(
-            STATE_LIST(projectId),
-            (prevData) => {
-              const newData = prevData?.map((item) => {
-                if (item.id === res.id) {
-                  return res;
-                }
-                return item;
-              });
-              return newData;
-            },
-            false
-          );
+          mutate(STATE_LIST(projectId));
          onClose();
        })
        .catch((err) => {
--- a/apps/app/components/states/delete-state-modal.tsx
+++ b/apps/app/components/states/delete-state-modal.tsx
@ -59,11 +59,7 @@ export const DeleteStateModal: React.FC<Props> = ({ isOpen, onClose, data }) =>
    await stateServices
      .deleteState(workspaceSlug as string, data.project, data.id)
      .then(() => {
-        mutate<IState[]>(
-          STATE_LIST(data.project),
-          (prevData) => prevData?.filter((state) => state.id !== data?.id),
-          false
-        );
+        mutate(STATE_LIST(data.project));
        handleClose();

        setToastAlert({