Pvws hosts for beamlines

.github/workflows/docker-image.yml

@@ -44,16 +44,6 @@ jobs:
           load: true
           tags: tag_for_testing
           network: host
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/[email protected]
-        with:
-          image-ref: 'docker.io/library/tag_for_testing:latest'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'
 
       # Extract the git tag for the checked out commit, or blank string if it does not have one
       - name: Get commit tag

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "private": true,
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -15,7 +15,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@diamondlightsource/cs-web-lib": "^0.10.5",
+    "@diamondlightsource/cs-web-lib": "^0.10.6",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@mui/icons-material": "^5.15.17",

src/config.ts

@@ -2,6 +2,7 @@ import { CsWebLibConfig, httpRequest } from "@diamondlightsource/cs-web-lib";
 
 export type BeamlinesConfig = {
   [beamline: string]: {
+    pvwsHost: string | undefined;
     host: string;
     entryPoint: string;
   };
@@ -27,6 +28,7 @@ export const loadConfig = async (): Promise<DaedalusConfig> => {
       PVWS_SOCKET: undefined,
       PVWS_SSL: undefined,
       THROTTLE_PERIOD: undefined,
+      storeMode: undefined,
       beamlines: {}
     };
   }

src/routes/SynopticPage.tsx

@@ -136,7 +136,8 @@ export function SynopticPage() {
           fileDescription.macros,
           fileDescription.defaultProtocol,
           fileContext,
-          location.pathname
+          location.pathname,
+          newBeamlineState.pvwsHost
         );
       } else {
         const macrosParameter = searchParams.get(MACROS_SEARCH_PARAMETER_NAME);

src/store.ts

@@ -210,6 +210,7 @@ export type BeamlineStateProperties = {
   screenTree: TreeViewBaseItem[];
   filePathIds: FileIDs;
   host: string;
+  pvwsHost?: string;
   loaded: boolean;
 };
 
@@ -234,6 +235,7 @@ export type BeamlineTreeState = {
 
 const defaultBeamline: BeamlineStateProperties = {
   host: "",
+  pvwsHost: undefined,
   entryPoint: "",
   topLevelScreen: "",
   screenTree: [],

src/utils/csWebLibActions.ts

@@ -71,7 +71,8 @@ export const executeOpenPageActionWithFileMetadata = (
     selectedMacros,
     protocol,
     fileContext,
-    urlPath
+    urlPath,
+    beamlineState.pvwsHost
   );
 };
 
@@ -80,7 +81,8 @@ export const executeOpenPageAction = (
   macros: MacroMap,
   protocol: string,
   fileContext: any,
-  browserUrl: string
+  browserUrl: string,
+  pvwsHost?: string
 ) => {
   executeAction(
     {
@@ -89,6 +91,7 @@ export const executeOpenPageAction = (
         name: screenFileUrl,
         location: "main",
         description: undefined,
+        pvwsHost,
         file: {
           path: screenFileUrl,
           macros: macros,