migrating to the useUser composable (coach plugin)

learningequality · Jul 23, 2024 · 7f9a301 · 7f9a301
1 parent 69860dd
commit 7f9a301
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 15 deletions.
diff --git a/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js b/kolibri/plugins/coach/assets/src/composables/useCoreCoach.js
@@ -3,6 +3,7 @@ import logger from 'kolibri.lib.logging';
 import { get } from '@vueuse/core';
 import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
 import { currentLanguage, isRtl } from 'kolibri.utils.i18n';
+import useUser from 'kolibri.coreVue.composables.useUser';
 import { coachStrings } from '../views/common/commonCoachStrings';
 
 const logging = logger.getLogger(__filename);
@@ -15,13 +16,14 @@ export default function useCoreCoach(store) {
   const authorized = computed(() => store.getters.userIsAuthorizedForCoach);
   const classId = computed(() => get(route).params.classId);
   const groups = computed(() => store.getters['classSummary/groups']);
+  const { isSuperuser } = useUser();
 
   function getAppBarTitle() {
     let facilityName;
     // Using coachStrings.$tr() here because mixins are not applied
     // prior to props being processed.
     const { facility_id, name } = store.state.classSummary;
-    if (facility_id && store.state.core.facilities.length > 1 && store.getters.isSuperuser) {
+    if (facility_id && store.state.core.facilities.length > 1 && isSuperuser) {
       const match = find(store.state.core.facilities, { id: facility_id }) || {};
       facilityName = match.name;
     }

diff --git a/kolibri/plugins/coach/assets/src/composables/useGroups.js b/kolibri/plugins/coach/assets/src/composables/useGroups.js
@@ -1,6 +1,7 @@
 import { ref } from 'kolibri.lib.vueCompositionApi';
 import samePageCheckGenerator from 'kolibri.utils.samePageCheckGenerator';
 import { LearnerGroupResource, FacilityUserResource } from 'kolibri.resources';
+import useUser from 'kolibri.coreVue.composables.useUser';
 
 // Place outside the function to keep the state
 const groupsAreLoading = ref(false);
@@ -13,7 +14,7 @@ export function useGroups() {
   async function showGroupsPage(store, classId) {
     const initClassInfoPromise = store.dispatch('initClassInfo', classId);
     const getFacilitiesPromise =
-      store.getters.isSuperuser && store.state.core.facilities.length === 0
+      useUser().isSuperuser && store.state.core.facilities.length === 0
         ? store.dispatch('getFacilities').catch(() => {})
         : Promise.resolve();
 

diff --git a/kolibri/plugins/coach/assets/src/composables/useLessons.js b/kolibri/plugins/coach/assets/src/composables/useLessons.js
@@ -1,5 +1,6 @@
 import { ref } from 'kolibri.lib.vueCompositionApi';
 import { LearnerGroupResource } from 'kolibri.resources';
+import useUser from 'kolibri.coreVue.composables.useUser';
 import { LessonsPageNames } from '../constants/lessonsConstants';
 
 // Place outside the function to keep the state
@@ -14,7 +15,7 @@ export function useLessons() {
   async function showLessonsRootPage(store, classId) {
     const initClassInfoPromise = store.dispatch('initClassInfo', classId);
     const getFacilitiesPromise =
-      store.getters.isSuperuser && store.state.core.facilities.length === 0
+      useUser().isSuperuser && store.state.core.facilities.length === 0
         ? store.dispatch('getFacilities').catch(() => {})
         : Promise.resolve();
 

diff --git a/kolibri/plugins/coach/assets/src/views/AllFacilitiesPage.vue b/kolibri/plugins/coach/assets/src/views/AllFacilitiesPage.vue
@@ -41,6 +41,7 @@
 
   import CoreTable from 'kolibri.coreVue.components.CoreTable';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import commonCoach from './common';
   import CoachAppBarPage from './CoachAppBarPage';
 
@@ -51,6 +52,10 @@
       CoreTable,
     },
     mixins: [commonCoach, commonCoreStrings],
+    setup() {
+      const { facility_id, userIsMultiFacilityAdmin } = useUser();
+      return { facility_id, userIsMultiFacilityAdmin };
+    },
     props: {
       subtopicName: {
         type: String,
@@ -64,8 +69,8 @@
       },
     },
     beforeMount() {
-      if (!this.$store.getters.userIsMultiFacilityAdmin) {
-        const singleFacility = { id: this.$store.getters.userFacilityId };
+      if (!this.userIsMultiFacilityAdmin) {
+        const singleFacility = { id: this.facility_id };
         this.$router.replace(this.coachClassListPageLink(singleFacility));
       }
     },

diff --git a/kolibri/plugins/coach/assets/src/views/CoachClassListPage.vue b/kolibri/plugins/coach/assets/src/views/CoachClassListPage.vue
@@ -65,10 +65,11 @@
 
 <script>
 
-  import { mapGetters, mapState } from 'vuex';
+  import { mapState } from 'vuex';
   import find from 'lodash/find';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import urls from 'kolibri.urls';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import { PageNames } from '../constants';
   import CoachAppBarPage from './CoachAppBarPage';
   import commonCoach from './common';
@@ -79,6 +80,10 @@
       CoachAppBarPage,
     },
     mixins: [commonCoach, commonCoreStrings],
+    setup() {
+      const { isClassCoach, isFacilityCoach, userIsMultiFacilityAdmin } = useUser();
+      return { isClassCoach, isFacilityCoach, userIsMultiFacilityAdmin };
+    },
     props: {
       subtopicName: {
         type: String,
@@ -87,7 +92,6 @@
       },
     },
     computed: {
-      ...mapGetters(['isAdmin', 'isClassCoach', 'isFacilityCoach', 'userIsMultiFacilityAdmin']),
       ...mapState(['classList', 'dataLoading']),
       // Message that shows up when state.classList is empty
       emptyStateDetails() {

diff --git a/kolibri/plugins/coach/assets/src/views/common.js b/kolibri/plugins/coach/assets/src/views/common.js
@@ -13,6 +13,7 @@ import MasteryModel from 'kolibri.coreVue.components.MasteryModel';
 import filter from 'lodash/filter';
 import get from 'lodash/get';
 import orderBy from 'lodash/orderBy';
+import useUser from 'kolibri.coreVue.composables.useUser';
 import { PageNames } from '../constants';
 import { LastPages } from '../constants/lastPagesConstants';
 import { STATUSES } from '../modules/classSummary/constants';
@@ -66,8 +67,15 @@ export default {
     TimeDuration,
   },
   mixins: [coachStringsMixin],
+  setup() {
+    const { isAdmin, isCoach, isSuperuser } = useUser();
+    return {
+      isAdmin,
+      isCoach,
+      isSuperuser,
+    };
+  },
   computed: {
-    ...mapGetters(['isAdmin', 'isCoach', 'isSuperuser']),
     ...mapState('classSummary', { classId: 'id', className: 'name' }),
     ...mapState('classSummary', [
       'adHocGroupsMap',

diff --git a/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue b/kolibri/plugins/coach/assets/src/views/home/HomePage/OverviewBlock.vue
@@ -62,15 +62,20 @@
   import { mapGetters } from 'vuex';
   import pickBy from 'lodash/pickBy';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import { ClassesPageNames } from '../../../../../../learn/assets/src/constants';
   import commonCoach from '../../common';
   import { LastPages } from '../../../constants/lastPagesConstants';
 
   export default {
     name: 'OverviewBlock',
     mixins: [commonCoach, commonCoreStrings],
+    setup() {
+      const { userIsMultiFacilityAdmin } = useUser();
+      return { userIsMultiFacilityAdmin };
+    },
     computed: {
-      ...mapGetters(['classListPageEnabled', 'userIsMultiFacilityAdmin']),
+      ...mapGetters(['classListPageEnabled']),
       coachNames() {
         return this.coaches.map(coach => coach.name);
       },
@@ -79,7 +84,7 @@
       },
       classListLink() {
         let facility_id;
-        if (this.$store.getters.userIsMultiFacilityAdmin) {
+        if (this.userIsMultiFacilityAdmin) {
           facility_id = this.$store.state.classSummary.facility_id;
         }
         return this.$router.getRoute('CoachClassListPage', { facility_id });

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonCreationPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonCreationPage/index.vue
@@ -49,7 +49,7 @@
     created() {
       const initClassInfoPromise = this.$store.dispatch('initClassInfo', this.classId);
       const getFacilitiesPromise =
-        this.$store.getters.isSuperuser && this.$store.state.core.facilities.length === 0
+        this.isSuperuser && this.$store.state.core.facilities.length === 0
           ? this.$store.dispatch('getFacilities').catch(() => {})
           : Promise.resolve();
 

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/index.vue
@@ -36,6 +36,7 @@
   import isEqual from 'lodash/isEqual';
   import { LessonResource } from 'kolibri.resources';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import { coachStringsMixin } from '../../common/commonCoachStrings';
   import CoachImmersivePage from '../../CoachImmersivePage';
   import AssignmentDetailsModal from '../assignments/AssignmentDetailsModal';
@@ -49,6 +50,10 @@
       ResourceListTable,
     },
     mixins: [coachStringsMixin, commonCoreStrings],
+    setup() {
+      const { isSuperuser } = useUser();
+      return { isSuperuser };
+    },
     props: {
       showResourcesTable: {
         type: Boolean,
@@ -96,7 +101,7 @@
         this.$route.params.classId,
       );
       const getFacilitiesPromise =
-        this.$store.getters.isSuperuser && this.$store.state.core.facilities.length === 0
+        this.isSuperuser && this.$store.state.core.facilities.length === 0
           ? this.$store.dispatch('getFacilities').catch(() => {})
           : Promise.resolve();
 

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue
@@ -117,6 +117,7 @@
   import BottomAppBar from 'kolibri.coreVue.components.BottomAppBar';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import commonCoach from '../../common';
   import CoachAppBarPage from '../../CoachAppBarPage';
   import CoachImmersivePage from '../../CoachImmersivePage';
@@ -149,8 +150,10 @@
     mixins: [commonCoach, commonCoreStrings],
     setup() {
       const { windowIsSmall } = useKResponsiveWindow();
+      const { getUserPermissions } = useUser();
       return {
         windowIsSmall,
+        getUserPermissions,
       };
     },
     data() {
@@ -180,7 +183,6 @@
         'ancestors',
       ]),
       ...mapGetters('lessonSummary/resources', ['numRemainingSearchResults']),
-      ...mapGetters(['getUserPermissions']),
       toolbarRoute() {
         if (this.$route.query.last) {
           return this.$router.getRoute(this.$route.query.last);

diff --git a/kolibri/plugins/coach/assets/src/views/plan/PlanHeader.vue b/kolibri/plugins/coach/assets/src/views/plan/PlanHeader.vue
@@ -29,6 +29,7 @@
 
   import { mapGetters } from 'vuex';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import commonCoach from '../common';
   import { PageNames } from '../../constants';
   import { LessonsPageNames } from '../../constants/lessonsConstants';
@@ -40,9 +41,11 @@
     mixins: [commonCoach, commonCoreStrings],
     setup() {
       const { saveTabsClick, wereTabsClickedRecently } = useCoachTabs();
+      const { userIsMultiFacilityAdmin } = useUser();
       return {
         saveTabsClick,
         wereTabsClickedRecently,
+        userIsMultiFacilityAdmin,
       };
     },
     props: {
@@ -57,7 +60,7 @@
       };
     },
     computed: {
-      ...mapGetters(['classListPageEnabled', 'userIsMultiFacilityAdmin']),
+      ...mapGetters(['classListPageEnabled']),
       LessonsPageNames() {
         return LessonsPageNames;
       },

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsHeader.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsHeader.vue
@@ -31,6 +31,7 @@
 
   import { mapGetters } from 'vuex';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import useUser from 'kolibri.coreVue.composables.useUser';
   import commonCoach from '../common';
   import { REPORTS_TABS_ID, ReportsTabs } from '../../constants/tabsConstants';
   import { useCoachTabs } from '../../composables/useCoachTabs';
@@ -40,9 +41,11 @@
     mixins: [commonCoach, commonCoreStrings],
     setup() {
       const { saveTabsClick, wereTabsClickedRecently } = useCoachTabs();
+      const { userIsMultiFacilityAdmin } = useUser();
       return {
         saveTabsClick,
         wereTabsClickedRecently,
+        userIsMultiFacilityAdmin,
       };
     },
     props: {
@@ -61,7 +64,7 @@
       };
     },
     computed: {
-      ...mapGetters(['classListPageEnabled', 'userIsMultiFacilityAdmin']),
+      ...mapGetters(['classListPageEnabled']),
       reportTitle() {
         return this.title || this.coachString('reportsLabel');
       },