diff --git a/daliuge-translator/dlg/dropmake/web/main.js b/daliuge-translator/dlg/dropmake/web/main.js index d8c31a9f8..d931c176a 100644 --- a/daliuge-translator/dlg/dropmake/web/main.js +++ b/daliuge-translator/dlg/dropmake/web/main.js @@ -38,10 +38,18 @@ function openSettingsModal(){ $('#settingsModal').modal("show") } -function initiateDeploy(method, selected, name){ +async function initiateDeploy(method, selected, name){ if (selected === false){ changeSelectedDeployMethod(name) } + var activeUrlReachable = await checkUrlStatus(window.localStorage.getItem("manager_url")) + + if(!activeUrlReachable){ + $("#warning-alert").fadeTo(2000, 1000).slideUp(200, function() { + $("#warning-alert").slideUp(200); + }); + return + } if(method === "direct"){ $("#gen_pg_button").val("Generate & Deploy Physical Graph") $("#dlg_mgr_deploy").prop("checked", true) @@ -83,8 +91,9 @@ function updateDeployOptionsDropdown() { selectedUrl=element.url //active option $("#deployDropdowns").prepend( - `Deploy: `+element.name+`` + `Deploy: `+element.name+`` ) + checkActiveDeployMethod(selectedUrl) } }) @@ -118,7 +127,7 @@ async function checkUrlStatus (url) { }else{ resolve(false) } - }, + }, timeout: 2000 }); }) @@ -159,6 +168,17 @@ async function manualCheckUrlStatus (clickPos) { } } +async function checkActiveDeployMethod(url){ + $("#activeDeployMethodButton").removeClass("activeDeployMethodButtonOnline") + $("#activeDeployMethodButton").removeClass("activeDeployMethodButtonOffline") + var urlStatus = await checkUrlStatus(url) + if(urlStatus){ + $("#activeDeployMethodButton").addClass("activeDeployMethodButtonOnline") + }else{ + $("#activeDeployMethodButton").addClass("activeDeployMethodButtonOffline") + } +} + function saveSettings() { //need a check function to confirm settings have been filled out correctly diff --git a/daliuge-translator/dlg/dropmake/web/pg_viewer.html b/daliuge-translator/dlg/dropmake/web/pg_viewer.html index 4c50dc103..6ea40d164 100755 --- a/daliuge-translator/dlg/dropmake/web/pg_viewer.html +++ b/daliuge-translator/dlg/dropmake/web/pg_viewer.html @@ -181,6 +181,10 @@ +
+ Deploy Aborted This Deploy Method's Url Is Not Reachable +
+