Merge pull request #189 from ICRAR/eagle-273

Eagle 273
ICRAR · Jul 15, 2022 · 63d7df9 · 63d7df9
2 parents bb5f78c + de0743f
commit 63d7df9
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/daliuge-translator/dlg/dropmake/web/main.js b/daliuge-translator/dlg/dropmake/web/main.js
@@ -60,11 +60,19 @@ function openSettingsModal(){
     $('#settingsModal').modal("show")
 }
 
-async function initiateDeploy(method, selected, name){
+async function initiateDeploy(method, selected, clickedName){
+    var clickedUrl
+    JSON.parse(window.localStorage.getItem("deployMethods")).forEach(element => {
+        if(element.name === clickedName){
+            clickedUrl = element.url
+        }
+    })
+
     if (selected === false){
-        changeSelectedDeployMethod(name)
+        await changeSelectedDeployMethod(clickedName, clickedUrl)
     }
-    var activeUrlReachable = await checkUrlStatus(window.localStorage.getItem("manager_url"))
+
+    var activeUrlReachable = await checkUrlStatus(clickedUrl)
 
     if(!activeUrlReachable){
         $("#warning-alert").fadeTo(2000, 1000).slideUp(200, function() {
@@ -85,16 +93,20 @@ async function initiateDeploy(method, selected, name){
     }
 }
 
-function changeSelectedDeployMethod(name) {
-    var deployMethodsArray = JSON.parse(localStorage.getItem("deployMethods"))
-    deployMethodsArray.forEach(element => {
-        element.active = "false"
-        if(element.name === name){
-            element.active = "true"
-        }
+async function changeSelectedDeployMethod(name,manager_url) {
+    return new Promise((resolve, reject) => {
+        var deployMethodsArray = JSON.parse(localStorage.getItem("deployMethods"))
+        $("#managerUrlInput").val(manager_url);
+        deployMethodsArray.forEach(element => {
+            element.active = "false"
+            if(element.name === name){
+                element.active = "true"
+            }
+        })
+        window.localStorage.setItem('deployMethods', JSON.stringify(deployMethodsArray))
+        updateDeployOptionsDropdown()
+        resolve(true)
     })
-    localStorage.setItem('deployMethods', JSON.stringify(deployMethodsArray))
-    updateDeployOptionsDropdown()
 }
 
 function updateDeployOptionsDropdown() {