Merge pull request #511 from actiontech/revert-510-fix/issue-2777-2

Revert "Fix/issue 2777 2"
actiontech · Nov 25, 2024 · fb19f33 · fb19f33
2 parents f2d3cc1 + e5b9c8f
commit fb19f33
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 66 deletions.
diff --git a/packages/sqle/src/components/RuleDetail/__snapshots__/index.test.tsx.snap b/packages/sqle/src/components/RuleDetail/__snapshots__/index.test.tsx.snap
@@ -249,7 +249,7 @@ exports[`sqle/components/RuleDetail click return button 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -543,7 +543,7 @@ exports[`sqle/components/RuleDetail render error snap 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -861,7 +861,7 @@ exports[`sqle/components/RuleDetail render snap 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -1155,7 +1155,7 @@ exports[`sqle/components/RuleDetail render snap 2`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -1475,7 +1475,7 @@ exports[`sqle/components/RuleDetail render snap when has params 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               id="rule-list-wrapper-id"
@@ -1799,7 +1799,7 @@ exports[`sqle/components/RuleDetail render snap when input fuzzy test 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -2118,7 +2118,7 @@ exports[`sqle/components/RuleDetail send global request when not select project
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"

diff --git a/packages/sqle/src/components/RuleList/RuleList.tsx b/packages/sqle/src/components/RuleList/RuleList.tsx
@@ -36,18 +36,6 @@ import usePermission from '@actiontech/shared/lib/global/usePermission/usePermis
 
 const scrollStepRange = 30;
 
-export const pageRemainingHeight = (
-  pageHeaderHeight: RuleListProps['pageHeaderHeight']
-) => {
-  let headerHeight = pageHeaderHeight;
-  // #if [demo || ce]
-  headerHeight += 184;
-  // #else
-  headerHeight += 128;
-  // #endif
-  return headerHeight;
-};
-
 const RuleList: React.FC<RuleListProps> = ({
   rules = [],
   pageHeaderHeight,
@@ -270,10 +258,16 @@ const RuleList: React.FC<RuleListProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rules]);
 
+  const pageRemainingHeight = useMemo(() => {
+    // #if [demo || ce]
+    return pageHeaderHeight + 184;
+    // #endif
+  }, [pageHeaderHeight]);
+
   return (
     <>
       <RulesStyleWrapper
-        pageHeaderHeight={pageRemainingHeight(pageHeaderHeight)}
+        pageHeaderHeight={pageRemainingHeight}
         className="rule-list-wrapper"
         // #if [demo || ce]
         paddingBottomNone={true}

diff --git a/packages/sqle/src/components/RuleList/test/RuleList.ce.test.tsx b/packages/sqle/src/components/RuleList/test/RuleList.ce.test.tsx
@@ -2,7 +2,7 @@
  * @test_version ce
  */
 
-import RuleList, { pageRemainingHeight } from '../RuleList';
+import RuleList from '../RuleList';
 import { act, cleanup } from '@testing-library/react';
 import { renderWithTheme } from '../../../testUtils/customRender';
 import { RuleListProps, RuleStatusEnum } from '../index.type';
@@ -45,8 +45,4 @@ describe('sqle/components/RuleList CE', () => {
     await act(async () => jest.advanceTimersByTime(3000));
     expect(baseElement).toMatchSnapshot();
   });
-
-  it('page remaining height should increase 184', () => {
-    expect(pageRemainingHeight(100)).toBe(284);
-  });
 });
diff --git a/packages/sqle/src/components/RuleList/test/RuleList.test.tsx b/packages/sqle/src/components/RuleList/test/RuleList.test.tsx
@@ -1,4 +1,4 @@
-import RuleList, { pageRemainingHeight } from '../RuleList';
+import RuleList from '../RuleList';
 import { act, cleanup, fireEvent, screen } from '@testing-library/react';
 import { renderWithTheme } from '../../../testUtils/customRender';
 import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
@@ -182,8 +182,4 @@ describe('sqle/components/RuleList', () => {
     await act(async () => jest.advanceTimersByTime(300));
     expect(baseElement).toMatchSnapshot();
   });
-
-  it('page remaining height should increase 128', () => {
-    expect(pageRemainingHeight(100)).toBe(228);
-  });
 });
