fixed deploy history conflict

pinterest · Oct 4, 2024 · 8b9bcff · 8b9bcff
1 parent 75ce826
commit 8b9bcff
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 52 deletions.
diff --git a/deploy-board/deploy_board/static/js/deploy-board.js b/deploy-board/deploy_board/static/js/deploy-board.js
@@ -55,6 +55,56 @@ function getUrlParameter(sParam) {
         }
     }
 }
+function setUrlParameter(url, name, val){
+    let searchString = url.search.substring(1);
+    let vars = searchString.split("&")
+    let modifiedString = "?"
+    let set= false;
+
+    for(let i=0; i < vars.length; i++){
+        if(i>0){
+            modifiedString+="&"
+        }
+        let currParam = vars[i].split('=');
+        if(currParam[0] === name){
+            modifiedString+=name
+            modifiedString+= "=" + encodeURIComponent(val)
+            set=true;
+        } else {
+            modifiedString+=vars[i]
+        }
+    }
+    if(!set){
+        if(modifiedString.length>1){
+            modifiedString+="&"
+        }
+        modifiedString+=name
+        modifiedString+="="+encodeURIComponent(val)
+    }
+    url.search=modifiedString;
+    return url
+}
+
+function deleteUrlParameter(url, name){
+    let searchString = url.search.substring(1);
+    let vars = searchString.split("&")
+    let modifiedString = "?"
+
+    for(let i=0; i < vars.length; i++){
+        let currParam = vars[i].split('=');
+        if(currParam[0]!==name){
+            if(modifiedString.length>1){
+                modifiedString+="&"
+            }
+            modifiedString+=vars[i]
+        }
+    }
+    url.search=modifiedString;
+    return url
+}
+
+
+
 
 function getRemainingCapacity(capacityInfo, placementList) {
     if (!capacityInfo || !placementList) {

diff --git a/deploy-board/deploy_board/templates/deploys/deploy_history.tmpl b/deploy-board/deploy_board/templates/deploys/deploy_history.tmpl
@@ -141,7 +141,7 @@
 
     jQuery(function(){
         var maxCheckedAllowed = 2;
-        var checkboxes = $('input[type="checkbox"]');
+        var checkboxes = $("#deployHistoryTableId").find('input[type="checkbox"]');
             checkboxes.change(function(){
                 var numChecked = checkboxes.filter(':checked').length;
                 checkboxes.filter(':not(:checked)').prop('disabled', numChecked >= maxCheckedAllowed);

diff --git a/deploy-board/deploy_board/templates/environs/env_tabs.tmpl b/deploy-board/deploy_board/templates/environs/env_tabs.tmpl
@@ -161,67 +161,19 @@
         let url = new URL(window.location.href)
         let newUrl;
         if(filter.length < 1){
-            newUrl = deleteParam(url, "stageFilter")
+            newUrl = deleteUrlParameter(url, "stageFilter")
         } else {
-            newUrl = setParam(url, "stageFilter", JSON.stringify(filter))
+            newUrl = setUrlParameter(url, "stageFilter", JSON.stringify(filter))
         }
         window.history.replaceState(null,null,newUrl);
     }
 
-    function setParam(url, name, val){
-        let searchString = url.search.substring(1);
-        let vars = searchString.split("&")
-        let modifiedString = "?"
-        let set= false;
-
-        for(let i=0; i < vars.length; i++){
-            if(i>0){
-                modifiedString+="&"
-            }
-            let currParam = vars[i].split('=');
-            if(currParam[0] === name){
-                modifiedString+=name
-                modifiedString+= "=" + encodeURIComponent(val)
-                set=true;
-            } else {
-                modifiedString+=vars[i]
-            }
-        }
-        if(!set){
-            if(modifiedString.length>1){
-                modifiedString+="&"
-            }
-            modifiedString+=name
-            modifiedString+="="+encodeURIComponent(val)
-        }
-        url.search=modifiedString;
-        return url
-    }
-
-    function deleteParam(url, name){
-        let searchString = url.search.substring(1);
-        let vars = searchString.split("&")
-        let modifiedString = "?"
-
-        for(let i=0; i < vars.length; i++){
-           let currParam = vars[i].split('=');
-           if(currParam[0]!==name){
-                if(modifiedString.length>1){
-                    modifiedString+="&"
-                }
-                modifiedString+=vars[i]
-           }
-        }
-        url.search=modifiedString;
-        return url
-    }
-
     //intercept and add filter parameter to link
     function callback(e, anchor){
         if(!filterInactive){
             e.preventDefault();
             let url = new URL(anchor.href);
-            let newUrl = setParam(url,"stageFilter", JSON.stringify(filter));
+            let newUrl = setUrlParameter(url,"stageFilter", JSON.stringify(filter));
             window.location.href=newUrl;
         }
     }