Skip to content

Commit c04b7d0

Browse files
author
Istemi Ekin Akkus
committed
refactor: management service returns more consistent workflow status
1 parent 99bfd69 commit c04b7d0

File tree

7 files changed

+158
-213
lines changed

7 files changed

+158
-213
lines changed

GUI/app/pages/functions/FunctionTableCtrl.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
function checkWorkflowDeploymentStatus(functionIndex, workflowId) {
347347
var req;
348348
//console.log('checkWorkflowDeploymentStatus,' + index + ',' + $scope.workflows[index].status);
349-
349+
350350

351351
console.log('checking workflow status for workflow ' + workflowId);
352352

@@ -356,7 +356,7 @@
356356
headers: {
357357
'Content-Type': 'application/json'
358358
},
359-
data: JSON.stringify({ "action" : "getWorkflowStatus", "data" : { "user" : { "token" : token } , "workflow" : { "id" : workflowId } } })
359+
data: JSON.stringify({ "action" : "getWorkflows", "data" : { "user" : { "token" : token } , "workflow" : { "id" : workflowId } } })
360360
}
361361

362362
$http(req).then(function successCallback(response) {
@@ -370,7 +370,7 @@
370370
else if (response.data.data.workflow.status=='failed')
371371
{
372372
$interval.cancel(promise);
373-
373+
374374
console.log("Error in deployment: " + response.data.data.workflow.deployment_error);
375375
$scope.errorMessage = response.data.data.workflow.deployment_error;
376376
$uibModal.open({
@@ -407,7 +407,7 @@
407407
});
408408
});
409409

410-
410+
411411
}
412412

413413

GUI/app/pages/workflows/WorkflowTableCtrl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
headers: {
294294
'Content-Type': 'application/json'
295295
},
296-
data: JSON.stringify({ "action" : "getWorkflowStatus", "data" : { "user" : { "token" : token } , "workflow" : { "id" : $scope.workflows[index].id } } })
296+
data: JSON.stringify({ "action" : "getWorkflows", "data" : { "user" : { "token" : token } , "workflow" : { "id" : $scope.workflows[index].id } } })
297297
}
298298

299299
$http(req).then(function successCallback(response) {

ManagementService/python/ManagementServiceEntry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ def actionOther(action, data, sapi):
216216
possibleActions["getFunctionZip"] = True
217217
possibleActions["getWorkflowJSON"] = True
218218
possibleActions["getWorkflows"] = True
219-
possibleActions["getWorkflowStatus"] = True
220219
possibleActions["modifyFunction"] = True
221220
possibleActions["modifyWorkflow"] = True
222221
possibleActions["undeployWorkflow"] = True

ManagementService/python/getWorkflowStatus.py

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)