Skip to content

Commit 7d595b0

Browse files
committed
#513 Fix handling multiple cortex analyzers in observable details page
1 parent 9aa8b2c commit 7d595b0

File tree

4 files changed

+146
-61
lines changed

4 files changed

+146
-61
lines changed

ui/app/scripts/controllers/case/CaseObservablesCtrl.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@
197197
$scope.analyzersList.active = {};
198198
$scope.analyzersList.datatypes = {};
199199
angular.forEach($scope.analyzersList.analyzers, function (analyzer) {
200-
$scope.analyzersList.active[analyzer.id] = false;
200+
$scope.analyzersList.active[analyzer.name] = false;
201201
});
202202
$scope.analyzersList.selected = {};
203203
angular.forEach($scope.analyzersList.analyzers, function (analyzer) {
204-
$scope.analyzersList.selected[analyzer.id] = false;
204+
$scope.analyzersList.selected[analyzer.name] = false;
205205
});
206206
});
207207
};
@@ -332,7 +332,6 @@
332332
};
333333

334334
$scope.dropArtifact = function (observable) {
335-
// TODO check result !
336335
CaseArtifactSrv.api().delete({
337336
artifactId: observable.id
338337
}, function () {
@@ -504,7 +503,7 @@
504503

505504
$scope.activeAnalyzers = function () {
506505
angular.forEach($scope.analyzersList.analyzers, function (analyzer) {
507-
$scope.analyzersList.active[analyzer.id] = false;
506+
$scope.analyzersList.active[analyzer.name] = false;
508507
});
509508

510509
$scope.analyzersList.countDataTypes = 0;
@@ -521,7 +520,7 @@
521520

522521
angular.forEach($scope.analyzersList.analyzers, function (analyzer) {
523522
if ($scope.checkDataTypeList(analyzer, key)) {
524-
$scope.analyzersList.active[analyzer.id] = true;
523+
$scope.analyzersList.active[analyzer.name] = true;
525524
$scope.analyzersList.countActiveAnalyzers.total++;
526525
$scope.analyzersList.countActiveAnalyzers[key]++;
527526

@@ -567,9 +566,9 @@
567566

568567
angular.forEach($scope.selection.artifacts, function (element) {
569568
angular.forEach($scope.analyzersList.analyzers, function (analyzer) {
570-
if (($scope.analyzersList.selected[analyzer.id]) && ($scope.checkDataTypeList(analyzer, element.dataType))) {
569+
if (($scope.analyzersList.selected[analyzer.name]) && ($scope.checkDataTypeList(analyzer, element.dataType))) {
571570
toRun.push({
572-
analyzerId: analyzer.id,
571+
analyzerId: analyzer.name,
573572
artifact: element
574573
});
575574
}
@@ -607,7 +606,7 @@
607606
var analyzerIds = [];
608607
AnalyzerSrv.forDataType(artifact.dataType)
609608
.then(function(analyzers) {
610-
analyzerIds = _.pluck(analyzers, 'id');
609+
analyzerIds = _.pluck(analyzers, 'name');
611610
return CortexSrv.getServers(analyzerIds);
612611
})
613612
.then(function (serverId) {

0 commit comments

Comments
 (0)