Merge branch 'main' into feat/FSADT1-1347

bcgov · Jul 11, 2024 · fd36c57 · fd36c57
2 parents 5bdba5b + e6e774e
commit fd36c57
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
  cleanup:
  name: Cleanup and Images
- uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.4.1
+ uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.5.0
  secrets:
  oc_namespace: ${{ secrets.OC_NAMESPACE }}
  oc_token: ${{ secrets.OC_TOKEN }}

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -53,7 +53,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
- - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+ - uses: bcgov-nr/action-builder-ghcr@v2.1.0
  name: Build (${{ matrix.package }})
  with:
  package: ${{ matrix.package }}

diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
@@ -22,7 +22,7 @@ jobs:
  validate:
  name: Validate PR
  needs: [vars]
- uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.4.1
+ uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.5.0
  with:
  markdown_links: |
  Any successful deployments (not always required) will be available [here](https://${{ github.event.repository.name }}-${{ needs.vars.outputs.url }}-frontend.apps.silver.devops.gov.bc.ca/)

diff --git a/.github/workflows/reusable-tests-repo.yml b/.github/workflows/reusable-tests-repo.yml
@@ -11,7 +11,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
  - name: Run Trivy vulnerability scanner in repo mode
- uses: aquasecurity/trivy-action@0.20.0
+ uses: aquasecurity/trivy-action@0.24.0
  with:
  format: "sarif"
  output: "trivy-results.sarif"

diff --git a/frontend/src/pages/SubmissionListPage.vue b/frontend/src/pages/SubmissionListPage.vue
@@ -168,7 +168,7 @@ const summitSvg = useSvg(summit);
  </div>
 
  <div class="empty-submission-list" 
- v-if="totalItems == 0 && userhasAuthority">
+ v-if="totalItems == 0 && userhasAuthority && !loading">
  <summit-svg alt="Summit pictogram" 
  class="standard-svg"/>
  <p class="heading-02">No submissions to show yet</p>