Merge "Add Tosca Monitoring App to Policy Gui"
diff --git a/gui-clamp/ui-react-lib/package.json b/gui-clamp/ui-react-lib/package.json
index b1efe2f..04f5198 100644
--- a/gui-clamp/ui-react-lib/package.json
+++ b/gui-clamp/ui-react-lib/package.json
@@ -16,19 +16,23 @@
"dist"
],
"peerDependencies": {
- "@json-editor/json-editor": "1.4.0-beta.0",
- "@material-ui/core": "4.6.0",
- "@material-ui/icons": "4.5.1",
+ "@fortawesome/fontawesome-free": "5.15.2",
+ "@json-editor/json-editor": "2.5.2",
+ "@material-ui/core": "4.11.3",
+ "@material-ui/icons": "4.11.2",
+ "@material-ui/lab": "4.0.0-alpha.57",
+ "@material-ui/pickers": "3.3.10",
"bootstrap-css-only": "4.3.1",
- "material-table": "1.53.0",
- "react": "16.9.0",
- "react-bootstrap": "1.0.0-beta.14",
- "react-dom": "16.9.0",
- "react-router-dom": "5.0.1",
- "react-scripts": "3.1.1",
- "react-select": "3.0.8",
- "rollup": "^1.29.1",
- "styled-components": "4.3.2"
+ "js-yaml": "4.1.0",
+ "material-table": "1.68.1",
+ "react": "17.0.2",
+ "react-bootstrap": "1.5.2",
+ "react-dom": "17.0.2",
+ "react-router-dom": "5.2.0",
+ "react-scripts": "4.0.3",
+ "react-select": "4.2.1",
+ "styled-components": "5.2.1",
+ "rollup": "^1.29.1"
},
"devDependencies": {
"@babel/cli": "7.7.5",
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/PolicyHandler.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/PolicyHandler.java
index a968695..f296083 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/PolicyHandler.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/PolicyHandler.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -139,7 +139,7 @@
* Create the content of the policy.
*
* @param session the Apex model editing session
- * @param jsonString the JSON string to be parsed See {@linkplain BeanPolicy}
+ * @param jsonbean the JSON string to be parsed See {@linkplain BeanPolicy}
* @return an ApexAPIResult object. If successful then
* {@link ApexApiResult#isOk()} will return true. Any messages/errors
* can be retrieved using {@link ApexApiResult#getMessages()}
@@ -191,7 +191,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -228,7 +228,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -264,7 +264,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -296,7 +296,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -343,7 +343,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -390,7 +390,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
@@ -443,7 +443,7 @@
*
* @param session the Apex model editing session
* @param policyName the policy name
- * @param policVersion the policy version
+ * @param policyVersion the policy version
* @param stateName the name of the state
* @param stateBean the information on the state to create
* @return an ApexAPIResult object. If successful then
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/TaskHandler.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/TaskHandler.java
index c9f4142..ed7f915 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/TaskHandler.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/TaskHandler.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -132,7 +132,7 @@
* Create the content of the task.
*
* @param session the Apex model editing session
- * @param jsonString the JSON string to be parsed. See {@linkplain BeanTask}
+ * @param jsonbean the JSON string to be parsed. See {@linkplain BeanTask}
* @return an ApexAPIResult object. If successful then
* {@link ApexApiResult#isOk()} will return true. Any messages/errors
* can be retrieved using {@link ApexApiResult#getMessages()}