Merge pull request #610 from actiontech/fix/sqle-ee-issue-2243

[fix]:(SQLE/DataSourceComparison) disable diff-only button when no differences found and fix SQL parameter generation issue

Author: anny1021

packages/sqle/src/locale/zh-CN/dataSourceComparison.ts

@@ -20,6 +20,7 @@ export default {
     generateSQLErrorTips:
       '当前选中的节点中包含对比结果一致的对象，请修改选择对象后重试！',
     generateSQLDisabledTips: '请先选择数据对象',
+    noDifferencesFound: '当前对比结果暂无差异',
     comparisonDetail: {
       title: '查看对比详情',
       generateSQL: '生成变更SQL',

packages/sqle/src/page/DataSourceComparison/ComparisonEntry/__tests__/index.test.tsx

@@ -12,6 +12,8 @@ import ComparisonEntry from '..';
 import DatabaseComparisonMockService from '../../../../testUtils/mockApi/database_comparison';
 import { mockProjectInfo } from '@actiontech/shared/lib/testUtil/mockHook/data';
 import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
+import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
+import { executeDatabaseComparisonMockData } from '../../../../testUtils/mockApi/database_comparison/data';
 
 describe('EnvironmentSelector', () => {
   let executeDatabaseComparisonSpy: jest.SpyInstance;
@@ -143,21 +145,13 @@ describe('EnvironmentSelector', () => {
           base_schema_name: 'test3',
           comparison_schema_name: 'test3',
           database_objects: [
-            {
-              object_name: undefined,
-              object_type: 'TABLE'
-            },
             {
               object_name: 'task',
               object_type: 'TABLE'
             },
             {
               object_name: 'task_copy',
               object_type: 'TABLE'
-            },
-            {
-              object_name: undefined,
-              object_type: undefined
             }
           ]
         }
@@ -201,14 +195,6 @@ describe('EnvironmentSelector', () => {
           base_schema_name: 'test3',
           comparison_schema_name: 'test3',
           database_objects: [
-            {
-              object_name: undefined,
-              object_type: undefined
-            },
-            {
-              object_name: undefined,
-              object_type: 'TABLE'
-            },
             {
               object_name: 'task',
               object_type: 'TABLE'
@@ -223,4 +209,36 @@ describe('EnvironmentSelector', () => {
       project_name: mockProjectInfo.projectName
     });
   });
+
+  it('should disabled showDifferencesOnly button when comparison result is not differences', async () => {
+    executeDatabaseComparisonSpy.mockImplementation(() =>
+      createSpySuccessResponse({
+        data: executeDatabaseComparisonMockData.filter(
+          (item) => item.comparison_result === 'same'
+        )
+      })
+    );
+    superRender(<ComparisonEntry />);
+
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    const baselineInstanceSelect = getBySelector('#baselineInstance');
+    fireEvent.mouseDown(baselineInstanceSelect);
+    fireEvent.click(screen.getAllByText('mysql-1(10.186.62.13:33061)')[0]);
+
+    const comparisonInstanceSelect = getBySelector('#comparisonInstance');
+    fireEvent.mouseDown(comparisonInstanceSelect);
+    fireEvent.click(
+      screen.getAllByText('xin-test-database(10.186.62.15:33063)')[1]
+    );
+    await act(async () => jest.advanceTimersByTime(0));
+
+    fireEvent.click(screen.getByText('执行对比'));
+    await act(async () => jest.advanceTimersByTime(0));
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    fireEvent.mouseEnter(screen.getByText('只看差异'));
+
+    await screen.findByText('当前对比结果暂无差异');
+  });
 });

packages/sqle/src/page/DataSourceComparison/ComparisonEntry/index.tsx

@@ -17,6 +17,7 @@ import {
   filterSchemasInDatabase,
   filteredWithoutParentNodeKey,
   getComparisonResultByNodeKey,
+  isValidChildNodeKey,
   parseTreeNodeKey
 } from './utils/TreeNode';
 import {
@@ -143,7 +144,9 @@ const ComparisonEntry: React.FC = () => {
                 keys: []
               };
             }
-            acc[key].keys.push(curr.key);
+            if (isValidChildNodeKey(curr.key)) {
+              acc[key].keys.push(curr.key);
+            }
             return acc;
           },
           {} as Record<
@@ -235,6 +238,13 @@ const ComparisonEntry: React.FC = () => {
       generateModifiedSqlInfoApi();
     }
   };
+
+  const noDifferencesFound = useMemo(() => {
+    return filteredComparisonResultsWithoutSame.every(
+      (item) => item.comparison_result === SchemaObjectComparisonResultEnum.same
+    );
+  }, [filteredComparisonResultsWithoutSame]);
+
   return (
     <ComparisonEntryStyleWrapper>
       {messageContextHolder}
@@ -266,15 +276,32 @@ const ComparisonEntry: React.FC = () => {
         }
       >
         <ComparisonActionStyleWrapper size={12}>
-          <ToggleButtonStyleWrapper
-            active={showDifferencesOnly}
-            onClick={() => {
-              toggleShowDifferencesOnly();
-              setCheckedObjectNodeKeys([]);
-            }}
-          >
-            {t('dataSourceComparison.entry.showDifferencesOnly')}
-          </ToggleButtonStyleWrapper>
+          {noDifferencesFound ? (
+            <BasicToolTip
+              title={t('dataSourceComparison.entry.noDifferencesFound')}
+            >
+              <ToggleButtonStyleWrapper
+                disabled={true}
+                active={showDifferencesOnly}
+                onClick={() => {
+                  toggleShowDifferencesOnly();
+                  setCheckedObjectNodeKeys([]);
+                }}
+              >
+                {t('dataSourceComparison.entry.showDifferencesOnly')}
+              </ToggleButtonStyleWrapper>
+            </BasicToolTip>
+          ) : (
+            <ToggleButtonStyleWrapper
+              active={showDifferencesOnly}
+              onClick={() => {
+                toggleShowDifferencesOnly();
+                setCheckedObjectNodeKeys([]);
+              }}
+            >
+              {t('dataSourceComparison.entry.showDifferencesOnly')}
+            </ToggleButtonStyleWrapper>
+          )}
 
           {/* <BasicButton disabled={executeComparisonPending}>
           {t('dataSourceComparison.entry.modifyMappings')}

packages/sqle/src/page/DataSourceComparison/ComparisonEntry/utils/TreeNode.tsx

@@ -91,6 +91,10 @@ export const generateTreeNodeKey = (...args: string[]) => {
   return args.join(TREE_NODE_KEY_SEPARATOR);
 };
 
+export const isValidChildNodeKey = (key: string) => {
+  return key.split(TREE_NODE_KEY_SEPARATOR).length === 3;
+};
+
 export const parseTreeNodeKey = (
   key: string,
   comparisonResults: ISchemaObject[]
@@ -109,6 +113,7 @@ export const parseTreeNodeKey = (
   }
 
   const [index, objectType, objectName] = key.split(TREE_NODE_KEY_SEPARATOR);
+
   return {
     baselineSchemaName: getComparisonResultSchemaName(
       comparisonResults[Number(index)],