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/4] 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/4] 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">

From cba62f07c064761260b956646a62f30667e13b1e Mon Sep 17 00:00:00 2001
From: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
Date: Sat, 20 May 2023 23:16:19 +0530
Subject: [PATCH 3/4] chore: analytic export mail (#1098)

---
 apiserver/templates/emails/exports/analytics.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apiserver/templates/emails/exports/analytics.html b/apiserver/templates/emails/exports/analytics.html
index 248c5513c..f5611705e 100644
--- a/apiserver/templates/emails/exports/analytics.html
+++ b/apiserver/templates/emails/exports/analytics.html
@@ -1,4 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
-    Your Export is ready
+    Hey there,<br/>
+    Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/>
+    Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/>
+    If you require any assistance or have any questions, please do not hesitate to contact us.<br/>
+    Thank you
 </html>

From a01e24152350530fa4c5d11d07de5f53e363d393 Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Sat, 20 May 2023 23:17:44 +0530
Subject: [PATCH 4/4] styles: UI changes in the gantt blocks (#1099)

---
 .../components/cycles/cycles-list-gantt-chart.tsx    |  6 +++---
 apps/app/components/cycles/gantt-chart.tsx           |  6 +++---
 apps/app/components/gantt-chart/blocks/index.tsx     | 12 +++++-------
 apps/app/components/gantt-chart/chart/index.tsx      |  2 +-
 apps/app/components/gantt-chart/views/month-view.ts  |  2 +-
 apps/app/components/issues/gantt-chart.tsx           |  6 +++---
 apps/app/components/modules/gantt-chart.tsx          |  6 +++---
 .../components/modules/modules-list-gantt-chart.tsx  |  6 +++---
 apps/app/components/views/gantt-chart.tsx            |  6 +++---
 9 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/apps/app/components/cycles/cycles-list-gantt-chart.tsx b/apps/app/components/cycles/cycles-list-gantt-chart.tsx
index 2b783f4e2..ad298e79d 100644
--- a/apps/app/components/cycles/cycles-list-gantt-chart.tsx
+++ b/apps/app/components/cycles/cycles-list-gantt-chart.tsx
@@ -23,9 +23,9 @@ export const CyclesListGanttChartView: FC<Props> = ({ cycles }) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: { data: ICycle }) => (
-    <div className="relative flex w-full h-full overflow-hidden">
-      <div className="flex-shrink-0 w-[4px] h-auto" style={{ backgroundColor: "#858e96" }} />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
+      <div className="flex-shrink-0 w-[4px] h-full" style={{ backgroundColor: "#858e96" }} />
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>
diff --git a/apps/app/components/cycles/gantt-chart.tsx b/apps/app/components/cycles/gantt-chart.tsx
index d38ad727b..04de7afb7 100644
--- a/apps/app/components/cycles/gantt-chart.tsx
+++ b/apps/app/components/cycles/gantt-chart.tsx
@@ -32,12 +32,12 @@ export const CycleIssuesGanttChartView: FC<Props> = ({}) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: any) => (
-    <div className="relative flex w-full h-full overflow-hidden">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
       <div
-        className="flex-shrink-0 w-[4px] h-auto"
+        className="flex-shrink-0 w-[4px] h-full"
         style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
       />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>
diff --git a/apps/app/components/gantt-chart/blocks/index.tsx b/apps/app/components/gantt-chart/blocks/index.tsx
index 24ee4d39e..113ca8964 100644
--- a/apps/app/components/gantt-chart/blocks/index.tsx
+++ b/apps/app/components/gantt-chart/blocks/index.tsx
@@ -21,14 +21,14 @@ export const GanttChartBlocks: FC<{
       className="relative z-10 mt-[58px] h-full w-[4000px] divide-x divide-gray-300 overflow-hidden overflow-y-auto bg-[#999] bg-opacity-5"
       style={{ width: `${itemsContainerWidth}px` }}
     >
-      <div className="w-full divide-y divide-brand-base">
+      <div className="w-full">
         {blocks &&
           blocks.length > 0 &&
           blocks.map((block: any, _idx: number) => (
             <>
               {block.start_date && block.target_date && (
                 <ChartDraggable
-                  className="relative flex h-[36.5px] items-center"
+                  className="relative flex h-[40px] items-center"
                   key={`blocks-${_idx}`}
                   block={block}
                   handleBlock={handleChartBlockPosition}
@@ -44,14 +44,12 @@ export const GanttChartBlocks: FC<{
                     </div>
 
                     <div
-                      className="rounded-sm shadow-sm bg-brand-base overflow-hidden relative flex items-center"
+                      className="rounded-sm shadow-sm bg-brand-base overflow-hidden relative flex items-center h-[34px] border border-brand-base"
                       style={{
                         width: `${block?.position?.width}px`,
                       }}
                     >
-                      <div className="w-full h-full relative overflow-hidden">
-                        {blockRender({ ...block?.data })}
-                      </div>
+                      {blockRender({ ...block?.data })}
                     </div>
 
                     <div className="flex-shrink-0 relative w-0 h-0 flex items-center invisible group-hover:visible whitespace-nowrap">
@@ -71,7 +69,7 @@ export const GanttChartBlocks: FC<{
         {blocks &&
           blocks.length > 0 &&
           blocks.map((block: any, _idx: number) => (
-            <div className="relative h-[36.5px] bg-brand-base" key={`sidebar-blocks-${_idx}`}>
+            <div className="relative h-[40px] bg-brand-base" key={`sidebar-blocks-${_idx}`}>
               {sidebarBlockRender(block?.data)}
             </div>
           ))}
diff --git a/apps/app/components/gantt-chart/chart/index.tsx b/apps/app/components/gantt-chart/chart/index.tsx
index a1b80ef84..6724c3552 100644
--- a/apps/app/components/gantt-chart/chart/index.tsx
+++ b/apps/app/components/gantt-chart/chart/index.tsx
@@ -214,7 +214,7 @@ export const ChartViewRoot: FC<ChartViewRootProps> = ({
     <div
       className={`${
         fullScreenMode ? `fixed top-0 bottom-0 left-0 right-0 z-[999999] bg-brand-base` : `relative`
-      } flex h-full flex-col rounded-sm border border-brand-base select-none`}
+      } flex h-full flex-col rounded-sm border border-brand-base select-none bg-brand-base shadow`}
     >
       {/* chart title */}
       <div className="flex w-full flex-shrink-0 flex-wrap items-center gap-5 gap-y-3 whitespace-nowrap p-2 border-b border-brand-base">
diff --git a/apps/app/components/gantt-chart/views/month-view.ts b/apps/app/components/gantt-chart/views/month-view.ts
index df537ba5e..7211a45eb 100644
--- a/apps/app/components/gantt-chart/views/month-view.ts
+++ b/apps/app/components/gantt-chart/views/month-view.ts
@@ -184,7 +184,7 @@ export const getMonthChartItemPositionWidthInMonth = (chartData: ChartDataType,
   diffMonths -= startDate.getMonth();
   diffMonths += itemStartDate.getMonth();
 
-  scrollPosition = scrollPosition + diffMonths - 1;
+  scrollPosition = scrollPosition + diffMonths;
   // position code ends
 
   // width code starts
diff --git a/apps/app/components/issues/gantt-chart.tsx b/apps/app/components/issues/gantt-chart.tsx
index 5e79822c5..b35d4a749 100644
--- a/apps/app/components/issues/gantt-chart.tsx
+++ b/apps/app/components/issues/gantt-chart.tsx
@@ -32,12 +32,12 @@ export const IssueGanttChartView: FC<Props> = ({}) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: any) => (
-    <div className="relative flex w-full h-full overflow-hidden">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
       <div
-        className="flex-shrink-0 w-[4px] h-auto"
+        className="flex-shrink-0 w-[4px] h-full"
         style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
       />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>
diff --git a/apps/app/components/modules/gantt-chart.tsx b/apps/app/components/modules/gantt-chart.tsx
index edc24cfc9..0d11da2c0 100644
--- a/apps/app/components/modules/gantt-chart.tsx
+++ b/apps/app/components/modules/gantt-chart.tsx
@@ -32,12 +32,12 @@ export const ModuleIssuesGanttChartView: FC<Props> = ({}) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: any) => (
-    <div className="relative flex w-full h-full overflow-hidden">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
       <div
-        className="flex-shrink-0 w-[4px] h-auto"
+        className="flex-shrink-0 w-[4px] h-full"
         style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
       />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>
diff --git a/apps/app/components/modules/modules-list-gantt-chart.tsx b/apps/app/components/modules/modules-list-gantt-chart.tsx
index c6fbf329f..edff17a95 100644
--- a/apps/app/components/modules/modules-list-gantt-chart.tsx
+++ b/apps/app/components/modules/modules-list-gantt-chart.tsx
@@ -27,12 +27,12 @@ export const ModulesListGanttChartView: FC<Props> = ({ modules }) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: { data: IModule }) => (
-    <div className="relative flex w-full h-full overflow-hidden">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
       <div
-        className="flex-shrink-0 w-[4px] h-auto"
+        className="flex-shrink-0 w-[4px] h-full"
         style={{ backgroundColor: MODULE_STATUS.find((s) => s.value === data.status)?.color }}
       />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>
diff --git a/apps/app/components/views/gantt-chart.tsx b/apps/app/components/views/gantt-chart.tsx
index dbe71fae0..461f46835 100644
--- a/apps/app/components/views/gantt-chart.tsx
+++ b/apps/app/components/views/gantt-chart.tsx
@@ -32,12 +32,12 @@ export const ViewIssuesGanttChartView: FC<Props> = ({}) => {
 
   // rendering issues on gantt card
   const GanttBlockView = ({ data }: any) => (
-    <div className="relative flex w-full h-full overflow-hidden">
+    <div className="relative flex items-center w-full h-full overflow-hidden shadow-sm">
       <div
-        className="flex-shrink-0 w-[4px] h-auto"
+        className="flex-shrink-0 w-[4px] h-full"
         style={{ backgroundColor: data?.state_detail?.color || "#858e96" }}
       />
-      <div className="inline-block text-brand-base text-sm whitespace-nowrap py-[4px] px-1.5">
+      <div className="w-full text-brand-base text-[15px] whitespace-nowrap py-[4px] px-2.5 overflow-hidden">
         {data?.name}
       </div>
     </div>