From 9aeee013b372f99aea51b9e2ad425615a601bcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 24 Jun 2021 11:38:05 +0200 Subject: [PATCH 1/4] chg: send the data (list of AMVs UUID) in the body of the request. wip --- src/ClientDashboardCtrl.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ClientDashboardCtrl.js b/src/ClientDashboardCtrl.js index 78cbac0f..642647a3 100644 --- a/src/ClientDashboardCtrl.js +++ b/src/ClientDashboardCtrl.js @@ -62,6 +62,7 @@ order = 'targetRisk' } + AnrService.getAnrRisks(anr.id, { order: order, @@ -70,6 +71,7 @@ amvs:amvs } ).then(function(data){ + console.log(data); let risks = data.risks.filter(function(risk){ return risk[field] > -1 && risk[field] >= d.threshold[0] && @@ -370,6 +372,7 @@ field = 'target_risk'; } + AnrService.getAnrRisks(anr.id, { order:'instance', @@ -638,11 +641,23 @@ AnrService.getInstances(anr.id).then(function(data) { let instances = data.instances; + data_json = { + limit: -1, + order: 'instance', + order_direction: 'asc' + }; + $http.get("api/client-anr/" + anr.id + "/risks", data=data_json) + .then(function(data){ + console.log('Result:'); + console.log(data); + }); + AnrService.getAnrRisks(anr.id, { limit: -1, order: 'instance', order_direction: 'asc' }).then(function(data) { + console.log('test'); let risks = data.risks; updateCurrentRisksByAsset(risks); updateTargetRisksByAsset(risks); From 067779456c1ff5fc275da545c62d100985264904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 24 Jun 2021 11:43:29 +0200 Subject: [PATCH 2/4] chg: send the data (list of AMVs UUID) in the body of the request on click in a cell of the cartography table. wip --- src/ClientDashboardCtrl.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ClientDashboardCtrl.js b/src/ClientDashboardCtrl.js index 642647a3..1b739c2d 100644 --- a/src/ClientDashboardCtrl.js +++ b/src/ClientDashboardCtrl.js @@ -373,6 +373,19 @@ } + data_json = { + order:'instance', + order_direction: 'asc', + limit: -1, + amvs:amvs + }; + $http.get("api/client-anr/" + anr.id + "/risks", data=data_json) + .then(function(data){ + console.log('Result 1:'); + console.log(data); + }); + + AnrService.getAnrRisks(anr.id, { order:'instance', @@ -657,7 +670,6 @@ order: 'instance', order_direction: 'asc' }).then(function(data) { - console.log('test'); let risks = data.risks; updateCurrentRisksByAsset(risks); updateTargetRisksByAsset(risks); From 859e9e080bfce74e6b39800f308d63ffa7ca23e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 24 Jun 2021 11:51:21 +0200 Subject: [PATCH 3/4] replace AnrService.getAnrRisks by http.get --- src/ClientDashboardCtrl.js | 46 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/src/ClientDashboardCtrl.js b/src/ClientDashboardCtrl.js index 1b739c2d..dd51245b 100644 --- a/src/ClientDashboardCtrl.js +++ b/src/ClientDashboardCtrl.js @@ -71,7 +71,6 @@ amvs:amvs } ).then(function(data){ - console.log(data); let risks = data.risks.filter(function(risk){ return risk[field] > -1 && risk[field] >= d.threshold[0] && @@ -373,27 +372,23 @@ } - data_json = { - order:'instance', - order_direction: 'asc', - limit: -1, - amvs:amvs - }; - $http.get("api/client-anr/" + anr.id + "/risks", data=data_json) - .then(function(data){ - console.log('Result 1:'); - console.log(data); - }); + + let url = "/api/client-anr/" + anr.id + "/risks"; + let config = { + params: { + order:'instance', + order_direction: 'asc', + limit: -1 + }, + data: amvs + } + // $http.get(url, config); - AnrService.getAnrRisks(anr.id, - { - order:'instance', - order_direction: 'asc', - limit: -1, - amvs:amvs - } - ).then(function(data){ + $http.get(url, config) + .then(function(data){ + console.log(data); + data = data.data; let risks = data.risks.filter(function(risk){ let impactMax = Math.max( risk.c_impact * risk.c_risk_enabled, @@ -654,17 +649,6 @@ AnrService.getInstances(anr.id).then(function(data) { let instances = data.instances; - data_json = { - limit: -1, - order: 'instance', - order_direction: 'asc' - }; - $http.get("api/client-anr/" + anr.id + "/risks", data=data_json) - .then(function(data){ - console.log('Result:'); - console.log(data); - }); - AnrService.getAnrRisks(anr.id, { limit: -1, order: 'instance', From 1ed0361dee516d8979a497829d1f3b4c482a5c14 Mon Sep 17 00:00:00 2001 From: jfrocha Date: Thu, 24 Jun 2021 12:57:49 +0200 Subject: [PATCH 4/4] Removed amvs and rolfRisks params in query --- src/ClientDashboardCtrl.js | 45 ++++++-------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/src/ClientDashboardCtrl.js b/src/ClientDashboardCtrl.js index dd51245b..56913a94 100644 --- a/src/ClientDashboardCtrl.js +++ b/src/ClientDashboardCtrl.js @@ -46,18 +46,14 @@ max: 0 }, onClickFunction: function(d) { - let amvs = null; let order = null; - let rolfRisks = null; let field = null; if (d.amvsCurrent || d.amvsTarget) { if (d.amvsCurrent) { - amvs = "'"+ d.amvsCurrent.join() + "'"; field = 'max_risk'; order = 'maxRisk' }else { - amvs = "'"+ d.amvsTarget.join() + "'"; field = 'target_risk'; order = 'targetRisk' } @@ -68,7 +64,6 @@ order: order, order_direction: 'desc', limit: -1, - amvs:amvs } ).then(function(data){ let risks = data.risks.filter(function(risk){ @@ -80,10 +75,8 @@ }); }else if(d.rolfRisksCurrent || d.rolfRisksTarget){ if (d.rolfRisksCurrent) { - rolfRisks = "'"+ d.rolfRisksCurrent.join() + "'"; field = 'cacheNetRisk'; }else { - rolfRisks = "'"+ d.rolfRisksTarget.join() + "'"; field = 'cacheTargetedRisk'; } @@ -92,7 +85,6 @@ order: field, order_direction: 'desc', limit: -1, - rolfRisks:rolfRisks } ).then(function(data){ let opRisks = data.oprisks.filter(function(risk){ @@ -358,37 +350,22 @@ color: ["#D6F107", "#FFBC1C", "#FD661F"], threshold: [], onClickFunction: function(d) { - let amvs = null; - let rolfRisks = null; let field = null; if (d.amvsCurrent || d.amvsTarget) { if (d.amvsCurrent) { - amvs = "'"+ d.amvsCurrent.join() + "'"; field = 'max_risk'; }else { - amvs = "'"+ d.amvsTarget.join() + "'"; field = 'target_risk'; } - - - let url = "/api/client-anr/" + anr.id + "/risks"; - let config = { - params: { - order:'instance', - order_direction: 'asc', - limit: -1 - }, - data: amvs - } - // $http.get(url, config); - - - $http.get(url, config) - .then(function(data){ - console.log(data); - data = data.data; + AnrService.getAnrRisks(anr.id, + { + order:'instance', + order_direction: 'asc', + limit: -1, + } + ).then(function(data){ let risks = data.risks.filter(function(risk){ let impactMax = Math.max( risk.c_impact * risk.c_risk_enabled, @@ -402,7 +379,6 @@ }); }else if(d.rolfRisksCurrent || d.rolfRisksTarget){ if (d.rolfRisksCurrent) { - rolfRisks = "'"+ d.rolfRisksCurrent.join() + "'"; field = 'cacheNetRisk'; }else { rolfRisks = "'"+ d.rolfRisksTarget.join() + "'"; @@ -414,7 +390,6 @@ order:'instance', order_direction: 'asc', limit: -1, - rolfRisks:rolfRisks } ).then(function(data){ let opRisks = data.oprisks.filter(function(risk){ @@ -449,14 +424,11 @@ showLegend: false, sort: true, onClickFunction: async function(d) { - let amvs = null; - let rolfRisks = null; let risks = []; let opRisks = []; if (d.amvs || d.rolfRisks) { if (d.amvs.length > 0) { - amvs = "'"+ d.amvs.join() + "'"; field = 'max_risk'; risks = await AnrService.getAnrRisks(anr.id, @@ -464,7 +436,6 @@ order:'instance', order_direction: 'asc', limit: -1, - amvs:amvs } ).then(function(data){ risksRec = data.risks.filter(function(risk){ @@ -479,14 +450,12 @@ } if (d.rolfRisks.length > 0){ - rolfRisks = "'"+ d.rolfRisks.join() + "'"; field = 'target_risk'; opRisks = await AnrService.getAnrRisksOp(anr.id, { order:'instance', order_direction: 'asc', limit: -1, - rolfRisks:rolfRisks } ).then(function(data){ opRisksRec = data.oprisks.filter(function(risk){