Merge pull request #609 from actiontech/fix/issue-2267

[fix](SqlAnalyze): Modify error message display

Author: LZS911

packages/shared/lib/api/sqle/service/common.d.ts

@@ -2980,6 +2980,8 @@ export interface ISqlAnalysis {
 }
 
 export interface ISqlAnalysisChart {
+  message?: string;
+
   points?: IChartPoint[];
 
   x_info?: string;

packages/sqle/src/page/SqlAnalyze/ManagementConf/index.tsx

@@ -93,9 +93,7 @@ const ManagementConfAnalyze = () => {
       sqlExecPlanCostDataSource={data}
       getSqlExecPlanCostDataSourceLoading={getSqlExecPlanCostDataSourceLoading}
       getSqlExecPlanCostDataSource={getSqlExecPlanCostDataSource}
-      getSqlExecPlanCostDataSourceError={
-        getSqlExecPlanCostDataSourceError?.message
-      }
+      getSqlExecPlanCostDataSourceError={getSqlExecPlanCostDataSourceError}
       showExecPlanCostChart
       initTime={initTime}
       selectedPoint={selectedPoint}

packages/sqle/src/page/SqlAnalyze/SqlManage/index.tsx

@@ -91,9 +91,7 @@ const SQLManageAnalyze = () => {
       sqlExecPlanCostDataSource={data}
       getSqlExecPlanCostDataSourceLoading={getSqlExecPlanCostDataSourceLoading}
       getSqlExecPlanCostDataSource={getSqlExecPlanCostDataSource}
-      getSqlExecPlanCostDataSourceError={
-        getSqlExecPlanCostDataSourceError?.message
-      }
+      getSqlExecPlanCostDataSourceError={getSqlExecPlanCostDataSourceError}
       showExecPlanCostChart
       initTime={initTime}
       selectedPoint={selectedPoint}

packages/sqle/src/page/SqlAnalyze/hooks/__tests__/useSqlExecPlanCost.test.tsx

@@ -8,6 +8,7 @@ import { mockUseCurrentProject } from '@actiontech/shared/lib/testUtil/mockHook/
 import { translateTimeForRequest } from '@actiontech/shared/lib/utils/Common';
 import { formatTime } from '@actiontech/shared/lib/utils/Common';
 import { DateRangeEnum } from '../../SqlAnalyze/ExecPlanCostChart/index.data';
+import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
 
 describe('SqlAnalyze/useSqlExecPlanCost', () => {
   let getSqlManageSqlAnalysisChartSpy: jest.SpyInstance;
@@ -193,4 +194,26 @@ describe('SqlAnalyze/useSqlExecPlanCost', () => {
       mockPoints[mockPoints.length - 1]
     ]);
   });
+
+  it('should return error when request api failed', async () => {
+    const { result } = renderHook(() => useSqlExecPlanCost(mockId));
+    getSqlManageSqlAnalysisChartSpy.mockImplementation(() =>
+      createSpySuccessResponse({
+        data: {
+          message: 'SQL is not supported'
+        }
+      })
+    );
+    await act(async () => {
+      result.current.getSqlExecPlanCostDataSource({
+        startTime: currentTime.subtract(24, 'hour'),
+        endTime: currentTime,
+        lastPointEnabled: true
+      });
+      await jest.advanceTimersByTime(3000);
+    });
+    expect(result.current.getSqlExecPlanCostDataSourceError).toBe(
+      'SQL is not supported'
+    );
+  });
 });

packages/sqle/src/page/SqlAnalyze/hooks/useSqlExecPlanCost.ts

@@ -31,13 +31,17 @@ const useSqlExecPlanCost = (id: string) => {
     Array<IChartPoint | undefined>
   >([]);
 
+  const [
+    getSqlExecPlanCostDataSourceError,
+    setGetSqlExecPlanCostDataSourceError
+  ] = useState<string | undefined>(undefined);
+
   const initTime = useMemo(() => dayjs(), []);
 
   const {
     data,
     loading: getSqlExecPlanCostDataSourceLoading,
     run,
-    error: getSqlExecPlanCostDataSourceError,
     mutate
   } = useRequest(
     ({
@@ -69,7 +73,7 @@ const useSqlExecPlanCost = (id: string) => {
           const firstPoint = convertedPoints?.[0];
           const lastPoint = convertedPoints?.[convertedPoints.length - 1];
 
-          if (!selectedPoint.length) {
+          if (!selectedPoint.length && !!convertedPoints.length) {
             setSelectedPoint([
               convertedPoints?.[convertedPoints.length - 2],
               lastPoint
@@ -95,6 +99,10 @@ const useSqlExecPlanCost = (id: string) => {
               return state;
             });
           }
+
+          if (!!res.data.data?.message) {
+            setGetSqlExecPlanCostDataSourceError(res.data.data?.message);
+          }
           return convertedPoints;
         }
       });