fix: review fixes

ydb-platform · Mar 15, 2024 · 25db7e7 · 25db7e7
1 parent ec8e91e
commit 25db7e7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/src/components/LinkWithIcon/LinkWithIcon.tsx b/src/components/LinkWithIcon/LinkWithIcon.tsx
@@ -2,7 +2,8 @@ import block from 'bem-cn-lite';
 
 import {Link} from '@gravity-ui/uikit';
 
-import {Icon} from '../Icon/Icon';
+import {ArrowUpRightFromSquare} from '@gravity-ui/icons';
+
 import {InternalLink} from '../InternalLink';
 import './LinkWithIcon.scss';
 
@@ -19,7 +20,7 @@ export const LinkWithIcon = ({title, url, external = true}: ExternalLinkWithIcon
         <>
             {title}
             {'\u00a0'}
-            <Icon name="external" viewBox={'0 0 16 16'} width={16} height={16} />
+            <ArrowUpRightFromSquare />
         </>
     );
 

diff --git a/src/components/StatusIcon/StatusIcon.tsx b/src/components/StatusIcon/StatusIcon.tsx
@@ -1,20 +1,21 @@
 import {Icon} from '@gravity-ui/uikit';
 
-import circleExclamationIcon from '../../assets/icons/circle-exclamation.svg';
-import circleInfoIcon from '../../assets/icons/circle-info.svg';
-import circleTimesIcon from '../../assets/icons/circle-xmark.svg';
-import triangleExclamationIcon from '../../assets/icons/triangle-exclamation.svg';
+import CircleExclamationFillIcon from '@gravity-ui/icons/svgs/circle-exclamation-fill.svg';
+import CircleInfoFillIcon from '@gravity-ui/icons/svgs/circle-info-fill.svg';
+import CircleXmarkFillIcon from '@gravity-ui/icons/svgs/circle-xmark-fill.svg';
+import TriangleExclamationFillIcon from '@gravity-ui/icons/svgs/triangle-exclamation-fill.svg';
+
 import {EFlag} from '../../types/api/enums';
 import {cn} from '../../utils/cn';
 import './StatusIcon.scss';
 
 const b = cn('ydb-status-icon');
 
 const icons = {
-    [EFlag.Blue]: circleInfoIcon,
-    [EFlag.Yellow]: circleExclamationIcon,
-    [EFlag.Orange]: triangleExclamationIcon,
-    [EFlag.Red]: circleTimesIcon,
+    [EFlag.Blue]: CircleInfoFillIcon,
+    [EFlag.Yellow]: CircleExclamationFillIcon,
+    [EFlag.Orange]: TriangleExclamationFillIcon,
+    [EFlag.Red]: CircleXmarkFillIcon,
 };
 
 export type StatusIconMode = 'color' | 'icons';

diff --git a/src/store/reducers/pdisk/utils.ts b/src/store/reducers/pdisk/utils.ts
@@ -32,23 +32,21 @@ export function preparePDiskStorageResponse(
 ) {
     const preparedGroups: PreparedStorageGroup[] = [];
 
-    data.StoragePools?.forEach((pool) => {
-        pool.Groups?.filter((group) => {
-            if (!group?.VDisks) {
-                return false;
-            }
+    data.StoragePools?.forEach((pool) =>
+        pool.Groups?.forEach((group) => {
+            const groupHasPDiskVDisks = group.VDisks?.some((vdisk) => {
+                // If VDisk has PDisk inside, PDiskId and NodeId fields could be only inside PDisk and vice versa
+                const groupPDiskId = vdisk.PDiskId ?? vdisk.PDisk?.PDiskId;
+                const groupNodeId = vdisk.NodeId ?? vdisk.PDisk?.NodeId;
+
+                return groupPDiskId === Number(pDiskId) && groupNodeId === Number(nodeId);
+            });
 
-            return (
-                group.VDisks.filter(
-                    (vdisk) =>
-                        (vdisk.PDiskId === pDiskId || vdisk.PDisk?.PDiskId === Number(pDiskId)) &&
-                        vdisk.PDisk?.NodeId === Number(nodeId),
-                ).length > 0
-            );
-        }).forEach((group) => {
-            preparedGroups.push(prepareStorageGroupData(group, pool.Name));
-        });
-    });
+            if (groupHasPDiskVDisks) {
+                preparedGroups.push(prepareStorageGroupData(group, pool.Name));
+            }
+        }),
+    );
 
     return preparedGroups;
 }