Fix success modal for reset grouping (#807)

Add debug message to catches Fix codacy Remove $log messages
uhawaii-system-its-ti-iam · May 20, 2023 · 434ef57 · 434ef57
1 parent 42efe7d
commit 434ef57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/resources/static/javascript/mainApp/general.controller.js b/src/main/resources/static/javascript/mainApp/general.controller.js
@@ -18,7 +18,6 @@
         $scope.invalidMembers = [];
         $scope.membersInList = "";
         $scope.isMultiAdd = false;
-
         // Remove members
         $scope.multiRemoveResults = [];
         $scope.membersToRemove = [];
@@ -913,7 +912,7 @@
                     $scope.getGroupingInformation();
                     $scope.syncDestArray = [];
                 }
-            });
+            }).catch(() => {});
         }
 
         /**
@@ -1328,7 +1327,7 @@
                 $scope.loading = true;
                 clearMemberInput($scope.listName);
                 $scope.getGroupingInformation();
-            });
+            }).catch(() => {});
         }
 
         /**
@@ -1524,6 +1523,7 @@
                     }
                 }
             }
+
             // Otherwise, display the result success modal.
             $scope.displaySuccessfulGroupResetModal((() => {
                 if (results.includeSuccess && results.excludeSuccess) {
@@ -1553,9 +1553,14 @@
             $scope.successfulGroupResetModalInstance = $uibModal.open({
                 templateUrl: "modal/successfulGroupResetModal",
                 scope: $scope,
-                backdrop: "static",
-                keyboard: false
+                backdrop: true,
+                keyboard: true
             });
+
+            $scope.successfulGroupResetModalInstance.result.finally(() => {
+                $scope.loading = true;
+                $scope.getGroupingInformation();
+            }).catch(() => {});
         };
 
         /**

diff --git a/src/main/resources/templates/modal/successfulGroupResetModal.html b/src/main/resources/templates/modal/successfulGroupResetModal.html
@@ -1,7 +1,7 @@
 <html xmlns:th="http://www.thymeleaf.org" lang="en">
 <div class="modal-header">
     <h5 class="modal-title" id="modal-title">Grouping Reset Completion</h5>
-    <a class="close" type="button" ng-click="closeResetNotifModal()">
+    <a class="close" type="button" ng-click="closeSuccessfulGroupResetModal()">
         <span aria-hidden="true">&times;</span>
     </a>
 </div>