Merge pull request #372 from uw-it-aca/feature/data-util

Replaces data mixin with composable util.
uw-it-aca · Jan 12, 2024 · 36434c8 · 36434c8
2 parents 8bb44c1 + 84efb40
commit 36434c8
Show file tree

Hide file tree

Showing 27 changed files with 381 additions and 245 deletions.
diff --git a/compass_vue/components/add-contact.vue b/compass_vue/components/add-contact.vue
@@ -238,12 +238,19 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
+import {
+  getStudentContactTopics,
+  getStudentContactTypes,
+  getStudentContactMethods,
+  getStudentContact,
+  saveStudentContact,
+  updateStudentContact,
+} from "@/utils/data";
+
 import { Modal } from "bootstrap";
 import { Role } from "@/utils/roles";
 
 export default {
-  mixins: [dataMixin],
   emits: ["contactUpdated"],
   props: {
     buttonType: {
@@ -259,6 +266,16 @@ export default {
       default: null,
     },
   },
+  setup() {
+    return {
+      getStudentContactTopics,
+      getStudentContactTypes,
+      getStudentContactMethods,
+      getStudentContact,
+      saveStudentContact,
+      updateStudentContact,
+    };
+  },
   data() {
     return {
       contactTopics: [],
@@ -319,7 +336,6 @@ export default {
             contactModal.hide();
           })
           .catch((error) => {
-            q;
             if (error.response.status == 401) {
               this.updatePermissionDenied = true;
               this.errorResponsePermission = error.response.data;

diff --git a/compass_vue/components/delete-contact.vue b/compass_vue/components/delete-contact.vue
@@ -11,10 +11,9 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
+import { deleteStudentContact } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   inject: ["mq"],
   emits: ["contactDeleted"],
   props: {
@@ -31,6 +30,11 @@ export default {
       default: null,
     },
   },
+  setup() {
+    return {
+      deleteStudentContact,
+    };
+  },
   data() {
     return {};
   },

diff --git a/compass_vue/components/nav-menu.vue b/compass_vue/components/nav-menu.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { Role } from "@/utils/roles.js";
+import { Role } from "@/utils/roles";
 
 export default {
   props: {

diff --git a/compass_vue/components/search-student.vue b/compass_vue/components/search-student.vue
@@ -22,17 +22,21 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
+import { getStudentDetail } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   props: {
     error: {
       type: Boolean,
       required: false,
       default: false,
     },
   },
+  setup() {
+    return {
+      getStudentDetail,
+    };
+  },
   data() {
     return {
       studentExists: true,

diff --git a/compass_vue/components/settings/settings-form.vue b/compass_vue/components/settings/settings-form.vue
@@ -80,10 +80,9 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
+import { getSettings, saveSettings } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   props: {
     settingLabel: {
       type: String,
@@ -99,6 +98,12 @@ export default {
     },
   },
   components: {},
+  setup() {
+    return {
+      getSettings,
+      saveSettings,
+    };
+  },
   data() {
     return {
       settings: [],

diff --git a/compass_vue/components/student/academics.vue b/compass_vue/components/student/academics.vue
@@ -174,14 +174,11 @@
 
 <script>
 import KeyValue from "@/components/_common/key-value.vue";
-import dataMixin from "@/mixins/data_mixin";
 import AffiliationSummary from "@/components/student/affiliation-mini.vue";
-
 import { translateTrueFalse } from "@/utils/translations";
 
 export default {
   inject: ["mq"],
-  mixins: [dataMixin],
   props: {
     person: {
       type: Object,

diff --git a/compass_vue/components/student/administrative/affiliation-add.vue b/compass_vue/components/student/administrative/affiliation-add.vue
@@ -128,12 +128,11 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import { Modal } from "bootstrap";
-import { getCohorts } from "@/utils/cohorts.js";
+import { getCohorts } from "@/utils/cohorts";
+import { saveStudentAffiliation, saveStudentContact } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   emits: ["affiliationsUpdated"],
   props: {
     buttonType: {
@@ -153,6 +152,12 @@ export default {
       required: true,
     },
   },
+  setup() {
+    return {
+      saveStudentAffiliation,
+      saveStudentContact,
+    };
+  },
   data() {
     return {
       affiliationId: null,

diff --git a/compass_vue/components/student/administrative/affiliation-delete.vue b/compass_vue/components/student/administrative/affiliation-delete.vue
@@ -69,11 +69,10 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import { Modal } from "bootstrap";
+import { deleteStudentAffiliation, saveStudentContact } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   emits: ["affiliationsUpdated"],
   props: {
     person: {
@@ -89,6 +88,12 @@ export default {
       required: true,
     },
   },
+  setup() {
+    return {
+      deleteStudentAffiliation,
+      saveStudentContact
+    };
+  },
   data() {
     return {
       notes: "",

diff --git a/compass_vue/components/student/administrative/affiliation-edit.vue b/compass_vue/components/student/administrative/affiliation-edit.vue
@@ -120,12 +120,15 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import { Modal } from "bootstrap";
-import { getCohorts } from "@/utils/cohorts.js";
+import { getCohorts } from "@/utils/cohorts";
+import {
+  clearOverride,
+  saveStudentAffiliation,
+  saveStudentContact,
+} from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   emits: ["affiliationsUpdated"],
   props: {
     person: {
@@ -145,6 +148,13 @@ export default {
       required: true,
     },
   },
+  setup() {
+    return {
+      clearOverride,
+      saveStudentAffiliation,
+      saveStudentContact,
+    };
+  },
   data() {
     return {
       affiliationId: null,

diff --git a/compass_vue/components/student/administrative/affiliation.vue b/compass_vue/components/student/administrative/affiliation.vue
@@ -71,14 +71,13 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import AffiliationAdd from "@/components/student/administrative/affiliation-add.vue";
 import AffiliationDelete from "@/components/student/administrative/affiliation-delete.vue";
 import AffiliationEdit from "@/components/student/administrative/affiliation-edit.vue";
 import { useAffiliationStore } from "@/stores/affiliations";
+import { getStudentAffiliations } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   components: {
     AffiliationAdd,
     AffiliationEdit,
@@ -90,6 +89,10 @@ export default {
       required: true,
     },
   },
+  setup() {
+    const storeAffiliations = useAffiliationStore();
+    return { storeAffiliations, getStudentAffiliations };
+  },
   data() {
     return {
       studentAffiliations: [],
@@ -101,10 +104,6 @@ export default {
   created() {
     this.loadAffiliationData();
   },
-  setup() {
-    const storeAffiliations = useAffiliationStore();
-    return { storeAffiliations };
-  },
   methods: {
     loadAffiliationData() {
       this.getStudentAffiliations(this.person.student.system_key).then(
@@ -115,7 +114,7 @@ export default {
         }
       );
 
-      this.storeAffiliations.getAffiliations.then(() => {
+      this.storeAffiliations.fetchAffiliations.then(() => {
         this.affiliations = this.storeAffiliations.affiliations.data;
       });
     },

diff --git a/compass_vue/components/student/administrative/eligibility.vue b/compass_vue/components/student/administrative/eligibility.vue
@@ -36,18 +36,27 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
-import { formatDate, getMinutesApart } from "@/utils/dates.js";
+import {
+  getEligibilities,
+  getStudentEligibility,
+  setStudentEligibility,
+} from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   components: {},
   props: {
     person: {
       type: Object,
       required: true,
     },
   },
+  setup() {
+    return {
+      getEligibilities,
+      getStudentEligibility,
+      setStudentEligibility,
+    };
+  },
   data() {
     return {
       student_eligibilities: [],

diff --git a/compass_vue/components/student/affiliation-mini.vue b/compass_vue/components/student/affiliation-mini.vue
@@ -35,18 +35,22 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import KeyValue from "@/components/_common/key-value.vue";
+import { getStudentAffiliations } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   components: { KeyValue },
   props: {
     person: {
       type: Object,
       required: true,
     },
   },
+  setup() {
+    return {
+      getStudentAffiliations,
+    };
+  },
   data() {
     return {
       affiliations: [],

diff --git a/compass_vue/components/student/contact.vue b/compass_vue/components/student/contact.vue
@@ -205,15 +205,14 @@
 </template>
 
 <script>
-import { Role } from "@/utils/roles.js";
-import dataMixin from "@/mixins/data_mixin.js";
 import AddEditContact from "@/components/add-contact.vue";
 import ManagerEditContact from "@/components/add-contact.vue";
 import DeleteContact from "@/components/delete-contact.vue";
+import { Role } from "@/utils/roles";
 import { formatUTCToLocalDateAndTimeZone, getTimeFromNow } from "@/utils/dates";
+import { getStudentContacts } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   components: {
     AddEditContact,
     ManagerEditContact,
@@ -229,6 +228,7 @@ export default {
     return {
       formatUTCToLocalDateAndTimeZone,
       getTimeFromNow,
+      getStudentContacts,
     };
   },
   data() {

diff --git a/compass_vue/components/student/programs.vue b/compass_vue/components/student/programs.vue
@@ -69,18 +69,24 @@
 </template>
 
 <script>
-import dataMixin from "@/mixins/data_mixin.js";
 import { useAffiliationStore } from "@/stores/affiliations";
+import { saveStudent } from "@/utils/data";
 
 export default {
-  mixins: [dataMixin],
   props: {
     person: {
       type: Object,
       required: true,
     },
   },
   components: {},
+  setup() {
+    const storeAffiliations = useAffiliationStore();
+    return {
+      storeAffiliations,
+      saveStudent,
+    };
+  },
   data() {
     return {
       groupedPrograms: this.person.student.compass_group_affiliations,
@@ -91,10 +97,6 @@ export default {
       userOverride: document.body.getAttribute("data-user-override"),
     };
   },
-  setup() {
-    const storeAffiliations = useAffiliationStore();
-    return { storeAffiliations };
-  },
   created: function () {
     this.loadPrograms();
   },