From 2069c89bb9b073b0cb227a6f8af7f990d5832c17 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@caravel.tech>
Date: Mon, 13 Feb 2023 04:50:00 +0530
Subject: [PATCH 1/2] feat: range date picker added

---
 .../cycles/cycle-detail-sidebar/index.tsx     | 123 +++++++++---------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx b/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
index cdbac8b17cf..64dad62b630 100644
--- a/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
+++ b/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 
 import { useRouter } from "next/router";
 import Image from "next/image";
@@ -10,11 +10,13 @@ import { Controller, useForm } from "react-hook-form";
 // react-circular-progressbar
 import { CircularProgressbar } from "react-circular-progressbar";
 import "react-circular-progressbar/dist/styles.css";
+import { Popover, Transition } from "@headlessui/react";
+import DatePicker from "react-datepicker";
 // icons
 import { CalendarDaysIcon, ChartPieIcon, LinkIcon, UserIcon } from "@heroicons/react/24/outline";
 import { CycleSidebarStatusSelect } from "components/project/cycles";
 // ui
-import { Loader, CustomDatePicker } from "components/ui";
+import { Loader } from "components/ui";
 // hooks
 import useToast from "hooks/use-toast";
 // services
@@ -24,7 +26,7 @@ import { SidebarProgressStats } from "components/core";
 // helpers
 import { copyTextToClipboard } from "helpers/string.helper";
 import { groupBy } from "helpers/array.helper";
-import { renderShortNumericDateFormat } from "helpers/date-time.helper";
+import { renderDateFormat, renderShortNumericDateFormat } from "helpers/date-time.helper";
 // types
 import { CycleIssueResponse, ICycle, IIssue } from "types";
 // fetch-keys
@@ -42,6 +44,9 @@ const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssue
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId } = router.query;
 
