From 7212e92fbe010ccf7a057153406d0633a293a8fd Mon Sep 17 00:00:00 2001 From: KrupaNagabhushan Date: Mon, 10 Aug 2020 18:42:48 +0100 Subject: Passing userId to upload policy Issue-ID: POLICY-2751 Signed-off-by: KrupaNagabhushan Change-Id: Ifc91bba369161a63f2ad759dcdc014bb12837e88 --- .../src/main/resources/webapp/index.html | 1 + .../src/main/resources/webapp/js/ApexUser.js | 30 ++++++++++++++++++++++ .../src/main/resources/webapp/upload/dialog.html | 10 +++++--- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexUser.js (limited to 'gui-editors/gui-editor-apex/src/main/resources/webapp') diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/index.html b/gui-editors/gui-editor-apex/src/main/resources/webapp/index.html index 53e205e..7aa3508 100644 --- a/gui-editors/gui-editor-apex/src/main/resources/webapp/index.html +++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/index.html @@ -242,6 +242,7 @@ + diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexUser.js b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexUser.js new file mode 100644 index 0000000..684fdf7 --- /dev/null +++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexUser.js @@ -0,0 +1,30 @@ +/* + * ============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========================================================= + */ + +const userManager = { + userId: null +}; + +(function () { + //grabbing the userId + const urlParams = new URLSearchParams(window.location.search); + userManager.userId = urlParams.get('userId'); +})(); diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/upload/dialog.html b/gui-editors/gui-editor-apex/src/main/resources/webapp/upload/dialog.html index aac7762..912bec4 100644 --- a/gui-editors/gui-editor-apex/src/main/resources/webapp/upload/dialog.html +++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/upload/dialog.html @@ -30,6 +30,7 @@ const toscaTemplateFile = $('#tosca-template-file')[0].files[0]; data.append('apex-config-file', apexConfigFile); data.append('tosca-template-file', toscaTemplateFile); + data.append('userId', userManager.userId); uploadPlugin.upload(data, function () { dialog.dialog("close"); }); @@ -48,6 +49,7 @@ } }); }); + @@ -55,10 +57,12 @@

Provide the following files to compose the policy TOSCA


-
+

- +
- \ No newline at end of file + -- cgit 1.2.3-korg