From 24ed96b348251c6d4fa38b07c7088eaa757a1d0e Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Fri, 22 Dec 2023 19:22:49 +0100
Subject: [PATCH] Manager installation process completed

---
 manager/ejs/managerinstances.ejs     | 12 +++---------
 manager/ejs/managermenu.ejs          |  2 +-
 manager/ejs/managerresult.ejs        |  4 ++--
 manager/javascripts/dcsinstance.js   | 10 ++++++++++
 manager/javascripts/managerresult.js |  2 +-
 manager/javascripts/preload.js       |  6 +++---
 scripts/install.bat                  | 12 ++++++++++--
 7 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/manager/ejs/managerinstances.ejs b/manager/ejs/managerinstances.ejs
index 77193735..6f093350 100644
--- a/manager/ejs/managerinstances.ejs
+++ b/manager/ejs/managerinstances.ejs
@@ -1,6 +1,6 @@
 <style>
     #manager-instances .scroll-container {
-        height: 440px;
+        height: 500px;
         overflow-y: auto;
     }  
 
@@ -105,17 +105,11 @@
 </style>
 <div id="manager-instances">
     <div class="page-header">
-        Step 1: Select DCS Installations
+        Step 1: Select Olympus Installations
     </div>
     <div class="instructions">
         <span>
-            Select the copy of DCS you want to install Olympus to.
-        </span>
-        <span>
-            For most people, this is your main DCS installation. 
-        </span>
-        <span>
-            If you are running a dedicated server, you would also install Olympus to this DCS version.
+            Select the copy of Olympus you want to manage.
         </span>
     </div>
     <div class="scroll-container">
diff --git a/manager/ejs/managermenu.ejs b/manager/ejs/managermenu.ejs
index 70f0ebee..11ea3d46 100644
--- a/manager/ejs/managermenu.ejs
+++ b/manager/ejs/managermenu.ejs
@@ -40,6 +40,6 @@
         Update/remove Olympus
     </div>
     <div class="option inverted manage">
-        View and manage instances
+        View and manage instances (WIP)
     </div>
 </div>
\ No newline at end of file
diff --git a/manager/ejs/managerresult.ejs b/manager/ejs/managerresult.ejs
index 623b82ce..9149de72 100644
--- a/manager/ejs/managerresult.ejs
+++ b/manager/ejs/managerresult.ejs
@@ -153,8 +153,8 @@
         <div class="button back">
             Back to main menu
         </div>
-        <div class="button cancel">
+        <!--<div class="button cancel">
             Close
-        </div>
+        </div>-->
     </div>
 </div>
\ No newline at end of file
diff --git a/manager/javascripts/dcsinstance.js b/manager/javascripts/dcsinstance.js
index 85b84b16..c0c73b9b 100644
--- a/manager/javascripts/dcsinstance.js
+++ b/manager/javascripts/dcsinstance.js
@@ -6,6 +6,7 @@ var path = require('path')
 const vi = require('win-version-info');
 const checkPort = require('./net')
 const dircompare = require('dir-compare');
+const { installJSON } = require('./filesystem')
 
 class DCSInstance {
     static instances = null;
@@ -64,6 +65,15 @@ class DCSInstance {
         this.name = path.basename(folder);
 
         if (fs.existsSync(path.join(folder, "Config", "olympus.json"))){
+            try {
+                var config = JSON.parse(fs.readFileSync(path.join(folder, "Config", "olympus.json")));
+                this.clientPort = config["client"]["port"];
+                this.backendPort = config["server"]["port"];
+                this.backendAddress = config["server"]["address"];
+            } catch (err) {
+                console.error(err)
+            }
+
             this.installed = true;
             const options = { compareContent: true };
             var err1 = true;
diff --git a/manager/javascripts/managerresult.js b/manager/javascripts/managerresult.js
index 72157d7e..e9c29dec 100644
--- a/manager/javascripts/managerresult.js
+++ b/manager/javascripts/managerresult.js
@@ -16,7 +16,7 @@ class ManagerResult extends ManagerPage {
         element.innerHTML = str;
 
         this.element.querySelector(".back").addEventListener("click", (e) => this.onBackClicked(e));
-        this.element.querySelector(".cancel").addEventListener("click", (e) => this.onCancelClicked(e));
+        //this.element.querySelector(".cancel").addEventListener("click", (e) => this.onCancelClicked(e));
     }    
 
     show(instance) {
diff --git a/manager/javascripts/preload.js b/manager/javascripts/preload.js
index 9b633005..0fb2c1ec 100644
--- a/manager/javascripts/preload.js
+++ b/manager/javascripts/preload.js
@@ -110,7 +110,7 @@ async function setup() {
     }
 
     /* Instances */
-    var managerInstances = new ManagerInstances({ instances: instances });
+    var managerInstances = new ManagerInstances({ instances: instances.filter((instance) => {return instance.installed; }) });
     managerInstances.onBackClicked = (e) => {
         managerInstances.hide();
         managerMenu.show();
@@ -189,11 +189,11 @@ async function setup() {
     var managerResult = new ManagerResult();
     managerResult.onBackClicked = (e) => {
         managerResult.hide();
-        managerMenu.show();
+        location.reload();
     }
     managerResult.onCancelClicked = (e) => {
         managerResult.hide();
-        managerMenu.show();
+        location.reload();
     }
 
     document.body.appendChild(managerMenu.getElement());
diff --git a/scripts/install.bat b/scripts/install.bat
index 5862d51a..7ceea2d0 100644
--- a/scripts/install.bat
+++ b/scripts/install.bat
@@ -9,9 +9,17 @@ echo "* |_____/ \_____|_____/   \____/|_|\__, |_| |_| |_| .__/ \__,_|___/ *
 echo "*                                   __/ |         | |               *"
 echo "*                                  |___/          |_|               *"
 echo "*********************************************************************"
-echo Welcome to the DCS Olympus v{{OLYMPUS_VERSION_NUMBER}} installation script. Please wait while the necessary dependencies are installed!
+echo Welcome to the DCS Olympus {{OLYMPUS_VERSION_NUMBER}} installation script. Please wait while the necessary dependencies are installed!
 echo:
-echo The output of this script is also available in the file %CD%\output.log. If you encounter any error, make sure to attach that file to your help request!
+
+
+WHERE /q powershell
+if %ERRORLEVEL% NEQ 0  (
+	echo Powershell not installed in the system, no output log available.
+) else (
+	echo The output of this script is also available in the file "%CD%\output.log". If you encounter any error, make sure to attach that file to your help request!
+)
+
 timeout /t 5
 
 echo Checking if node.js framework is installed...