GP-44570 Fix taskRunner UI styling for task errors

greenpeace-cee · Sep 4, 2024 · cca13e1 · cca13e1
1 parent 8238def
commit cca13e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ang/taskRunner.js b/ang/taskRunner.js
@@ -113,11 +113,13 @@
             "Task execution",
             "error"
           );
+          $scope.errors.push(new Error("Task execution encountered errors. See execution logs for more details"));
+          $scope.state = "error";
         } else {
           CRM.alert("Task execution completed", "Task execution", "success");
+          $scope.state = "done";
         }
 
-        $scope.state = "done";
         $scope.logs = taskExecResult.values.logs;
         $scope.runButtonLabel = "Run again";
         $scope.$apply();
@@ -154,6 +156,9 @@
 
         if ($scope.state === "done") {
           if (execution.error_count > 0) {
+            $scope.state = "error";
+            $scope.errors.push(new Error("Task execution encountered errors. See execution logs for more details"));
+            $scope.$apply();
             CRM.alert(
               "Task execution encountered errors. See execution logs for more details",
               "Task execution",

diff --git a/ang/taskRunner/taskRunner.html b/ang/taskRunner/taskRunner.html
@@ -25,7 +25,8 @@ <h1 crm-page-title>{{ts('Run SQL task:')}} {{task.name}}</h1>
       </div>
 
       <div class="str__errors crm-error" ng-if="state === 'error'">
-        <ul>
+        <span ng-if="errors.length == 1">{{errors[0].message}}</span>
+        <ul ng-if="errors.length > 1">
           <li ng-repeat="error in errors">{{error.message}}</li>
         </ul>
       </div>