4 files changed, 102 insertions, 29 deletions

diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
index 9ce8ff0a..6e45ce4b 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/ui-react/src/api/LoopActionService.js
@@ -20,35 +20,55 @@
  * ===================================================================
  *
  */
-const loopActionService = {
-	submit
-};
 
+export default class LoopActionService{
 
-function submit(uiAction) {
-	const cl_name = "";
-	console.log("clActionServices perform action: " + uiAction + " closedloopName="
-		+ cl_name);
-	const svcAction = uiAction.toLowerCase();
-	const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
+	static performAction(cl_name, uiAction) {
+		console.log("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name);
+		const svcAction = uiAction.toLowerCase();
+ 		return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
+ 				method: 'PUT',
+ 				credentials: 'same-origin',
+ 			})
+ 		.then(function (response) {
+ 			if (response.ok) {
+ 				return response.json();
+ 			} else {
+ 				return Promise.reject("Perform action failed with code:" + response.status);
+ 			}
+ 		})
+ 		.then(function (data) {
+			alert("Action Successful: " + uiAction);
+ 			return data;
+ 		})
+ 		.catch(function(error) {
+ 			console.log("Action Failure: " + uiAction);
+ 			return Promise.reject(error);
+ 		});
+ 	}
 
-	let options = {
-		method: 'GET'
-	};
-	return sendRequest(svcUrl, svcAction, options);
-}
-
-function sendRequest(svcUrl, svcAction) {
-	fetch(svcUrl, options)
-		.then(
-			response => {
-				alertService.alertMessage("Action Successful: " + svcAction, 1)
-			}).error(error => {
-				alertService.alertMessage("Action Failure: " + svcAction, 2);
-				return Promise.reject(error);
-			});
 
-	return response.json();
-};
+	static refreshStatus(cl_name) {
+		console.log("Refresh the status for closedloopName=" + cl_name);
 
-export default loopActionService;
\ No newline at end of file
+		return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, {
+			method: 'GET',
+			credentials: 'same-origin',
+		})
+		.then(function (response) {
+			if (response.ok) {
+				return response.json();
+			} else {
+				return Promise.reject("Refresh status failed with code:" + response.status);
+			}
+		})
+		.then(function (data) {
+			console.info ("Refresh status Successful");
+			return data;
+		})
+		.catch(function(error) {
+			console.info ("Refresh status failed:", error);
+			return Promise.reject(error);
+		});
+ 	}
+}
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 3ee5acc6..dd8c5b52 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -28,9 +28,9 @@ export default class LoopCache {
 		this.loopJsonCache=loopJson;
 	}
 
-	updateMicroServiceProperties(type, newMsProperties) {
+	updateMicroServiceProperties(name, newMsProperties) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
-				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) {
 					this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties;
 				}
 			}
@@ -51,6 +51,10 @@ export default class LoopCache {
 	getOperationalPolicyConfigurationJson() {
 		return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
 	}
+	
+	getOperationalPolicyJsonSchema() {
+		return this.loopJsonCache["operationalPolicySchema"];
+	}
 
 	getOperationalPolicies() {
 		return this.loopJsonCache["operationalPolicies"];
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 031ec638..eece20c9 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -104,6 +104,30 @@ export default class LoopService {
 				return "";
 			});
 	}
+	
+	static setOperationalPolicyProperties(loopName, jsonData) {
+		return fetch('/restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
+			method: 'POST',
+			credentials: 'same-origin',
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(jsonData),
+		})
+			.then(function (response) {
+				console.debug("updateOperationalPolicies response received: ", response.status);
+				if (response.ok) {
+					return response.text();
+				} else {
+					console.error("updateOperationalPolicies query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("updateOperationalPolicies error received", error);
+				return "";
+			});
+	}
 
 	static updateGlobalProperties(loopName, jsonData) {
 		return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index be21e692..37ec73d1 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,6 +47,31 @@ export default class UserService {
 			return UserService.notLoggedUserName;
 		});
 	}
+	
+	static logout() {
+		return fetch('/restservices/clds/v1/user/logout', {
+			method: 'POST',
+			credentials: 'same-origin',
+		})
+		.then(function (response) {
+			console.debug("logout response received, status code:", response.status);
+			if (response.ok) {
+				return response.text();
+			} else {
+				console.error("logout response is nok");
+				return UserService.notLoggedUserName;
+			}
+		})
+		.then(function (data) {
+			console.info ("User disconnected:",data)
+			return data;
+		})
+		.catch(function(error) {
+			console.warn("logout error received, user set to: ",UserService.notLoggedUserName);
+			console.error("logout error:",error);
+			return UserService.notLoggedUserName;
+		});
+	}
 
 	static getUserInfo() {
 		return fetch('/restservices/clds/v1/clds/cldsInfo', {