From 98a223e5e149f698918ab4cd4aca69ca174f48fc Mon Sep 17 00:00:00 2001
From: anmolsinghbhatia <anmolsinghbhatia@caravel.tech>
Date: Sat, 20 May 2023 22:24:05 +0530
Subject: [PATCH 1/2] fix: cycle view board view fix , feat: on gantt view set
 all cycle as default tab

---
 .../app/components/cycles/completed-cycles.tsx |  8 --------
 apps/app/components/cycles/cycles-view.tsx     | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/app/components/cycles/completed-cycles.tsx b/apps/app/components/cycles/completed-cycles.tsx
index 738b6c5fb..36ef691f5 100644
--- a/apps/app/components/cycles/completed-cycles.tsx
+++ b/apps/app/components/cycles/completed-cycles.tsx
@@ -104,14 +104,6 @@ export const CompletedCycles: React.FC<CompletedCyclesListProps> = ({
                 ))}
               </div>
             )}
-            {cycleView === "gantt" && (
-              <EmptyState
-                type="cycle"
-                title="Create New Cycle"
-                description="Sprint more effectively with Cycles by confining your project to a fixed amount of time. Create new cycle now."
-                imgURL={emptyCycle}
-              />
-            )}
           </div>
         ) : (
           <EmptyState
diff --git a/apps/app/components/cycles/cycles-view.tsx b/apps/app/components/cycles/cycles-view.tsx
index c0a5da836..aedd82ba3 100644
--- a/apps/app/components/cycles/cycles-view.tsx
+++ b/apps/app/components/cycles/cycles-view.tsx
@@ -89,9 +89,9 @@ export const CyclesView: React.FC<Props> = ({
           <button
             type="button"
             className={`grid h-7 w-7 place-items-center rounded p-1 outline-none duration-300 hover:bg-brand-surface-2 ${
-              cyclesView === "grid" ? "bg-brand-surface-2" : ""
+              cyclesView === "board" ? "bg-brand-surface-2" : ""
             }`}
-            onClick={() => setCyclesView("grid")}
+            onClick={() => setCyclesView("board")}
           >
             <Squares2X2Icon className="h-4 w-4 text-brand-secondary" />
           </button>
@@ -100,7 +100,10 @@ export const CyclesView: React.FC<Props> = ({
             className={`grid h-7 w-7 place-items-center rounded outline-none duration-300 hover:bg-brand-surface-2 ${
               cyclesView === "gantt_chart" ? "bg-brand-surface-2" : ""
             }`}
-            onClick={() => setCyclesView("gantt_chart")}
+            onClick={() => {
+              setCyclesView("gantt_chart");
+              setCycleTab("All");
+            }}
           >
             <span className="material-symbols-rounded text-brand-secondary text-[18px] rotate-90">
               waterfall_chart
@@ -111,6 +114,7 @@ export const CyclesView: React.FC<Props> = ({
       <Tab.Group
         as={React.Fragment}
         defaultIndex={currentTabValue(cycleTab)}
+        selectedIndex={currentTabValue(cycleTab)}
         onChange={(i) => {
           switch (i) {
             case 0:
@@ -123,7 +127,6 @@ export const CyclesView: React.FC<Props> = ({
               return setCycleTab("Completed");
             case 4:
               return setCycleTab("Drafts");
-
             default:
               return setCycleTab("All");
           }
@@ -132,7 +135,10 @@ export const CyclesView: React.FC<Props> = ({
         <div className="flex justify-between">
           <Tab.List as="div" className="flex flex-wrap items-center justify-start gap-4 text-base">
             {["All", "Active", "Upcoming", "Completed", "Drafts"].map((tab, index) => {
-              if (cyclesView === "gantt_chart" && (tab === "Active" || tab === "Drafts"))
+              if (
+                cyclesView === "gantt_chart" &&
+                (tab === "Active" || tab === "Drafts" || tab === "Completed")
+              )
                 return null;
 
               return (
@@ -162,7 +168,7 @@ export const CyclesView: React.FC<Props> = ({
                 type="current"
               />
             )}
-            {cyclesView === "grid" && (
+            {cyclesView === "board" && (
               <AllCyclesBoard
                 cycles={cyclesCompleteList}
                 setCreateUpdateCycleModal={setCreateUpdateCycleModal}

From 44397407682ec2bc6cda14cc5ca2a9aeb1001fed Mon Sep 17 00:00:00 2001
From: anmolsinghbhatia <anmolsinghbhatia@caravel.tech>
Date: Sat, 20 May 2023 22:30:44 +0530
Subject: [PATCH 2/2] fix: create label modal error message updated

---
 .../components/labels/create-label-modal.tsx  | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/app/components/labels/create-label-modal.tsx b/apps/app/components/labels/create-label-modal.tsx
index 3f1b4d647..858f7f7b5 100644
--- a/apps/app/components/labels/create-label-modal.tsx
+++ b/apps/app/components/labels/create-label-modal.tsx
@@ -156,19 +156,21 @@ export const CreateLabelModal: React.FC<Props> = ({ isOpen, projectId, handleClo
                           </>
                         )}
                       </Popover>
-                      <Input
-                        type="text"
-                        id="name"
-                        name="name"
-                        placeholder="Label title"
-                        autoComplete="off"
-                        error={errors.name}
-                        register={register}
-                        width="full"
-                        validations={{
-                          required: "Name is required",
-                        }}
-                      />
+                      <div className="flex w-full flex-col gap-0.5 justify-center">
+                        <Input
+                          type="text"
+                          id="name"
+                          name="name"
+                          placeholder="Label title"
+                          autoComplete="off"
+                          error={errors.name}
+                          register={register}
+                          width="full"
+                          validations={{
+                            required: "Label title is required",
+                          }}
+                        />
+                      </div>
                     </div>
                   </div>
                   <div className="mt-5 flex justify-end gap-2">