diff --git a/.github/workflows/pushImage.yml b/.github/workflows/pushImage.yml index cd0a7a1..ef9c9c2 100644 --- a/.github/workflows/pushImage.yml +++ b/.github/workflows/pushImage.yml @@ -45,7 +45,7 @@ jobs: id: nvm - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "${{ steps.nvm.outputs.NVMRC }}" cache: 'yarn' @@ -55,7 +55,7 @@ jobs: # Based on steps described here - https://nextjs.org/docs/pages/building-your-application/deploying/ci-build-caching#github-actions - name: Next cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ github.workspace }}/.next/cache key: next-cache-${{ steps.yarn-lock-hash.outputs.name }}-${{ steps.source-file-hash.outputs.name }} @@ -86,13 +86,13 @@ jobs: docker-image-name: ${{ steps.docker-image-name.outputs.name }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Fetch all commits since we use the total commit count to determine the build version fetch-depth: 0 - name: Setup AWS credentials - uses: aws-actions/configure-aws-credentials@v3 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.AWS_ROLE_ARN }} role-session-name: github-gap-find-web @@ -128,7 +128,7 @@ jobs: run: docker save --output ${{ steps.docker-image-name.outputs.name }}.tar $ECR_REGISTRY/find-a-grant-client:${{ env.BUILD_VERSION }} - name: Upload Docker image - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.docker-image-name.outputs.name }} path: ${{ steps.docker-image-name.outputs.name }}.tar @@ -147,13 +147,13 @@ jobs: contents: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Fetch all commits since we use the total commit count to determine the build version fetch-depth: 0 - name: Setup AWS credentials - uses: aws-actions/configure-aws-credentials@v3 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.AWS_ROLE_ARN }} role-session-name: github-gap-find-web @@ -170,7 +170,7 @@ jobs: echo BUILD_VERSION is ${{ env.BUILD_VERSION }} - name: Download Docker image - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ needs.build.outputs.docker-image-name }} diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml deleted file mode 100644 index 1e61703..0000000 --- a/.github/workflows/snyk.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Security Vulnerabilities - -on: - pull_request: - branches: - - develop - -jobs: - build: - name: Snyk scan - - runs-on: ubuntu-latest - - permissions: - contents: read - - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - - name: Snyk setup - uses: snyk/actions/node@master - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - args: --strict-out-of-sync=false diff --git a/.snyk b/.snyk deleted file mode 100644 index 68d6607..0000000 --- a/.snyk +++ /dev/null @@ -1,41 +0,0 @@ -# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. -version: v1.25.0 -# ignores vulnerabilities until expiry date; change duration by modifying expiry date -ignore: - SNYK-JS-POSTCSS-5926692: - - '*': - reason: >- - Dev dependency - upgrade requires migration to next 13 - expires: 2023-09-30T14:10:46.319Z - created: 2023-09-05T14:10:46.321Z - SNYK-JS-AXIOS-6032459: - - '*': - reason: >- - Dev dependency - upgrade requires migration to contentful 10.4.0 which introduces breaking changes - expires: 2024-04-01T00:00:46.319Z - created: 2023-10-27T16:30:46.321Z - SNYK-JS-NEXT-6032387: - - '*': - reason: >- - Dev dependency - upgrade requires migration to next 13 - expires: 2023-10-31T00:00:46.319Z - created: 2023-10-27T16:30:46.321Z - SNYK-JS-AXIOS-6124857: - - '*': - reason: >- - Dev dependency - upgrade requires migration to contentful 10.4.0 - expires: 2024-04-01T15:43:03.411Z - created: 2024-02-07T15:43:03.416Z - SNYK-JS-AXIOS-6144788: - - '*': null - reason: >- - Dev dependency - upgrade requires migration to contentful 10.4.0 - expires: 2024-04-01T15:43:45.894Z - created: 2024-02-07T15:43:45.901Z - SNYK-JS-FOLLOWREDIRECTS-6444610: - - '*': - reason: >- - Subdependency of Contenful - no direct upgrade path - expires: 2024-08-12T13:23:00.901Z - created: 2024-05-12T13:23:00.901Z -patch: {} diff --git a/src/service/elastic_service.data.js b/src/service/elastic_service.data.js index 189fe47..efd3c38 100644 --- a/src/service/elastic_service.data.js +++ b/src/service/elastic_service.data.js @@ -16,6 +16,7 @@ export const elasticSearchResultMinimumAmount = { ELASTIC_INDEX_FIELDS.summary, ELASTIC_INDEX_FIELDS.eligibility, ELASTIC_INDEX_FIELDS.shortDescription, + ELASTIC_INDEX_FIELDS.grantFunder, ], fuzziness: 'AUTO', operator: 'AND', @@ -57,6 +58,7 @@ export const elasticSearchResultMaximumAmount = { ELASTIC_INDEX_FIELDS.summary, ELASTIC_INDEX_FIELDS.eligibility, ELASTIC_INDEX_FIELDS.shortDescription, + ELASTIC_INDEX_FIELDS.grantFunder, ], fuzziness: 'AUTO', operator: 'AND', @@ -98,6 +100,7 @@ export const elasticSearchResultClosingDate = { ELASTIC_INDEX_FIELDS.summary, ELASTIC_INDEX_FIELDS.eligibility, ELASTIC_INDEX_FIELDS.shortDescription, + ELASTIC_INDEX_FIELDS.grantFunder, ], fuzziness: 'AUTO', operator: 'AND', @@ -139,6 +142,7 @@ export const elasticSearchResultWithoutSort = { ELASTIC_INDEX_FIELDS.summary, ELASTIC_INDEX_FIELDS.eligibility, ELASTIC_INDEX_FIELDS.shortDescription, + ELASTIC_INDEX_FIELDS.grantFunder, ], fuzziness: 'AUTO', operator: 'AND', diff --git a/src/service/elastic_service.ts b/src/service/elastic_service.ts index de5ee6d..da1639f 100644 --- a/src/service/elastic_service.ts +++ b/src/service/elastic_service.ts @@ -124,6 +124,7 @@ export class ElasticSearchService { ELASTIC_INDEX_FIELDS.summary, ELASTIC_INDEX_FIELDS.eligibility, ELASTIC_INDEX_FIELDS.shortDescription, + ELASTIC_INDEX_FIELDS.grantFunder, ], }, }); diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 148c628..144efdb 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -99,6 +99,7 @@ export const URL_ACTION_MESSAGES = new Map([ export const ELASTIC_INDEX_FIELDS = { grantName: 'fields.grantName.en-US', + grantFunder: 'fields.grantFunder.en-US', shortDescription: 'fields.grantShortDescription.en-US', summary: 'fields.grantSummaryTab.en-US.content.content.*', eligibility: 'fields.grantEligibilityTab.en-US.content.content.*',