Merge branch 'main' into astandrik.show-vdisks-of-selected-group-1335

Author: astandrik

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ name: Node.js CI
 on:
   pull_request:
     branches: ['**']
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   verify_files:
@@ -38,6 +40,7 @@ jobs:
   e2e_tests:
     name: Playwright Tests
     runs-on: ubuntu-latest
+    if: ${{github.event.action != 'checks_requested'}}
     permissions:
       contents: read
 
@@ -121,6 +124,7 @@ jobs:
   bundle_size:
     name: Check Bundle Size
     runs-on: ubuntu-latest
+    if: ${{github.event.action != 'checks_requested'}}
     outputs:
       current_size: ${{ steps.current_size.outputs.size }}
       main_size: ${{ steps.main_size.outputs.size }}
@@ -183,7 +187,7 @@ jobs:
   deploy_and_update:
     name: Deploy and Update PR
     needs: [e2e_tests, bundle_size]
-    if: always() && github.event.pull_request.head.repo.full_name == github.repository
+    if: ${{always() && github.event.pull_request.head.repo.full_name == github.repository && github.event.action != 'checks_requested'}}
     runs-on: ubuntu-latest
     permissions:
       contents: write

.github/workflows/pr-title.yml

@@ -7,11 +7,14 @@ on:
       - synchronize
       - reopened
       - edited
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   verify_title:
     name: Verify Title
     runs-on: ubuntu-latest
+    if: ${{github.event.action != 'checks_requested'}}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

src/components/QueryResultTable/Cell/Cell.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {hideTooltip, showTooltip} from '../../../store/reducers/tooltip';
+import {showTooltip} from '../../../store/reducers/tooltip';
 import {useTypedDispatch} from '../../../utils/hooks';
 import {b} from '../QueryResultTable';
 
@@ -14,13 +14,6 @@ export const Cell = React.memo(function Cell(props: CellProps) {
 
     const dispatch = useTypedDispatch();
 
-    React.useEffect(
-        () => () => {
-            dispatch(hideTooltip());
-        },
-        [dispatch],
-    );
-
     return (
         <span
             className={b('cell', className)}

src/containers/ReduxTooltip/ReduxTooltip.js

@@ -23,19 +23,19 @@ function ReduxTooltip(props) {
         rect: {top: props.positions?.top, left: props.positions?.left},
     });
 
+    const handleScroll = React.useCallback(() => {
+        const {hideTooltip, toolTipVisible} = props;
+        if (toolTipVisible) {
+            setTimeout(() => hideTooltip(), 500);
+        }
+    }, [props]);
+
     React.useEffect(() => {
         window.addEventListener('scroll', handleScroll, true);
         return () => {
             window.removeEventListener('scroll', handleScroll);
         };
-    }, []);
-
-    const handleScroll = () => {
-        const {hideTooltip, toolTipVisible} = props;
-        if (toolTipVisible) {
-            setTimeout(() => hideTooltip(), 500);
-        }
-    };
+    }, [handleScroll]);
 
     const renderPositionPopup = (visible, positions, data, additionalData) => {
         const {template, popupClassName, hideTooltip} = props;

src/containers/Storage/PaginatedStorage.tsx

@@ -30,7 +30,7 @@ export const PaginatedStorage = ({
     parentContainer,
 }: PaginatedStorageProps) => {
     const {balancer} = useClusterBaseInfo();
-    const additionalNodesProps = useAdditionalNodeProps({balancer});
+    const {additionalNodesProps} = useAdditionalNodeProps({balancer});
 
     const [queryParams, setQueryParams] = useQueryParams({
         type: StringParam,

src/containers/Storage/Storage.tsx

@@ -67,7 +67,7 @@ interface StorageProps {
 
 export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => {
     const {balancer} = useClusterBaseInfo();
-    const additionalNodesProps = useAdditionalNodeProps({balancer});
+    const {additionalNodesProps} = useAdditionalNodeProps({balancer});
 
     const capabilitiesLoaded = useCapabilitiesLoaded();
     const groupsHandlerAvailable = useStorageGroupsHandlerAvailable();

src/containers/Storage/StorageGroups/columns/columns.tsx

@@ -241,12 +241,12 @@ export const getStorageTopGroupsColumns: StorageColumnsGetter = () => {
 
 export const getStorageGroupsColumns: StorageColumnsGetter = (data) => {
     const columns = [
+        groupIdColumn,
         poolNameColumn,
         typeColumn,
         erasureColumn,
         degradedColumn,
         usageColumn,
-        groupIdColumn,
         usedColumn,
         limitColumn,
         usedSpaceFlagColumn,

src/containers/Storage/StorageGroups/columns/constants.ts

@@ -6,10 +6,10 @@ export const STORAGE_GROUPS_COLUMNS_WIDTH_LS_KEY = 'storageGroupsColumnsWidth';
 export const STORAGE_GROUPS_SELECTED_COLUMNS_LS_KEY = 'storageGroupsSelectedColumns';
 
 export const STORAGE_GROUPS_COLUMNS_IDS = {
+    GroupId: 'GroupId',
     PoolName: 'PoolName',
     MediaType: 'MediaType',
     Erasure: 'Erasure',
-    GroupId: 'GroupId',
     Used: 'Used',
     Limit: 'Limit',
     Usage: 'Usage',
@@ -24,10 +24,10 @@ export const STORAGE_GROUPS_COLUMNS_IDS = {
 type StorageGroupsColumnId = ValueOf<typeof STORAGE_GROUPS_COLUMNS_IDS>;
 
 export const DEFAULT_STORAGE_GROUPS_COLUMNS: StorageGroupsColumnId[] = [
+    'GroupId',
     'PoolName',
     'MediaType',
     'Erasure',
-    'GroupId',
     'Used',
     'Limit',
     'Usage',