summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/README.md1
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js57
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js141
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js61
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js6
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/layouts.js4
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/report_whitelist.js2
7 files changed, 12 insertions, 260 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/README.md b/ecomp-sdk/epsdk-app-overlay/README.md
index 5ed68c5e..20025e02 100644
--- a/ecomp-sdk/epsdk-app-overlay/README.md
+++ b/ecomp-sdk/epsdk-app-overlay/README.md
@@ -22,6 +22,7 @@ Version 1.3.0
- Portal-19 Renaming the Group Id in the POM file to org.onap.portal.sdk
- Portal-21 Increased Role name size in UI
- Portal-81 Add ONAP logo to header in app overlay
+- PORTAL-86 Remove internal company URLs
Version 1.1.0
- Portal-7 Improvements added as part of the rebasing process
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js
index e819c92f..7a10f2e4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js
@@ -1,81 +1,26 @@
-/*app.
-controller('notebookFrameController', ['$scope', '$location','$window','$http', function ($scope,$location,$window,$http) {
-
- $scope.invokeSaveNotebook() = function() {
-
-
- // $http.post('rNotebookFE/authCr', $scope.postData).success(function(data, status) {
- $http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}}).success(function(data, status) {
- console.log('Data Sent', data);
- console.log('Status ', status);
-
-
-
- // iframe.name = "my_iframe";
-
- // $scope.ifr = "<div><iframe src='http://www.w3schools.com'/></div>"
-
- // var url = "https://rcloud.research.att.com";
- // document.getElementById('itestfr').src = data;
- window.open ('notebook.htm#/notebook-frame','_self',false);
- // $scope.iframevisibility = true;
- // document.getElementById('itestfr').src = data;
-
-
- })
-
-
- }
-
-}]);*/
-app.controller('notebookFrameController', function ($scope,$location,$window,$http,$routeParams) {
-
- //alert($location.search(1, $scope.additionalqueryParams));
- //var nid = $routeParams.nid;
- //var qprms = $routeParams.qprms;
- //var value = $routeParams.value;
- //console.log('check id ');
+app.controller('notebookFrameController', function ($scope,$location,$window,$http,$routeParams) {
var nid = $window.location.search.substr($window.location.search.indexOf("=")+1);
- //console.log('nid',nid);
- //console.log('qprms',qprms);
- //$scope.notebookvalue = '833c0a69ec1433fbb2f8752af733cf0e';
$scope.additionalqueryParams={};
if ($window.location.search.substr($window.location.search.indexOf("=")+1)) {
$scope.queryParams = $window.location.search;
- //console.log('$window.location.search',$window.location.search.substring(0, $window.location.search.length-1));
- //if ($window.location.search.indexOf("&")!=-1) {
if($window.location.search.substring(0, $window.location.search.length-1).indexOf("&")!=-1) {
$scope.notebookparam = $window.location.search.substring($window.location.search.indexOf("?")+1,$window.location.search.indexOf("&"));
$scope.additionalqueryParams = JSON.parse('{"' + decodeURI($scope.queryParams.substr($scope.queryParams.indexOf("&")+1).replace(/&/g, "\",\"").replace(/=/g,"\":\"")) + '"}');
- //console.log('Additional parameters present');
}
else {
$scope.notebookparam1 = $window.location.search.substr($window.location.search.indexOf("?")+1);
$scope.notebookparam = $scope.notebookparam1.substring(0, $scope.notebookparam1.length - 1);
- //console.log('Additional parameters absent');
}
- //console.log('add parameters',$scope.additionalqueryParams);
- // $scope.notebookid = $scope.notebookparam.substring(0,$scope.notebookparam.indexOf("="));
$scope.notebookvalue = $scope.notebookparam.substr($scope.notebookparam.indexOf("=")+1);
- // $scope.notebookvalue = $scope.notebookvalue1.substring(0, $scope.notebookvalue1.length - 1);
- //console.log('New VALL',$scope.notebookvalue);
- //$scope.postData = $window.location.search.substr($window.location.search.indexOf("=")+1);
- //console.log('Notebook value present ',$scope.notebookvalue);
}
else {
$scope.notebookvalue = '833c0a69ec1433fbb2f8752af733cf0e';
//console.log('Notebook value absent ',$scope.notebookvalue);
}
-
-
-
$http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}}).success(function(data, status) {
//console.log('Data received', data);
//console.log('Status ', status);
document.getElementById('itestframe').src = data;
})
-
-
-
});
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js
index c32cdd39..efd22f0f 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js
@@ -1,170 +1,37 @@
-
appDS2.controller('nbookController', ['$scope', '$location','$window','$http', function ($scope,$location,$window,$http) {
-
$scope.keyValueList = [{}];
- //console.log('onload nbookController');
$scope.submitParameters = function() {
-
$scope.iframevisibility = false;
- console.log('Inside nbook invoke save');
-
$scope.postData = {};
-
$scope.additionalqueryParams = {};
-
- //Use this if there is only one 1 query param key value pair
+ //Use this if there is only one 1 query param key value pair
$scope.additionalqueryParams.paramKey = $scope.qparamKey;
$scope.additionalqueryParams.paramVal = $scope.qparamVal;
-
-
- // console.log('$scope.additionalqueryParams',$scope.additionalqueryParams);
- //console.log('$scope.notebookvalue',$scope.notebookvalue);
-
-
- //$scope.postData['notebookid'] = 'a06a9cf14211012e221bf842c168849d';
- //$scope.postData['param1'] = 'p1';
- //$scope.postData['param2'] = 'p2';
-
- //console.log('Report Schedule object', $scope.reportScheduleObject);
-
-
- /* if ($window.location.search.substr($window.location.search.indexOf("=")+1)) {
- $scope.queryParams = $window.location.search;
-
- if ($window.location.search.indexOf("&")!=-1) {
- $scope.notebookparam = $window.location.search.substring($window.location.search.indexOf("?")+1,$window.location.search.indexOf("&"));
- $scope.additionalqueryParams = JSON.parse('{"' + decodeURI($scope.queryParams.substr($scope.queryParams.indexOf("&")+1).replace(/&/g, "\",\"").replace(/=/g,"\":\"")) + '"}');
- console.log('Additional parameters present');
- }
- else {
- $scope.notebookparam = $window.location.search.substr($window.location.search.indexOf("?")+1);
- console.log('Additional parameters absent');
- }
- console.log('add parameters',$scope.additionalqueryParams);
- // $scope.notebookid = $scope.notebookparam.substring(0,$scope.notebookparam.indexOf("="));
- $scope.notebookvalue = $scope.notebookparam.substr($scope.notebookparam.indexOf("=")+1);
- $scope.postData = $window.location.search.substr($window.location.search.indexOf("=")+1);
- console.log('Notebook value present ',$scope.notebookvalue);
- }
- else {
- $scope.notebookvalue = '833c0a69ec1433fbb2f8752af733cf0e';
- console.log('Notebook value absent ',$scope.notebookvalue);
- }*/
-
- // $http.get("notebook.htm#/notebook-frame", {params : {"a" : "b"}})
-
- /* $http.get("app/fusion/notebook-integration/scripts/view-models/notebook-frame.html", {params : {"a" : "b"}})
- .then(function(response) {
- console.log("Got response from http get ");
- // window.open ('notebook.htm#/notebook-frame','_self',false);
- }); */
-
- // $location.search(1, $scope.additionalqueryParams);
-// }
- //console.log('$scope.additionalqueryParams',$scope.additionalqueryParams);
-// $scope.invokeSaveNotebook() = function() {
- // window.open ('notebook.htm#/notebook-frame/1/2/3','_self',false);
-
- //var testurl = 'nbooktest.htm?nid='+$scope.notebookvalue;
- //var testurl = 'nbooktest.htm?nid='+$scope.notebookvalue+'&'+encodeURIComponent(JSON.stringify($scope.additionalqueryParams));
- // var testurl = 'notebook.htm#/notebook-frame/' + $scope.notebookvalue + '/' + encodeURIComponent(JSON.stringify($scope.additionalqueryParams));
-
- // console.log('$scope.keyValueList',$scope.keyValueList);
-
- /*for (var obj in $scope.keyValueList) {
- for (var prop in obj) {
- if (obj.hasOwnProperty(prop)) {
- // or if (Object.prototype.hasOwnProperty.call(obj,prop)) for safety...
- console.log('property',obj[prop]);
- //console.log("prop: " + prop.qk + " value: " + obj[prop.qk]);
- }
- }
- }*/
-
- //console.log('$scope.keyValueList.length',$scope.keyValueList.length);
-
var qryStr = '';
for(var i = 0; i < $scope.keyValueList.length; i++) {
var obj = $scope.keyValueList[i];
- //console.log('obj.qK',obj.qK);
if (obj.qK != undefined && obj.qV != undefined) {
- //console.log('Inside qk defined');
if (qryStr!='')
qryStr = qryStr+'&'+obj.qK+'='+obj.qV;
else
qryStr = obj.qK+'='+obj.qV;
-
}
-
- }
- //console.log('qryStr',qryStr);
-
-
-
- //var testurl = 'nbooktest.htm?nid='+$scope.notebookvalue+'&k1='+$scope.additionalqueryParams.paramKey+'&v1='+$scope.additionalqueryParams.paramVal;
-
- // var testurl = 'nbooktest.htm?nid='+$scope.notebookvalue+'&'+$scope.additionalqueryParams.paramKey+'='+$scope.additionalqueryParams.paramVal;
-
+ }
var queryurl = 'nbooktest.htm?nid='+$scope.notebookvalue+'&'+qryStr;
-
- // var testurl = 'notebook.htm#/notebook-frame';
-
window.open (queryurl,'_self',false);
-
-
- // var w = window.open ('notebook.htm#/notebook-frame','_self',false);
- // w.nid = $scope.notebookvalue;
-
-
- // $http.post('rNotebookFE/authCr', $scope.postData).success(function(data, status) {
- /* $http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}}).success(function(data, status) {
- console.log('Data Sent', data);
- console.log('Status ', status);
-
-
-
- // iframe.name = "my_iframe";
-
- // $scope.ifr = "<div><iframe src='http://www.w3schools.com'/></div>"
-
- // var url = "https://rcloud.research.att.com";
- // document.getElementById('itestfr').src = data;
- // window.open ('notebook.htm#/notebook-frame/1/2/3','_self',false);
- // $scope.iframevisibility = true;
- // document.getElementById('itestfr').src = data;
-
-
- })*/
-
-
- }
-
+ }
$scope.addKeyValuePairs = function (kv) {
-
-
if ($scope.keyValueList.length < 9) {
$scope.keyValueList.push({
-
- });
- // alert($scope.reportRunJson.rangeAxisList.length);
- // console.log('$scope.keyValueList',$scope.keyValueList);
-
+ });
} else {
- //document.getElementById("addbtn").disabled = true;
- // $scope.btnactive = false;
document.getElementById("addbtn")["disabled"] = true;
- //document.getElementById("addbtn")["style.background-color"] = "#FFFF00";
-
- //$('#addbtn').btn('type') = "disabled";
}
}
-
$scope.removeKeyValuePairs = function (index) {
$scope.keyValueList.splice(index, 1);
if ($scope.keyValueList.length == 8) {
document.getElementById("addbtn")["disabled"] = false;
}
- //console.log($scope.hardCodeReport.rangeAxisList)
}
-
}]); \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js
index 9522611c..95489918 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js
@@ -1,85 +1,24 @@
-/*app.
-controller('notebookFrameController', ['$scope', '$location','$window','$http', function ($scope,$location,$window,$http) {
-
- $scope.invokeSaveNotebook() = function() {
-
-
- // $http.post('rNotebookFE/authCr', $scope.postData).success(function(data, status) {
- $http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}}).success(function(data, status) {
- console.log('Data Sent', data);
- console.log('Status ', status);
-
-
-
- // iframe.name = "my_iframe";
-
- // $scope.ifr = "<div><iframe src='http://www.w3schools.com'/></div>"
-
- // var url = "https://rcloud.research.att.com";
- // document.getElementById('itestfr').src = data;
- window.open ('notebook.htm#/notebook-frame','_self',false);
- // $scope.iframevisibility = true;
- // document.getElementById('itestfr').src = data;
-
-
- })
-
-
- }
-
-}]);*/
appDS2.controller('notebookFrameController', function ($scope,$location,$window,$http,$routeParams) {
-
- //alert($location.search(1, $scope.additionalqueryParams));
- //var nid = $routeParams.nid;
- //var qprms = $routeParams.qprms;
- //var value = $routeParams.value;
- //console.log('check id ');
var nid = $window.location.search.substr($window.location.search.indexOf("=")+1);
- //console.log('nid',nid);
- //console.log('qprms',qprms);
- //$scope.notebookvalue = '833c0a69ec1433fbb2f8752af733cf0e';
$scope.additionalqueryParams={};
if ($window.location.search.substr($window.location.search.indexOf("=")+1)) {
$scope.queryParams = $window.location.search;
- //console.log('$window.location.search',$window.location.search.substring(0, $window.location.search.length-1));
- //if ($window.location.search.indexOf("&")!=-1) {
if($window.location.search.substring(0, $window.location.search.length-1).indexOf("&")!=-1) {
$scope.notebookparam = $window.location.search.substring($window.location.search.indexOf("?")+1,$window.location.search.indexOf("&"));
$scope.additionalqueryParams = JSON.parse('{"' + decodeURI($scope.queryParams.substr($scope.queryParams.indexOf("&")+1).replace(/&/g, "\",\"").replace(/=/g,"\":\"")) + '"}');
- //console.log('Additional parameters present');
}
else {
$scope.notebookparam1 = $window.location.search.substr($window.location.search.indexOf("?")+1);
$scope.notebookparam = $scope.notebookparam1.substring(0, $scope.notebookparam1.length - 1);
- //console.log('Additional parameters absent');
}
- //console.log('add parameters',$scope.additionalqueryParams);
- // $scope.notebookid = $scope.notebookparam.substring(0,$scope.notebookparam.indexOf("="));
$scope.notebookvalue = $scope.notebookparam.substr($scope.notebookparam.indexOf("=")+1);
- // $scope.notebookvalue = $scope.notebookvalue1.substring(0, $scope.notebookvalue1.length - 1);
- //console.log('New VALL',$scope.notebookvalue);
- //$scope.postData = $window.location.search.substr($window.location.search.indexOf("=")+1);
- //console.log('Notebook value present ',$scope.notebookvalue);
}
else {
$scope.notebookvalue = '833c0a69ec1433fbb2f8752af733cf0e';
- //console.log('Notebook value absent ',$scope.notebookvalue);
}
-
-
-
-/* $http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}}).success(function(data, status) {
- //console.log('Data received', data);
- //console.log('Status ', status);
- document.getElementById('itestframe').src = data;
-
- })*/
$http({method:'POST', url:'rNotebookFE/authCr', data: $scope.notebookvalue, params:{'qparams' : $scope.additionalqueryParams}, transformResponse: [function (data) {
// Do whatever you want!
document.getElementById('itestframe').src = data;
return data;
}]})
-
-
});
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js
index 7696251e..ef0a8fd2 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/directives/header.js
@@ -351,16 +351,16 @@ app.directive('qHeader', function () {
{
"menuId": 94,
"column": 2,
- "text": "HROneStop",
+ "text": "ONAP test link",
"parentMenuId": 4,
- "url": "http://ebiz.sbc.com/hronestop"
+ "url": "http://tbd.onap.org/testlink"
},
{
"menuId": 95,
"column": 2,
"text": "4th Level App4a R16",
"parentMenuId": 4,
- "url": "http://www.e-access.att.com/ecomp_portal_ist/ecompportal/widgets"
+ "url": "http://app4ar16.onap.org/testlink"
},
{
"menuId": 96,
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/layouts.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/layouts.js
index 154a6b08..fda21ab0 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/layouts.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/layouts.js
@@ -49,8 +49,8 @@ app
console.log($scope.reports);
$scope.report1 = $scope.reports[1];
});
-
- $scope.rcloud_url= "https://rcloud.research.att.com/mini.html?notebook=c131ea997453e75303588699936d1896";
+ // Can this be removed?
+ $scope.rcloud_url= "https://tbd.onap.org/mini.html?notebook=c131ea997453e75303588699936d1896";
$scope.layoutOptions = {
storageId: 'demo-layouts-explicit-save',
storage: localStorage,
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/report_whitelist.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/report_whitelist.js
index f1e76096..f67d5e64 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/report_whitelist.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/app/report_whitelist.js
@@ -1,3 +1,3 @@
app.config(function ($sceDelegateProvider) {
- $sceDelegateProvider.resourceUrlWhitelist(['self','https://rcloud.research.att.com/**']);
+ $sceDelegateProvider.resourceUrlWhitelist(['self','https://tbd.onap.org/**']);
}); \ No newline at end of file