Skip to content

Feature/AB-01 Risk source #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruslanbaidan merged 1 commit into from
Jun 1, 2026
Merged

Feature/AB-01 Risk source #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 128 additions & 8 deletions src/AnrKbMgmtCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@
.controller('AnrKbMgmtCtrl', [
'$scope', '$stateParams', 'toastr', '$mdMedia', '$mdDialog', 'gettextCatalog', 'TableHelperService',
'AssetService', 'ThreatService', 'VulnService', 'AmvService', 'MeasureService', 'ClientSoaService',
'TagService', 'RiskService', 'ObjlibService', 'SOACategoryService', 'ReferentialService', 'MeasureMeasureService',
'TagService', 'RiskService', 'RiskSourceService', 'ObjlibService', 'SOACategoryService', 'ReferentialService', 'MeasureMeasureService',
'ClientRecommendationService', 'DownloadService', '$state', '$timeout', '$rootScope', AnrKbMgmtCtrl
])
/**
* ANR > KB
*/
function AnrKbMgmtCtrl($scope, $stateParams, toastr, $mdMedia, $mdDialog, gettextCatalog, TableHelperService,
AssetService, ThreatService, VulnService, AmvService, MeasureService, ClientSoaService, TagService,
RiskService, ObjlibService, SOACategoryService, ReferentialService, MeasureMeasureService, ClientRecommendationService,
RiskService, RiskSourceService, ObjlibService, SOACategoryService, ReferentialService, MeasureMeasureService, ClientRecommendationService,
DownloadService, $state, $timeout, $rootScope) {
$scope.gettext = gettextCatalog.getString;
TableHelperService.resetBookmarks();
Expand Down Expand Up @@ -117,18 +117,21 @@
case 'vulns':
$scope.currentTabIndex = 2;
break;
case 'measures':
case 'risk-sources':
$scope.currentTabIndex = 3;
break;
case 'amvs':
case 'measures':
$scope.currentTabIndex = 4;
break;
case 'objlibs':
case 'amvs':
$scope.currentTabIndex = 5;
break;
case 'recommendations':
case 'objlibs':
$scope.currentTabIndex = 6;
break;
case 'recommendations':
$scope.currentTabIndex = 7;
break;
}
}

Expand Down Expand Up @@ -918,6 +921,123 @@
});
};

/*
* RISK SOURCES TAB
*/
$scope.riskSourcesKb = TableHelperService.build('label', 20, 1, '');
$scope.riskSourcesKb.activeFilter = 1;
var riskSourcesFilterWatch;

$scope.selectRiskSourcesTab = function() {
$state.transitionTo('main.kb_mgmt.info_risk', {
'tab': 'risk-sources'
});
var initRiskSourcesFilter = true;
riskSourcesFilterWatch = $scope.$watch('riskSourcesKb.activeFilter', function() {
if (initRiskSourcesFilter) {
initRiskSourcesFilter = false;
} else {
$scope.updateRiskSources();
}
});
TableHelperService.watchSearch($scope, 'riskSourcesKb.query.filter', $scope.riskSourcesKb.query, $scope.updateRiskSources, $scope.riskSourcesKb);
};

$scope.deselectRiskSourcesTab = function() {
if (riskSourcesFilterWatch) {
riskSourcesFilterWatch();
}
TableHelperService.unwatchSearch($scope.riskSourcesKb);
};

$scope.updateRiskSources = function() {
var query = angular.copy($scope.riskSourcesKb.query);
query.status = $scope.riskSourcesKb.activeFilter;

if ($scope.riskSourcesKb.previousQueryOrder != $scope.riskSourcesKb.query.order) {
$scope.riskSourcesKb.query.page = query.page = 1;
$scope.riskSourcesKb.previousQueryOrder = $scope.riskSourcesKb.query.order;
}

$scope.riskSourcesKb.promise = RiskSourceService.getRiskSources(query);
$scope.riskSourcesKb.promise.then(function(data) {
$scope.riskSourcesKb.items = data;
});
};

$scope.removeRiskSourcesFilter = function() {
TableHelperService.removeFilter($scope.riskSourcesKb);
};

