From f5b5a9a65756444abb1ef2f551c6cba66f02bfe7 Mon Sep 17 00:00:00 2001
From: Yunus M <myounis.ar@live.com>
Date: Fri, 2 Feb 2024 16:44:27 +0530
Subject: [PATCH] fix: maintain existing pagination configs (#4484)

* fix: maintain existing pagination configs

* fix: pass pagination info services table

* fix: general setting - cloud - add email mailto link
---
 frontend/src/components/ResizeTable/ResizeTable.tsx   | 11 ++---------
 .../GeneralSettingsCloud/GeneralSettingsCloud.tsx     |  4 ++--
 .../ServiceMetrics/ServiceMetricTable.tsx             |  5 +++++
 .../ServiceTraces/ServiceTracesTable.tsx              |  5 +++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/ResizeTable/ResizeTable.tsx b/frontend/src/components/ResizeTable/ResizeTable.tsx
index a7d0396a50..90cc588c47 100644
--- a/frontend/src/components/ResizeTable/ResizeTable.tsx
+++ b/frontend/src/components/ResizeTable/ResizeTable.tsx
@@ -73,19 +73,12 @@ function ResizeTable({
 		}
 	}, [columns]);
 
-	const paginationConfig = {
-		hideOnSinglePage: true,
-		showTotal: (total: number, range: number[]): string =>
-			`${range[0]}-${range[1]} of ${total} items`,
-		...tableParams.pagination,
-	};
-
 	return onDragColumn ? (
 		<ReactDragListView.DragColumn {...dragColumnParams} onDragEnd={onDragColumn}>
-			<Table {...tableParams} pagination={paginationConfig} />
+			<Table {...tableParams} />
 		</ReactDragListView.DragColumn>
 	) : (
-		<Table {...tableParams} pagination={paginationConfig} />
+		<Table {...tableParams} />
 	);
 }
 
diff --git a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx
index 4782d03e12..6a8988deaf 100644
--- a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx
+++ b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx
@@ -8,8 +8,8 @@ export default function GeneralSettingsCloud(): JSX.Element {
 		<Card className="general-settings-container">
 			<Info size={16} />
 			<Typography.Text>
-				Please email us or connect with us via intercom support to change the
-				retention period.
+				Please <a href="mailto:cloud-support@signoz.io"> email us </a> or connect
+				with us via intercom support to change the retention period.
 			</Typography.Text>
 		</Card>
 	);
diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx
index 4fee7aeb3a..5213513dc8 100644
--- a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx
+++ b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx
@@ -91,6 +91,11 @@ function ServiceMetricTable({
 			<ResourceAttributesFilter />
 
 			<ResizeTable
+				pagination={{
+					defaultPageSize: 10,
+					showTotal: (total: number, range: number[]): string =>
+						`${range[0]}-${range[1]} of ${total} items`,
+				}}
 				columns={tableColumns}
 				loading={isLoading}
 				dataSource={services}
diff --git a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx
index 3b21acba6e..717060d901 100644
--- a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx
+++ b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx
@@ -49,6 +49,11 @@ function ServiceTraceTable({
 			<ResourceAttributesFilter />
 
 			<ResizeTable
+				pagination={{
+					defaultPageSize: 10,
+					showTotal: (total: number, range: number[]): string =>
+						`${range[0]}-${range[1]} of ${total} items`,
+				}}
 				columns={tableColumns}
 				loading={loading}
 				dataSource={services}