From b451e6fee417687b3f2794b093cd7d21f14aba33 Mon Sep 17 00:00:00 2001
From: gakshita <akshitagoyal1516@gmail.com>
Date: Mon, 16 Sep 2024 15:31:55 +0530
Subject: [PATCH 1/2] fix: analytics scroll + dashboard stat minor padding

---
 .../analytics/custom-analytics/custom-analytics.tsx      | 4 ++--
 .../components/analytics/custom-analytics/select-bar.tsx | 9 +++++----
 web/core/components/analytics/custom-analytics/table.tsx | 2 +-
 web/core/components/dashboard/widgets/overview-stats.tsx | 6 +++---
 web/core/components/page-views/workspace-dashboard.tsx   | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/web/core/components/analytics/custom-analytics/custom-analytics.tsx b/web/core/components/analytics/custom-analytics/custom-analytics.tsx
index bfb5398ec65..37e2e53326c 100644
--- a/web/core/components/analytics/custom-analytics/custom-analytics.tsx
+++ b/web/core/components/analytics/custom-analytics/custom-analytics.tsx
@@ -54,7 +54,7 @@ export const CustomAnalytics: React.FC<Props> = observer((props) => {
 
   return (
     <div className={cn("relative flex h-full w-full overflow-hidden", isProjectLevel ? "flex-col-reverse" : "")}>
-      <ContentWrapper>
+      <div className="flex h-full w-full flex-col overflow-hidden">
         <CustomAnalyticsSelectBar
           control={control}
           setValue={setValue}
@@ -68,7 +68,7 @@ export const CustomAnalytics: React.FC<Props> = observer((props) => {
           params={params}
           fullScreen={fullScreen}
         />
-      </ContentWrapper>
+      </div>
 
       <div
         className={cn(
diff --git a/web/core/components/analytics/custom-analytics/select-bar.tsx b/web/core/components/analytics/custom-analytics/select-bar.tsx
index 7921e785f86..7465c253f76 100644
--- a/web/core/components/analytics/custom-analytics/select-bar.tsx
+++ b/web/core/components/analytics/custom-analytics/select-bar.tsx
@@ -5,6 +5,7 @@ import { IAnalyticsParams } from "@plane/types";
 import { SelectProject, SelectSegment, SelectXAxis, SelectYAxis } from "@/components/analytics";
 import { ANALYTICS_X_AXIS_VALUES } from "@/constants/analytics";
 import { useProject } from "@/hooks/store";
+import { Row } from "@plane/ui";
 // components
 // types
 
@@ -30,10 +31,10 @@ export const CustomAnalyticsSelectBar: React.FC<Props> = observer((props) => {
     : ANALYTICS_X_AXIS_VALUES;
 
   return (
-    <div
-      className={`grid items-center gap-4 pb-2.5 ${
+    <Row
+      className={`grid items-center gap-4 py-2.5 ${
         isProjectLevel ? "grid-cols-1 sm:grid-cols-3" : "grid-cols-2"
-      } ${fullScreen ? "md:pb-5 lg:grid-cols-4" : ""}`}
+      } ${fullScreen ? "md:py-5 lg:grid-cols-4" : ""}`}
     >
       {!isProjectLevel && (
         <div>
@@ -88,6 +89,6 @@ export const CustomAnalyticsSelectBar: React.FC<Props> = observer((props) => {
           )}
         />
       </div>
-    </div>
+    </Row>
   );
 });
diff --git a/web/core/components/analytics/custom-analytics/table.tsx b/web/core/components/analytics/custom-analytics/table.tsx
index ca3c17846ff..49039ed02b6 100644
--- a/web/core/components/analytics/custom-analytics/table.tsx
+++ b/web/core/components/analytics/custom-analytics/table.tsx
@@ -19,7 +19,7 @@ type Props = {
 };
 
 export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, params, yAxisKey }) => (
-  <div className="w-full overflow-hidden overflow-x-auto absolute left-0">
+  <div className="w-full overflow-hidden overflow-x-auto">
     <table className="w-full overflow-hidden divide-y divide-custom-border-200 whitespace-nowrap border-y border-custom-border-200">
       <thead className="bg-custom-background-80">
         <tr className="divide-x divide-custom-border-200 text-sm text-custom-text-100">
diff --git a/web/core/components/dashboard/widgets/overview-stats.tsx b/web/core/components/dashboard/widgets/overview-stats.tsx
index d355da644d4..62200102777 100644
--- a/web/core/components/dashboard/widgets/overview-stats.tsx
+++ b/web/core/components/dashboard/widgets/overview-stats.tsx
@@ -66,7 +66,7 @@ export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
   return (
     <Card
       spacing={ECardSpacing.SM}
-      className="flex-row grid lg:grid-cols-4 md:grid-cols-2 sm:grid-cols-2 grid-cols-2 space-y-0
+      className="flex-row grid lg:grid-cols-4 md:grid-cols-2 sm:grid-cols-2 grid-cols-2 space-y-0 p-0.5
         [&>div>a>div]:border-r
         [&>div:last-child>a>div]:border-0
         [&>div>a>div]:border-custom-border-200
@@ -79,8 +79,8 @@ export const OverviewStatsWidget: React.FC<WidgetProps> = observer((props) => {
           key={stat.key}
           className={cn(
             `w-full flex flex-col gap-2 hover:bg-custom-background-80`,
-            index === 0 ? "rounded-tl-xl lg:rounded-l-xl" : "",
-            index === STATS_LIST.length - 1 ? "rounded-br-xl lg:rounded-r-xl" : "",
+            index === 0 ? "rounded-l-md" : "",
+            index === STATS_LIST.length - 1 ? "rounded-r-md" : "",
             index === 1 ? "rounded-tr-xl lg:rounded-[0px]" : "",
             index == 2 ? "rounded-bl-xl lg:rounded-[0px]" : ""
           )}
diff --git a/web/core/components/page-views/workspace-dashboard.tsx b/web/core/components/page-views/workspace-dashboard.tsx
index a6affa4ae3f..05546af56fc 100644
--- a/web/core/components/page-views/workspace-dashboard.tsx
+++ b/web/core/components/page-views/workspace-dashboard.tsx
@@ -67,7 +67,7 @@ export const WorkspaceDashboardView = observer(() => {
             <>
               <IssuePeekOverview />
               <ContentWrapper
-                className={cn("gap-7", {
+                className={cn("gap-7 bg-custom-background-90", {
                   "vertical-scrollbar scrollbar-lg": windowWidth >= 768,
                 })}
               >

From 07cf235474f98804da307398168939bdab51cff3 Mon Sep 17 00:00:00 2001
From: gakshita <akshitagoyal1516@gmail.com>
Date: Mon, 16 Sep 2024 15:41:53 +0530
Subject: [PATCH 2/2] fix: build issue

---
 web/app/[workspaceSlug]/(projects)/settings/layout.tsx      | 6 +++---
 .../analytics/custom-analytics/custom-analytics.tsx         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx b/web/app/[workspaceSlug]/(projects)/settings/layout.tsx
index 6e947c4877b..5e1f68c7bf9 100644
--- a/web/app/[workspaceSlug]/(projects)/settings/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/settings/layout.tsx
@@ -3,14 +3,14 @@
 import { FC, ReactNode } from "react";
 import { observer } from "mobx-react";
 // components
+import { NotAuthorizedView } from "@/components/auth-screens";
 import { AppHeader } from "@/components/core";
+import { useUserPermissions } from "@/hooks/store";
+import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 // local components
 import { WorkspaceSettingHeader } from "./header";
 import { MobileWorkspaceSettingsTabs } from "./mobile-header-tabs";
 import { WorkspaceSettingsSidebar } from "./sidebar";
-import { NotAuthorizedView } from "@/components/auth-screens";
-import { useUserPermissions } from "@/hooks/store";
-import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
 
 export interface IWorkspaceSettingLayout {
   children: ReactNode;
diff --git a/web/core/components/analytics/custom-analytics/custom-analytics.tsx b/web/core/components/analytics/custom-analytics/custom-analytics.tsx
index 37e2e53326c..413126c482b 100644
--- a/web/core/components/analytics/custom-analytics/custom-analytics.tsx
+++ b/web/core/components/analytics/custom-analytics/custom-analytics.tsx
@@ -5,7 +5,6 @@ import useSWR from "swr";
 import { IAnalyticsParams } from "@plane/types";
 // services
 // components
-import { ContentWrapper } from "@plane/ui";
 import { CustomAnalyticsSelectBar, CustomAnalyticsMainContent, CustomAnalyticsSidebar } from "@/components/analytics";
 // types
 // fetch-keys