aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuaxing <huaxing.jin@est.tech>2020-03-31 16:55:48 +0800
committerhuaxing <huaxing.jin@est.tech>2020-04-02 10:41:24 +0800
commitdde2033879d895d12a93150987b308c5b87e2ab8 (patch)
treea03505bdb57110c5c902a826c3e243eb626da42d
parent60944ec26d43e3c5376621a389852c434c9679e5 (diff)
Fix UUID missing in policy editor
Issue-ID: POLICY-2445 Signed-off-by: huaxing <huaxing.jin@est.tech> Change-Id: I7fda1961e95b1f18da6c0e22c7799195fc511443
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexAjax.js31
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js13
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js13
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js10
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexMain.js11
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexPageControl.js9
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js17
-rw-r--r--client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js10
8 files changed, 70 insertions, 44 deletions
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexAjax.js b/client/client-editor/src/main/resources/webapp/js/ApexAjax.js
index b682136ec..c241a4459 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexAjax.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexAjax.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -33,6 +34,30 @@ function ajax_get(requestURL, callback) {
});
}
+function ajax_getWithKeyInfo(requestURL, objectType, callback, keyName) {
+ var keyName = keyName || "key";
+ var keyInfoURL = restRootURL + "/KeyInformation/Get?name=&version=";
+ ajax_get(keyInfoURL, function(dataKeyInfos) {
+ ajax_get(requestURL, function(data) {
+ var keyInfos = [];
+ for ( var i = 0; i < dataKeyInfos.messages.message.length; i++) {
+ var ki = JSON.parse(dataKeyInfos.messages.message[i]).apexKeyInfo;
+ keyInfos.push(ki);
+ }
+ var object = JSON.parse(data.messages.message[0])[objectType];
+ var keyInfo = keyInfos.filter(function(ki) {
+ return ki.key.name === object[keyName].name
+ && ki.key.version === object[keyName].version;
+ });
+ if (keyInfo.length > 0) {
+ object.uuid = keyInfo[0].UUID;
+ object.description = keyInfo[0].description;
+ }
+ callback(object);
+ });
+ });
+}
+
function ajax_getOKOrFail(requestURL, callback) {
$.ajax({
type : 'GET',
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
index 8b4f890d2..602fa4908 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -50,8 +51,7 @@ function editContextAlbumForm_deleteContextAlbum(parent, name, version) {
function editContextAlbumForm_viewContextAlbum(parent, name, version) {
var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var contextAlbum = JSON.parse(data.messages.message[0]).apexContextAlbum;
+ ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
// Get all contextSchemas too for album item schema
var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
var contextSchemas = new Array();
@@ -72,8 +72,7 @@ function editContextAlbumForm_viewContextAlbum(parent, name, version) {
function editContextAlbumForm_editContextAlbum(formParent, name, version) {
var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var contextAlbum = JSON.parse(data.messages.message[0]).apexContextAlbum;
+ ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
// Get all contextSchemas too for album item schema
var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
var contextSchemas = new Array();
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js
index 83ed5f4a6..52dcff894 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -36,16 +37,14 @@ function editContextSchemaForm_deleteContextSchema(parent, name, version) {
function editContextSchemaForm_viewContextSchema(parent, name, version) {
var requestURL = restRootURL + "/ContextSchema/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var contextSchema = JSON.parse(data.messages.message[0]).apexContextSchema;
+ ajax_getWithKeyInfo(requestURL, "apexContextSchema", function(contextSchema) {
editContextSchemaForm_activate(parent, "VIEW", contextSchema);
});
}
function editContextSchemaForm_editContextSchema(formParent, name, version) {
var requestURL = restRootURL + "/ContextSchema/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var contextSchema = JSON.parse(data.messages.message[0]).apexContextSchema;
+ ajax_getWithKeyInfo(requestURL, "apexContextSchema", function(contextSchema) {
editContextSchemaForm_activate(formParent, "EDIT", contextSchema);
});
}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js
index c70fa1bd0..51408e31a 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -59,8 +60,7 @@ function editEventForm_createEvent(formParent) {
function editEventForm_editEvent_inner(formParent, name, version, viewOrEdit) {
var requestURL = restRootURL + "/Event/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var event = JSON.parse(data.messages.message[0]).apexEvent;
+ ajax_getWithKeyInfo(requestURL, "apexEvent", function(event) {
// Get all contextSchemas too for event params
var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
var contextSchemas = new Array();
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexMain.js b/client/client-editor/src/main/resources/webapp/js/ApexMain.js
index 9b5b25bbc..e8ad0de98 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexMain.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexMain.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -118,7 +119,9 @@ function main_getRestRootURL() {
var modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey;
pageControl_modelMode(modelKey.name, modelKey.version, modelFileName);
if (localStorage.getItem("apex_tab_index")) {
- $('#mainTabs a[href="' + localStorage.getItem("apex_tab_index") + '"]').trigger('click');
+ $("#mainTabs").tabs({
+ active: localStorage.getItem("apex_tab_index")
+ });
}
}
});
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js b/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js
index d81b0fe0d..4904f306f 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -51,7 +52,7 @@ function pageControl_modelMode(name, version, fileName) {
},
disabled : false,
activate : function(event, ui) {
- localStorage.setItem("apex_tab_index", ui.newTab.context.getAttribute("href"));
+ localStorage.setItem("apex_tab_index", ui.newTab.index());
}
});
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js
index 79985828d..93c672cb6 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -37,19 +38,17 @@ function editPolicyForm_deletePolicy(parent, name, version) {
function editPolicyForm_viewPolicy(formParent, name, version) {
// get the policy
var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var policy = JSON.parse(data.messages.message[0]).apexPolicy;
+ ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) {
editPolicyForm_editPolicy_inner(formParent, policy, "VIEW");
- });
+ }, "policyKey");
}
function editPolicyForm_editPolicy(formParent, name, version) {
// get the policy
var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var policy = JSON.parse(data.messages.message[0]).apexPolicy;
+ ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) {
editPolicyForm_editPolicy_inner(formParent, policy, "EDIT");
- });
+ }, "policyKey");
}
function editPolicyForm_editPolicy_inner(formParent, policy, viewOrEdit) {
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js
index b29675fbc..d4021c003 100644
--- a/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js
+++ b/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -74,8 +75,7 @@ function editTaskForm_editTask(formParent, name, version) {
function editTaskForm_editTask_inner(formParent, name, version, viewOrEdit) {
var requestURL = restRootURL + "/Task/Get?name=" + name + "&version=" + version;
- ajax_get(requestURL, function(data) {
- var task = JSON.parse(data.messages.message[0]).apexTask;
+ ajax_getWithKeyInfo(requestURL, "apexTask", function(task) {
// Get all contextSchemas too for task inputfields
var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
var contextSchemas = new Array();