Merge pull request #5582 from dfe-analytical-services/master

Merging master into dev after PR's #5578, #5580, #5581, #5583
dfe-analytical-services · Feb 3, 2025 · 9a7e4ba · 9a7e4ba
2 parents 230a6ea + 71caccc
commit 9a7e4ba
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 29 deletions.
diff --git a/.npmrc b/.npmrc
@@ -3,8 +3,8 @@ engine-strict=true
 # feature parity with npm
 auto-install-peers=true
 
-# create a flat, non-symlinked node_modules structure 
-# (as the project doesn't play nice with symlinks). 
+# create a flat, non-symlinked node_modules structure
+# (as the project doesn't play nice with symlinks).
 # see https://pnpm.io/feature-comparison for more info
 shamefully-hoist=true
 

diff --git a/README.md b/README.md
@@ -104,20 +104,13 @@ Corepack is a tool installed as part of your Node.js installation that allows yo
 manage multiple package manager versions in your environment based on per-project configuration 
 (via the `packageManager` field in `package.json`). 
 
-We use corepack to ensure that everyone is using the same version of PNPM to avoid any issues when 
+We use Corepack to ensure that everyone is using the same version of PNPM to avoid any issues when 
 people are using different versions of PNPM. 
 
 In order to install Corepack and the right version of PNPM, run the following command:
 
 ```bash
-corepack enable
-```
-
-If for some reason the above corepack command doesn't work, you can install PNPM manually by running:
-
-```bash
-PNPM_VERSION=$(node -e "console.log(require('./package.json').engines.pnpm)")
-curl -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION=$PNPM_VERSION sh -
+corepack install
 ```
 
 This will install the package manager version specified in the `package.json` file. You can check
@@ -135,6 +128,14 @@ Install the project's PNPM dependencies by simply running:
 pnpm i
 ```
 
+If this fails with an integrity key check, install the latest version of Corepack first:
+
+```bash
+npm i -g corepack@latest
+corepack install
+pnpm i
+```
+
 ### Set up the database and storage emulator hosts
 
 Add the following to your `hosts` file:

diff --git a/azure-pipelines-main.yml b/azure-pipelines-main.yml
@@ -261,6 +261,13 @@ jobs:
         inputs:
           version: $(NodeVersion)
 
+      - task: Bash@3
+        displayName: Install Corepack
+        inputs:
+          workingDir: .
+          targetType: inline
+          script: npm i -g corepack@latest
+
       - task: Bash@3
         displayName: corepack enable
         inputs:
@@ -331,6 +338,13 @@ jobs:
         inputs:
           version: $(NodeVersion)
 
+      - task: Bash@3
+        displayName: Install Corepack
+        inputs:
+          workingDir: .
+          targetType: inline
+          script: npm i -g corepack@latest
+
       - task: Bash@3
         displayName: corepack enable
         inputs:

diff --git a/docker/public-frontend/Dockerfile b/docker/public-frontend/Dockerfile
@@ -3,6 +3,7 @@ FROM node:20.16.0-alpine AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
+RUN npm i -g corepack@latest
 RUN corepack enable
 
 WORKDIR /app

diff --git a/infrastructure/parameters/prod.parameters.json b/infrastructure/parameters/prod.parameters.json
@@ -93,7 +93,7 @@
       "value": 4294967296
     },
     "maxStatsDbSizeBytes": {
-      "value": 1610612736000
+      "value": 2199023255552
     },
     "publicDataDbExists": {
       "value": false

diff --git a/...re-education-statistics-frontend/src/modules/find-statistics/PreReleaseAccessListPage.tsx b/...re-education-statistics-frontend/src/modules/find-statistics/PreReleaseAccessListPage.tsx
@@ -22,9 +22,7 @@ const PreReleaseAccessListPage = ({ release }: Props) => {
         { name: 'Find statistics and data', link: '/find-statistics' },
         {
           name: release.publication.title,
-          link: release.latestRelease
-            ? `/find-statistics/${release.publication.slug}`
-            : `/find-statistics/${release.publication.slug}/${release.slug}`,
+          link: `/find-statistics/${release.publication.slug}/${release.slug}`,
         },
       ]}
       breadcrumbLabel="Pre-release access list"

diff --git a/...lore-education-statistics-frontend/src/modules/find-statistics/PublicationReleasePage.tsx b/...lore-education-statistics-frontend/src/modules/find-statistics/PublicationReleasePage.tsx
@@ -126,7 +126,7 @@ const PublicationReleasePage: NextPage<Props> = ({ release }) => {
                     <Link
                       className="govuk-!-display-none-print govuk-!-display-block govuk-!-margin-bottom-3"
                       unvisited
-                      to={`/data-tables/${release.publication.slug}/${release.slug}`}
+                      to={`/find-statistics/${release.publication.slug}/${release.slug}`}
                     >
                       View latest data:{' '}
                       <span className="govuk-!-font-weight-bold">
@@ -295,11 +295,7 @@ const PublicationReleasePage: NextPage<Props> = ({ release }) => {
             <ul className="govuk-list">
               <li>
                 <Link
-                  to={
-                    release.latestRelease
-                      ? `/find-statistics/${release.publication.slug}/data-guidance`
-                      : `/find-statistics/${release.publication.slug}/${release.slug}/data-guidance`
-                  }
+                  to={`/find-statistics/${release.publication.slug}/${release.slug}/data-guidance`}
                 >
                   Data guidance
                 </Link>
@@ -308,11 +304,7 @@ const PublicationReleasePage: NextPage<Props> = ({ release }) => {
               {release.hasPreReleaseAccessList && (
                 <li>
                   <Link
-                    to={
-                      release.latestRelease
-                        ? `/find-statistics/${release.publication.slug}/prerelease-access-list`
-                        : `/find-statistics/${release.publication.slug}/${release.slug}/prerelease-access-list`
-                    }
+                    to={`/find-statistics/${release.publication.slug}/${release.slug}/prerelease-access-list`}
                   >
                     Pre-release access list
                   </Link>

diff --git a/...ore-education-statistics-frontend/src/modules/find-statistics/ReleaseDataGuidancePage.tsx b/...ore-education-statistics-frontend/src/modules/find-statistics/ReleaseDataGuidancePage.tsx
@@ -20,9 +20,7 @@ const ReleaseDataGuidancePage = ({ release }: Props) => {
         { name: 'Find statistics and data', link: '/find-statistics' },
         {
           name: release.publication.title,
-          link: release.latestRelease
-            ? `/find-statistics/${release.publication.slug}`
-            : `/find-statistics/${release.publication.slug}/${release.slug}`,
+          link: `/find-statistics/${release.publication.slug}/${release.slug}`,
         },
       ]}
       breadcrumbLabel="Data guidance"