Merge pull request #163 from cabinetoffice/release/v12.1

Release/v12.1
cabinetoffice · Sep 2, 2024 · 1e7c69b · 1e7c69b
2 parents f85af31 + 237c354
commit 1e7c69b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 75 deletions.
diff --git 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
diff --git a/.snyk b/.snyk
diff --git 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
@@ -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
@@ -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.*',