Merge pull request #1519 from bcgov/feature/vue3

Vue3 issues
bcgov · Jul 28, 2023 · 9c4ddab · 9c4ddab
2 parents bfdf5c9 + 450a68f
commit 9c4ddab
Show file tree

Hide file tree

Showing 14 changed files with 211 additions and 209 deletions.
diff --git a/.github/workflows/deploy-to.openshift-dev-and-test.yml b/.github/workflows/deploy-to.openshift-dev-and-test.yml
@@ -209,99 +209,99 @@ jobs:
       with:
         target: 'https://${{ env.HOST_ROUTE }}'
 
-#  deploy-test:
-#    name: Deploy to TEST
-#    needs: build-and-deploy-dev
-#    runs-on: ubuntu-22.04
-#    environment: test
-#
-#    outputs:
-#      ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
-#      SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
-#
-#    steps:
-#      - name: Check for required secrets
-#        uses: actions/github-script@v6
-#        with:
-#          script: |
-#            const secrets = {
-#              OPENSHIFT_SERVER: `${{ secrets.OPENSHIFT_SERVER }}`,
-#              OPENSHIFT_TOKEN: `${{ secrets.OPENSHIFT_TOKEN }}`,
-#            };
-#
-#            const GHCR = "ghcr.io";
-#            if (`${{ env.IMAGE_REGISTRY }}`.startsWith(GHCR)) {
-#              core.info(`Image registry is ${GHCR} - no registry password required`);
-#            }
-#            else {
-#              core.info("A registry password is required");
-#              secrets["IMAGE_REGISTRY_PASSWORD"] = `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`;
-#            }
-#
-#            const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
-#              if (value.length === 0) {
-#                core.error(`Secret "${name}" is not set`);
-#                return true;
-#              }
-#              core.info(`✔️ Secret "${name}" is set`);
-#              return false;
-#            });
-#
-#            if (missingSecrets.length > 0) {
-#              core.setFailed(`❌ At least one required secret is not set in the repository. \n` +
-#                "You can add it using:\n" +
-#                "GitHub UI: https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository \n" +
-#                "GitHub CLI: https://cli.github.com/manual/gh_secret_set \n" +
-#                "Also, refer to https://github.com/redhat-actions/oc-login#getting-started-with-the-action-or-see-example");
-#            }
-#            else {
-#              core.info(`✅ All the required secrets are set`);
-#            }
-#
-#      - name: Check out repository
-#        uses: actions/checkout@v3
-#
-#      - name: Install oc
-#        uses: redhat-actions/openshift-tools-installer@v1
-#        with:
-#          oc: 4
-#
-#        # https://github.com/redhat-actions/oc-login#readme
-#      - uses: actions/checkout@v3
-#      - name: Deploy
-#        run: |
-#          set -eux
-#          # Login to OpenShift and select project
-#          oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
-#          oc project ${{ env.OPENSHIFT_NAMESPACE_TEST }}
-#          # Cancel any rollouts in progress
-#          oc rollout cancel dc/${{ env.IMAGE_NAME }} 2> /dev/null \
-#          || true && echo "No rollout in progress"
-#
-#          oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-frontend-static:latest ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-frontend-static:latest
-#          oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-backend-${{ env.BRANCH }}:latest ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-backend-${{ env.BRANCH }}:latest
-#
-#          # Process and apply deployment template
-#          oc process -f tools/openshift/backend.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU }} -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
-#          | oc apply -f -
-#
-#          # Process and apply deployment template
-#          oc process -f tools/openshift/frontend-static.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU }} -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
-#          | oc apply -f -
-#
-#          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh | bash /dev/stdin test ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{ env.COMMON_NAMESPACE }} ${{ env.EDX_NAMESPACE }} ${{ env.SPLUNK_TOKEN }}
-#
-#          # Start rollout (if necessary) and follow it
-#          oc rollout latest dc/${{ env.IMAGE_NAME }} 2> /dev/null \
-#          || true && echo "Rollout in progress"
-#
-#          oc rollout latest dc/${{ env.APP_NAME_FRONTEND_MASTER }} 2> /dev/null \
-#          || true && echo "Rollout in progress"
-#          oc logs -f dc/${{ env.IMAGE_NAME }}
-#          # Get status, returns 0 if rollout is successful
-#          oc rollout status dc/${{ env.IMAGE_NAME }}
-#
-#      - name: ZAP Scan
-#        uses: zaproxy/[email protected]
-#        with:
-#          target: 'https://${{ env.HOST_ROUTE }}'
+  deploy-test:
+    name: Deploy to TEST
+    needs: build-and-deploy-dev
+    runs-on: ubuntu-22.04
+    environment: test
+
+    outputs:
+      ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
+      SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
+
+    steps:
+      - name: Check for required secrets
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const secrets = {
+              OPENSHIFT_SERVER: `${{ secrets.OPENSHIFT_SERVER }}`,
+              OPENSHIFT_TOKEN: `${{ secrets.OPENSHIFT_TOKEN }}`,
+            };
+
+            const GHCR = "ghcr.io";
+            if (`${{ env.IMAGE_REGISTRY }}`.startsWith(GHCR)) {
+              core.info(`Image registry is ${GHCR} - no registry password required`);
+            }
+            else {
+              core.info("A registry password is required");
+              secrets["IMAGE_REGISTRY_PASSWORD"] = `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`;
+            }
+
+            const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
+              if (value.length === 0) {
+                core.error(`Secret "${name}" is not set`);
+                return true;
+              }
+              core.info(`✔️ Secret "${name}" is set`);
+              return false;
+            });
+
+            if (missingSecrets.length > 0) {
+              core.setFailed(`❌ At least one required secret is not set in the repository. \n` +
+                "You can add it using:\n" +
+                "GitHub UI: https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository \n" +
+                "GitHub CLI: https://cli.github.com/manual/gh_secret_set \n" +
+                "Also, refer to https://github.com/redhat-actions/oc-login#getting-started-with-the-action-or-see-example");
+            }
+            else {
+              core.info(`✅ All the required secrets are set`);
+            }
+
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Install oc
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4
+
+        # https://github.com/redhat-actions/oc-login#readme
+      - uses: actions/checkout@v3
+      - name: Deploy
+        run: |
+          set -eux
+          # Login to OpenShift and select project
+          oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
+          oc project ${{ env.OPENSHIFT_NAMESPACE_TEST }}
+          # Cancel any rollouts in progress
+          oc rollout cancel dc/${{ env.IMAGE_NAME }} 2> /dev/null \
+          || true && echo "No rollout in progress"
+
+          oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-frontend-static:latest ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-frontend-static:latest
+          oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-backend-${{ env.BRANCH }}:latest ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-backend-${{ env.BRANCH }}:latest
+
+          # Process and apply deployment template
+          oc process -f tools/openshift/backend.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU }} -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
+          | oc apply -f -
+
+          # Process and apply deployment template
+          oc process -f tools/openshift/frontend-static.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU }} -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
+          | oc apply -f -
+
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh | bash /dev/stdin test ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{ env.COMMON_NAMESPACE }} ${{ env.EDX_NAMESPACE }} ${{ env.SPLUNK_TOKEN }}
+
+          # Start rollout (if necessary) and follow it
+          oc rollout latest dc/${{ env.IMAGE_NAME }} 2> /dev/null \
+          || true && echo "Rollout in progress"
+
+          oc rollout latest dc/${{ env.APP_NAME_FRONTEND_MASTER }} 2> /dev/null \
+          || true && echo "Rollout in progress"
+          oc logs -f dc/${{ env.IMAGE_NAME }}
+          # Get status, returns 0 if rollout is successful
+          oc rollout status dc/${{ env.IMAGE_NAME }}
+
+      - name: ZAP Scan
+        uses: zaproxy/[email protected]
+        with:
+          target: 'https://${{ env.HOST_ROUTE }}'
diff --git a/backend/src/components/studentSearch.js b/backend/src/components/studentSearch.js
@@ -111,7 +111,7 @@ async function searchStudent(req, res) {
 
   const baseUrl = config.get('server:student:rootURL');
   try {
-    const dataResponse = await utils.getData(token, isAuditHistorySearch ? baseUrl + '/history/paginated/distinct/students' : baseUrl + '/paginated', params);
+    const dataResponse = await utils.getData(token, isAuditHistorySearch === 'true' ? baseUrl + '/history/paginated/distinct/students' : baseUrl + '/paginated', params);
     if (dataResponse?.totalElements > 2000000) {
       logInfo(`Search Criteria produced ${dataResponse?.totalElements} records`, params?.params);
       return res.status(400).json({