Merge branch 'bugfix/fix-the-node-table' into q/125.0

scality · Oct 6, 2023 · 2ee5a75 · 2ee5a75
2 parents f582385 + 7b01adf
commit 2ee5a75
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/ui/src/components/NodeListTable.tsx b/ui/src/components/NodeListTable.tsx
@@ -3,7 +3,7 @@ import { useHistory } from 'react-router';
 import { useLocation, useRouteMatch } from 'react-router-dom';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
-import { Icon, LargeText, SecondaryText } from '@scality/core-ui';
+import { Icon, Stack, Text } from '@scality/core-ui';
 import { Box, Button, Table } from '@scality/core-ui/dist/next';
 import { useURLQuery } from '../services/utils';
 import CircleStatus from './CircleStatus';
@@ -44,17 +44,21 @@ const NodeListTable = ({ nodeTableData }) => {
           const { name, controlPlaneIP, workloadPlaneIP } = value;
           return (
             <>
-              <LargeText data-cy="node_table_name_cell">{name}</LargeText>
-              <Box display={'inline-flex'} flexWrap={'wrap'}>
+              <Text data-cy="node_table_name_cell" variant="Basic" isEmphazed>
+                {name}
+              </Text>
+              <Stack>
                 {controlPlaneIP ? (
-                  <SecondaryText>CP: {controlPlaneIP}</SecondaryText>
+                  <Text variant="Smaller" color="textSecondary">
+                    CP: {controlPlaneIP}
+                  </Text>
                 ) : null}
                 {workloadPlaneIP ? (
-                  <Box pl={'0.5rem'}>
-                    <SecondaryText>WP: {workloadPlaneIP}</SecondaryText>
-                  </Box>
+                  <Text variant="Smaller" color="textSecondary">
+                    WP: {workloadPlaneIP}
+                  </Text>
                 ) : null}
-              </Box>
+              </Stack>
             </>
           );
         },
@@ -63,7 +67,7 @@ const NodeListTable = ({ nodeTableData }) => {
         Header: 'Roles',
         accessor: 'roles',
         cellStyle: {
-          flex: 1,
+          flex: 0.5,
         },
       },
       {
@@ -167,4 +171,4 @@ const NodeListTable = ({ nodeTableData }) => {
   );
 };
 
-export default NodeListTable;
+export default NodeListTable;