From 66f6e103c26c0b10fb1339bfb24e78878d511844 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-6AP4J8U>
Date: Fri, 16 Aug 2024 16:00:05 +0200
Subject: [PATCH] check deployments

---
 manage.html | 24 ++++++++++++++++++++++--
 scan.php    | 49 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/manage.html b/manage.html
index 3b7151c..3740e8c 100644
--- a/manage.html
+++ b/manage.html
@@ -18,12 +18,12 @@
 
 <fieldset>
 <legend>Deployments</legend>
-<div id="deployments"></div>
+<div id="deployments" style="text-align:left">Loading...</div>
 </fieldset>
 
 <fieldset>
 <legend>Running services</legend>
-<pre><div id="running" style="text-align:left"></div></pre>
+<pre><div id="running" style="text-align:left">Loading...</div></pre>
 </fieldset>
 
 <fieldset>
@@ -45,6 +45,25 @@
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
 <script>
 
+function check_deployments() {
+  var url  = 'scan.php?op=check_init&services=1';
+  jQuery.get(url, function(data) {
+      if (data!="") {
+	      jQuery("#deployments").html(data);
+      }
+      else setTimeout(check_deployments, 500);
+  });
+}
+
+function get_deployments() {
+  var url  = 'scan.php?op=init';
+  jQuery.get(url, function(data) {
+	  if (data=="OK") {
+      		setTimeout(check_deployments, 500);
+	  }
+  });
+}
+
 function check_containers() {
   var url  = 'scan.php?op=check_containers';
   jQuery.get(url, function(data) {
@@ -66,6 +85,7 @@ function get_containers() {
 
 jQuery(document).ready(function(){
 
+	get_deployments();
 	get_containers();
 
 	jQuery('select#smarthost').click(function() {
diff --git a/scan.php b/scan.php
index 93540cc..487381d 100644
--- a/scan.php
+++ b/scan.php
@@ -13,25 +13,6 @@ switch ($_GET["op"]) {
 			echo "RedisException caught: " . $e->getMessage();
 		}
 	break;
-	case "init":
-		$arr = array("STATUS" => 0);
-		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
-
-		$op = "init:".date("YmdHis");
-		redis_set($op,$json);
-		echo "OK"; // TODO?
-	break;
-	case "check_init":
-		$arr = check_redis("web_out");
-		if (!empty($arr)) {
-			foreach ($arr as $key=>$data) {
-				if ($data["INSTALL_STATUS"]==2) echo "NEW";
-				elseif ($data["INSTALL_STATUS"]==1) echo "EXISTS";
-				redis_remove("$key");
-			}
-		}
-		else echo "WAIT";
-	break;
 	case "check_install":
 		$arr = check_redis("web_out",$_GET["key"]);
 		if (!empty($arr)) {
@@ -47,6 +28,36 @@ switch ($_GET["op"]) {
 		}
 		else echo "NOT EXISTS";
 	break;
+	case "init":
+		$arr = array("STATUS" => 0);
+		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+
+		$op = "init:".date("YmdHis");
+		redis_set($op,$json);
+		echo "OK"; // TODO?
+	break;
+	case "check_init":
+		$arr = check_redis("web_out");
+		if (!empty($arr)) {
+			foreach ($arr as $key=>$data) {
+
+				if ($data["INSTALL_STATUS"]==2) echo "NEW";
+				elseif ($data["INSTALL_STATUS"]==1) {
+					if ($_GET["services"]==1) {
+						$deployments = "";
+						foreach ($data["INSTALLED_SERVICES"] as $service_name => $content) {
+							//echo base64_decode($content);
+							echo $service_name."<br>";
+						}
+						echo $deployments."<br>";
+					}
+					else echo "EXISTS";
+				}
+				redis_remove("$key");
+			}
+		}
+		else echo "WAIT";
+	break;
 	case "containers":
 		$arr = array("STATUS" => 0);
 		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);