Merge branch 'master' of https://github.com/icrar/daliuge into LIU-470

Author: myxie

.github/workflows/run-unit-tests.yml

@@ -87,7 +87,7 @@ jobs:
 
   finish:
     needs: run_tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@master

daliuge-engine/dlg/apps/simple.py

@@ -659,7 +659,8 @@ def gather_inputs(self):
 # @par EAGLE_START
 # @param category PythonApp
 # @param tag daliuge
-# @param greet World/String/ApplicationArgument/NoPort/ReadWrite//False/False/What appears after 'Hello '
+# @param greet World/String/ApplicationArgument/InputPort/ReadWrite//False/False/What appears after 'Hello '
+# @param hello "world"/Object/ApplicationArgument/OutputPort/ReadWrite//False/False/message
 # @param log_level "NOTSET"/Select/ComponentParameter/NoPort/ReadWrite/NOTSET,DEBUG,INFO,WARNING,ERROR,CRITICAL/False/False/Set the log level for this drop
 # @param dropclass dlg.apps.simple.HelloWorldApp/String/ComponentParameter/NoPort/ReadOnly//False/False/Application class
 # @param base_name simple/String/ComponentParameter/NoPort/ReadOnly//False/False/Base name of application class

daliuge-engine/dlg/manager/web/static/js/dm.js

@@ -580,11 +580,18 @@ function startStatusQuery(serverUrl, sessionId, selectedNode, graph_update_handl
 			// to know when we go to RUNNING.
 			// During RUNNING (or potentially FINISHED/CANCELLED, if the execution is
 			// extremely fast) we need to start updating the status of the graph
-			if (status == 3 || status == 4 || status == 5) {
+			if (status === 3 || status === 4 || status === 5) {
 				startGraphStatusUpdates(serverUrl, sessionId, selectedNode, delay,
 					status_update_handler);
 			}
-			else if (status == 0 || status == 1 || status == 2 || status == -1) {
+			else if (status === 0 || status === 1 || status === 2 || status === -1) {
+				if (status === 2) {
+					// Visualise the drops if we are trying to 'deploy' them.
+					var keys = Object.keys(doSpecs);
+					keys.sort();
+					var statuses = keys.map(function (k) { return {"status": 0} });
+					status_update_handler(statuses);
+				}
 				// schedule a new JSON request
 				updateGraphDelayTimer = d3.timer(updateGraph, delay);
 				updateGraphDelayTimerActive = true;
@@ -605,7 +612,9 @@ function startStatusQuery(serverUrl, sessionId, selectedNode, graph_update_handl
 
 function _addNode(g, doSpec, url) {
 
-	if (g.hasNode(g)) {
+	var oid = doSpec.oid;
+
+	if (g.hasNode(oid)) {
 		return false;
 	}
 
@@ -628,7 +637,6 @@ function _addNode(g, doSpec, url) {
 	}
     url = url.replace("api/","") + "/graph/drop/" +  doSpec.oid;
     let link = "<a href=" + url +  " target='_blank'>Details</a>";
-	var oid = doSpec.oid;
 	var html = '<div class="drop-label ' + typeShape + '" id="id_' + oid + '">';
 	html += '<span class="notes">' + notes + '</span>';
     oid_date = doSpec.oid.split("_")[0];