Merge branch 'vuetifyv3' of https://github.com/bcgov/EDUC-GRAD-ADMIN …

…into vuetify-sl
bcgov · Nov 1, 2024 · fff79e3 · fff79e3
2 parents 0c49308 + 86ee01b
commit fff79e3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Backend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
@@ -169,6 +169,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Frontend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
@@ -171,7 +171,7 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
 
diff --git a/frontend/src/components/StudentProfile/StudentAssessments.vue b/frontend/src/components/StudentProfile/StudentAssessments.vue
@@ -10,7 +10,6 @@
       showFilter="true"
       title="Assessments"
       :items-per-page="'-1'"
-      :id="id"
     >
       <template
         v-slot:item.data-table-expand="{

diff --git a/frontend/src/components/StudentProfile/StudentCourses.vue b/frontend/src/components/StudentProfile/StudentCourses.vue
@@ -10,17 +10,8 @@
           :items="courses"
           :headers="fields"
           :items-per-page="'-1'"
-          :id="id"
           showFilter="true"
           title="studentCourse"
-          :delete="{
-            disable: {
-              condition: 'OR',
-              criteria: [],
-            },
-            label: 'Delete',
-            action: 'removeStudentCourse',
-          }"
         >
           <template
             v-slot:item.data-table-expand="{
@@ -318,14 +309,14 @@ export default {
       // Set the data property to false to close the modal
       this.modalState = false;
     },
-    toggle(id) {
-      const index = this.opened.indexOf(id);
-      if (index > -1) {
-        this.opened.splice(index, 1);
-      } else {
-        this.opened.push(id);
-      }
-    },
+    // toggle(id) {
+    //   const index = this.opened.indexOf(id);
+    //   if (index > -1) {
+    //     this.opened.splice(index, 1);
+    //   } else {
+    //     this.opened.push(id);
+    //   }
+    // },
     checkForPendingUpdates() {
       if (this.hasGradStatus) {
         for (let i = 0; i < this.courses.length; i++) {

diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
@@ -22,12 +22,12 @@ export const useStudentStore = defineStore("student", {
     quickSearchId: "",
     student: {
       profile: {},
-      courses: "not loaded",
-      assessments: "not loaded",
-      exams: "not loaded",
+      courses: [],
+      assessments: [],
+      exams: [],
       notes: [],
       gradStatus: "not loaded",
-      optionalPrograms: "not loaded",
+      optionalPrograms: [],
       hasExams: false,
       hasAssessments: false,
       hasCourses: false,
@@ -341,12 +341,12 @@ export const useStudentStore = defineStore("student", {
     unsetStudent() {
       this.student.profile = {};
       this.student.notes = [];
-      this.student.id = "not loaded";
-      this.student.courses = "not loaded";
-      this.student.assessments = "not loaded";
-      this.student.exams = "not loaded";
+      this.student.id = [];
+      this.student.courses = [];
+      this.student.assessments = [];
+      this.student.exams = [];
       this.student.gradStatus = "not loaded";
-      this.student.optionalPrograms = "not loaded";
+      this.student.optionalPrograms = [];
       this.student.hasExams = false;
       this.student.hasAssessments = false;
       this.student.hasCourses = false;
@@ -624,7 +624,11 @@ export const useStudentStore = defineStore("student", {
       }));
     },
     getStudentExams() {
-      return this.student.exams;
+      if (!this.student.exams || this.student.exams.length === 0) {
+        return [];
+      } else {
+        return this.student.exams;
+      }
     },
     getStudentAssessments() {
       if (