Merge workflow

.github/workflows/docker-build.yml

@@ -0,0 +1,40 @@
+name: Build and Push psgui Docker Image
+
+on:
+  push:
+    branches:
+      - development
+  workflow_dispatch:  #to allow manual trigger from UI
+  pull_request:
+    branches:
+      - development
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write  # Required for pushing to GHCR
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./docker/build_single_image
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/psgui:latest
+

src/containers/ReThroughputChart.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { LineChart, Line, ReferenceLine, ReferenceArea, CartesianGrid, XAxis, YAxis, Tooltip, ResponsiveContainer } from 'recharts';
+import { LineChart, Line, ReferenceLine, ReferenceArea, CartesianGrid, XAxis, YAxis, Tooltip } from 'recharts';
 
 class ReThroughputChart extends Component {
 

src/containers/ReTraceChart.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { LineChart, Line, ReferenceLine, ReferenceArea, CartesianGrid, XAxis, YAxis, Tooltip } from 'recharts';
+import { LineChart, Line,  CartesianGrid, XAxis, YAxis, Tooltip } from 'recharts';
 
 const formatter = (value, name, props) => {
   let formattedName = props.payload['y']

src/containers/Selects.jsx

@@ -12,13 +12,14 @@ class Selects extends Component {
     let search = window.location.search;
     let params = new URLSearchParams(search);
     let source = params.get('source');
+    let destination = params.get('destination');
 
     this.state = {
       error: null,
       isLoaded: false,
       sourceOption: source,
       nodeoptions: [],
-      destOption: "",
+      destOption: destination,
       sErr: false,
       dErr: false
     };
@@ -127,15 +128,21 @@ class Selects extends Component {
           this.setState({
             isLoaded: true,
             nodeoptions: options,
-            sourceOption: options.filter(option => option.value === this.state.sourceOption)[0]
+            sourceOption: options.filter(option => option.value === this.state.sourceOption)[0],
+            destOption: options.filter(option => option.value === this.state.destOption)[0]
           }, async () => {
                 await this.handleDestError();
                 await this.handleSourceError();
-                let initialval = '';
+                let sourceinitialval = '';
+                let destinitialval = '';
                 if(typeof this.state.sourceOption === 'object' && this.state.sourceOption !== null) {
-                  initialval = this.state.sourceOption.value;
+                  sourceinitialval = this.state.sourceOption.value;
                 }
-                this.props.handleformdatachange('select-source', initialval);
+                this.props.handleformdatachange('select-source', sourceinitialval);
+                if(typeof this.state.destOption === 'object' && this.state.destOption !== null) {
+                  destinitialval = this.state.destOption.value;
+                }
+                this.props.handleformdatachange('select-dest', destinitialval);
               });
         },
         (error) => {