diff --git a/packages/sqle/src/components/RuleList/test/__snapshots__/RuleList.test.tsx.snap b/packages/sqle/src/components/RuleList/test/__snapshots__/RuleList.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`sqle/components/RuleList scroll infinite list 1`] = `
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1r6bun"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -813,7 +813,7 @@ exports[`sqle/components/RuleList should match snap shot when actionType is disa
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -1269,7 +1269,7 @@ exports[`sqle/components/RuleList should match snap shot when actionType is enab
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -1849,7 +1849,7 @@ exports[`sqle/components/RuleList should match snap shot when enableCheckDetail
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -2305,7 +2305,7 @@ exports[`sqle/components/RuleList should match snap shot when enableCheckDetail
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -3153,7 +3153,7 @@ exports[`sqle/components/RuleList should match snap shot when has props 1`] = `
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -3433,7 +3433,7 @@ exports[`sqle/components/RuleList should match snap shot when has renderDisableN
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -3909,7 +3909,7 @@ exports[`sqle/components/RuleList should match snap shot when isAction is true 1
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-1bhqk71"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         id="rule-list-wrapper-id"
@@ -4353,7 +4353,7 @@ exports[`sqle/components/RuleList should match snap shot when no rule data 1`] =
 <body>
   <div>
     <div
-      class="rule-list-wrapper css-5u6w7h"
+      class="rule-list-wrapper css-8rro2x"
     >
       <div
         class="css-1br6ibb"

diff --git a/packages/sqle/src/page/CustomRule/CustomRuleList/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/CustomRule/CustomRuleList/__snapshots__/index.test.tsx.snap
@@ -161,7 +161,7 @@ exports[`sqle/CustomRuleList click rule item 1`] = `
             class="ant-space-item"
           >
             <div
-              class="rule-list-wrapper css-1bhqk71"
+              class="rule-list-wrapper css-8rro2x"
             >
               <div
                 id="rule-list-wrapper-id"
@@ -779,7 +779,7 @@ exports[`sqle/CustomRuleList should match snap shot 1`] = `
             class="ant-space-item"
           >
             <div
-              class="rule-list-wrapper css-1bhqk71"
+              class="rule-list-wrapper css-8rro2x"
             >
               <div
                 id="rule-list-wrapper-id"
@@ -1177,7 +1177,7 @@ exports[`sqle/CustomRuleList should render empty tips when request return null 1
             class="ant-space-item"
           >
             <div
-              class="rule-list-wrapper css-1bhqk71"
+              class="rule-list-wrapper css-8rro2x"
             >
               <div
                 class="css-1br6ibb"

diff --git a/...ges/sqle/src/page/GlobalRuleTemplate/CreateRuleTemplate/__snapshots__/index.test.tsx.snap b/...ges/sqle/src/page/GlobalRuleTemplate/CreateRuleTemplate/__snapshots__/index.test.tsx.snap
@@ -460,7 +460,7 @@ exports[`sqle/GlobalRuleTemplate/CreateRuleTemplate create global rule template
                 </div>
               </div>
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   class="css-1br6ibb"
@@ -1508,7 +1508,7 @@ exports[`sqle/GlobalRuleTemplate/CreateRuleTemplate rule list action 1`] = `
                 </div>
               </div>
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   id="rule-list-wrapper-id"
@@ -3044,7 +3044,7 @@ exports[`sqle/GlobalRuleTemplate/CreateRuleTemplate should match snap shot 1`] =
               class="ant-spin-container"
             >
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   class="css-1br6ibb"

diff --git a/...ges/sqle/src/page/GlobalRuleTemplate/ImportRuleTemplate/__snapshots__/index.test.tsx.snap b/...ges/sqle/src/page/GlobalRuleTemplate/ImportRuleTemplate/__snapshots__/index.test.tsx.snap
@@ -447,7 +447,7 @@ exports[`sqle/GlobalRuleTemplate/ImportRuleTemplate import global rule template
                     </div>
                   </div>
                   <div
-                    class="rule-list-wrapper css-ghg9ee"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       class="css-1br6ibb"
@@ -2891,7 +2891,7 @@ exports[`sqle/GlobalRuleTemplate/ImportRuleTemplate rule list action 1`] = `
                     </div>
                   </div>
                   <div
-                    class="rule-list-wrapper css-ghg9ee"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       id="rule-list-wrapper-id"

diff --git a/...ges/sqle/src/page/GlobalRuleTemplate/RuleTemplateDetail/__snapshots__/index.test.tsx.snap b/...ges/sqle/src/page/GlobalRuleTemplate/RuleTemplateDetail/__snapshots__/index.test.tsx.snap
@@ -252,7 +252,7 @@ exports[`sqle/GlobalRuleTemplate/RuleTemplateDetail should match snap shot 1`] =
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-rhwzhg"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               id="rule-list-wrapper-id"

diff --git a/...ges/sqle/src/page/GlobalRuleTemplate/UpdateRuleTemplate/__snapshots__/index.test.tsx.snap b/...ges/sqle/src/page/GlobalRuleTemplate/UpdateRuleTemplate/__snapshots__/index.test.tsx.snap
@@ -459,7 +459,7 @@ exports[`sqle/GlobalRuleTemplate/UpdateRuleTemplate rule list action 1`] = `
                     </div>
                   </div>
                   <div
-                    class="rule-list-wrapper css-ghg9ee"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       id="rule-list-wrapper-id"
@@ -1932,7 +1932,7 @@ exports[`sqle/GlobalRuleTemplate/UpdateRuleTemplate should match snap shot 1`] =
                   class="ant-spin-container"
                 >
                   <div
-                    class="rule-list-wrapper css-ghg9ee"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       id="rule-list-wrapper-id"
@@ -2969,7 +2969,7 @@ exports[`sqle/GlobalRuleTemplate/UpdateRuleTemplate update global rule template
                     </div>
                   </div>
                   <div
-                    class="rule-list-wrapper css-ghg9ee"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       id="rule-list-wrapper-id"

diff --git a/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/Rule/__snapshots__/index.test.tsx.snap
@@ -370,7 +370,7 @@ exports[`sqle/Rule filter list based on project name 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-1vzpr2e"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               id="rule-list-wrapper-id"
@@ -1342,7 +1342,7 @@ exports[`sqle/Rule request return no data 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-1vzpr2e"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               class="css-1br6ibb"
@@ -2162,7 +2162,7 @@ exports[`sqle/Rule should match snap shot 1`] = `
             </div>
           </div>
           <div
-            class="rule-list-wrapper css-1vzpr2e"
+            class="rule-list-wrapper css-8rro2x"
           >
             <div
               id="rule-list-wrapper-id"

diff --git a/packages/sqle/src/page/RuleManager/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/RuleManager/__tests__/__snapshots__/index.test.tsx.snap
@@ -1030,7 +1030,7 @@ exports[`sqle/RuleManager should render custom rule list 1`] = `
                   class="ant-space-item"
                 >
                   <div
-                    class="rule-list-wrapper css-1bhqk71"
+                    class="rule-list-wrapper css-8rro2x"
                   >
                     <div
                       id="rule-list-wrapper-id"

diff --git a/packages/sqle/src/page/RuleTemplate/CreateRuleTemplate/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/RuleTemplate/CreateRuleTemplate/__snapshots__/index.test.tsx.snap
@@ -460,7 +460,7 @@ exports[`sqle/RuleTemplate/CreateRuleTemplate create rule template 1`] = `
                 </div>
               </div>
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   class="css-1br6ibb"
@@ -1508,7 +1508,7 @@ exports[`sqle/RuleTemplate/CreateRuleTemplate rule list action 1`] = `
                 </div>
               </div>
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   id="rule-list-wrapper-id"
@@ -3044,7 +3044,7 @@ exports[`sqle/RuleTemplate/CreateRuleTemplate should match snap shot 1`] = `
               class="ant-spin-container"
             >
               <div
-                class="rule-list-wrapper css-ghg9ee"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   class="css-1br6ibb"
-Original file line number
+Diff line change
@@ Expand Up @@
                 </div>
               </div>
               <div
-                class="rule-list-wrapper css-rhwzhg"
+                class="rule-list-wrapper css-8rro2x"
               >
                 <div
                   id="rule-list-wrapper-id"
@@ Expand Down @@