fix(collaborator-modal/client/controller): bugfix for spinner ui (#1858)

* fix(collaborator-modal/client/controller): bugfix for spinner ui * fix(collaborator-modal/client/controller): changes into then/catch blocks * chore(collaborator-modal/client/controller): removes console log * style(collaborator-modal/client/controller): removed unneeded lines and cleaned up code
opengovsg · May 11, 2021 · 5fb952f · 5fb952f
1 parent 879b596
commit 5fb952f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/public/modules/forms/admin/controllers/collaborator-modal.client.controller.js b/src/public/modules/forms/admin/controllers/collaborator-modal.client.controller.js
@@ -237,8 +237,18 @@ function CollaboratorModalController(
     )
 
     $scope.btnStatus = 2 // pressed; loading
-    $scope.updatePermissionList(permissionList).catch((err) => {
-      if (err) {
+    $scope
+      .updatePermissionList(permissionList)
+      .then(() => {
+        // If no error, clear email input
+        $scope.btnStatus = 3 // pressed; saved
+        $scope.closeEditCollaboratorDropdowns()
+
+        $timeout(() => {
+          resetCollabForm()
+        }, 1000)
+      })
+      .catch((err) => {
         // Make the alert message correspond to the error code
         if (err.response.status === StatusCodes.BAD_REQUEST) {
           Toastr.error(
@@ -250,16 +260,7 @@ function CollaboratorModalController(
           Toastr.error('Error adding collaborator.')
         }
         resetCollabForm()
-        return
-      }
-      // If no error, clear email input
-      $scope.btnStatus = 3 // pressed; saved
-      $scope.closeEditCollaboratorDropdowns()
-
-      $timeout(() => {
-        resetCollabForm()
-      }, 1000)
-    })
+      })
   }
 
   /**