From c92184d89f6d0739d582236ca2a2e9180a3f58fe Mon Sep 17 00:00:00 2001
From: tristanliu <37809633+sevenliu1896@users.noreply.github.com>
Date: Thu, 26 Oct 2023 05:02:05 -0500
Subject: [PATCH] [improvement][semantic-fe] Fixing the API for the indicator
 list by changing "current" to "pageNum" (#295)

* [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab.
[improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions.
[improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager.

* [improvement][semantic-fe] Add time granularity setting in the data source configuration.

* [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility

* [improvement][semantic-fe] Modification of data source creation prompt wording"

* [improvement][semantic-fe] metric market experience optimization

* [improvement][semantic-fe] enhance the analysis of metric trends

* [improvement][semantic-fe] optimize the presentation of metric trend permissions

* [improvement][semantic-fe] add metric trend download functionality

* [improvement][semantic-fe] fix the dimension initialization issue in metric correlation

* [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source.

* [improvement][semantic-fe] Optimizing pagination logic and some CSS styles

* [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum"
---
 .../supersonic-fe/src/pages/SemanticModel/Metric/index.tsx    | 4 ++--
 .../pages/SemanticModel/components/ClassDimensionTable.tsx    | 3 ++-
 .../src/pages/SemanticModel/components/ClassMetricTable.tsx   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx
index 1a7a6602f..485a77be3 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx
@@ -67,14 +67,14 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       pageSize: params.showType ? 100 : params.pageSize || pagination.pageSize,
     });
     setLoading(false);
-    const { list, pageSize, total } = data || {};
+    const { list, pageSize, pageNum, total } = data || {};
     let resData: any = {};
     if (code === 200) {
       if (!params.showType) {
         setPagination({
           ...pagination,
           pageSize: Math.min(pageSize, 100),
-          // current,
+          current: pageNum,
           total,
         });
       }
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
index 91c3706bf..b25e81c94 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx
@@ -42,12 +42,13 @@ const ClassDimensionTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       ...pagination,
       modelId,
     });
-    const { list, pageSize, total } = data || {};
+    const { list, pageSize, pageNum, total } = data || {};
     let resData: any = {};
     if (code === 200) {
       setPagination({
         ...pagination,
         pageSize: Math.min(pageSize, 100),
+        current: pageNum,
         total,
       });
 
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
index 47ec0fea2..9428edca6 100644
--- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx
@@ -36,12 +36,13 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       ...pagination,
       modelId,
     });
-    const { list, pageSize, total } = data || {};
+    const { list, pageSize, pageNum, total } = data || {};
     let resData: any = {};
     if (code === 200) {
       setPagination({
         ...pagination,
         pageSize: Math.min(pageSize, 100),
+        current: pageNum,
         total,
       });