using (Membership|Role)Resource#saveCollection method

Author: nucleogenesis

kolibri/plugins/facility/assets/src/modules/classAssignMembers/actions.js

@@ -1,23 +1,19 @@
-import client from 'kolibri/client';
-import urls from 'kolibri/urls';
+import MembershipResource from 'kolibri-common/apiResources/MembershipResource';
+import RoleResource from 'kolibri-common/apiResources/RoleResource';
 import { UserKinds } from 'kolibri/constants';
 import uniq from 'lodash/uniq';
 
-export async function enrollLearnersInClass(store, { classId, users }) {
-  return client({
-    url: urls['kolibri:core:membership_list'](),
-    method: 'POST',
+export async function enrollLearnersInClass(_, { classId, users }) {
+  return MembershipResource.saveCollection({
     data: uniq(users).map(userId => ({
       collection: classId,
       user: userId,
     })),
   });
 }
 
-export async function assignCoachesToClass(store, { classId, coaches }) {
-  return client({
-    url: urls['kolibri:core:role_list'](),
-    method: 'POST',
+export async function assignCoachesToClass(_, { classId, coaches }) {
+  return RoleResource.saveCollection({
     data: uniq(coaches).map(userId => ({
       collection: classId,
       user: userId,

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

@@ -116,8 +116,6 @@
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import { bulkUserManagementStrings } from 'kolibri-common/strings/bulkUserManagementStrings';
   import { UserKinds } from 'kolibri/constants';
-  import client from 'kolibri/client';
-  import urls from 'kolibri/urls';
   import RoleResource from 'kolibri-common/apiResources/RoleResource';
   import { useGoBack } from 'kolibri-common/composables/usePreviousRoute';
   import { coreStrings } from 'kolibri/uiText/commonCoreStrings';
@@ -280,12 +278,7 @@
         );
 
         // Errors will be caught in _handleAssign
-        const response = await client({
-          url: urls['kolibri:core:role_list'](),
-          method: 'POST',
-          data: roleData,
-        });
-
+        const response = await RoleResource.saveCollection({ data: roleData });
         const { created, invalid } = response.data;
 
         // Only add roles that were actually created (have an id)

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

@@ -113,8 +113,6 @@
 
 <script>
 
-  import client from 'kolibri/client';
-  import urls from 'kolibri/urls';
   import { useRouter, useRoute } from 'vue-router/composables';
   import { getCurrentInstance, ref, computed, nextTick } from 'vue';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
@@ -224,12 +222,7 @@
         });
         if (enrollments.length > 0) {
           try {
-            const response = await client({
-              url: urls['kolibri:core:membership_list'](),
-              method: 'POST',
-              data: enrollments,
-            });
-
+            const response = await MembershipResource.saveCollection({ data: enrollments });
             const { created, invalid } = response.data;
 
             createdMemberships.value = created;

kolibri/plugins/facility/assets/src/views/users/sidePanels/UserCreate/index.vue

@@ -147,20 +147,19 @@
 <script>
 
   import store from 'kolibri/store';
-  import client from 'kolibri/client';
-  import urls from 'kolibri/urls';
   import { ref, computed, nextTick, onBeforeMount, getCurrentInstance } from 'vue';
   import { useRoute, useRouter } from 'vue-router/composables';
   import CatchErrors from 'kolibri/utils/CatchErrors';
   import useSnackbar from 'kolibri/composables/useSnackbar';
   import notificationStrings from 'kolibri/uiText/notificationStrings';
+  import FacilityUserResource from 'kolibri-common/apiResources/FacilityUserResource';
+  import MembershipResource from 'kolibri-common/apiResources/MembershipResource';
   import RoleResource from 'kolibri-common/apiResources/RoleResource';
   import useFacilities from 'kolibri-common/composables/useFacilities';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import ExtraDemographics from 'kolibri-common/components/ExtraDemographics';
   import GenderSelect from 'kolibri-common/components/userAccounts/GenderSelect';
   import commonCoreStrings, { coreStrings } from 'kolibri/uiText/commonCoreStrings';
-  import FacilityUserResource from 'kolibri-common/apiResources/FacilityUserResource';
   import { UserKinds, ERROR_CONSTANTS, DemographicConstants } from 'kolibri/constants';
   import BirthYearSelect from 'kolibri-common/components/userAccounts/BirthYearSelect';
   import FullNameTextbox from 'kolibri-common/components/userAccounts/FullNameTextbox';
@@ -356,19 +355,13 @@
       };
 
       const enrollLearnerInClasses = (userId, classIds) => {
-        return client({
-          url: urls['kolibri:core:membership_list'](),
-          method: 'POST',
+        return MembershipResource.saveCollection({
           data: classIds.map(cid => ({ collection: cid, user: userId })),
         });
       };
 
       const assignCoachToClasses = (userId, classIds) => {
-        // The endpoint still expects COACH for the kind when assigning,
-        // even if the user's facility role is an admin
-        return client({
-          url: urls['kolibri:core:role_list'](),
-          method: 'POST',
+        return RoleResource.saveCollection({
           data: classIds.map(cid => ({ collection: cid, user: userId, kind: UserKinds.COACH })),
         });
       };