From 93b5533e44728faa87c291fbf44120ea013fab51 Mon Sep 17 00:00:00 2001
From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Thu, 10 Mar 2022 14:39:42 +0000
Subject: Upgrade apex-pdp version in Apex Editor

Upgrade apex-pdp version to 2.7.1-SNAPSHOT
Fix NullPointerException in ModelHandler::setUuidAndDescription
Allow parsing models from policy_type_impl or apexPolicyModel
Remove deprecated Task input and output field functionality
Fix JS REST calls and tests after JAXB to Gson changes
Fix bugs in Task Edit form relating to task logic edit area

Issue-ID: POLICY-3990
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I4f506889df46619a0178ab99c99c73ec2fd5a1e3
---
 .../src/main/webapp/js/ApexTaskTab.js              | 42 +---------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'gui-editors/gui-editor-apex/src/main/webapp/js/ApexTaskTab.js')

diff --git a/gui-editors/gui-editor-apex/src/main/webapp/js/ApexTaskTab.js b/gui-editors/gui-editor-apex/src/main/webapp/js/ApexTaskTab.js
index afd0cad..eaf014f 100644
--- a/gui-editors/gui-editor-apex/src/main/webapp/js/ApexTaskTab.js
+++ b/gui-editors/gui-editor-apex/src/main/webapp/js/ApexTaskTab.js
@@ -39,7 +39,7 @@ function taskTab_activate() {
         $("#taskTableBody").find("tr:gt(0)").remove();
 
         for (let value of data.messages) {
-            const task = JSON.parse(value).apexTask;
+            const task = JSON.parse(value);
 
             const taskRow_tr = document.createElement("tr");
 
@@ -51,36 +51,6 @@ function taskTab_activate() {
                 task.taskLogic.logicFlavour             +
                 "</td>";
 
-            taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Field Name</th><th>Field Type/Schema</th><th>Optional</th></tr></thead><tbody>";
-            for (let fieldEntry of task.inputFields.entry) {
-
-                taskTableRow +=
-                    "<tr><td>"                        +
-                    fieldEntry.key                    +
-                    "</td>"                           +
-                    "<td>"                            +
-                    fieldEntry.value.fieldSchemaKey.name + ":"  + fieldEntry.value.fieldSchemaKey.version +
-                    "<td>"                            +
-                    fieldEntry.value.optional           +
-                    "</td></tr>";
-            }
-            taskTableRow += "</tbody></table></td>";
-
-            taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Field Name</th><th>Field Type/Schema</th><th>Optional</th></tr></thead><tbody>";
-            for (let fieldEntry of task.outputFields.entry) {
-
-                taskTableRow +=
-                    "<tr><td>"                        +
-                    fieldEntry.key                    +
-                    "</td>"                           +
-                    "<td>"                            +
-                    fieldEntry.value.fieldSchemaKey.name + ":"  + fieldEntry.value.fieldSchemaKey.version +
-                    "<td>"                            +
-                    fieldEntry.value.optional           +
-                    "</td></tr>";
-            }
-            taskTableRow += "</tbody></table></td>";
-
             taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Parameter Name</th><th>Default Value</th></tr></thead><tbody>";
             for (let parameterEntry of task.taskParameters.entry) {
 
@@ -156,16 +126,6 @@ function taskTab_create() {
     taskTableLogicFlavourHeader.setAttribute("id", "taskTableLogicFlavourHeader");
     taskTableLogicFlavourHeader.appendChild(document.createTextNode("Logic Flavour"));
 
-    var taskTableInputFieldHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableInputFieldHeader);
-    taskTableInputFieldHeader.setAttribute("id", "taskTableInputFieldHeader");
-    taskTableInputFieldHeader.appendChild(document.createTextNode("Input Fields"));
-
-    var taskTableOutputFieldHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableOutputFieldHeader);
-    taskTableOutputFieldHeader.setAttribute("id", "taskTableOutputFieldHeader");
-    taskTableOutputFieldHeader.appendChild(document.createTextNode("Output Fields"));
-
     var taskTableParameterHeader = document.createElement("th");
     taskTableHeaderRow.appendChild(taskTableParameterHeader);
     taskTableParameterHeader.setAttribute("id", "taskTableParameterHeader");
-- 
cgit