{
);
};
+
+ if (!user) return <>;
+
return (
<>
+ {privacyPolicyIsNotAccepted(user, domainName) && (
+
dispatch(loadUser())} />
+ )}
{
const dispatch = useDispatch();
- const environment = useSelector((state) => state?.networkResources?.environment);
+ const {
+ environment = undefined, domainName = undefined,
+ } = useSelector((state) => state?.networkResources ?? {});
+
+ const user = useSelector((state) => state?.user?.current);
const [exampleExperiments, setExampleExperiments] = useState([]);
useEffect(() => {
- if (!environment) return;
+ if (!environment || privacyPolicyIsNotAccepted(user, domainName)) return;
fetchAPI('/v2/experiments/examples').then((experiments) => {
setExampleExperiments(experiments);
}).catch(() => { });
- }, [environment]);
+ }, [environment, user]);
const cloneIntoCurrentExperiment = async (exampleExperimentId) => {
const url = `/v2/experiments/${exampleExperimentId}/clone`;
diff --git a/src/components/data-management/PrivacyPolicyIntercept.css b/src/components/data-management/PrivacyPolicyIntercept.css
new file mode 100644
index 0000000000..5103d2fd38
--- /dev/null
+++ b/src/components/data-management/PrivacyPolicyIntercept.css
@@ -0,0 +1,4 @@
+.ok-to-the-right-modal .ant-modal-confirm-btns .ant-btn {
+ float: right;
+ margin-left: 10px;
+}
\ No newline at end of file
diff --git a/src/components/data-management/PrivacyPolicyIntercept.jsx b/src/components/data-management/PrivacyPolicyIntercept.jsx
new file mode 100644
index 0000000000..b1c0116434
--- /dev/null
+++ b/src/components/data-management/PrivacyPolicyIntercept.jsx
@@ -0,0 +1,99 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+
+import Auth from '@aws-amplify/auth';
+
+import {
+ Modal, Space, Checkbox, Typography,
+} from 'antd';
+
+import 'components/data-management/PrivacyPolicyIntercept.css';
+
+import pushNotificationMessage from 'utils/pushNotificationMessage';
+import endUserMessages from 'utils/endUserMessages';
+
+const { Text } = Typography;
+
+const agreedPrivacyPolicyKey = 'custom:agreed_terms';
+const agreedEmailsKey = 'custom:agreed_emails';
+
+const PrivacyPolicyIntercept = (props) => {
+ const { user, onOk } = props;
+
+ const {
+ attributes: {
+ [agreedPrivacyPolicyKey]: originalAgreedPrivacyPolicy,
+ [agreedEmailsKey]: originalAgreedEmails,
+ },
+ } = user;
+
+ const [agreedPrivacyPolicy, setAgreedPrivacyPolicy] = useState(originalAgreedPrivacyPolicy);
+ const [agreedEmails, setAgreedEmails] = useState(originalAgreedEmails ?? 'false');
+
+ const privacyPolicyUrl = 'https://static1.squarespace.com/static/5f355513fc75aa471d47455c/t/62d67b8cbd2d7f3177d91f83/1658223501108/Privacy+Policy_July+2022.pdf';
+
+ return (
+ {
+ await Auth.updateUserAttributes(
+ user,
+ {
+ [agreedPrivacyPolicyKey]: agreedPrivacyPolicy,
+ [agreedEmailsKey]: agreedEmails,
+ },
+ )
+ .then(() => {
+ pushNotificationMessage('success', endUserMessages.ACCOUNT_DETAILS_UPDATED, 3);
+ onOk();
+ })
+ .catch(() => pushNotificationMessage('error', endUserMessages.ERROR_SAVING, 3));
+ }}
+ onCancel={async () => Auth.signOut()}
+ >
+
+
+ setAgreedPrivacyPolicy(e.target.checked.toString())}
+ />
+
+ *
+ I accept the terms of the
+ {' '}
+ Biomage privacy policy
+ .
+
+
+
+ setAgreedEmails(e.target.checked.toString())}
+ style={{ marginRight: 10 }}
+ />
+
+ I agree to receive updates about new features in Cellenics,
+ research done with Cellenics, and Cellenics community events. (No external marketing.)
+
+
+
+
+ );
+};
+
+PrivacyPolicyIntercept.propTypes = {
+ user: PropTypes.object.isRequired,
+ onOk: PropTypes.func.isRequired,
+};
+
+PrivacyPolicyIntercept.defaultProps = {};
+
+export default PrivacyPolicyIntercept;
diff --git a/src/components/header/UserButton.jsx b/src/components/header/UserButton.jsx
index a64c307f7e..f31793940c 100644
--- a/src/components/header/UserButton.jsx
+++ b/src/components/header/UserButton.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
import {
Avatar,
Button,
@@ -11,24 +11,23 @@ import Auth from '@aws-amplify/auth';
import endUserMessages from 'utils/endUserMessages';
import { resetTrackingId } from 'utils/tracking';
import handleError from 'utils/http/handleError';
+import { loadUser } from 'redux/actions/user';
+import { useDispatch, useSelector } from 'react-redux';
const UserButton = () => {
- const [user, setUser] = useState();
+ const dispatch = useDispatch();
- const getUser = () => Auth.currentAuthenticatedUser()
- .then((userData) => userData)
- .catch((e) => console.log('error during getuser', e));
+ const user = useSelector((state) => state.user.current);
useEffect(() => {
Hub.listen('auth', ({ payload: { event } }) => {
switch (event) {
case 'signIn':
case 'cognitoHostedUI':
- getUser().then((userData) => setUser(userData));
+ dispatch(loadUser());
break;
case 'signOut':
resetTrackingId();
- setUser(null);
break;
case 'signIn_failure':
case 'cognitoHostedUI_failure':
@@ -38,13 +37,11 @@ const UserButton = () => {
break;
}
});
-
- getUser().then((userData) => setUser(userData));
}, []);
const content = () => (