Merge pull request #904 from gravitl/bug-fix

fix: bug fixes for egress modal and side menu
gravitl · Nov 13, 2024 · 42071b7 · 42071b7
2 parents 5de683a + 82bef5e
commit 42071b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/components/modals/add-egress-modal/AddEgressModal.tsx b/src/components/modals/add-egress-modal/AddEgressModal.tsx
@@ -111,6 +111,10 @@ export default function AddEgressModal({
       {
         title: 'Endpoint',
         dataIndex: 'endpointip',
+        render(_, egress) {
+          const addrs = ([] as Array<string>).concat(egress.endpointip || [], egress.endpointipv6 || []).join(', ');
+          return <Typography.Text title={addrs}>{`${addrs}`}</Typography.Text>;
+        },
       },
       {
         title: 'Firewall',
@@ -256,7 +260,9 @@ export default function AddEgressModal({
                     <Col span={6}>
                       {selectedEgress?.address ?? ''} {selectedEgress?.address6 ?? ''}
                     </Col>
-                    <Col span={5}>{selectedEgress?.endpointip ?? ''}</Col>
+                    <Col span={5}>
+                      {selectedEgress?.endpointip ?? ''} {selectedEgress?.endpointipv6 ?? ''}
+                    </Col>
                     <Col span={3}>{selectedEgress.firewallinuse}</Col>
                     <Col span={3}>{getNodeConnectivity(selectedEgress)}</Col>
                     <Col span={1} style={{ textAlign: 'right' }}>

diff --git a/src/components/modals/update-egress-modal/UpdateEgressModal.tsx b/src/components/modals/update-egress-modal/UpdateEgressModal.tsx
@@ -150,7 +150,9 @@ export default function UpdateEgressModal({
                     <Col span={6}>
                       {extendedEgress?.address ?? ''} {extendedEgress?.address6 ?? ''}
                     </Col>
-                    <Col span={6}>{extendedEgress?.endpointip ?? ''}</Col>
+                    <Col span={6}>
+                      {extendedEgress?.endpointip ?? ''} {extendedEgress?.endpointipv6 ?? ''}
+                    </Col>
                     <Col span={5}>{initialEgressHealth}</Col>
                   </Row>
                 </>

diff --git a/src/layouts/MainLayout.tsx b/src/layouts/MainLayout.tsx
@@ -487,6 +487,7 @@ export default function MainLayout() {
             top: 0,
             bottom: 0,
             borderRight: `1px solid ${themeToken.colorBorder}`,
+            zIndex: 1000,
           }}
           zeroWidthTriggerStyle={{
             border: `2px solid ${store.currentTheme === 'dark' ? branding.primaryColorDark : branding.primaryColorLight}`,