+  const [startDateRange, setStartDateRange] = useState<Date | null>(new Date());
+  const [endDateRange, setEndDateRange] = useState<Date | null>(null);
+
   const { setToastAlert } = useToast();
 
   const defaultValues: Partial<ICycle> = {
@@ -102,17 +107,61 @@ const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssue
             <div className="px-2 py-1 rounded bg-gray-200">
               <span className="capitalize">{cycle.status}</span>
             </div>
-            <div className="px-2 py-1 rounded bg-gray-200">
-              <span>
-                {renderShortNumericDateFormat(`${cycle.start_date}`)
-                  ? renderShortNumericDateFormat(`${cycle.start_date}`)
-                  : "N/A"}{" "}
-                -{" "}
-                {renderShortNumericDateFormat(`${cycle.end_date}`)
-                  ? renderShortNumericDateFormat(`${cycle.end_date}`)
-                  : "N/A"}
-              </span>
-            </div>
+            <Popover className="relative bg-gray-200 rounded-lg">
+              {({ open }) => (
+                <>
+                  <Popover.Button
+                    className={`group flex items-center gap-2 rounded-md border bg-transparent p-2 text-xs font-medium text-gray-900 hover:bg-gray-100 hover:text-gray-900 focus:outline-none ${
+                      open ? "bg-gray-100" : ""
+                    }`}
+                  >
+                    <CalendarDaysIcon className="h-4 w-4 flex-shrink-0" />
+                    <span>
+                      {renderShortNumericDateFormat(`${cycle.start_date}`)
+                        ? renderShortNumericDateFormat(`${cycle.start_date}`)
+                        : "N/A"}{" "}
+                      -{" "}
+                      {renderShortNumericDateFormat(`${cycle.end_date}`)
+                        ? renderShortNumericDateFormat(`${cycle.end_date}`)
+                        : "N/A"}
+                    </span>
+                  </Popover.Button>
+
+                  <Transition
+                    as={React.Fragment}
+                    enter="transition ease-out duration-200"
+                    enterFrom="opacity-0 translate-y-1"
+                    enterTo="opacity-100 translate-y-0"
+                    leave="transition ease-in duration-150"
+                    leaveFrom="opacity-100 translate-y-0"
+                    leaveTo="opacity-0 translate-y-1"
+                  >
+                    <Popover.Panel className="absolute top-10 left-0 z-20  transform overflow-hidden">
+                      <DatePicker
+                        selected={startDateRange}
+                        onChange={(dates) => {
+                          const [start, end] = dates;
+                          submitChanges({
+                            start_date: renderDateFormat(start),
+                            end_date: renderDateFormat(end),
+                          });
+                          if (setStartDateRange) {
+                            setStartDateRange(start);
+                          }
+                          if (setEndDateRange) {
+                            setEndDateRange(end);
+                          }
+                        }}
+                        startDate={startDateRange}
+                        endDate={endDateRange}
+                        selectsRange
+                        inline
+                      />
+                    </Popover.Panel>
+                  </Transition>
+                </>
+              )}
+            </Popover>
           </div>
           <div className="flex items-center justify-between pb-3">
             <h4 className="text-sm font-medium">{cycle.name}</h4>
@@ -193,52 +242,6 @@ const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssue
               </div>
             </div>
             <div className="py-1">
-              <div className="flex flex-wrap items-center py-2">
-                <div className="flex items-center gap-x-2 text-sm sm:basis-1/2">
-                  <CalendarDaysIcon className="h-4 w-4 flex-shrink-0" />
-                  <p>Start date</p>
-                </div>
-                <div className="sm:basis-1/2">
-                  <Controller
-                    control={control}
-                    name="start_date"
-                    render={({ field: { value } }) => (
-                      <CustomDatePicker
-                        value={value}
-                        onChange={(val) =>
-                          submitChanges({
-                            start_date: val,
-                          })
-                        }
-                        isClearable={false}
-                      />
-                    )}
-                  />
-                </div>
-              </div>
-              <div className="flex flex-wrap items-center py-2">
-                <div className="flex items-center gap-x-2 text-sm sm:basis-1/2">
-                  <CalendarDaysIcon className="h-4 w-4 flex-shrink-0" />
-                  <p>End date</p>
-                </div>
-                <div className="sm:basis-1/2">
-                  <Controller
-                    control={control}
-                    name="end_date"
-                    render={({ field: { value } }) => (
-                      <CustomDatePicker
-                        value={value}
-                        onChange={(val) =>
-                          submitChanges({
-                            end_date: val,
-                          })
-                        }
-                        isClearable={false}
-                      />
-                    )}
-                  />
-                </div>
-              </div>
               <CycleSidebarStatusSelect
                 control={control}
                 submitChanges={submitChanges}

From 9ea73430586e7a1a88f14c448de9a278634efb95 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@caravel.tech>
Date: Mon, 13 Feb 2023 05:21:11 +0530
Subject: [PATCH 2/2] feat: cycle status ui improved

---
 .../cycles/cycle-detail-sidebar/index.tsx     | 54 +++++++++++----
 apps/app/components/project/cycles/index.ts   |  1 -
 .../project/cycles/sidebar-select/index.ts    |  1 -
 .../cycles/sidebar-select/select-status.tsx   | 69 -------------------
 4 files changed, 39 insertions(+), 86 deletions(-)
 delete mode 100644 apps/app/components/project/cycles/sidebar-select/index.ts
 delete mode 100644 apps/app/components/project/cycles/sidebar-select/select-status.tsx

diff --git a/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx b/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
index 64dad62b630..e1aa46692b8 100644
--- a/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
+++ b/apps/app/components/project/cycles/cycle-detail-sidebar/index.tsx
@@ -13,10 +13,15 @@ import "react-circular-progressbar/dist/styles.css";
 import { Popover, Transition } from "@headlessui/react";
 import DatePicker from "react-datepicker";
 // icons
-import { CalendarDaysIcon, ChartPieIcon, LinkIcon, UserIcon } from "@heroicons/react/24/outline";
-import { CycleSidebarStatusSelect } from "components/project/cycles";
+import {
+  CalendarDaysIcon,
+  ChartPieIcon,
+  LinkIcon,
+  Squares2X2Icon,
+  UserIcon,
+} from "@heroicons/react/24/outline";
 // ui
-import { Loader } from "components/ui";
+import { CustomSelect, Loader } from "components/ui";
 // hooks
 import useToast from "hooks/use-toast";
 // services
@@ -32,6 +37,7 @@ import { CycleIssueResponse, ICycle, IIssue } from "types";
 // fetch-keys
 import { CYCLE_DETAILS } from "constants/fetch-keys";
 import ProgressChart from "components/core/sidebar/progress-chart";
+import { CYCLE_STATUS } from "constants/cycle";
 
 type Props = {
   issues: IIssue[];
@@ -103,15 +109,40 @@ const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssue
     >
       {cycle ? (
         <>
-          <div className="flex gap-2 text-sm my-2">
-            <div className="px-2 py-1 rounded bg-gray-200">
-              <span className="capitalize">{cycle.status}</span>
+          <div className="flex gap-1 text-sm my-2">
+            <div className="flex items-center ">
+              <Controller
+                control={control}
+                name="status"
+                render={({ field: { value } }) => (
+                  <CustomSelect
+                    label={
+                      <span
+                        className={`flex items-center gap-1 text-left capitalize p-1 text-xs h-full w-full  text-gray-900`}
+                      >
+                        <Squares2X2Icon className="h-4 w-4 flex-shrink-0" />
+                        {watch("status")}
+                      </span>
+                    }
+                    value={value}
+                    onChange={(value: any) => {
+                      submitChanges({ status: value });
+                    }}
+                  >
+                    {CYCLE_STATUS.map((option) => (
+                      <CustomSelect.Option key={option.value} value={option.value}>
+                        <span className="text-xs">{option.label}</span>
+                      </CustomSelect.Option>
+                    ))}
+                  </CustomSelect>
+                )}
+              />
             </div>
-            <Popover className="relative bg-gray-200 rounded-lg">
+            <Popover className="flex justify-center items-center relative  rounded-lg">
               {({ open }) => (
                 <>
                   <Popover.Button
-                    className={`group flex items-center gap-2 rounded-md border bg-transparent p-2 text-xs font-medium text-gray-900 hover:bg-gray-100 hover:text-gray-900 focus:outline-none ${
+                    className={`group flex items-center gap-2 rounded-md border bg-transparent h-full w-full p-2 px-4  text-xs font-medium text-gray-900 hover:bg-gray-100 hover:text-gray-900 focus:outline-none ${
                       open ? "bg-gray-100" : ""
                     }`}
                   >
@@ -241,13 +272,6 @@ const CycleDetailSidebar: React.FC<Props> = ({ issues, cycle, isOpen, cycleIssue
                 </div>
               </div>
             </div>
-            <div className="py-1">
-              <CycleSidebarStatusSelect
-                control={control}
-                submitChanges={submitChanges}
-                watch={watch}
-              />
-            </div>
             <div className="py-1" />
           </div>
           <div className="flex flex-col items-center justify-center w-full gap-2 ">
diff --git a/apps/app/components/project/cycles/index.ts b/apps/app/components/project/cycles/index.ts
index 9c6e55594fc..d330ba698f0 100644
--- a/apps/app/components/project/cycles/index.ts
+++ b/apps/app/components/project/cycles/index.ts
@@ -1,3 +1,2 @@
-export * from "./sidebar-select";
 export * from "./stats-view";
 export * from "./cycle-detail-sidebar";
\ No newline at end of file
diff --git a/apps/app/components/project/cycles/sidebar-select/index.ts b/apps/app/components/project/cycles/sidebar-select/index.ts
deleted file mode 100644
index efa8c553e91..00000000000
--- a/apps/app/components/project/cycles/sidebar-select/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./select-status";
\ No newline at end of file
diff --git a/apps/app/components/project/cycles/sidebar-select/select-status.tsx b/apps/app/components/project/cycles/sidebar-select/select-status.tsx
deleted file mode 100644
index 0c53083bd1d..00000000000
--- a/apps/app/components/project/cycles/sidebar-select/select-status.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// react
-import React from "react";
-// react-hook-form
-import { Control, Controller, UseFormWatch } from "react-hook-form";
-// icons
-import { Squares2X2Icon } from "@heroicons/react/24/outline";
-// ui
-import { CustomSelect } from "components/ui";
-// types
-import { ICycle } from "types";
-// common
-// constants
-import { CYCLE_STATUS } from "constants/cycle";
-
-type Props = {
-  control: Control<Partial<ICycle>, any>;
-  submitChanges: (formData: Partial<ICycle>) => void;
-  watch: UseFormWatch<Partial<ICycle>>;
-};
-
-export const CycleSidebarStatusSelect: React.FC<Props> = ({ control, submitChanges, watch }) => (
-  <div className="flex flex-wrap items-center py-2">
-    <div className="flex items-center gap-x-2 text-sm sm:basis-1/2">
-      <Squares2X2Icon className="h-4 w-4 flex-shrink-0" />
-      <p>Status</p>
-    </div>
-    <div className="sm:basis-1/2">
-      <Controller
-        control={control}
-        name="status"
-        render={({ field: { value } }) => (
-          <CustomSelect
-            label={
-              <span
-                className={`flex items-center gap-2 text-left capitalize ${
-                  value ? "" : "text-gray-900"
-                }`}
-              >
-                <span
-                  className="h-2 w-2 flex-shrink-0 rounded-full"
-                  style={{
-                    backgroundColor: CYCLE_STATUS?.find((option) => option.value === value)?.color,
-                  }}
-                />
-                {watch("status")}
-              </span>
-            }
-            value={value}
-            onChange={(value: any) => {
-              submitChanges({ status: value });
-            }}
-          >
-            {CYCLE_STATUS.map((option) => (
-              <CustomSelect.Option key={option.value} value={option.value}>
-                <>
-                  <span
-                    className="h-2 w-2 flex-shrink-0 rounded-full"
-                    style={{ backgroundColor: option.color }}
-                  />
-                  {option.label}
-                </>
-              </CustomSelect.Option>
-            ))}
-          </CustomSelect>
-        )}
-      />
-    </div>
-  </div>
-);