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 @@ - Your Export is ready + Hey there,
+ Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.
+ Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.
+ If you require any assistance or have any questions, please do not hesitate to contact us.
+ Thank you 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 = ({ ))} )} - {cycleView === "gantt" && ( - - )} ) : ( = ({ cycles }) => { // rendering issues on gantt card const GanttBlockView = ({ data }: { data: ICycle }) => ( -
-
-
+
+
+
{data?.name}
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 = ({ @@ -100,7 +100,10 @@ export const CyclesView: React.FC = ({ 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"); + }} > waterfall_chart @@ -111,6 +114,7 @@ export const CyclesView: React.FC = ({ { switch (i) { case 0: @@ -123,7 +127,6 @@ export const CyclesView: React.FC = ({ return setCycleTab("Completed"); case 4: return setCycleTab("Drafts"); - default: return setCycleTab("All"); } @@ -132,7 +135,10 @@ export const CyclesView: React.FC = ({
{["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 = ({ type="current" /> )} - {cyclesView === "grid" && ( + {cyclesView === "board" && ( = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
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` }} > -
+
{blocks && blocks.length > 0 && blocks.map((block: any, _idx: number) => ( <> {block.start_date && block.target_date && (
-
- {blockRender({ ...block?.data })} -
+ {blockRender({ ...block?.data })}
@@ -71,7 +69,7 @@ export const GanttChartBlocks: FC<{ {blocks && blocks.length > 0 && blocks.map((block: any, _idx: number) => ( -
+
{sidebarBlockRender(block?.data)}
))} 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 = ({
{/* chart title */}
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 = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
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 = ({ isOpen, projectId, handleClo )} - +
+ +
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 = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}
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 = ({ modules }) => { // rendering issues on gantt card const GanttBlockView = ({ data }: { data: IModule }) => ( -
+
s.value === data.status)?.color }} /> -
+
{data?.name}
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 = ({}) => { // rendering issues on gantt card const GanttBlockView = ({ data }: any) => ( -
+
-
+
{data?.name}