Updates snackbars, fixes messages when bulk actions complete

Author: nucleogenesis

kolibri/plugins/facility/assets/src/views/users/UsersRootPage/index.vue

@@ -303,7 +303,9 @@
       }
 
       function navigateToSidePanel(sidePanelName) {
-        const newRoute = overrideRoute(route, { name: sidePanelName });
+        const { query } = route;
+        delete query.failedActionType;
+        const newRoute = overrideRoute(route, { name: sidePanelName, query });
         router.push(newRoute);
       }
 
@@ -358,15 +360,12 @@
         return {};
       });
 
-
-      // Alerting users about enrollment/assignment errors
-      const alertDismissed = ref(false)
-
-      function handleAlertDismissal() {
-        alertDismissed.value = true
-      }
-
-      const showingInvalidUsers = computed(() => !alertDismissed.value && Boolean(route.query.by_ids));
+      const showingInvalidUsers = computed(() => {
+        return (
+          Boolean(route.query.by_ids) &&
+          Boolean(route.query.failedActionType)
+        );
+      });
       const warningMessage = computed(
         () => {
           switch(route.query?.failedActionType) {
@@ -375,13 +374,13 @@
             case(InvalidActionTypes.ENROLL):
               return someFailedToEnroll$();
             default:
+              // When the page loads
               return '';
           }
         }
       );
 
       return {
-        handleAlertDismissal,
         warningMessage,
         showingInvalidUsers,
         windowIsSmall,
@@ -526,12 +525,6 @@
         }
       },
     },
-    beforeRouteLeave(to,__,next) {
-      this.alertDismissed = false;
-      const { query } = to;
-      delete query.failedActionType;
-      next(this.overrideRoute(to, { query }))
-    }
   };
 
 </script>

kolibri/plugins/facility/assets/src/views/users/sidePanels/AssignCoachesSidePanel.vue

@@ -319,7 +319,7 @@
           }
         }
         if(invalidRoles.value?.length) {
-          return unableToAssignAlert$();
+          return someFailedToAssign$();
         }
       };
 

kolibri/plugins/facility/assets/src/views/users/sidePanels/EnrollLearnersSidePanel.vue

@@ -137,14 +137,17 @@
       CloseConfirmationGuard,
     },
     mixins: [commonCoreStrings],
-    setup(props) {
+    setup(props, { emit }) {
       const store = getCurrentInstance().proxy.$store;
       const route = useRoute();
       const router = useRouter();
       const goBack = useGoBack({
         getFallbackRoute: () => {
+          const { query } = route;
+          delete query.failedActionType;
           return overrideRoute(route, {
             name: getRootRouteName(route),
+            query,
           });
         },
       });
@@ -220,7 +223,6 @@
       async function _enrollLearners() {
         loading.value = true;
         const enrollments = selectedOptions.value.flatMap(collection_id => {
-          const alreadyEnrolled = classMembershipsByUser.value;
           return Array.from(props.selectedUsers)
             .map(user => ({ collection: collection_id, user }));
         });
@@ -239,9 +241,10 @@
 
             // nextTick to give the hasUnsavedChanges a chance to react
             // so that the confirmation guard doesn't trigger in this case
-            nextTick(() => {
-              if(invalid?.length) {
-                return router.push(
+            return nextTick(() => {
+              // This doesn't need to be done in the assign side panel but IDK for sure why
+              if(Boolean(invalid)) {
+                router.push(
                   overrideRoute(
                     route,
                     {
@@ -253,8 +256,9 @@
                     },
                   )
                 );
+                emit('clearSelection');
+                return true;
               } else {
-                goBack();
                 return true;
               }
             });
@@ -285,7 +289,7 @@
             return usersEnrolledNotice$();
           }
         }
-        if(invalidRoles.value?.length) {
+        if(invalidMemberships.value?.length) {
           return someFailedToEnroll$();
         }
       };