From 880abeb110832ec12be8a6030055b973637722b1 Mon Sep 17 00:00:00 2001
From: Sky Brewer <sky.brewer@ess.eu>
Date: Mon, 11 Nov 2024 14:15:35 +0100
Subject: [PATCH] fix svg imports
---
.../navigation/NavigationMenu/NavigationMenu.jsx | 9 ++++++++-
src/icons/BatchDeploySymbol.jsx | 7 +------
src/icons/BatchUndeploySymbol.jsx | 7 +------
src/icons/CCCEControlSymbol.jsx | 7 +------
src/icons/RocketLaunch.jsx | 11 ++++-------
vite-env.d.ts | 1 +
6 files changed, 16 insertions(+), 26 deletions(-)
create mode 100644 vite-env.d.ts
diff --git a/src/components/navigation/NavigationMenu/NavigationMenu.jsx b/src/components/navigation/NavigationMenu/NavigationMenu.jsx
index b461e4c2..f970a82e 100644
--- a/src/components/navigation/NavigationMenu/NavigationMenu.jsx
+++ b/src/components/navigation/NavigationMenu/NavigationMenu.jsx
@@ -80,7 +80,14 @@ function MenuListItems({ menuItems, drawerOpen }) {
const makeLink = (text, url, icon) => ({ text, url, icon });
const menuItemsAll = [
makeLink("Records", "/records", <SettingsInputComponent />),
- makeLink("IOCs", "/iocs", <CCCEControlSymbol />),
+ makeLink(
+ "IOCs",
+ "/iocs",
+ <CCCEControlSymbol
+ width="25px"
+ height="25px"
+ />
+ ),
makeLink("IOC hosts", "/hosts", <Storage />),
makeLink("Log", "/jobs", <Assignment />)
];
diff --git a/src/icons/BatchDeploySymbol.jsx b/src/icons/BatchDeploySymbol.jsx
index ef7e29c2..2cad91c3 100644
--- a/src/icons/BatchDeploySymbol.jsx
+++ b/src/icons/BatchDeploySymbol.jsx
@@ -1,10 +1,5 @@
import BatchDeployIcon from "./resources/batch/batch_deploy_icon.svg?react";
-import SvgIcon from "@mui/material/SvgIcon";
export function BatchDeploySymbol(props) {
- return (
- <SvgIcon {...props}>
- <BatchDeployIcon />
- </SvgIcon>
- );
+ return <BatchDeployIcon {...props} />;
}
diff --git a/src/icons/BatchUndeploySymbol.jsx b/src/icons/BatchUndeploySymbol.jsx
index 2566d469..4afdad2d 100644
--- a/src/icons/BatchUndeploySymbol.jsx
+++ b/src/icons/BatchUndeploySymbol.jsx
@@ -1,10 +1,5 @@
import BatchUndeployIcon from "./resources/batch/batch_undeploy_icon.svg?react";
-import SvgIcon from "@mui/material/SvgIcon";
export function BatchUndeploySymbol(props) {
- return (
- <SvgIcon {...props}>
- <BatchUndeployIcon />
- </SvgIcon>
- );
+ return <BatchUndeployIcon {...props} />;
}
diff --git a/src/icons/CCCEControlSymbol.jsx b/src/icons/CCCEControlSymbol.jsx
index 3bc9f254..11061f4d 100644
--- a/src/icons/CCCEControlSymbol.jsx
+++ b/src/icons/CCCEControlSymbol.jsx
@@ -1,10 +1,5 @@
import CcceControlSymbolGray from "./resources/control/ccce-control-symbol_757575.svg?react";
-import SvgIcon from "@mui/material/SvgIcon";
export function CCCEControlSymbol(props) {
- return (
- <SvgIcon {...props}>
- <CcceControlSymbolGray />
- </SvgIcon>
- );
+ return <CcceControlSymbolGray {...props} />;
}
diff --git a/src/icons/RocketLaunch.jsx b/src/icons/RocketLaunch.jsx
index b170e8a7..bbb86db8 100644
--- a/src/icons/RocketLaunch.jsx
+++ b/src/icons/RocketLaunch.jsx
@@ -1,13 +1,10 @@
-import { ReactComponent as RocketLaunchBlack } from "./resources/rocket/rocket_launch_black_24dp.svg";
+import { ReactComponent as RocketLaunchBlack } from "./resources/rocket/rocket_launch_black_24dp.svg?react";
import { Tooltip } from "@mui/material";
-import SvgIcon from "@mui/material/SvgIcon";
export function RocketLaunch(props) {
return (
- <SvgIcon {...props}>
- <Tooltip title="Deployment">
- <RocketLaunchBlack />
- </Tooltip>
- </SvgIcon>
+ <Tooltip title="Deployment">
+ <RocketLaunchBlack {...props} />
+ </Tooltip>
);
}
diff --git a/vite-env.d.ts b/vite-env.d.ts
new file mode 100644
index 00000000..d8161248
--- /dev/null
+++ b/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite-plugin-svgr/client" />
--
GitLab