[BIOMAGE-1903] add two checkboxes for compliance

src/__test__/components/ContentWrapper.test.jsx

@@ -36,7 +36,11 @@ jest.mock('next/router', () => ({
 }));
 
 jest.mock('@aws-amplify/auth', () => ({
-  currentAuthenticatedUser: jest.fn().mockImplementation(async () => true),
+  currentAuthenticatedUser: jest.fn().mockImplementation(async () => ({
+    attributes: {
+      'custom:agreed_terms': 'true',
+    },
+  })),
   federatedSignIn: jest.fn(),
 }));
 
@@ -124,7 +128,6 @@ describe('ContentWrapper', () => {
     await store.dispatch(updateExperimentInfo({ experimentId, experimentName, sampleIds }));
   });
 
-  // PROBLEMATIC
   it('renders correctly', async () => {
     getBackendStatus.mockImplementation(() => () => ({
       loading: false,

src/__test__/components/data-management/SamplesTable.test.jsx

@@ -19,13 +19,19 @@ import thunk from 'redux-thunk';
 import createTestComponentFactory from '__test__/test-utils/testComponentFactory';
 
 import { loadExperiments, setActiveExperiment } from 'redux/actions/experiments';
-import loadEnvironment from 'redux/actions/networkResources/loadEnvironment';
+import loadDeploymentInfo from 'redux/actions/networkResources/loadDeploymentInfo';
 import { loadSamples } from 'redux/actions/samples';
 
 import mockDemoExperiments from '__test__/test-utils/mockData/mockDemoExperiments.json';
+import { loadUser } from 'redux/actions/user';
 
 jest.mock('@aws-amplify/auth', () => ({
-  currentAuthenticatedUser: jest.fn(() => Promise.resolve({ attributes: { name: 'mockUserName' } })),
+  currentAuthenticatedUser: jest.fn(() => Promise.resolve({
+    attributes: {
+      name: 'mockUserName',
+      'custom:agreed_terms': 'true',
+    },
+  })),
   federatedSignIn: jest.fn(),
 }));
 
@@ -103,7 +109,9 @@ describe('Samples table', () => {
 
     // Defaults to project with samples
     await storeState.dispatch(setActiveExperiment(experimentWithSamplesId));
-    await storeState.dispatch(loadEnvironment('test'));
+    await storeState.dispatch(loadDeploymentInfo({ environment: 'test' }));
+
+    await storeState.dispatch(loadUser());
   });
 
   it('Does not show prompt to upload datasets if samples are available', async () => {

src/__test__/components/header/UserButton.test.jsx

@@ -1,3 +1,5 @@
+import React from 'react';
+
 import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { act } from 'react-dom/test-utils';
@@ -6,12 +8,19 @@ import Auth from '@aws-amplify/auth';
 
 import UserButton from 'components/header/UserButton';
 import createTestComponentFactory from '__test__/test-utils/testComponentFactory';
+import { Provider } from 'react-redux';
+import { makeStore } from 'redux/store';
+import { loadUser } from 'redux/actions/user';
 
 const UserButtonFactory = createTestComponentFactory(UserButton);
 
-const renderUserButton = async () => {
+const renderUserButton = async (store) => {
   await act(async () => {
-    render(UserButtonFactory({}));
+    render(
+      <Provider store={store}>
+        {UserButtonFactory(store)}
+      </Provider>,
+    );
   });
 };
 
@@ -26,32 +35,39 @@ const getLoginButton = () => {
 };
 
 describe('UserButton', () => {
+  let store;
+
   beforeEach(async () => {
     jest.clearAllMocks();
 
-    Auth.currentAuthenticatedUser = jest.fn(() => Promise.resolve({ attributes: { name: userName } }));
+    store = makeStore();
+
+    Auth.currentAuthenticatedUser = jest.fn(() => Promise.resolve({ attributes: { name: userName, 'custom:agreed_terms': 'true' } }));
     Auth.signOut = jest.fn(() => { });
     Auth.federatedSignIn = jest.fn(() => { });
+
+    store.dispatch(loadUser());
   });
 
   it('Shows sign in by default', async () => {
     Auth.currentAuthenticatedUser = jest.fn(() => Promise.resolve(null));
+    store.dispatch(loadUser());
 
-    await renderUserButton();
+    await renderUserButton(store);
 
     expect(screen.getByText(/Sign in/i)).toBeInTheDocument();
   });
 
   it('Shows the user initial for the ', async () => {
     const userInitial = getUserInitial();
 
-    await renderUserButton();
+    await renderUserButton(store);
 
     expect(screen.getByText(userInitial)).toBeInTheDocument();
   });
 
   it('Clicking on menu opens up the menu bar', async () => {
-    await renderUserButton();
+    await renderUserButton(store);
 
     const button = getLoginButton();
 

src/__test__/pages/__snapshots__/_error.test.jsx.snap

@@ -134,6 +134,7 @@ Array [
       },
     },
     "networkResources": Object {
+      "domainName": "scp.biomage.net",
       "environment": "production",
     },
     "samples": Object {
@@ -143,6 +144,9 @@ Array [
         "saving": false,
       },
     },
+    "user": Object {
+      "current": null,
+    },
   },
 ]
 `;
@@ -281,6 +285,7 @@ Array [
       },
     },
     "networkResources": Object {
+      "domainName": "scp.biomage.net",
       "environment": "staging",
     },
     "samples": Object {
@@ -290,6 +295,9 @@ Array [
         "saving": false,
       },
     },
+    "user": Object {
+      "current": null,
+    },
   },
 ]
 `;

src/__test__/pages/_error.test.jsx

@@ -6,7 +6,8 @@ import { Provider } from 'react-redux';
 import { makeStore } from 'redux/store';
 
 import postErrorToSlack from 'utils/postErrorToSlack';
-import loadEnvironment from 'redux/actions/networkResources/loadEnvironment';
+import loadDeploymentInfo from 'redux/actions/networkResources/loadDeploymentInfo';
+import { DomainName } from 'utils/deploymentInfo';
 
 import createTestComponentFactory from '__test__/test-utils/testComponentFactory';
 
@@ -36,7 +37,7 @@ describe('ErrorPage', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     storeState = makeStore();
-    storeState.dispatch(loadEnvironment('production'));
+    storeState.dispatch(loadDeploymentInfo({ environment: 'production', domainName: DomainName.BIOMAGE }));
   });
 
   it('Renders properly without props', () => {
@@ -70,7 +71,7 @@ describe('ErrorPage', () => {
   });
 
   it('Should post error to Slack if environment is production', () => {
-    storeState.dispatch(loadEnvironment('production'));
+    storeState.dispatch(loadDeploymentInfo({ environment: 'production', domainName: DomainName.BIOMAGE }));
 
     renderErrorPage(mockErrorProp, storeState);
 
@@ -79,7 +80,7 @@ describe('ErrorPage', () => {
   });
 
   it('Should post error to Slack if environment is staging', () => {
-    storeState.dispatch(loadEnvironment('staging'));
+    storeState.dispatch(loadDeploymentInfo({ environment: 'staging', domainName: DomainName.BIOMAGE }));
 
     renderErrorPage(mockErrorProp, storeState);
 
@@ -88,7 +89,7 @@ describe('ErrorPage', () => {
   });
 
   it('Should not post error to Slack if environment is not production', () => {
-    storeState.dispatch(loadEnvironment('development'));
+    storeState.dispatch(loadDeploymentInfo({ environment: 'development', domainName: DomainName.BIOMAGE }));
 
     renderErrorPage(mockErrorProp, storeState);
 

src/__test__/pages/experiments/[experimentId]/data-management/index.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import fetchMock, { enableFetchMocks } from 'jest-fetch-mock';
 import { Provider } from 'react-redux';
@@ -20,7 +20,8 @@ import DataManagementPage from 'pages/data-management';
 import userEvent from '@testing-library/user-event';
 
 import { setActiveExperiment } from 'redux/actions/experiments';
-import loadEnvironment from 'redux/actions/networkResources/loadEnvironment';
+import loadDeploymentInfo from 'redux/actions/networkResources/loadDeploymentInfo';
+import { loadUser } from 'redux/actions/user';
 
 jest.mock('utils/data-management/downloadFromUrl');
 jest.mock('react-resize-detector', () => (props) => props.children({ width: 100, height: 100 }));
@@ -34,7 +35,12 @@ jest.mock('utils/AppRouteProvider', () => ({
 }));
 
 jest.mock('@aws-amplify/auth', () => ({
-  currentAuthenticatedUser: jest.fn(() => Promise.resolve({ attributes: { name: 'mockUserName' } })),
+  currentAuthenticatedUser: jest.fn(() => Promise.resolve({
+    attributes: {
+      name: 'mockUserName',
+      'custom:agreed_terms': 'true',
+    },
+  })),
   federatedSignIn: jest.fn(),
 }));
 
@@ -53,11 +59,6 @@ const experimentWithoutSamples = experiments.find(
   (experiment) => experiment.samplesOrder.length === 0,
 );
 
-const expectedSampleNames = [
-  'Example 1',
-  'Another-Example no.2',
-];
-
 const experimentWithSamplesId = experimentWithSamples.id;
 const experimentWithoutSamplesId = experimentWithoutSamples.id;
 
@@ -79,7 +80,8 @@ describe('Data Management page', () => {
     fetchMock.mockIf(/.*/, mockAPI(mockAPIResponse));
 
     storeState = makeStore();
-    storeState.dispatch(loadEnvironment('test'));
+    storeState.dispatch(loadDeploymentInfo({ environment: 'test' }));
+    storeState.dispatch(loadUser());
   });
 
   it('Shows an empty project list if there are no projects', async () => {

src/__test__/pages/settings/profile/index.test.jsx

@@ -4,10 +4,15 @@ import { render, screen } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import userEvent from '@testing-library/user-event';
 import { useRouter } from 'next/router';
+import { makeStore } from 'redux/store';
 import createTestComponentFactory from '__test__/test-utils/testComponentFactory';
 import Auth from '@aws-amplify/auth';
 import ProfileSettings from 'pages/settings/profile';
 import pushNotificationMessage from 'utils/pushNotificationMessage';
+import { Provider } from 'react-redux';
+
+import { loadUser } from 'redux/actions/user';
+import loadDeploymentInfo from 'redux/actions/networkResources/loadDeploymentInfo';
 
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
@@ -16,19 +21,43 @@ jest.mock('next/router', () => ({
 jest.mock('@aws-amplify/auth', () => jest.fn());
 jest.mock('utils/pushNotificationMessage');
 
-const profileSettingsPageFactory = createTestComponentFactory(ProfileSettings);
 const updateMock = jest.fn(() => Promise.resolve(true));
 
+const profileSettingsPageFactory = createTestComponentFactory(ProfileSettings);
+
+const renderProfileSettingsPage = (store, newState = {}) => {
+  render(
+    <Provider store={store}>
+      {profileSettingsPageFactory(newState)}
+    </Provider>,
+  );
+};
+
+const setUpAuthMocks = () => {
+  Auth.currentAuthenticatedUser = jest.fn(() => Promise.resolve({
+    attributes: {
+      name: userName,
+      'custom:agreed_terms': 'true',
+    },
+  }));
+  Auth.signOut = jest.fn(() => { });
+  Auth.federatedSignIn = jest.fn(() => { });
+  Auth.updateUserAttributes = updateMock;
+};
+
 const userName = 'Arthur Dent';
 jest.mock('components/Header', () => () => <></>);
 
 describe('Profile page', () => {
+  const store = makeStore();
+
   beforeEach(async () => {
     jest.clearAllMocks();
-    Auth.currentAuthenticatedUser = jest.fn(() => Promise.resolve({ attributes: { name: userName } }));
-    Auth.signOut = jest.fn(() => { });
-    Auth.federatedSignIn = jest.fn(() => { });
-    Auth.updateUserAttributes = updateMock;
+
+    setUpAuthMocks();
+
+    store.dispatch(loadDeploymentInfo({ environment: 'test' }));
+    store.dispatch(loadUser());
   });
 
   it('check that the back button is called on cancel', async () => {
@@ -38,9 +67,7 @@ describe('Profile page', () => {
     }));
 
     await act(async () => {
-      render(
-        profileSettingsPageFactory(),
-      );
+      renderProfileSettingsPage(store);
     });
 
     await act(async () => {
@@ -52,9 +79,7 @@ describe('Profile page', () => {
 
   it('check update is called on Save changes', async () => {
     await act(async () => {
-      render(
-        profileSettingsPageFactory(),
-      );
+      renderProfileSettingsPage(store);
     });
 
     const nameInput = screen.getByPlaceholderText(userName);

src/__test__/redux/actions/experiments/__snapshots__/switchExperiment.test.js.snap

@@ -183,6 +183,7 @@ Object {
     },
   },
   "networkResources": Object {
+    "domainName": undefined,
     "environment": undefined,
   },
   "samples": Object {
@@ -321,6 +322,9 @@ Object {
       "uuid": "test9188-d682-test-mock-cb6d644cmock-2",
     },
   },
+  "user": Object {
+    "current": null,
+  },
 }
 `;
 
@@ -507,6 +511,7 @@ Object {
     },
   },
   "networkResources": Object {
+    "domainName": undefined,
     "environment": undefined,
   },
   "samples": Object {
@@ -645,5 +650,8 @@ Object {
       "uuid": "test9188-d682-test-mock-cb6d644cmock-2",
     },
   },
+  "user": Object {
+    "current": null,
+  },
 }
 `;