Migrate from old string elements to new software version elements

Author: vogti

libraries/elements/percentage-dep/copy.php

@@ -12,7 +12,12 @@
 /** @var $copyValue string */
 
 // when generating multi-job, we need to copy the current configurations and apply our setting for every of them
-// we have the interval, so we need to go from min to max in steps and copy all configurations and add the corresponding setting for each of them
-if (!empty($copyData[$e['id'] . "-parameter"]) && isset($copyData[$copyData[$e['id'] . "-parameter"] . "-percentage"])) { // special handle for checkbox selections
-    $copyValue = $copyData[$copyData[$e['id'] . "-parameter"] . "-percentage"];
+if (!empty($copyData[$e['id'] . "-parameter"])) {
+    $parameterName = $copyData[$e['id'] . "-parameter"] . "-percentage";
+
+    if (empty($copyData[$parameterName])) {
+        $copyValue = 0;
+    } else {
+        $copyValue = $copyData[$parameterName];
+    }
 }

libraries/elements/percentage-dep/process.php

@@ -31,8 +31,14 @@
         throw new Exception("Dependency value for percentage dependency element is not set");
     }
 
-    if (!isset($percentage) && is_numeric($percentage)) {
-        throw new Exception("No or non-numeric value set for: " . $parameter . "-percentage");
+    if (!isset($percentage)) {
+        throw new Exception("No value set for: " . $parameter . "-percentage");
+    } else if (!is_numeric($percentage)) {
+        if ($percentage == "") {
+            $percentage = 0;
+        } else {
+            throw new Exception("Non-numeric value set for: " . $parameter . "-percentage");
+        }
     }
 
     $value = $copy[Define::CONFIGURATION_PARAMETERS][$dep] * $percentage / 100;

libraries/elements/percentage-dep/render.template.html

@@ -8,14 +8,14 @@
         <input type="hidden" name="[[parameter]]-dependency" value="[[dependency]]">
         <b>[[name]]</b> (<i>[[parameter]]</i>)
         <div class="row">
-            <div class="col-md-3">
+            <div class="col-md-4">
                 Percentage of <b><i>[[dependency]]</i></b>
                 <div class="input-group">
                     <span class="input-group-addon">%</span>
-                    <input name="[[parameter]]-percentage" id="parameter-[[parameter]]-percentage" type="number" class="form-control" placeholder="Percentage"{{IF !empty([[copy]])}} value="[[copy]]"{{ENDIF}}{{IF empty([[copy]]) && [[default]] != false}} value="[[default]]"{{ENDIF}}>
+                    <input name="[[parameter]]-percentage" id="parameter-[[parameter]]-percentage" type="number" class="form-control" placeholder="Percentage"{{IF isset([[copy]])}} value="[[copy]]"{{ENDIF}}{{IF !isset([[copy]]) && [[default]] != false}} value="[[default]]"{{ENDIF}}>
                 </div>
             </div>
-            <div class="col-md-9">
+            <div class="col-md-8">
                 <div class="row">
                     <div class="col-md-4">
                         Start

libraries/elements/software-version-list/copy.php

@@ -12,7 +12,7 @@
 /** @var $copyValue string */
 
 // when copy the experiment, we need to copy the current configurations and apply our setting for every of them
-if (!empty($copyData[$e['id'] . "-parameter"])) { // special handle for checkbox selections
+if (!empty($copyData[$e['id'] . "-parameter"])) {
     $parameterName = $copyData[$e['id'] . "-parameter"];
     if (empty($copyData[$parameterName . "-numberOfVersions"])) {
         var_dump($copyData);
@@ -24,4 +24,14 @@
     for ($i = 0; $i < $numberOfVersions; $i++) {
         $copyValue[$i] = $copyData[$parameterName . "-version-" . $i];
     }
+} else {
+    // Migrate from old elements, if there is a string element with the same parameter name, we use it
+    $copyValue = [];
+    $i = 0;
+    if (!empty($copyData[$e['parameter']])) {
+        foreach(explode(",", $copyData[$e['parameter']]) as $version) {
+            $copyValue[$i] = $version;
+            $i++;
+        }
+    }
 }

libraries/elements/software-version-list/process.php

@@ -23,4 +23,5 @@
     }
 }
 
+
 $allConfigurations = $newConfigurations;

libraries/elements/software-version-list/render.template.html

@@ -7,13 +7,13 @@
         <b>[[name]]</b> (<i>[[parameter]]</i>)
         <div class="input-group">
             <span class="input-group-addon text-bold" style="background-color: #f7f7f7;">Number of Versions</span>
-            <input id="numberOfVersionsInput" name="[[parameter]]-numberOfVersions" type="number" class="form-control" placeholder="Number of versions to compare" min="0">
+            <input id="numberOfVersionsInput" name="[[parameter]]-numberOfVersions" type="number" class="form-control" placeholder="Number of versions to compare" min="1">
         </div>
         <div id="versionInputsContainer"></div>
 
         <script>
             const copy = JSON.parse('[[json_encode([[copy]])]]');
-            const initialNumberOfVersions = copy.length;
+            const initialNumberOfVersions = Math.max(copy.length,1);
 
             document.addEventListener('DOMContentLoaded', function () {
                 const numberOfVersionsInput = document.getElementById('numberOfVersionsInput');
@@ -36,7 +36,8 @@
                     input.name = `[[parameter]]-version-${index}`;
                     input.type = 'text';
                     input.classList.add('form-control');
-                    input.placeholder = `Branch for version ${index + 1}`;
+                    input.required = true;
+                    input.placeholder = `Default branch for version ${index + 1}`;
                     if (value) {
                         input.value = value;
                     }