Merge pull request #46 from siemens/feature/multi-nic-capture

Feature/multi nic capture
siemens · Feb 13, 2024 · 9bc9e39 · 9bc9e39
2 parents e9e5713 + d9a303c
commit 9bc9e39
Show file tree

Hide file tree

Showing 22 changed files with 636 additions and 82 deletions.
diff --git a/webui/.env.development b/webui/.env.development
@@ -0,0 +1 @@
+VITE_APP_ENABLE_MONOLITH=true
diff --git a/webui/icons/Capture.svg b/webui/icons/Capture.svg
diff --git a/webui/icons/CaptureCheck.svg b/webui/icons/CaptureCheck.svg
diff --git a/webui/icons/CaptureMulti.svg b/webui/icons/CaptureMulti.svg
diff --git a/webui/icons/CaptureMultiOn.svg b/webui/icons/CaptureMultiOn.svg
diff --git a/webui/package.json b/webui/package.json
@@ -70,8 +70,8 @@
     "vite-tsconfig-paths": "^4.2.3"
   },
   "scripts": {
-    "start": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} REACT_APP_ENABLE_MONOLITH=true vite --port 3300",
-    "unstrict": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} REACT_APP_UNSTRICT=true REACT_APP_ENABLE_MONOLITH=true vite --port 3300",
+    "start": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} vite --port 3300",
+    "unstrict": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} VITE_VITE_APP_UNSTRICT=true VITE_APP_ENABLE_MONOLITH=true vite --port 3300",
     "build": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} vite build",
     "imagebuild": "REACT_APP_GIT_VERSION=${GIT_VERSION:-$(git describe)} vite build",
     "icons": "node genicons",

diff --git a/webui/src/components/containeebadge/ContaineeBadge.tsx b/webui/src/components/containeebadge/ContaineeBadge.tsx
@@ -5,7 +5,7 @@
 import React from 'react'
 import clsx from 'clsx'
 
-import { Button, styled, Tooltip } from '@mui/material'
+import { Box, Button, styled, Tooltip } from '@mui/material'
 
 import { containeeDescription, containeeState, ContainerState, containerStateString, Containee, containeeFullName, isPrivilegedContainer, isElevatedContainer, isContainer, GHOSTWIRE_LABEL_ROOT } from 'models/gw'
 import { ContaineeIcon } from 'utils/containeeicon'
@@ -161,6 +161,7 @@ export interface ContaineeBadgeProps {
     notooltip?: boolean
     /** show an additional capture button? */
     capture?: boolean
+    hideCapture?: boolean
 }
 
 /**
@@ -203,6 +204,7 @@ export const ContaineeBadge = ({
     endIcon,
     notooltip,
     capture,
+    hideCapture,
     onClick
 }: ContaineeBadgeProps) => {
     const privileged = isPrivilegedContainer(containee)
@@ -220,7 +222,9 @@ export const ContaineeBadge = ({
 
     const CeeIcon = ContaineeIcon(containee)
 
-    const shark = capture && <CaptureButton target={containee} />
+    const shark = capture && (!hideCapture
+        ? <CaptureButton target={containee} />
+        : <Box sx={{width: '30px', display:'inline-block'}} />)
 
     const kingOfBoxIcon = privileged
         ? <PrivilegedIcon className="kinginthebox" />