fix(app): parse response with null body (#4654)

* fix(app): parse response with null body

* style(docker): add comment explaining change

* fix(images): show correct error when failing import

* fix(images): use async await

app/docker/rest/response/handlers.js

@@ -18,6 +18,10 @@ function isJSON(jsonString) {
 // This handler wrap the JSON objects in an array.
 // Used by the API in: Image push, Image create, Events query.
 export function jsonObjectsToArrayHandler(data) {
+  // catching empty data helps the function not to fail and prevents unwanted error message to user.
+  if (!data) {
+    return [];
+  }
   var str = '[' + data.replace(/\n/g, ' ').replace(/\}\s*\{/g, '}, {') + ']';
   return angular.fromJson(str);
 }

app/docker/views/images/build/buildImageController.js

@@ -1,11 +1,6 @@
-angular.module('portainer.docker').controller('BuildImageController', [
+angular.module('portainer.docker').controller('BuildImageController', BuildImageController);
-  '$scope',
+
-  '$window',
+function BuildImageController($scope, $async, $window, ModalService, BuildService, Notifications, HttpRequestHelper) {
-  'ModalService',
-  'BuildService',
-  'Notifications',
-  'HttpRequestHelper',
-  function ($scope, $window, ModalService, BuildService, Notifications, HttpRequestHelper) {
   $scope.state = {
     BuildType: 'editor',
     actionInProgress: false,
@@ -52,7 +47,10 @@ angular.module('portainer.docker').controller('BuildImageController', [
     }
   }
 
-    $scope.buildImage = function () {
+  $scope.buildImage = buildImage;
+
+  async function buildImage() {
+    return $async(async () => {
       var buildType = $scope.state.BuildType;
 
       if (buildType === 'editor' && $scope.formValues.DockerFileContent === '') {
@@ -71,24 +69,23 @@ angular.module('portainer.docker').controller('BuildImageController', [
       var nodeName = $scope.formValues.NodeName;
       HttpRequestHelper.setPortainerAgentTargetHeader(nodeName);
 
-      buildImageBasedOnBuildType(buildType, imageNames)
+      try {
-        .then(function success(data) {
+        const data = await buildImageBasedOnBuildType(buildType, imageNames);
         $scope.buildLogs = data.buildLogs;
         $scope.state.activeTab = 1;
         if (data.hasError) {
-            Notifications.error('An error occured during build', { msg: 'Please check build logs output' });
+          Notifications.error('An error occurred during build', { msg: 'Please check build logs output' });
         } else {
           Notifications.success('Image successfully built');
           $scope.state.isEditorDirty = false;
         }
-        })
+      } catch (err) {
-        .catch(function error(err) {
         Notifications.error('Failure', err, 'Unable to build image');
-        })
+      } finally {
-        .finally(function final() {
         $scope.state.actionInProgress = false;
+      }
     });
-    };
+  }
 
   $scope.validImageNames = function () {
     for (var i = 0; i < $scope.formValues.ImageNames.length; i++) {
@@ -110,5 +107,4 @@ angular.module('portainer.docker').controller('BuildImageController', [
       return ModalService.confirmWebEditorDiscard();
     }
   };
-  },
+}
-]);

app/docker/views/images/import/importImageController.js

@@ -25,7 +25,7 @@ angular.module('portainer.docker').controller('ImportImageController', [
           Notifications.success('Images successfully uploaded');
         })
         .catch(function error(err) {
-          Notifications.error('Failure', err.message, 'Unable to upload image');
+          Notifications.error('Failure', err, 'Unable to upload image');
         })
         .finally(function final() {
           $scope.state.actionInProgress = false;