Merge pull request #4780 from luisramos0/bulk_prod_errors

Fix javascript logic that parses server errors in the bulk product edit page

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, Columns, tax_categories, RequestMonitor, SortOptions, ErrorsParser) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
@@ -230,10 +230,9 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       BulkProducts.updateVariantLists(data.products || [])
       $timeout -> $scope.displaySuccess()
     ).error (data, status) ->
-      if status == 400 && data.errors? && data.errors.length > 0
-        errors = error + "\n" for error in data.errors
-        alert t("products_update_error") + "\n" + errors
-        $scope.displayFailure t("products_update_error")
+      if status == 400 && data.errors?
+        errorsString = ErrorsParser.toString(data.errors, status)
+        $scope.displayFailure t("products_update_error") + "\n" + errorsString
       else
         $scope.displayFailure t("products_update_error_data") + status
 
@@ -284,7 +283,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
 
   $scope.displayFailure = (failMessage) ->
-    StatusMessage.display  'failure', t("products_update_error_msg") + "#{failMessage}"
+    StatusMessage.display  'failure', t("products_update_error_msg") + " #{failMessage}"
 
 
   $scope.displayDirtyProducts = ->

app/assets/javascripts/admin/utils/services/errors_parser.js.coffee

@@ -0,0 +1,21 @@
+# Parses a structure of errors that came from the server
+angular.module("admin.utils").factory "ErrorsParser", ->
+  new class ErrorsParser
+    toString: (errors, defaultContent = "") =>
+      return defaultContent unless errors?
+
+      errorsString = ""
+      if errors.length > 0
+        # it is an array of errors
+        errorsString = errors.join("\n") + "\n"
+      else
+        # it is a hash of errors
+        keys = Object.keys(errors)
+        for key in keys
+          errorsString += errors[key].join("\n") + "\n"
+
+      this.defaultIfEmpty(errorsString, defaultContent)
+
+    defaultIfEmpty: (content, defaultContent) =>
+      return defaultContent if content == ""
+      content

spec/javascripts/unit/admin/bulk_product_update_spec.js.coffee

@@ -710,13 +710,22 @@ describe "AdminProductEditCtrl", ->
         $httpBackend.flush()
         expect($scope.displayFailure).toHaveBeenCalled()
 
-      it "shows an alert with error information when post returns 400 with an errors array", ->
-        spyOn(window, "alert")
-        $scope.products = "updated list of products"
-        $httpBackend.expectPOST("/admin/products/bulk_update").respond 400, { "errors": ["an error"] }
-        $scope.updateProducts "updated list of products"
-        $httpBackend.flush()
-        expect(window.alert).toHaveBeenCalledWith("Saving failed with the following error(s):\nan error\n")
+      describe "displaying the error information when post returns 400", ->
+        beforeEach ->
+          spyOn $scope, "displayFailure"
+          $scope.products = "updated list of products"
+
+        it "displays errors in an array", ->
+          $httpBackend.expectPOST("/admin/products/bulk_update").respond 400, { "errors": ["an error"] }
+          $scope.updateProducts "updated list of products"
+          $httpBackend.flush()
+          expect($scope.displayFailure).toHaveBeenCalledWith("Saving failed with the following error(s):\nan error\n")
+
+        it "displays errors in a hash", ->
+          $httpBackend.expectPOST("/admin/products/bulk_update").respond 400, { "errors": { "base": ["a basic error"] } }
+          $scope.updateProducts "updated list of products"
+          $httpBackend.flush()
+          expect($scope.displayFailure).toHaveBeenCalledWith("Saving failed with the following error(s):\na basic error\n")
 
 
   describe "adding variants", ->

spec/javascripts/unit/admin/utils/services/errors_parser_spec.js.coffee

@@ -0,0 +1,20 @@
+describe "ErrorsParser service", ->
+  errorsParser = null
+
+  beforeEach ->
+    module('admin.utils')
+    inject (ErrorsParser) ->
+      errorsParser = ErrorsParser
+
+  describe "toString", ->
+    it "returns empty string for nil errors", ->
+      expect(errorsParser.toString(null)).toEqual ""
+
+    it "returns the elements in the array if an array is provided", ->
+      expect(errorsParser.toString(["1", "2"])).toEqual "1\n2\n"
+
+    it "returns the elements in the hash if a hash is provided", ->
+      expect(errorsParser.toString({ "keyname": ["1", "2"] })).toEqual "1\n2\n"
+
+    it "returns all elements in all hash keys provided", ->
+      expect(errorsParser.toString({ "keyname1": ["1", "2"], "keyname2": ["3", "4"] })).toEqual "1\n2\n3\n4\n"