Merge branch 'main' into codeql-fixes

Author: geoffhouse

.github/workflows/backend.yml

@@ -1,5 +1,8 @@
 # .github/workflows/backend.yml
 name: BUG Backend
+permissions:
+    contents: read
+    packages: write
 
 on:
     push:

.github/workflows/docker.yml

@@ -1,5 +1,8 @@
 # .github/workflows/docker.yml
 name: BUG Deploy
+permissions:
+    contents: read
+    packages: write
 
 env:
     regsitry: "ghcr.io"

.github/workflows/frontend.yml

@@ -1,5 +1,8 @@
 # .github/workflows/frontend.yml
 name: BUG Frontend
+permissions:
+    contents: read
+    packages: write
 
 on:
     push:

src/client/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "bug-client",
-    "version": "3.0.90",
+    "version": "3.0.92",
     "private": true,
     "dependencies": {
         "@date-io/date-fns": "^1.3.13",

src/client/package.json

@@ -81,6 +81,15 @@ export default {
                 defaultValue: { summary: null },
             },
         },
+        maxVlan: {
+            type: { name: "number" },
+            description: "The maximum VLAN that can be set (usually 4094 or 4093)",
+            defaultValue: 4094,
+            table: {
+                type: { summary: "number" },
+                defaultValue: { summary: null },
+            },
+        },
     },
 };
 

src/client/src/stories/BugApiVlanAutocomplete.stories.jsx

@@ -59,6 +59,16 @@ export default {
                 defaultValue: { summary: null },
             },
         },
+        lefticon: {
+            type: { name: "string" },
+            description:
+                "Optional small indicator icon to be displayed in the top left of the button. Can be MUI or Material Display icon",
+            defaultValue: "",
+            table: {
+                type: { summary: "string" },
+                defaultValue: { summary: null },
+            },
+        },
         iconColor: {
             control: "color",
             description: "The color of the icon to be displayed in the button.",

src/client/src/stories/BugRouterButton.stories.jsx

@@ -4,7 +4,6 @@ const mongoCollection = require("@core/mongo-collection");
 const matchAnyRegex = require("@core/regex-matchany");
 const wildcard = require("wildcard-regex");
 const configGet = require("@core/config-get");
-const mongoSingle = require("@core/mongo-single");
 
 module.exports = async (sortField = null, sortDirection = "asc", filters = {}, stackId = null) => {
     const config = await configGet();

src/modulebuilder/network-switch/src/container/services/interface-list.js

@@ -2,27 +2,35 @@ import BugApiButton from "@core/BugApiButton";
 import BugToolbarWrapper from "@core/BugToolbarWrapper";
 import LaunchIcon from "@mui/icons-material/Launch";
 import SaveIcon from "@mui/icons-material/Save";
+import TerminalIcon from "@mui/icons-material/Terminal";
 import Divider from "@mui/material/Divider";
 import ListItemIcon from "@mui/material/ListItemIcon";
 import ListItemText from "@mui/material/ListItemText";
 import MenuItem from "@mui/material/MenuItem";
 import AxiosCommand from "@utils/AxiosCommand";
 import { useAlert } from "@utils/Snackbar";
-import React from "react";
 import { useSelector } from "react-redux";
 
 export default function Toolbar({ panelId, ...props }) {
     const sendAlert = useAlert();
     const panelConfig = useSelector((state) => state.panelConfig);
 
-    const handleLaunchClicked = async (event, item) => {
+    const handleUILaunchClicked = async (event, item) => {
         if (panelConfig?.data?.address) {
             const url = `http://${panelConfig.data.address}`;
             const newWindow = window.open(url, "_blank", "noopener,noreferrer");
             if (newWindow) newWindow.opener = null;
         }
     };
 
+    const handleTerminalLaunchClicked = async (event, item) => {
+        if (panelConfig?.data?.address) {
+            const url = `http://${panelConfig.data.address}:8081`;
+            const newWindow = window.open(url, "_blank", "noopener,noreferrer");
+            if (newWindow) newWindow.opener = null;
+        }
+    };
+
     const handleSave = async (event, item) => {
         sendAlert("Saving device config ... please wait", {
             variant: "info",
@@ -58,11 +66,17 @@ export default function Toolbar({ panelId, ...props }) {
                 <ListItemText primary="Save Changes" />
             </MenuItem>,
             <Divider key="divider" />,
-            <MenuItem key="launch" onClick={handleLaunchClicked}>
+            <MenuItem key="launch" onClick={handleUILaunchClicked}>
                 <ListItemIcon>
                     <LaunchIcon fontSize="small" />
                 </ListItemIcon>
-                <ListItemText primary="Launch device webpage" />
+                <ListItemText primary="Launch device UI" />
+            </MenuItem>,
+            <MenuItem key="launch" onClick={handleTerminalLaunchClicked}>
+                <ListItemIcon>
+                    <TerminalIcon fontSize="small" />
+                </ListItemIcon>
+                <ListItemText primary="Launch device terminal" />
             </MenuItem>,
         ];
     };