$scope.openRiskSourceDialog = function(ev, riskSource) {
var prompt = $mdDialog.prompt()
.title(gettextCatalog.getString(riskSource ? 'Edit risk source' : 'Add a risk source'))
.placeholder(gettextCatalog.getString('Risk source label'))
.ariaLabel(gettextCatalog.getString('Risk source label'))
.theme('light')
.targetEvent(ev)
.required(true)
.ok(gettextCatalog.getString(riskSource ? 'Save' : 'Create'))
.cancel(gettextCatalog.getString('Cancel'));

if (riskSource) {
prompt.initialValue(riskSource.label);
}

$mdDialog.show(prompt.multiple(true)).then(function(label) {
var payload = {
label: label.trim()
};

if (riskSource) {
payload.id = riskSource.id;
RiskSourceService.updateRiskSource(payload, function() {
$scope.updateRiskSources();
toastr.success(gettextCatalog.getString('The risk source has been edited successfully.'), gettextCatalog.getString('Edition successful'));
});
} else {
RiskSourceService.createRiskSource(payload, function() {
$scope.updateRiskSources();
toastr.success(gettextCatalog.getString('The risk source has been created successfully.'), gettextCatalog.getString('Creation successful'));
});
}
}, function(reject) {
$scope.handleRejectionDialog(reject);
});
};

$scope.toggleRiskSourceStatus = function(riskSource) {
RiskSourceService.updateRiskSource({
id: riskSource.id,
isActive: !riskSource.isActive
}, function() {
$scope.updateRiskSources();
});
};

$scope.removeRiskSource = function(ev, riskSource) {
var confirm = $mdDialog.confirm()
.title(gettextCatalog.getString('Are you sure you want to delete risk source?', {
label: riskSource.label
}))
.textContent(gettextCatalog.getString('This operation is irreversible.'))
.targetEvent(ev)
.theme('light')
.ok(gettextCatalog.getString('Delete'))
.cancel(gettextCatalog.getString('Cancel'));

$mdDialog.show(confirm).then(function() {
RiskSourceService.deleteRiskSource(riskSource.id, function() {
$scope.updateRiskSources();
toastr.success(gettextCatalog.getString('The risk source has been deleted.'), gettextCatalog.getString('Deletion successful'));
}, function(error) {
toastr.error(error.data.message, gettextCatalog.getString('Deletion failed'));
});
}, function(reject) {
$scope.handleRejectionDialog(reject);
});
};

/*
* REFERENTIALS TAB
*/
Expand All @@ -939,7 +1059,7 @@
};

