[pre-commit.ci lite] apply automatic fixes

Author: pre-commit-ci-lite[bot]

kolibri/plugins/facility/assets/src/composables/useActionWithUndo.js

@@ -1,9 +1,7 @@
 import { computed } from 'vue';
 import { coreStrings } from 'kolibri/uiText/commonCoreStrings';
 import useSnackbar from 'kolibri/composables/useSnackbar';
-import {
-  bulkUserManagementStrings
-} from 'kolibri-common/strings/bulkUserManagementStrings';
+import { bulkUserManagementStrings } from 'kolibri-common/strings/bulkUserManagementStrings';
 
 /**
  *

kolibri/plugins/facility/assets/src/composables/useUserManagement.js

@@ -38,22 +38,22 @@ export default function useUserManagement({
     dataLoading.value = true;
     try {
       const fetchResource = softDeletedUsers ? DeletedFacilityUserResource : FacilityUserResource;
-      const getParams = Boolean(by_ids.value) ?
-        {
-          by_ids: by_ids.value,
-          member_of: activeFacilityId,
-          page: page.value,
-          page_size: pageSize.value,
-        } :
-        pickBy({
-          member_of: activeFacilityId,
-          date_joined__gte: dateJoinedGt?.toISOString(),
-          page: page.value,
-          page_size: pageSize.value,
-          search: search.value?.trim() || null,
-          ordering: order.value === 'desc' ? `-${ordering.value}` : ordering.value || null,
-          ...getBackendFilters(),
-        });
+      const getParams = by_ids.value
+        ? {
+            by_ids: by_ids.value,
+            member_of: activeFacilityId,
+            page: page.value,
+            page_size: pageSize.value,
+          }
+        : pickBy({
+            member_of: activeFacilityId,
+            date_joined__gte: dateJoinedGt?.toISOString(),
+            page: page.value,
+            page_size: pageSize.value,
+            search: search.value?.trim() || null,
+            ordering: order.value === 'desc' ? `-${ordering.value}` : ordering.value || null,
+            ...getBackendFilters(),
+          });
 
       const resp = await fetchResource.fetchCollection({
         getParams,
@@ -87,7 +87,12 @@ export default function useUserManagement({
     }
   };
 
-  function onChange({ resetSelection = false, affectedClasses = null, created = [], invalid = [] } = {}) {
+  function onChange({
+    resetSelection = false,
+    affectedClasses = null,
+    created = [],
+    invalid = [],
+  } = {}) {
     if (resetSelection) {
       selectedUsers.value = new Set();
     }

kolibri/plugins/facility/assets/src/composables/useUsersFilters.js

@@ -124,7 +124,7 @@ export default function useUsersFilters({ classes }) {
   watch(
     routeFilters,
     newFilters => {
-      if(workingFilters.by_ids?.length) {
+      if (workingFilters.by_ids?.length) {
         // If we're filtering by by_ids, it's programmatic navigation
         // so we will clear all existing filters and set the ids alone
         resetWorkingFilters();

kolibri/plugins/facility/assets/src/constants.js

@@ -25,10 +25,9 @@ export const PageNames = {
   ENROLL_LEARNERS_SIDE_PANEL__NEW_USERS: 'ENROLL_LEARNERS_SIDE_PANEL__NEW_USERS',
 };
 
-
 export const InvalidActionTypes = {
-  ASSIGN: "assign",
-  ENROLL: "enroll",
+  ASSIGN: 'assign',
+  ENROLL: 'enroll',
 };
 
 // modal names

kolibri/plugins/facility/assets/src/views/CoachClassAssignmentPage.vue

@@ -28,9 +28,9 @@
   import ImmersivePage from 'kolibri/components/pages/ImmersivePage';
   import commonCoreStrings from 'kolibri/uiText/commonCoreStrings';
   import useSnackbar from 'kolibri/composables/useSnackbar';
-  import ClassEnrollForm from './ClassEnrollForm';
   import { bulkUserManagementStrings } from 'kolibri-common/strings/bulkUserManagementStrings';
   import useActionWithUndo from '../composables/useActionWithUndo';
+  import ClassEnrollForm from './ClassEnrollForm';
 
   export default {
     name: 'CoachClassAssignmentPage',
@@ -46,11 +46,8 @@
     mixins: [commonCoreStrings],
     setup() {
       const { createSnackbar } = useSnackbar();
-      const {
-        someLearnersEnrolledNotice$,
-        coachesAllAssignedNotice$,
-        someCoachesAssignedNotice$,
-      } = bulkUserManagementStrings;
+      const { someLearnersEnrolledNotice$, coachesAllAssignedNotice$, someCoachesAssignedNotice$ } =
+        bulkUserManagementStrings;
       return {
         someCoachesAssignedNotice$,
         coachesAllAssignedNotice$,
@@ -81,15 +78,14 @@
         this.assignCoachesToClass({ classId: this.class.id, coaches })
           .then(response => {
             const { created, invalid } = response.data;
-            if(created?.length) {
-              if(invalid?.length) {
+            if (created?.length) {
+              if (invalid?.length) {
                 this.createSnackbar(this.someCoachesAssignedNotice$());
               } else {
                 this.createSnackbar(this.coachesAllAssignedNotice$());
               }
             }
-            this.$router
-              .push(this.$store.getters.facilityPageLinks.ClassEditPage(this.class.id))
+            this.$router.push(this.$store.getters.facilityPageLinks.ClassEditPage(this.class.id));
           })
           .catch(() => {
             this.formIsDisabled = false;

kolibri/plugins/facility/assets/src/views/LearnerClassEnrollmentPage.vue

@@ -45,10 +45,7 @@
     mixins: [commonCoreStrings],
     setup() {
       const { createSnackbar } = useSnackbar();
-      const {
-        usersEnrolledNotice$,
-        someLearnersEnrolledNotice$,
-      } = bulkUserManagementStrings;
+      const { usersEnrolledNotice$, someLearnersEnrolledNotice$ } = bulkUserManagementStrings;
       return {
         createSnackbar,
         usersEnrolledNotice$,
@@ -83,8 +80,8 @@
         this.enrollLearnersInClass({ classId: this.class.id, users: selectedUsers })
           .then(response => {
             const { created, invalid } = response.data;
-            if(created?.length) {
-              if(invalid?.length) {
+            if (created?.length) {
+              if (invalid?.length) {
                 this.createSnackbar(this.someLearnersEnrolledNotice$());
               } else {
                 this.createSnackbar(this.usersEnrolledNotice$());

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

@@ -99,7 +99,6 @@
               />
             </template>
             <template #userActions>
-
               <KIconButton
                 ref="assignButton"
                 icon="assignCoaches"
@@ -267,7 +266,6 @@
         someFailedToEnroll$,
       } = bulkUserManagementStrings;
 
-
       const { $store, $router } = getCurrentInstance().proxy;
       const activeFacilityId =
         $router.currentRoute.params.facility_id || $store.getters.activeFacilityId;
@@ -361,24 +359,19 @@
       });
 
       const showingInvalidUsers = computed(() => {
-        return (
-          Boolean(route.query.by_ids) &&
-          Boolean(route.query.failedActionType)
-        );
+        return Boolean(route.query.by_ids) && Boolean(route.query.failedActionType);
       });
-      const warningMessage = computed(
-        () => {
-          switch(route.query?.failedActionType) {
-            case(InvalidActionTypes.ASSIGN):
-              return someFailedToAssign$();
-            case(InvalidActionTypes.ENROLL):
-              return someFailedToEnroll$();
-            default:
-              // When the page loads
-              return '';
-          }
+      const warningMessage = computed(() => {
+        switch (route.query?.failedActionType) {
+          case InvalidActionTypes.ASSIGN:
+            return someFailedToAssign$();
+          case InvalidActionTypes.ENROLL:
+            return someFailedToEnroll$();
+          default:
+            // When the page loads
+            return '';
         }
-      );
+      });
 
       return {
         warningMessage,

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

@@ -239,18 +239,15 @@
             affectedClasses: selectedClasses.value,
             resetSelection: true,
           });
-          if(invalidRoles.value.length) {
+          if (invalidRoles.value.length) {
             router.push(
-              overrideRoute(
-                route,
-                {
-                  name: getRootRouteName(route),
-                  query: {
-                    by_ids: invalidRoles.value.map(r => r.user).join(','),
-                    failedActionType: InvalidActionTypes.ASSIGN,
-                  },
+              overrideRoute(route, {
+                name: getRootRouteName(route),
+                query: {
+                  by_ids: invalidRoles.value.map(r => r.user).join(','),
+                  failedActionType: InvalidActionTypes.ASSIGN,
                 },
-              )
+              }),
             );
             return true;
           } else {
@@ -298,7 +295,7 @@
         invalidRoles.value = invalid || [];
       }
 
-      const canUndo = computed(() => createdRoles.value?.length)
+      const canUndo = computed(() => createdRoles.value?.length);
 
       async function handleUndoAssignments() {
         if (createdRoles.value?.length > 0) {
@@ -311,14 +308,14 @@
       }
 
       const snackbarMessage$ = () => {
-        if(createdRoles.value?.length) {
-          if(invalidRoles.value?.length) {
+        if (createdRoles.value?.length) {
+          if (invalidRoles.value?.length) {
             return someCoachesAssignedNotice$();
           } else {
             return coachesAllAssignedNotice$();
           }
         }
-        if(invalidRoles.value?.length) {
+        if (invalidRoles.value?.length) {
           return someFailedToAssign$();
         }
       };

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

@@ -223,8 +223,7 @@
       async function _enrollLearners() {
         loading.value = true;
         const enrollments = selectedOptions.value.flatMap(collection_id => {
-          return Array.from(props.selectedUsers)
-            .map(user => ({ collection: collection_id, user }));
+          return Array.from(props.selectedUsers).map(user => ({ collection: collection_id, user }));
         });
         if (enrollments.length > 0) {
           try {
@@ -243,18 +242,15 @@
             // so that the confirmation guard doesn't trigger in this case
             return nextTick(() => {
               // This doesn't need to be done in the assign side panel but IDK for sure why
-              if(Boolean(invalid)) {
+              if (invalid) {
                 router.push(
-                  overrideRoute(
-                    route,
-                    {
-                      name: getRootRouteName(route),
-                      query: {
-                        by_ids: invalidMemberships.value.map(r => r.user).join(','),
-                        failedActionType: InvalidActionTypes.ENROLL,
-                      },
+                  overrideRoute(route, {
+                    name: getRootRouteName(route),
+                    query: {
+                      by_ids: invalidMemberships.value.map(r => r.user).join(','),
+                      failedActionType: InvalidActionTypes.ENROLL,
                     },
-                  )
+                  }),
                 );
                 emit('clearSelection');
                 return true;
@@ -282,19 +278,19 @@
       }
 
       const snackbarMessage$ = () => {
-        if(createdMemberships.value?.length) {
-          if(invalidMemberships.value?.length) {
+        if (createdMemberships.value?.length) {
+          if (invalidMemberships.value?.length) {
             return someLearnersEnrolledNotice$();
           } else {
             return usersEnrolledNotice$();
           }
         }
-        if(invalidMemberships.value?.length) {
+        if (invalidMemberships.value?.length) {
           return someFailedToEnroll$();
         }
       };
 
-      const canUndo = computed(() => createdMemberships.value?.length)
+      const canUndo = computed(() => createdMemberships.value?.length);
 
       const { performAction: enrollLearners } = useActionWithUndo({
         action: _enrollLearners,

packages/kolibri-common/strings/bulkUserManagementStrings.js

@@ -205,19 +205,23 @@ export const bulkUserManagementStrings = createTranslator('BulkUserManagementStr
   },
   someLearnersEnrolledNotice: {
     message: 'Some learners enrolled succesfully, but some were not',
-    context: 'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
+    context:
+      'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
   },
   someCoachesAssignedNotice: {
     message: 'Some coaches assigned succesfully, but some were not.',
-    context: 'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
+    context:
+      'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
   },
   someFailedToAssign: {
     message: 'The users shown were unable to be assigned.',
-    context: 'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
+    context:
+      'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
   },
   someFailedToEnroll: {
     message: 'The users shown were unable to be enrolled.',
-    context: 'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
+    context:
+      'Shown at the top of a table that is filtered to show the users which did not get assigned successfully',
   },
   assignCoachUndoneNotice: {
     message: 'Assign action has been undone',