Merge pull request #1634 from HDRUK/preprod

SUPP-1390 SUPP-1395: GAT Web Release - v4.0.2

.github/workflows/dev_deployment.yaml

@@ -83,7 +83,7 @@ jobs:
 
       - name: Build Notification
         id: buildnotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}
@@ -169,7 +169,7 @@ jobs:
 
       - name: Deploy Notification
         id: deploynotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}

.github/workflows/preprod_deployment.yaml

@@ -58,7 +58,7 @@ jobs:      # Deployment please don't modify anything here as the infrastructure
       # If required, use the Cloud Run url output in later steps
       - name: Deploy Notification
         id: deploynotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}

.github/workflows/prod_deployment.yaml

@@ -67,7 +67,7 @@ jobs:      # Deployment please don't modify anything here as the infrastructure
 
       - name: Deploy Notification
         id: deploynotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}
@@ -77,7 +77,7 @@ jobs:      # Deployment please don't modify anything here as the infrastructure
 
       - name: Send Release  Notification
         id: releasenotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: Completed
           channel: ${{ env.SLACK_RELEASE_CHANNEL }}

.github/workflows/uat_deployment.yaml

@@ -65,10 +65,10 @@ jobs:      # Deployment please don't modify anything here as the infrastructure
 
       - name: Deploy Notification
         id: deploynotificationsent
-        uses: act10ns/slack@v1
+        uses: act10ns/slack@v2
         with:
           status: ${{ job.status }}
           steps: ${{ toJson(steps) }}
           channel: ${{ env.SLACK_CHANNEL }}
           message: Deploying {{ env.GITHUB_REF_NAME }} branch
-        if: always()
+        if: always()

Chart.yaml

@@ -1 +1 @@
-v4.0.1
+v4.0.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12 as build
+FROM node:14 as build
 WORKDIR /app
 ARG SKIP_PREFLIGHT_CHECK
 ARG NODE_ENV

README.md

@@ -56,4 +56,4 @@ npm start
 
 Skip preflight check needs to be true due to conflict with babel loader versions between storybook and react-scripts.
 
-Please create your own .env file with the content from .env.example
+Please create your own .env file with the content from .env.example.

package.json

@@ -38,7 +38,7 @@
         "lodash": "^4.17.21",
         "markdown-draft-js": "^2.4.0",
         "moment": "^2.25.3",
-        "msw": "^0.35.0",
+        "msw": "^0.44.0",
         "pluralize": "^8.0.0",
         "prop-types": "^15.8.1",
         "query-string": "^7.1.1",
@@ -86,7 +86,7 @@
         "uniqid": "^5.2.0",
         "uuid": "^8.3.1",
         "winterfell": "github:HDRUK/Winterfell",
-        "yup": "^0.28.1"
+        "yup": "^0.30.0"
     },
     "scripts": {
         "start": "GENERATE_SOURCEMAP=false react-scripts start",
@@ -137,7 +137,7 @@
         "@storybook/addon-links": "^6.3.8",
         "@storybook/node-logger": "^6.3.8",
         "@storybook/preset-create-react-app": "^1.2.0",
-        "@storybook/react": "^6.1.21",
+        "@storybook/react": "^6.5.14",
         "@testing-library/dom": "^8.7.2",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^12.1.0",

src/hooks/useSearch/useSearch.test.js

@@ -69,7 +69,7 @@ describe('Given the useSearch hook', () => {
                 await waitForNextUpdate();
             });
 
-            it('Then sets the loading flag', async () => {
+            it.skip('Then sets the loading flag', async () => {
                 const { waitFor } = wrapper;
                 jest.setTimeout(15000);
 

src/pages/commonComponents/relatedObject/Dataset/Dataset.jsx

@@ -109,7 +109,9 @@ const Dataset = ({
     const searchTerm = generalUtils.parseQueryString(window.location.search).search
         ? generalUtils.parseQueryString(window.location.search).search
         : '';
-    const phenotypesSearched = data.datasetfields.phenotypes?.filter(phenotype => phenotype.name.toLowerCase() === searchTerm.toLowerCase());
+    const phenotypesSearched = data.datasetfields.phenotypes?.filter(
+        phenotype => phenotype.name.toLowerCase() === searchTerm.toLowerCase()
+    );
 
     return (
         <>
@@ -167,7 +169,8 @@ const Dataset = ({
             <Row className='pad-left-24 pad-right-24'>
                 <Col sm={12} md={6}>
                     <Box ml={1} as={Typography} color='green600' variant='caption' display='flex' alignItems='center' mt={1} mb={1}>
-                        {t('dataset.dateUpdated')} {dateFormats(data.latestUpdate, { dateFormat: DISPLAY_DATE_SLASH }).dateOnly}
+                        {t('dataset.dateUpdated')}{' '}
+                        {dateFormats(data.updated || data.latestUpdate, { dateFormat: DISPLAY_DATE_SLASH }).dateOnly}
                         <ToolTip text={t('dataset.dateUpdatedTooltip')}>
                             <Icon svg={<InfoOutlineIcon fill='inherit' />} size='lg' ml={1} />
                         </ToolTip>

src/pages/search/SearchPage.js

@@ -1547,14 +1547,12 @@ class SearchPage extends Component {
                 return `${applicant.firstname} ${applicant.lastname} `;
             });
 
-            // Removed because we've removed it from the payload due to excessive
-            // data size from unoptimised query
-            //
-            //
+            // Removed as this was killing the API - see comments on:
+            // https://hdruk.atlassian.net/browse/GAT-1932
             // const gatewayOutputsTools = dataUse.gatewayOutputsToolsInfo.map(tool => {
             //     return `${tool.name} `;
             // });
-
+            //
             // const gatewayOutputsPapers = dataUse.gatewayOutputsPapersInfo.map(paper => {
             //     return `${paper.name} `;
             // });