$rootScope.$on('anrUpdated', function() {
if ($scope.currentTabIndex == 3) {
if ($scope.currentTabIndex == 4) {
$scope.deselectMeasuresTab();
$scope.selectMeasuresTab();
}
Expand Down Expand Up @@ -2447,7 +2567,7 @@
};

$rootScope.$on('anrUpdated', function() {
if ($scope.currentTabIndex == 3) {
if ($scope.currentTabIndex == 7) {
$scope.deselectRecommendationsTab();
$scope.selectRecommendationsTab();
}
Expand Down
136 changes: 134 additions & 2 deletions src/AnrLayoutCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'$scope', 'toastr', '$http', '$q', '$mdMedia', '$mdDialog', '$timeout', 'gettextCatalog', 'gettext', 'TableHelperService',
'ModelService', 'ObjlibService', 'AnrService', '$stateParams', '$rootScope', '$location', '$state', 'ToolsAnrService',
'$transitions', 'DownloadService', '$mdPanel', '$injector', 'ConfigService', 'ClientRecommendationService',
'ReferentialService', 'AmvService', 'RiskService', 'SoaScaleCommentService', 'UserService', AnrLayoutCtrl
'ReferentialService', 'AmvService', 'RiskService', 'RiskSourceService', 'SoaScaleCommentService', 'UserService', AnrLayoutCtrl
]);

/**
Expand All @@ -15,7 +15,7 @@
function AnrLayoutCtrl($scope, toastr, $http, $q, $mdMedia, $mdDialog, $timeout, gettextCatalog, gettext, TableHelperService, ModelService,
ObjlibService, AnrService, $stateParams, $rootScope, $location, $state, ToolsAnrService,
$transitions, DownloadService, $mdPanel, $injector, ConfigService, ClientRecommendationService,
ReferentialService, AmvService, RiskService, SoaScaleCommentService, UserService) {
ReferentialService, AmvService, RiskService, RiskSourceService, SoaScaleCommentService, UserService) {


if ($scope.OFFICE_MODE == 'FO') {
Expand Down Expand Up @@ -82,6 +82,7 @@
var minWidthMenu = 80;
var isModelLoading = false;
var __panel = null;
$scope.riskSources = [];

if ($scope.OFFICE_MODE == 'FO') {
$rootScope.$on("$locationChangeStart", function(e, nextUrl, oldUrl) {
Expand Down Expand Up @@ -567,6 +568,8 @@
$scope.ToolsAnrService.currentTab = 0;
$scope.opsheet_risk = undefined;
$scope.sheet_risk = angular.copy(risk);
$scope.updateSheetRiskSourceLabel();
$scope.loadRiskSources();
AmvService.getAmv($scope.sheet_risk.amv).then(function(data) {
if (!angular.equals(data['measures'], {})) {
$scope.sheet_risk.measures = data['measures'];
Expand Down Expand Up @@ -817,6 +820,135 @@
}
};

$scope.loadRiskSources = function(cb) {
RiskSourceService.getRiskSources({
status: true
}).then(function(data) {
$scope.riskSources = (data.riskSources || []).sort(function(a, b) {
return a.label.localeCompare(b.label);
});
$scope.ensureSelectedRiskSourceAvailable(cb);
}, function() {
if (cb) {
cb();
}
});
};

$scope.ensureSelectedRiskSourceAvailable = function(cb) {
if (!$scope.sheet_risk) {
if (cb) {
cb();
}
return;
}

var selectedRiskSourceId = $scope.sheet_risk.riskSourceId;

var hasSelectedRiskSource = $scope.riskSources.some(function(riskSource) {
return riskSource.id == selectedRiskSourceId;
});

if (!selectedRiskSourceId || hasSelectedRiskSource) {
$scope.updateSheetRiskSourceLabel();
if (cb) {
cb();
}
return;
}

RiskSourceService.getRiskSource(selectedRiskSourceId).then(function(riskSource) {
if (riskSource && !$scope.riskSources.some(function(source) {
return source.id == riskSource.id;
})) {
$scope.riskSources.push(riskSource);
$scope.riskSources.sort(function(a, b) {
return a.label.localeCompare(b.label);
});
}

$scope.updateSheetRiskSourceLabel();
if (cb) {
cb();
}
}, function() {
$scope.updateSheetRiskSourceLabel();
if (cb) {
cb();
}
});
};

$scope.updateSheetRiskSourceLabel = function() {
if (!$scope.sheet_risk) {
return;
}

var selectedRiskSourceId = $scope.sheet_risk.riskSourceId;

var selectedRiskSource = $scope.riskSources.find(function(riskSource) {
return riskSource.id == selectedRiskSourceId;
});

if (selectedRiskSource) {
$scope.sheet_risk.riskSourceId = selectedRiskSource.id;
$scope.sheet_risk.riskSourceLabel = selectedRiskSource.label;
} else if (selectedRiskSourceId === null || selectedRiskSourceId === '' || selectedRiskSourceId === undefined) {
$scope.clearRiskSourceSelection();
}
};

$scope.clearRiskSourceSelection = function() {
if (!$scope.sheet_risk) {
return;
}

$scope.sheet_risk.riskSourceId = null;
$scope.sheet_risk.riskSourceLabel = '';
};

$scope.createRiskSourceFromSheet = function(ev) {
if ($scope.isAnrReadOnly || !$scope.sheet_risk) {
return;
}

var prompt = $mdDialog.prompt()
.title(gettextCatalog.getString('Add a risk source'))
.placeholder(gettextCatalog.getString('Risk source label'))
.ariaLabel(gettextCatalog.getString('Risk source label'))
.theme('light')
.targetEvent(ev)
.required(true)
.ok(gettextCatalog.getString('Create'))
.cancel(gettextCatalog.getString('Cancel'));

$mdDialog.show(prompt.multiple(true)).then(function(label) {
var trimmedLabel = label.trim();
var existingRiskSource = $scope.riskSources.find(function(riskSource) {
return riskSource.label.toLowerCase() === trimmedLabel.toLowerCase();
});

if (existingRiskSource) {
$scope.sheet_risk.riskSourceId = existingRiskSource.id;
$scope.updateSheetRiskSourceLabel();
return;
}

RiskSourceService.createRiskSource({
label: trimmedLabel
}, function(riskSource) {
$scope.riskSources.push(riskSource);
$scope.riskSources.sort(function(a, b) {
return a.label.localeCompare(b.label);
});
$scope.sheet_risk.riskSourceId = riskSource.id;
$scope.updateSheetRiskSourceLabel();
});
}, function(reject) {
$scope.handleRejectionDialog(reject);
});
};

$scope.queryOwnerSearch = function(query, scope) {
var promise = $q.defer();
AnrService.getAnrRiskOwners($scope.model.anr.id, {
Expand Down
Loading