diff --git a/asreview/webapp/public/index.html b/asreview/webapp/public/index.html
index 02adf2fac..7aef04546 100644
--- a/asreview/webapp/public/index.html
+++ b/asreview/webapp/public/index.html
@@ -1,4 +1,4 @@
-
+
}
- />
+
- )
+ );
};
return (
@@ -201,27 +200,26 @@ const App = (props) => {
- { (appReady === false) &&
+ {appReady === false && (
-
- }
- { (appReady === true) && (authentication === false) &&
- {render_routes()} }
+ )}
+ {appReady === true && authentication === false && (
+ {render_routes()}
+ )}
- { (appReady === true) && (authentication === true) &&
+ {appReady === true && authentication === true && (
- { render_sign_routes() }
-
- }
+ )}
{/* Dialogs */}
@@ -239,7 +237,6 @@ const App = (props) => {
toggleUndoEnabled={toggleUndoEnabled}
/>
@@ -241,7 +241,7 @@ const AppBarWithinDialog = React.forwardRef(
);
- }
+ },
);
AppBarWithinDialog.propTypes = {
diff --git a/asreview/webapp/src/Components/ConfirmAccount.js b/asreview/webapp/src/Components/ConfirmAccount.js
index 484899672..3aace3043 100644
--- a/asreview/webapp/src/Components/ConfirmAccount.js
+++ b/asreview/webapp/src/Components/ConfirmAccount.js
@@ -8,33 +8,32 @@ const ConfirmAccount = () => {
const [searchParams] = useSearchParams();
const [errorMessage, setErrorMessage] = React.useState(false);
- // This effect does a boot request to gather information
+ // This effect does a boot request to gather information
// from the backend
React.useEffect(() => {
- let userId = searchParams.get('user_id')
- let token = searchParams.get('token');
+ let userId = searchParams.get("user_id");
+ let token = searchParams.get("token");
console.log(userId, token);
AuthAPI.confirmAccount({
userId: userId,
- token: token
+ token: token,
})
- .then(response => {
- navigate('/signin')
- })
- .catch(err => {
- // I'd like to have a flash!
- console.log(err);
- setErrorMessage('Could not confirm account: ' + err.message);
- });
- }, [navigate, searchParams])
+ .then((response) => {
+ navigate("/signin");
+ })
+ .catch((err) => {
+ // I'd like to have a flash!
+ console.log(err);
+ setErrorMessage("Could not confirm account: " + err.message);
+ });
+ }, [navigate, searchParams]);
return (
{Boolean(errorMessage) &&
- )
-
+ );
};
-export default ConfirmAccount;
\ No newline at end of file
+export default ConfirmAccount;
diff --git a/asreview/webapp/src/Components/DrawerItem.js b/asreview/webapp/src/Components/DrawerItem.js
index f80a53414..f19a23ce8 100644
--- a/asreview/webapp/src/Components/DrawerItem.js
+++ b/asreview/webapp/src/Components/DrawerItem.js
@@ -20,7 +20,7 @@ import {
Download,
Edit,
History,
- PeopleAlt
+ PeopleAlt,
} from "@mui/icons-material";
const PREFIX = "DrawerItem";
diff --git a/asreview/webapp/src/Components/DrawerItemContainer.js b/asreview/webapp/src/Components/DrawerItemContainer.js
index d5a28c7ac..41ac1697e 100644
--- a/asreview/webapp/src/Components/DrawerItemContainer.js
+++ b/asreview/webapp/src/Components/DrawerItemContainer.js
@@ -24,7 +24,12 @@ import { Diversity3, Help, Payment, Settings } from "@mui/icons-material";
import { DrawerItem, ElasGame } from "../Components";
import { ProjectAPI } from "../api/index.js";
-import { communityURL, donateURL, projectModes, projectStatuses } from "../globals.js";
+import {
+ communityURL,
+ donateURL,
+ projectModes,
+ projectStatuses,
+} from "../globals.js";
import Finished from "../images/ElasHoldingSIGNS_Finished.svg";
import InReview from "../images/ElasHoldingSIGNS_InReview.svg";
import SetUp from "../images/ElasHoldingSIGNS_SetUp.svg";
@@ -91,8 +96,8 @@ const StyledList = styled(List)(({ theme }) => ({
const DrawerItemContainer = (props) => {
const { project_id } = useParams();
- const authentication = useSelector(state => state.authentication);
- const allowTeams = useSelector(state => state.allow_teams);
+ const authentication = useSelector((state) => state.authentication);
+ const allowTeams = useSelector((state) => state.allow_teams);
const queryClient = useQueryClient();
const isFetchingInfo = useIsFetching("fetchInfo");
@@ -102,7 +107,7 @@ const DrawerItemContainer = (props) => {
const fetchProjectInfo = React.useCallback(async () => {
const data = await queryClient.fetchQuery(
["fetchInfo", { project_id }],
- ProjectAPI.fetchInfo
+ ProjectAPI.fetchInfo,
);
setProjectInfo(data);
}, [project_id, queryClient]);
@@ -154,11 +159,14 @@ const DrawerItemContainer = (props) => {
path: "history",
label: "History",
},
- ...(authentication && allowTeams ?
- [{
- path: "team",
- label: "Team",
- }] : []),
+ ...(authentication && allowTeams
+ ? [
+ {
+ path: "team",
+ label: "Team",
+ },
+ ]
+ : []),
{
path: "export",
label: "Export",
diff --git a/asreview/webapp/src/Components/ElasGame.js b/asreview/webapp/src/Components/ElasGame.js
index 546dcf6cf..b90c993a1 100644
--- a/asreview/webapp/src/Components/ElasGame.js
+++ b/asreview/webapp/src/Components/ElasGame.js
@@ -71,13 +71,13 @@ const ElasGame = (props) => {
if (paperSelected?.length < 2) {
setPaperSelected((paperSelected) => paperSelected?.concat(image));
setPaperSelectedIds((paperSelectedIds) =>
- paperSelectedIds?.concat(index)
+ paperSelectedIds?.concat(index),
);
if (paperSelected?.length === 1) {
if (paperSelected[0] === image) {
setOpenCards((openCards) =>
- openCards?.concat([paperSelected[0], image])
+ openCards?.concat([paperSelected[0], image]),
);
}
setTimeout(() => {
diff --git a/asreview/webapp/src/Components/ForgotPassword.js b/asreview/webapp/src/Components/ForgotPassword.js
index faefb6afc..23420387b 100644
--- a/asreview/webapp/src/Components/ForgotPassword.js
+++ b/asreview/webapp/src/Components/ForgotPassword.js
@@ -1,5 +1,5 @@
import * as React from "react";
-import { useSelector } from 'react-redux';
+import { useSelector } from "react-redux";
import { useNavigate } from "react-router-dom";
import { useMutation, useQueryClient } from "react-query";
import {
@@ -62,10 +62,9 @@ const Root = styled("div")(({ theme }) => ({
},
}));
-
const ForgotPassword = () => {
- const emailConfig = useSelector(state => state.email_config) || false;
- const [email, setEmail] = React.useState('');
+ const emailConfig = useSelector((state) => state.email_config) || false;
+ const [email, setEmail] = React.useState("");
const [successMessage, setSuccessMessage] = React.useState(false);
const queryClient = useQueryClient();
const navigate = useNavigate();
@@ -78,28 +77,28 @@ const ForgotPassword = () => {
queryClient.resetQueries("refresh");
},
onSuccess: (data) => {
- setEmail('');
- setSuccessMessage(data.message)
+ setEmail("");
+ setSuccessMessage(data.message);
},
onError: (data) => {
- console.error('Forgot password error', data);
- }
- }
+ console.error("Forgot password error", data);
+ },
+ },
);
const handleSubmit = (event) => {
event.preventDefault();
reset();
mutate({ email });
- }
+ };
const handleEmailChange = (event) => {
setEmail(event.target.value);
};
const handleSignin = (event) => {
- navigate('/signin')
- }
+ navigate("/signin");
+ };
return (
@@ -115,15 +114,18 @@ const ForgotPassword = () => {
alt="ASReview LAB"
/>
Forgot your password?
- { emailConfig &&
+ {emailConfig && (
- Enter your email address, click on the submit button and an email will be sent to you.
- Check your spam or bulk folder if you don't get an email.
+ Enter your email address, click on the submit button and
+ an email will be sent to you. Check your spam or bulk
+ folder if you don't get an email.
- }
- { !emailConfig && Contact your ASReview-app administrator
}
+ )}
+ {!emailConfig && (
+ Contact your ASReview-app administrator
+ )}
- { emailConfig &&
+ {emailConfig && (
<>
{
>
Submit
-
+
Sign In instead
- }
+ )}
@@ -162,4 +167,4 @@ const ForgotPassword = () => {
);
};
-export default ForgotPassword;
\ No newline at end of file
+export default ForgotPassword;
diff --git a/asreview/webapp/src/Components/Header.js b/asreview/webapp/src/Components/Header.js
index 523335750..26fdd2ada 100644
--- a/asreview/webapp/src/Components/Header.js
+++ b/asreview/webapp/src/Components/Header.js
@@ -46,7 +46,7 @@ const mapStateToProps = (state) => {
const Header = (props) => {
const navigate = useNavigate();
- const authentication = useSelector(state => state.authentication);
+ const authentication = useSelector((state) => state.authentication);
return (
@@ -73,7 +73,9 @@ const Header = (props) => {
/>
- { authentication === true &&
@@ -206,8 +204,8 @@ const ProfilePopper = (props) => {
Profile
-
- { false && allowTeams &&
+
+ {false && allowTeams && (
Collaboration Invites
- { projectInvitations.length > 0 &&
- 0 && (
+
-
- }
+ )}
- }
+ )}
@@ -240,15 +240,14 @@ const ProfilePopper = (props) => {
Sign out
-
- { allowTeams &&
- {
handleAcceptance={acceptanceHandler}
handleRejection={rejectionHandler}
/>
- }
-
+ )}
);
};
diff --git a/asreview/webapp/src/Components/RequireAuth.js b/asreview/webapp/src/Components/RequireAuth.js
index 802b266bf..b763ac047 100644
--- a/asreview/webapp/src/Components/RequireAuth.js
+++ b/asreview/webapp/src/Components/RequireAuth.js
@@ -1,7 +1,7 @@
import { useLocation, Navigate } from "react-router-dom";
import useAuth from "../hooks/useAuth";
-const RequireAuth = ({ enforce_authentication=false, children }) => {
+const RequireAuth = ({ enforce_authentication = false, children }) => {
const { auth } = useAuth();
const location = useLocation();
diff --git a/asreview/webapp/src/Components/ResetPassword.js b/asreview/webapp/src/Components/ResetPassword.js
index 93ab6eda7..f3e8caaea 100644
--- a/asreview/webapp/src/Components/ResetPassword.js
+++ b/asreview/webapp/src/Components/ResetPassword.js
@@ -1,4 +1,3 @@
-
import * as React from "react";
import { useSearchParams, useNavigate } from "react-router-dom";
import { useMutation, useQueryClient } from "react-query";
@@ -21,8 +20,8 @@ import { styled } from "@mui/material/styles";
import AuthAPI from "../api/AuthAPI";
import { WordmarkState } from "../globals";
import { useToggle } from "../hooks/useToggle";
-import { useFormik } from 'formik';
-import * as Yup from 'yup';
+import { useFormik } from "formik";
+import * as Yup from "yup";
const PREFIX = "SignInForm";
@@ -72,12 +71,12 @@ const SignupSchema = Yup.object().shape({
password: Yup.string()
.matches(
/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&#])[A-Za-z\d@$!%*?&#]{8,}$/,
- 'Use 8 or more characters with a mix of letters, numbers & symbols'
+ "Use 8 or more characters with a mix of letters, numbers & symbols",
)
- .required('Password is required'),
+ .required("Password is required"),
confirmPassword: Yup.string()
- .required('Password confirmation is required')
- .oneOf([Yup.ref('password'), null], 'Passwords must match')
+ .required("Password confirmation is required")
+ .oneOf([Yup.ref("password"), null], "Passwords must match"),
});
const ResetPassword = (props) => {
@@ -85,11 +84,11 @@ const ResetPassword = (props) => {
const [showPassword, toggleShowPassword] = useToggle();
const [searchParams] = useSearchParams();
const navigate = useNavigate();
- const [errorMessage, setErrorMessage] = React.useState('')
+ const [errorMessage, setErrorMessage] = React.useState("");
const initialValues = {
- password: '',
- confirmPassword: ''
+ password: "",
+ confirmPassword: "",
};
const formik = useFormik({
@@ -101,33 +100,30 @@ const ResetPassword = (props) => {
return !showPassword ? "password" : "text";
};
- const { isLoading, mutate } = useMutation(
- AuthAPI.resetPassword,
- {
- onMutate: () => {
- // clear potential error
- queryClient.resetQueries("refresh");
- },
- onSuccess: (data) => {
- formik.setValues(initialValues, false);
- navigate('/sigin');
- },
- onError: (data) => {
- setErrorMessage(data.message);
- console.error('Reset password error', data);
- }
- }
- );
+ const { isLoading, mutate } = useMutation(AuthAPI.resetPassword, {
+ onMutate: () => {
+ // clear potential error
+ queryClient.resetQueries("refresh");
+ },
+ onSuccess: (data) => {
+ formik.setValues(initialValues, false);
+ navigate("/sigin");
+ },
+ onError: (data) => {
+ setErrorMessage(data.message);
+ console.error("Reset password error", data);
+ },
+ });
const handleSubmit = (event) => {
event.preventDefault();
- let userId = searchParams.get('user_id')
- let token = searchParams.get('token');
+ let userId = searchParams.get("user_id");
+ let token = searchParams.get("token");
let password = formik.values.password;
console.log(userId, token, password);
mutate({ userId, token, password });
//reset();
- }
+ };
return (
@@ -172,8 +168,13 @@ const ResetPassword = (props) => {
/>
- {formik.touched.password && formik.errors.password ? {formik.errors.password} : null}
- {formik.touched.confirmPassword && formik.errors.confirmPassword ? {formik.errors.confirmPassword} : null}
+ {formik.touched.password && formik.errors.password ? (
+ {formik.errors.password}
+ ) : null}
+ {formik.touched.confirmPassword &&
+ formik.errors.confirmPassword ? (
+ {formik.errors.confirmPassword}
+ ) : null}
{
label="Show password"
/>
- {Boolean(errorMessage) &&
{
- )
-
-}
+ );
+};
-export default ResetPassword;
\ No newline at end of file
+export default ResetPassword;
diff --git a/asreview/webapp/src/Components/SettingsDialog.js b/asreview/webapp/src/Components/SettingsDialog.js
index 2f5eec1b2..6a46371e2 100644
--- a/asreview/webapp/src/Components/SettingsDialog.js
+++ b/asreview/webapp/src/Components/SettingsDialog.js
@@ -78,7 +78,7 @@ const SettingsDialog = (props) => {
// second layer font size setting
const handleFontSize = (event, newValue) => {
let fontSizeSelected = fontSizeOptions.find(
- (size) => size.value === newValue
+ (size) => size.value === newValue,
);
if (fontSizeSelected !== props.fontSize) {
props.handleFontSizeChange(fontSizeSelected);
diff --git a/asreview/webapp/src/Components/SignIn.js b/asreview/webapp/src/Components/SignIn.js
index bea9de043..82007e716 100644
--- a/asreview/webapp/src/Components/SignIn.js
+++ b/asreview/webapp/src/Components/SignIn.js
@@ -1,19 +1,9 @@
import * as React from "react";
-import { useSelector } from 'react-redux';
-import {
- Box,
- Card,
- CardContent,
- Fade,
- Stack,
- Typography,
-} from "@mui/material";
+import { useSelector } from "react-redux";
+import { Box, Card, CardContent, Fade, Stack, Typography } from "@mui/material";
import { styled } from "@mui/material/styles";
-import {
- HelpPrivacyTermsButton,
- SignInForm,
-} from "../Components";
+import { HelpPrivacyTermsButton, SignInForm } from "../Components";
import { WordmarkState } from "../globals";
import SignInOAuth from "./SignInOAuth";
@@ -61,10 +51,10 @@ const Root = styled("div")(({ theme }) => ({
},
}));
-
const SignIn = () => {
- const oAuthData = useSelector(state => state.oAuthData);
- const allowAccountCreation = useSelector(state => state.allow_account_creation) || false;
+ const oAuthData = useSelector((state) => state.oAuthData);
+ const allowAccountCreation =
+ useSelector((state) => state.allow_account_creation) || false;
return (
@@ -85,12 +75,9 @@ const SignIn = () => {
classes={classes}
allowAccountCreation={allowAccountCreation}
/>
- { Object.keys(oAuthData.services).length > 0 &&
-
- { allowAccountCreation &&
+ {allowAccountCreation && (
Create profile
- }
+ )}
Forgot password
diff --git a/asreview/webapp/src/Components/SignInOAuth.js b/asreview/webapp/src/Components/SignInOAuth.js
index 0ae9bebac..d5230c55c 100644
--- a/asreview/webapp/src/Components/SignInOAuth.js
+++ b/asreview/webapp/src/Components/SignInOAuth.js
@@ -3,15 +3,8 @@
import * as React from "react";
import { useNavigate } from "react-router-dom";
-import {
- IconButton,
- Stack,
- Typography,
-} from "@mui/material";
-import {
- GitHub,
- Google
-} from "@mui/icons-material";
+import { IconButton, Stack, Typography } from "@mui/material";
+import { GitHub, Google } from "@mui/icons-material";
import { Orcid } from "../icons";
import AuthAPI from "../api/AuthAPI";
import useAuth from "../hooks/useAuth";
@@ -24,9 +17,11 @@ const POPUP_WIDTH = 600;
const redirect_uri = `${window.location.origin}/oauth_callback`;
const generateOAuthUrl = (config) => {
- return `${config.authorization_url}?response_type=code&client_id=${config.client_id}` +
- `&redirect_uri=${redirect_uri}&scope=${config.scope}&state=${config.state}`;
-}
+ return (
+ `${config.authorization_url}?response_type=code&client_id=${config.client_id}` +
+ `&redirect_uri=${redirect_uri}&scope=${config.scope}&state=${config.state}`
+ );
+};
const SignInOauth = (props) => {
const classes = props.classes;
@@ -35,19 +30,19 @@ const SignInOauth = (props) => {
const { setAuth } = useAuth();
const navigate = useNavigate();
- const [errorMessage, setErrorMessage] = React.useState('')
+ const [errorMessage, setErrorMessage] = React.useState("");
const handleSignin = (code, provider) => {
- let message = '';
+ let message = "";
const payload = {
provider: provider,
code: code,
redirect_uri: redirect_uri,
- }
+ };
AuthAPI.oAuthCallback(payload)
- .then(data => {
+ .then((data) => {
if (data.logged_in) {
setAuth({
logged_in: data.logged_in,
@@ -63,59 +58,59 @@ const SignInOauth = (props) => {
navigate("/projects");
}
} else {
- message = 'Backend could not log you in.'
+ message = "Backend could not log you in.";
console.error(message);
setErrorMessage(message);
}
})
- .catch(err => {
- message = 'Did not receive OAuth data from backend';
- console.error(message, err)
+ .catch((err) => {
+ message = "Did not receive OAuth data from backend";
+ console.error(message, err);
setErrorMessage(message);
});
- }
-
+ };
+
const getIcon = (service) => {
- switch(service) {
- case 'google':
- return
- Or sign in with:
- { Object.keys(oAuthServices).map((provider) => {
- let config = oAuthServices[provider];
- return (
- handleSignin(code, provider)}
- onClose={(data) => true}
- key={provider}
- width={POPUP_WIDTH}
- height={POPUP_HEIGHT}
- >
- 'true'}//handleOauthSignIn(provider)}
+ Or sign in with:
+ {Object.keys(oAuthServices).map((provider) => {
+ let config = oAuthServices[provider];
+ return (
+ handleSignin(code, provider)}
+ onClose={(data) => true}
key={provider}
+ width={POPUP_WIDTH}
+ height={POPUP_HEIGHT}
>
- {getIcon(provider)}
-
-
- )
- })}
+ "true"} //handleOauthSignIn(provider)}
+ key={provider}
+ >
+ {getIcon(provider)}
+
+
+ );
+ })}
{Boolean(errorMessage) &&
-
+
@@ -154,7 +147,6 @@ const SignUpForm = (props) => {
noValidate
autoComplete="off"
>
-
{
onChange={formik.handleChange}
onBlur={formik.handleBlur}
/>
- {formik.touched.email && formik.errors.email ? {formik.errors.email} : null}
+ {formik.touched.email && formik.errors.email ? (
+ {formik.errors.email}
+ ) : null}
{
onChange={formik.handleChange}
onBlur={formik.handleBlur}
/>
- {formik.touched.name && formik.errors.name ? {formik.errors.name} : null}
+ {formik.touched.name && formik.errors.name ? (
+ {formik.errors.name}
+ ) : null}
{
onChange={formik.handleChange}
onBlur={formik.handleBlur}
/>
- {formik.touched.affiliation && formik.errors.affiliation ? {formik.errors.affiliation} : null}
+ {formik.touched.affiliation && formik.errors.affiliation ? (
+ {formik.errors.affiliation}
+ ) : null}
{
/>
- {formik.touched.password && formik.errors.password ? {formik.errors.password} : null}
- {formik.touched.confirmPassword && formik.errors.confirmPassword ? {formik.errors.confirmPassword} : null}
+ {formik.touched.password && formik.errors.password ? (
+ {formik.errors.password}
+ ) : null}
+ {formik.touched.confirmPassword &&
+ formik.errors.confirmPassword ? (
+ {formik.errors.confirmPassword}
+ ) : null}
{
}
label="Show password"
/>
- { false &&
+ {false && (
<>
{
Making this account public allows you to collaborate.
- }
+ )}
{isError &&
-
+
Sign In instead
{
Create
-
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/DashboardPage.js b/asreview/webapp/src/HomeComponents/DashboardComponents/DashboardPage.js
index c121a09a9..f3feb152b 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/DashboardPage.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/DashboardPage.js
@@ -5,13 +5,10 @@ import { styled } from "@mui/material/styles";
const Root = styled("div")(({ theme }) => ({}));
const DashboardPage = (props) => {
-
return (
-
- {props.children}
-
+ {props.children}
);
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/NumberCard.js b/asreview/webapp/src/HomeComponents/DashboardComponents/NumberCard.js
index 1978c4e9b..82bb246b4 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/NumberCard.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/NumberCard.js
@@ -35,7 +35,7 @@ export default function NumberCard(props) {
const { data, error, isError, isFetched, isSuccess } = useQuery(
"fetchDashboardStats",
ProjectAPI.fetchDashboardStats,
- { refetchOnWindowFocus: false }
+ { refetchOnWindowFocus: false },
);
return (
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/ProfilePage.js b/asreview/webapp/src/HomeComponents/DashboardComponents/ProfilePage.js
index d809e6be1..3b4459fae 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/ProfilePage.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/ProfilePage.js
@@ -1,12 +1,9 @@
import React from "react";
-import {
- useNavigate,
- useSearchParams
-} from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
import { useMutation, useQuery } from "react-query";
import DashboardPage from "./DashboardPage";
import {
- Box,
+ Box,
Checkbox,
FormControl,
FormControlLabel,
@@ -17,34 +14,32 @@ import {
} from "@mui/material";
import LoadingButton from "@mui/lab/LoadingButton";
-import {
+import {
TypographyH5Medium,
- TypographyH6Medium
+ TypographyH6Medium,
} from "../../StyledComponents/StyledTypography.js";
import { InlineErrorHandler } from "../../Components";
import { useToggle } from "../../hooks/useToggle";
import { AuthAPI } from "../../api";
-import { useFormik } from 'formik';
-import * as Yup from 'yup';
+import { useFormik } from "formik";
+import * as Yup from "yup";
// VALIDATION SCHEMA
const SignupSchema = Yup.object().shape({
- email: Yup.string()
- .email('Invalid email')
- .required('Email is required'),
- name: Yup.string()
- .required('Full name is required'),
+ email: Yup.string().email("Invalid email").required("Email is required"),
+ name: Yup.string().required("Full name is required"),
affiliation: Yup.string()
- .min(2, 'Affiliation must be at least 2 characters long')
+ .min(2, "Affiliation must be at least 2 characters long")
.nullable(),
- password: Yup.string()
- .matches(
- /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&#])[A-Za-z\d@$!%*?&#]{8,}$/,
- 'Use 8 or more characters with a mix of letters, numbers & symbols'
- ),
- confirmPassword: Yup.string()
- .oneOf([Yup.ref('password'), null], 'Passwords must match')
+ password: Yup.string().matches(
+ /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&#])[A-Za-z\d@$!%*?&#]{8,}$/,
+ "Use 8 or more characters with a mix of letters, numbers & symbols",
+ ),
+ confirmPassword: Yup.string().oneOf(
+ [Yup.ref("password"), null],
+ "Passwords must match",
+ ),
});
const ProfilePage = (props) => {
@@ -54,30 +49,27 @@ const ProfilePage = (props) => {
const [loadingSaveButton, setLoadingSaveButton] = React.useState(true);
const [showPasswordFields, setShowPasswordFields] = React.useState(false);
const [searchParams] = useSearchParams();
- const showFirstTimeMessage = searchParams.get('first_time');
+ const showFirstTimeMessage = searchParams.get("first_time");
- const { error, isError, mutate } = useMutation(
- AuthAPI.updateProfile,
- {
- onSuccess: () => {
- navigate('/projects');
- },
- }
- );
+ const { error, isError, mutate } = useMutation(AuthAPI.updateProfile, {
+ onSuccess: () => {
+ navigate("/projects");
+ },
+ });
const handleSubmit = () => {
if (formik.isValid) {
mutate(formik.values);
}
- }
+ };
const initialValues = {
- email: '',
- name: '',
- affiliation: '',
- password: '',
- confirmPassword: '',
- publicAccount: true
+ email: "",
+ name: "",
+ affiliation: "",
+ password: "",
+ confirmPassword: "",
+ publicAccount: true,
};
const formik = useFormik({
@@ -85,29 +77,29 @@ const ProfilePage = (props) => {
validationSchema: SignupSchema,
});
- const {data, isFetched} = useQuery(
- "fetchProfileData",
- AuthAPI.getProfile,
- {
- onSuccess: (data) => {
- formik.setFieldValue('email', data.message.email, true);
- formik.setFieldValue('name', data.message.name, true);
- formik.setFieldValue('affiliation', data.message.affiliation || '', false);
- formik.setFieldValue('public', data.message.public || true);
- // show password field?
- if (data.message.origin === "asreview") {
- setShowPasswordFields(true);
- } else {
- setShowPasswordFields(false);
- }
- // stop spinner in button
- setLoadingSaveButton(false);
- },
- onError: (err) => {
- console.log('Did not fetch profile data from backend', err)
- }
+ const { data, isFetched } = useQuery("fetchProfileData", AuthAPI.getProfile, {
+ onSuccess: (data) => {
+ formik.setFieldValue("email", data.message.email, true);
+ formik.setFieldValue("name", data.message.name, true);
+ formik.setFieldValue(
+ "affiliation",
+ data.message.affiliation || "",
+ false,
+ );
+ formik.setFieldValue("public", data.message.public || true);
+ // show password field?
+ if (data.message.origin === "asreview") {
+ setShowPasswordFields(true);
+ } else {
+ setShowPasswordFields(false);
}
- )
+ // stop spinner in button
+ setLoadingSaveButton(false);
+ },
+ onError: (err) => {
+ console.log("Did not fetch profile data from backend", err);
+ },
+ });
const returnType = () => {
return !showPassword ? "password" : "text";
@@ -140,8 +132,12 @@ const ProfilePage = (props) => {
/>
- {formik.touched.password && formik.errors.password ? {formik.errors.password} : null}
- {formik.touched.confirmPassword && formik.errors.confirmPassword ? {formik.errors.confirmPassword} : null}
+ {formik.touched.password && formik.errors.password ? (
+ {formik.errors.password}
+ ) : null}
+ {formik.touched.confirmPassword && formik.errors.confirmPassword ? (
+ {formik.errors.confirmPassword}
+ ) : null}
{
);
- }
+ };
return (
- { data && isFetched &&
- <>
- {/* Header */}
- theme.palette.background.paper }}
- >
-
- {!props.mobileScreen && (
- Profile
- )}
- {props.mobileScreen && (
- Profile
- )}
-
-
-
- Save
-
-
-
+ {data && isFetched && (
+ <>
+ {/* Header */}
+ theme.palette.background.paper }}
+ >
+
+ {!props.mobileScreen && (
+ Profile
+ )}
+ {props.mobileScreen && (
+ Profile
+ )}
+
+
+
+ Save
+
+
+
+
-
- {/* Page body */}
-
-
- { showFirstTimeMessage &&
- Please take a second to review your profile data:
- }
- {formik.errors.email} : null}
- {formik.errors.name} : null}
- {formik.errors.affiliation} : null}
- {showPasswordFields && renderPasswordFields(formik) }
- { false &&
- <>
-
+
+ {showFirstTimeMessage && (
+
+ Please take a second to review your profile data:
+
+ )}
+ {formik.errors.email}
+ ) : null}
+ {formik.errors.name}
+ ) : null}
+ {formik.errors.affiliation}
+ ) : null}
+ {showPasswordFields && renderPasswordFields(formik)}
+ {false && (
+ <>
+
+ Making this account public allows you to collaborate.
+
+
+ )}
+ {isError && (
- Making this account public allows you to collaborate.
+
-
-
- }
- {isError &&
-
-
- }
+ )}
+
+
+
+ )}
);
};
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectCheckDialog.js b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectCheckDialog.js
index 343ad981c..d8a6fd675 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectCheckDialog.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectCheckDialog.js
@@ -42,7 +42,7 @@ const ProjectCheckDialog = (props) => {
retry: false,
onSuccess: () => {
navigate(
- `/projects/${props.projectCheck?.project_id}/${props.projectCheck?.path}`
+ `/projects/${props.projectCheck?.project_id}/${props.projectCheck?.path}`,
);
queryClient.invalidateQueries("fetchProjectIsOld", {
refetchActive: false,
@@ -58,7 +58,7 @@ const ProjectCheckDialog = (props) => {
setUpgrade(false);
},
refetchOnWindowFocus: false,
- }
+ },
);
/**
@@ -75,7 +75,7 @@ const ProjectCheckDialog = (props) => {
enabled: exporting,
refetchOnWindowFocus: false,
onSettled: () => setExporting(false),
- }
+ },
);
const returnAction = () => {
@@ -195,7 +195,7 @@ const ProjectCheckDialog = (props) => {
{
checkText.find(
- (element) => element.label === props.projectCheck?.issue
+ (element) => element.label === props.projectCheck?.issue,
)?.text
}
{returnError()[0] && (
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectTable.js b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectTable.js
index 566769a61..facb83ef7 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectTable.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectTable.js
@@ -31,7 +31,7 @@ import {
mapDispatchToProps,
projectModes,
projectStatuses,
- formatDate
+ formatDate,
} from "../../globals";
import useAuth from "../../hooks/useAuth";
import { setMyProjects } from "../../redux/actions";
@@ -118,8 +118,8 @@ const columns = [
const ProjectTable = (props) => {
const navigate = useNavigate();
const queryClient = useQueryClient();
- const authenticated = useSelector(state => state.authentication);
- const myProjects = useSelector(state => state.myProjects);
+ const authenticated = useSelector((state) => state.authentication);
+ const myProjects = useSelector((state) => state.myProjects);
const dispatch = useDispatch();
const { auth } = useAuth();
@@ -142,7 +142,7 @@ const ProjectTable = (props) => {
* Simulation status query state
*/
const [querySimulationFinished, setQuerySimulationFinished] = React.useState(
- []
+ [],
);
const [querySimulationError, setQuerySimulationError] = React.useState({
isError: false,
@@ -169,7 +169,7 @@ const ProjectTable = (props) => {
(element) =>
element.mode === projectModes.SIMULATION &&
element.reviews[0] !== undefined &&
- element.reviews[0].status === projectStatuses.REVIEW
+ element.reviews[0].status === projectStatuses.REVIEW,
);
if (!simulationProjects.length) {
console.log("No simulation running");
@@ -229,9 +229,9 @@ const ProjectTable = (props) => {
setTimeout(
() =>
queryClient.invalidateQueries(
- `fetchProjectStatus-${project_id[key]}`
+ `fetchProjectStatus-${project_id[key]}`,
),
- checkIfSimulationFinishedDuration
+ checkIfSimulationFinishedDuration,
);
}
},
@@ -243,7 +243,7 @@ const ProjectTable = (props) => {
}
},
refetchOnWindowFocus: false,
- }
+ },
);
/**
@@ -426,7 +426,10 @@ const ProjectTable = (props) => {
?.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
.map((row) => {
// if we do authentication, then we need to know who the owner is
- row["owner_id"] = authenticated && ("owner_id" in row)? row["owner_id"] : false;
+ row["owner_id"] =
+ authenticated && "owner_id" in row
+ ? row["owner_id"]
+ : false;
// A collaborator can not edit
const isOwner = authenticated && row["owner_id"] === auth.id;
@@ -486,7 +489,7 @@ const ProjectTable = (props) => {
) {
queryClient.prefetchQuery(
["fetchExportProject", { project_id: row["id"] }],
- ProjectAPI.fetchExportProject
+ ProjectAPI.fetchExportProject,
);
} else {
openProject(row, "export");
@@ -507,7 +510,11 @@ const ProjectTable = (props) => {
tabIndex={-1}
key={row.id}
onMouseEnter={() => {
- return hoverOnProject(row["id"], row["name"], row["owner_id"]);
+ return hoverOnProject(
+ row["id"],
+ row["name"],
+ row["owner_id"],
+ );
}}
onMouseLeave={() => hoverOffProject()}
>
@@ -532,7 +539,9 @@ const ProjectTable = (props) => {
showReviewButton={showReviewButton}
onClickProjectAnalytics={onClickProjectAnalytics}
onClickCollaboration={onClickCollaboration}
- onClickEndCollaboration={onClickCollaboration} /* !!!!!!!!! */
+ onClickEndCollaboration={
+ onClickCollaboration
+ } /* !!!!!!!!! */
onClickProjectReview={onClickProjectReview}
onClickProjectExport={onClickProjectExport}
onClickProjectDetails={onClickProjectDetails}
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectsOverview.js b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectsOverview.js
index a1280a4ec..c1e72816d 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectsOverview.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/ProjectsOverview.js
@@ -75,4 +75,4 @@ const ProjectsOverview = (props) => {
);
};
-export default ProjectsOverview;
\ No newline at end of file
+export default ProjectsOverview;
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/TableRowButton.js b/asreview/webapp/src/HomeComponents/DashboardComponents/TableRowButton.js
index d3d190ba0..f09e57577 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/TableRowButton.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/TableRowButton.js
@@ -7,11 +7,10 @@ import {
Download,
GroupAdd,
MoreVert,
- PersonOff
+ PersonOff,
} from "@mui/icons-material";
import { projectStatuses } from "../../globals.js";
-
const PREFIX = "TableRowButton";
const classes = {
@@ -79,7 +78,7 @@ export default function TableRowButton(props) {
)}
- { false && props.isOwner && (
+ {false && props.isOwner && (
)}
- { false && !props.isOwner && (
+ {false && !props.isOwner && (
)}
- Delete {props.isOwner ? "forever" : ""}
+
+ Delete {props.isOwner ? "forever" : ""}
+
diff --git a/asreview/webapp/src/HomeComponents/DashboardComponents/index.js b/asreview/webapp/src/HomeComponents/DashboardComponents/index.js
index 80c6541b1..31bb06a7b 100644
--- a/asreview/webapp/src/HomeComponents/DashboardComponents/index.js
+++ b/asreview/webapp/src/HomeComponents/DashboardComponents/index.js
@@ -1,7 +1,7 @@
export { default as DashboardPage } from "./DashboardPage";
export { default as DashboardPageHeader } from "./DashboardPageHeader";
export { default as NumberCard } from "./NumberCard";
-export { default as ProfilePage} from "./ProfilePage";
+export { default as ProfilePage } from "./ProfilePage";
export { default as ProjectCheckDialog } from "./ProjectCheckDialog";
export { default as ProjectTable } from "./ProjectTable";
export { default as ProjectsOverview } from "./ProjectsOverview";
diff --git a/asreview/webapp/src/HomeComponents/HomePage.js b/asreview/webapp/src/HomeComponents/HomePage.js
index eb222acd3..8c11171cf 100644
--- a/asreview/webapp/src/HomeComponents/HomePage.js
+++ b/asreview/webapp/src/HomeComponents/HomePage.js
@@ -4,7 +4,10 @@ import clsx from "clsx";
import { Box } from "@mui/material";
import { styled } from "@mui/material/styles";
-import { ProfilePage, ProjectsOverview } from "../HomeComponents/DashboardComponents";
+import {
+ ProfilePage,
+ ProjectsOverview,
+} from "../HomeComponents/DashboardComponents";
import RouteNotFound from "../RouteNotFound";
import { drawerWidth } from "../globals.js";
@@ -72,7 +75,7 @@ const HomePage = (props) => {
}
/>
{/* Redirect root to projects */}
-
-
- handleClickAddNote(value.id)}
- size={!props.mobileScreen ? "medium" : "small"}
- >
- Add note
-
-
-
- )}
+ {!props.is_prior &&
+ !value.note &&
+ value.id !== note.editing && (
+
+
+ handleClickAddNote(value.id)}
+ size={!props.mobileScreen ? "medium" : "small"}
+ >
+ Add note
+
+
+
+ )}
{
onClick={() =>
handleClickEditNote(
props.record?.note,
- props.record?.id
+ props.record?.id,
)
}
size={!props.mobileScreen ? "medium" : "small"}
diff --git a/asreview/webapp/src/ProjectComponents/ImportFromFile.js b/asreview/webapp/src/ProjectComponents/ImportFromFile.js
index 89ad90bf4..46264ee9a 100644
--- a/asreview/webapp/src/ProjectComponents/ImportFromFile.js
+++ b/asreview/webapp/src/ProjectComponents/ImportFromFile.js
@@ -88,7 +88,7 @@ const ImportFromFile = ({
// set the state such that we ca upload the file
setFile(acceptedFiles[0]);
},
- [setFile, isAddFileError, reset]
+ [setFile, isAddFileError, reset],
);
const {
@@ -112,7 +112,7 @@ const ImportFromFile = ({
...(isDragAccept ? acceptStyle : {}),
...(isDragReject ? rejectStyle : {}),
}),
- [isDragActive, isDragReject, isDragAccept]
+ [isDragActive, isDragReject, isDragAccept],
);
const returnAcceptFile = () => {
diff --git a/asreview/webapp/src/ProjectComponents/ProjectDeleteDialog.js b/asreview/webapp/src/ProjectComponents/ProjectDeleteDialog.js
index c24bd7d3f..ac600b659 100644
--- a/asreview/webapp/src/ProjectComponents/ProjectDeleteDialog.js
+++ b/asreview/webapp/src/ProjectComponents/ProjectDeleteDialog.js
@@ -23,7 +23,7 @@ const ProjectDeleteDialog = (props) => {
const queryClient = useQueryClient();
const { auth } = useAuth();
- const authenticated = useSelector(state => state.authentication);
+ const authenticated = useSelector((state) => state.authentication);
const dispatch = useDispatch();
const descriptionElementRef = React.useRef(null);
@@ -41,32 +41,32 @@ const ProjectDeleteDialog = (props) => {
navigate("/projects");
}
},
- }
+ },
);
const endCollaboration = () => {
if (authenticated && props.project_id && auth.id) {
TeamAPI.endCollaboration(props.project_id, auth.id)
- .then(data => {
- if (data.success) {
- // success, the collaboration was ended, get all projects
- ProjectAPI.fetchProjects({})
- .then(data => {
- if (data.result instanceof Array) {
- // refresh project list
- dispatch(setMyProjects(data.result));
- // close dialog
- props.toggleDeleteDialog();
- } else {
- console.log('Could not get projects list -- DB failure');
- }
- })
- .catch(err => console.log('Could not pull all projects', err));
- } else {
- console.log('Could not end collaboration -- DB failure');
- }
- })
- .catch(err => console.log('Could not end collaboration', err))
+ .then((data) => {
+ if (data.success) {
+ // success, the collaboration was ended, get all projects
+ ProjectAPI.fetchProjects({})
+ .then((data) => {
+ if (data.result instanceof Array) {
+ // refresh project list
+ dispatch(setMyProjects(data.result));
+ // close dialog
+ props.toggleDeleteDialog();
+ } else {
+ console.log("Could not get projects list -- DB failure");
+ }
+ })
+ .catch((err) => console.log("Could not pull all projects", err));
+ } else {
+ console.log("Could not end collaboration -- DB failure");
+ }
+ })
+ .catch((err) => console.log("Could not end collaboration", err));
}
};
@@ -102,7 +102,7 @@ const ProjectDeleteDialog = (props) => {
} else {
return " from your list";
}
- }
+ };
return (
{
Cancel
- { props.isOwner &&
+ {props.isOwner && (
mutate({ project_id: props.project_id })}
disabled={disableConfirmButton()}
>
Delete Forever
- }
- { !props.isOwner &&
-
+ )}
+ {!props.isOwner && (
+
Delete
- }
+ )}
);
diff --git a/asreview/webapp/src/ProjectComponents/ProjectImportDialog.js b/asreview/webapp/src/ProjectComponents/ProjectImportDialog.js
index 2c9b3cac7..1be9b84cd 100644
--- a/asreview/webapp/src/ProjectComponents/ProjectImportDialog.js
+++ b/asreview/webapp/src/ProjectComponents/ProjectImportDialog.js
@@ -29,7 +29,7 @@ const ProjectImportDialog = (props) => {
queryClient.invalidateQueries("fetchProjects");
props.onClose();
},
- }
+ },
);
React.useEffect(() => {
diff --git a/asreview/webapp/src/ProjectComponents/ProjectPage.js b/asreview/webapp/src/ProjectComponents/ProjectPage.js
index c400482f0..3ba300b58 100644
--- a/asreview/webapp/src/ProjectComponents/ProjectPage.js
+++ b/asreview/webapp/src/ProjectComponents/ProjectPage.js
@@ -37,7 +37,6 @@ import {
} from "../globals.js";
import useAuth from "../hooks/useAuth";
-
const PREFIX = "ProjectPage";
const classes = {
@@ -66,7 +65,7 @@ const Root = styled("div")(({ theme }) => ({
}));
const ProjectPage = (props) => {
- const authenticated = useSelector(state => state.authentication);
+ const authenticated = useSelector((state) => state.authentication);
const { auth } = useAuth();
const queryClient = useQueryClient();
const navigate = useNavigate();
@@ -126,7 +125,7 @@ const ProjectPage = (props) => {
}
},
refetchOnWindowFocus: false,
- }
+ },
);
const refetchAnalytics = () => {
@@ -154,12 +153,12 @@ const ProjectPage = (props) => {
// not finished yet
setTimeout(
() => queryClient.invalidateQueries("fetchProjectStatus"),
- checkIfSimulationFinishedDuration
+ checkIfSimulationFinishedDuration,
);
}
},
refetchOnWindowFocus: false,
- }
+ },
);
const returnError = () => {
diff --git a/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPage.js b/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPage.js
index 6b848b2f3..f66f2600d 100644
--- a/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPage.js
+++ b/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPage.js
@@ -60,7 +60,7 @@ const ReviewPage = (props) => {
setActiveRecord(data["result"]);
}
},
- }
+ },
);
const { error, isError, isLoading, mutate, reset } = useMutation(
@@ -81,7 +81,7 @@ const ReviewPage = (props) => {
queryClient.invalidateQueries("fetchRecord");
showUndoBarIfNeeded(variables.label, variables.initial);
},
- }
+ },
);
/**
diff --git a/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPageFinished.js b/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPageFinished.js
index 353fb7fbb..8db1f94de 100644
--- a/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPageFinished.js
+++ b/asreview/webapp/src/ProjectComponents/ReviewComponents/ReviewPageFinished.js
@@ -56,7 +56,7 @@ const ReviewPageFinished = (props) => {
onSuccess: () => {
queryClient.invalidateQueries("fetchInfo");
},
- }
+ },
);
const handleChangeStatus = () => {
@@ -73,7 +73,7 @@ const ReviewPageFinished = (props) => {
const ifRecordPoolEmpty = React.useCallback(async () => {
const data = await queryClient.fetchQuery(
["fetchRecord", { project_id }],
- ProjectAPI.fetchRecord
+ ProjectAPI.fetchRecord,
);
setRecordEmpty(data["pool_empty"]);
}, [project_id, queryClient]);
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/AddDataset.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/AddDataset.js
index a495dbf3b..d0871d340 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/AddDataset.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/AddDataset.js
@@ -66,7 +66,7 @@ const AddDataset = (props) => {
queryClient.invalidateQueries("fetchLabeledStats");
props.toggleAddDataset();
},
- }
+ },
);
const handleDatasetSource = (event) => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DataForm.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DataForm.js
index adc1aa74d..072cbe62e 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DataForm.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DataForm.js
@@ -36,7 +36,7 @@ const DataForm = (props) => {
{
enabled: props.project_id !== null && props.datasetAdded,
refetchOnWindowFocus: false,
- }
+ },
);
const priorAdded = () => {
@@ -54,7 +54,7 @@ const DataForm = (props) => {
const refetchInfo = () => {
queryClient.prefetchQuery(
["fetchInfo", { project_id: props.project_id }],
- ProjectAPI.fetchInfo
+ ProjectAPI.fetchInfo,
);
};
@@ -72,11 +72,12 @@ const DataForm = (props) => {
the AI. Prior knowledge is required to warm up the AI.
- {!props.isFetchInfoError && (isFetching || props.isFetchingLabeledStats) && (
-
-
- )}
+ {!props.isFetchInfoError &&
+ (isFetching || props.isFetchingLabeledStats) && (
+
+
+ )}
{!isFetching && isError && (
{
} = useQuery(
["fetchDatasets", { subset: props.subset }],
ProjectAPI.fetchDatasets,
- { refetchOnWindowFocus: false }
+ { refetchOnWindowFocus: false },
);
const refetchDatasets = () => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DatasetFromURL.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DatasetFromURL.js
index 2d8ccc372..385850a58 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DatasetFromURL.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/DatasetFromURL.js
@@ -45,7 +45,7 @@ const DatasetFromURL = (props) => {
props.setURL(data["files"][0]["link"]);
}
},
- }
+ },
);
const handleURL = (event) => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorRandom.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorRandom.js
index 5c2c95e5e..10b2f29ae 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorRandom.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorRandom.js
@@ -101,7 +101,7 @@ const PriorRandom = (props) => {
setRefresh(false);
},
refetchOnWindowFocus: false,
- }
+ },
);
const handleNRecordsChange = (event) => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorSearch.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorSearch.js
index e8c292532..5a23b116f 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorSearch.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorSearch.js
@@ -85,7 +85,7 @@ const PriorSearch = (props) => {
}
},
refetchOnWindowFocus: false,
- }
+ },
);
const refetchPriorSearch = () => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorUnlabeled.js b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorUnlabeled.js
index 7068861b5..e3b9dfe82 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorUnlabeled.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/DataComponents/PriorUnlabeled.js
@@ -85,7 +85,7 @@ const PriorUnlabeled = (props) => {
};
}),
};
- }
+ },
);
} else {
// update cached data
@@ -112,11 +112,11 @@ const PriorUnlabeled = (props) => {
};
}),
};
- }
+ },
);
}
},
- }
+ },
);
const isDebugInclusion = () => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/FinishSetup.js b/asreview/webapp/src/ProjectComponents/SetupComponents/FinishSetup.js
index f70b1acf4..737fbdf70 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/FinishSetup.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/FinishSetup.js
@@ -47,7 +47,7 @@ const FinishSetup = (props) => {
props.handleBack();
queryClient.resetQueries("fetchProjectStatus");
},
- }
+ },
);
const onClickCloseSetup = async () => {
@@ -55,7 +55,7 @@ const FinishSetup = (props) => {
console.log("Opening existing project " + props.project_id);
await queryClient.prefetchQuery(
["fetchInfo", { project_id: props.project_id }],
- ProjectAPI.fetchInfo
+ ProjectAPI.fetchInfo,
);
if (props.mode !== projectModes.SIMULATION) {
navigate(`/projects/${props.project_id}/review`);
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/ModelComponents/ModelForm.js b/asreview/webapp/src/ProjectComponents/SetupComponents/ModelComponents/ModelForm.js
index b904eea8c..3279c4737 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/ModelComponents/ModelForm.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/ModelComponents/ModelForm.js
@@ -101,7 +101,7 @@ const ModelForm = (props) => {
});
},
refetchOnWindowFocus: false,
- }
+ },
);
const handleModel = (event) => {
diff --git a/asreview/webapp/src/ProjectComponents/SetupComponents/SetupDialog.js b/asreview/webapp/src/ProjectComponents/SetupComponents/SetupDialog.js
index 1f0f557df..43ff8be5c 100644
--- a/asreview/webapp/src/ProjectComponents/SetupComponents/SetupDialog.js
+++ b/asreview/webapp/src/ProjectComponents/SetupComponents/SetupDialog.js
@@ -188,7 +188,7 @@ const SetupDialog = (props) => {
setDisableFetchInfo(true); // avoid getting all the time
},
refetchOnWindowFocus: false,
- }
+ },
);
const {
@@ -276,7 +276,7 @@ const SetupDialog = (props) => {
enabled:
props.project_id !== null && activeStep === 1 && projectHasDataset(),
refetchOnWindowFocus: false,
- }
+ },
);
/**
@@ -345,13 +345,13 @@ const SetupDialog = (props) => {
// not ready yet
setTimeout(
() => queryClient.invalidateQueries("fetchProjectStatus"),
- 12000
+ 12000,
);
}
},
refetchOnWindowFocus: false,
retry: false,
- }
+ },
);
const restartTraining = () => {
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceContents.js b/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceContents.js
index bdc18b775..2533d06c4 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceContents.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceContents.js
@@ -10,7 +10,7 @@ import {
TableRow,
} from "@mui/material";
import { styled } from "@mui/material/styles";
-import {formatDate} from "../../globals";
+import { formatDate } from "../../globals";
const PREFIX = "ProjectTable";
@@ -35,7 +35,7 @@ const StyledPaper = styled(Paper)(({ theme }) => ({
marginLeft: "auto",
marginRight: "auto",
paddingLeft: 10,
- paddingRight: 10
+ paddingRight: 10,
},
[`& .${classes.error}`]: {
@@ -97,7 +97,6 @@ const columns = [
];
const AcceptanceDialog = (props) => {
-
return (
@@ -112,36 +111,34 @@ const AcceptanceDialog = (props) => {
- {
- props.projectInvitations.map((project) => {
- return (
-
- {project.name}
- {formatDate(project.created_at_unix)}
- {project.mode}
-
- props.handleAcceptance(project)}
- sx={{ textTransform: "none" }}
- >
- Accept
-
- props.handleRejection(project)}
- sx={{ textTransform: "none" }}
- >
- Reject
-
-
-
- );
- })
- }
+ {props.projectInvitations.map((project) => {
+ return (
+
+ {project.name}
+ {formatDate(project.created_at_unix)}
+ {project.mode}
+
+ props.handleAcceptance(project)}
+ sx={{ textTransform: "none" }}
+ >
+ Accept
+
+ props.handleRejection(project)}
+ sx={{ textTransform: "none" }}
+ >
+ Reject
+
+
+
+ );
+ })}
- )
+ );
};
-export default AcceptanceDialog;
\ No newline at end of file
+export default AcceptanceDialog;
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceDialog.js b/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceDialog.js
index e1f83d9df..9eddcba2b 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceDialog.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/AcceptanceDialog.js
@@ -1,8 +1,5 @@
-import * as React from 'react';
-import {
- Dialog,
- Divider,
-} from "@mui/material";
+import * as React from "react";
+import { Dialog, Divider } from "@mui/material";
import { styled } from "@mui/material/styles";
import AcceptanceContents from "./AcceptanceContents";
import DialogHeader from "./DialogHeader";
@@ -41,7 +38,6 @@ const StyledDialog = styled(Dialog)(({ theme }) => ({
}));
const AcceptanceDialog = (props) => {
-
const handleClose = () => {
props.onClose();
};
@@ -67,8 +63,8 @@ const AcceptanceDialog = (props) => {
handleAcceptance={props.handleAcceptance}
handleRejection={props.handleRejection}
/>
-
+
);
-}
+};
-export default AcceptanceDialog;
\ No newline at end of file
+export default AcceptanceDialog;
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/ConfirmationDialog.js b/asreview/webapp/src/ProjectComponents/TeamComponents/ConfirmationDialog.js
index f56e83e75..717c86c62 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/ConfirmationDialog.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/ConfirmationDialog.js
@@ -1,10 +1,9 @@
import { Button } from "@mui/material";
-import Dialog from '@mui/material/Dialog';
-import DialogActions from '@mui/material/DialogActions';
-import DialogContent from '@mui/material/DialogContent';
-import DialogContentText from '@mui/material/DialogContentText';
-import DialogTitle from '@mui/material/DialogTitle';
-
+import Dialog from "@mui/material/Dialog";
+import DialogActions from "@mui/material/DialogActions";
+import DialogContent from "@mui/material/DialogContent";
+import DialogContentText from "@mui/material/DialogContentText";
+import DialogTitle from "@mui/material/DialogTitle";
const ConfirmationDialog = (props) => {
return (
@@ -14,9 +13,7 @@ const ConfirmationDialog = (props) => {
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
>
-
- {props.title}
-
+ {props.title}
{props.contents}
@@ -29,9 +26,7 @@ const ConfirmationDialog = (props) => {
- )
-
-
-}
+ );
+};
-export default ConfirmationDialog;
\ No newline at end of file
+export default ConfirmationDialog;
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/DialogHeader.js b/asreview/webapp/src/ProjectComponents/TeamComponents/DialogHeader.js
index 4cc24139b..c10d8bf7e 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/DialogHeader.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/DialogHeader.js
@@ -1,12 +1,7 @@
-import {
- DialogTitle,
- Stack,
- Tooltip,
-} from "@mui/material";
+import { DialogTitle, Stack, Tooltip } from "@mui/material";
import { Close } from "@mui/icons-material";
import { StyledIconButton } from "../../StyledComponents/StyledButton.js";
-
const DialogHeader = (props) => {
return (
@@ -25,7 +20,7 @@ const DialogHeader = (props) => {
- )
-}
+ );
+};
-export default DialogHeader;
\ No newline at end of file
+export default DialogHeader;
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/EndCollaboration.js b/asreview/webapp/src/ProjectComponents/TeamComponents/EndCollaboration.js
index 73177b586..75e6d9c4f 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/EndCollaboration.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/EndCollaboration.js
@@ -1,15 +1,12 @@
-import * as React from 'react';
+import * as React from "react";
import { useNavigate, useParams } from "react-router-dom";
import { TeamAPI } from "../../api/index.js";
import useAuth from "../../hooks/useAuth";
import { Box, Button, Stack } from "@mui/material";
import { InlineErrorHandler } from "../../Components";
-import { ConfirmationDialog } from ".";
-
-
+import { ConfirmationDialog } from ".";
const EndCollaboration = (props) => {
-
const [dialogOpen, setDialogOpen] = React.useState(false);
const { auth } = useAuth();
const navigate = useNavigate();
@@ -27,28 +24,31 @@ const EndCollaboration = (props) => {
const handleEndCollaboration = () => {
setDialogOpen(false);
TeamAPI.endCollaboration(project_id, auth.id)
- .then(data => {
+ .then((data) => {
if (data.success) {
- navigate("/projects")
+ navigate("/projects");
} else {
- let message = "Could not end the collaboration -- DB failure"
+ let message = "Could not end the collaboration -- DB failure";
console.error(message);
- setErrorMessage(message)
+ setErrorMessage(message);
}
})
- .catch(err => {
- let message = `Could not end the collaboration: ${err.message} (${err.code})`
+ .catch((err) => {
+ let message = `Could not end the collaboration: ${err.message} (${err.code})`;
console.error("Could not invite user", err);
- setErrorMessage(message)
+ setErrorMessage(message);
});
- }
+ };
return (
<>
You are collaborating in this project
- If you would like to end this collaboration, please click on the button below:
+
+ If you would like to end this collaboration, please click on the
+ button below:
+
{
>
Remove me from this Team
- {(errorMessage !== undefined) &&
-
-
+
- }
+ )}
option.id === value.id}
- onChange={(event, newValue=null) => {
+ onChange={(event, newValue = null) => {
if (newValue !== null) {
setSelectedUser(newValue);
}
@@ -128,13 +126,15 @@ const InvitationContents = (props) => {
setInputValue(newInputValue);
}}
id="controllable-states-demo"
- options={ allUsers.filter(item => !associatedUsers.has(item.id)) }
- getOptionLabel={option => `${option.name}` }
+ options={allUsers.filter((item) => !associatedUsers.has(item.id))}
+ getOptionLabel={(option) => `${option.name}`}
sx={{ width: 300, padding: 1 }}
- renderInput={(params) => {
Pending (dbl click to remove)
- { allUsers.filter(item => invitedUsers.has(item.id)).map((user) => (
-
Collaborators (dbl click to remove)
- { allUsers.filter(item => collaborators.has(item.id)).map((user) => (
-
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/UserListEntry.js b/asreview/webapp/src/ProjectComponents/TeamComponents/UserListEntry.js
index 3c703dbe8..2b0fc379a 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/UserListEntry.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/UserListEntry.js
@@ -1,16 +1,13 @@
-import ListItem from '@mui/material/ListItem';
-import ListItemAvatar from '@mui/material/ListItemAvatar';
-import ListItemText from '@mui/material/ListItemText';
-import PersonIcon from '@mui/icons-material/Person';
-import Avatar from '@mui/material/Avatar';
-import { blue } from '@mui/material/colors';
+import ListItem from "@mui/material/ListItem";
+import ListItemAvatar from "@mui/material/ListItemAvatar";
+import ListItemText from "@mui/material/ListItemText";
+import PersonIcon from "@mui/icons-material/Person";
+import Avatar from "@mui/material/Avatar";
+import { blue } from "@mui/material/colors";
const UserListEntry = (props) => {
return (
- props.onDoubleClick(props.user)}
- >
+ props.onDoubleClick(props.user)}>
);
-}
+};
-export default UserListEntry;
\ No newline at end of file
+export default UserListEntry;
diff --git a/asreview/webapp/src/ProjectComponents/TeamComponents/index.js b/asreview/webapp/src/ProjectComponents/TeamComponents/index.js
index 131abd3c3..532e4aa0e 100644
--- a/asreview/webapp/src/ProjectComponents/TeamComponents/index.js
+++ b/asreview/webapp/src/ProjectComponents/TeamComponents/index.js
@@ -1,6 +1,6 @@
export { default as AcceptanceDialog } from "./AcceptanceDialog";
-export { default as ConfirmationDialog} from "./ConfirmationDialog";
-export { default as EndCollaboration} from "./EndCollaboration";
+export { default as ConfirmationDialog } from "./ConfirmationDialog";
+export { default as EndCollaboration } from "./EndCollaboration";
export { default as DialogHeader } from "./DialogHeader";
export { default as InvitationContents } from "./InvitationComponent";
export { default as TeamPage } from "./TeamPage";
diff --git a/asreview/webapp/src/api/AuthAPI.js b/asreview/webapp/src/api/AuthAPI.js
index f9cef87c5..10ae8c28c 100644
--- a/asreview/webapp/src/api/AuthAPI.js
+++ b/asreview/webapp/src/api/AuthAPI.js
@@ -31,7 +31,7 @@ class AuthAPI {
let body = new FormData();
body.set("email", variables.email);
body.set("password", variables.password);
-
+
const url = auth_url + `signin`;
return new Promise((resolve, reject) => {
axios({
@@ -53,7 +53,7 @@ class AuthAPI {
static forgotPassword(variables) {
let body = new FormData();
body.set("email", variables.email);
-
+
const url = auth_url + `forgot_password`;
return new Promise((resolve, reject) => {
axios({
diff --git a/asreview/webapp/src/api/ProjectAPI.js b/asreview/webapp/src/api/ProjectAPI.js
index 60048aa8c..877cf63ed 100644
--- a/asreview/webapp/src/api/ProjectAPI.js
+++ b/asreview/webapp/src/api/ProjectAPI.js
@@ -412,7 +412,7 @@ class ProjectAPI {
link.href = url;
link.setAttribute(
"download",
- `asreview_dataset_${datasetLabel}_${project_title}.${fileFormat}`
+ `asreview_dataset_${datasetLabel}_${project_title}.${fileFormat}`,
);
document.body.appendChild(link);
link.click();
@@ -550,7 +550,7 @@ class ProjectAPI {
console.log(
`${variables.project_id} - add item ${variables.doc_id} to ${
variables.label === 1 ? "inclusions" : "exclusions"
- }`
+ }`,
);
})
.catch((error) => {
diff --git a/asreview/webapp/src/api/TeamAPI.js b/asreview/webapp/src/api/TeamAPI.js
index f0245db74..cdba5f8cd 100644
--- a/asreview/webapp/src/api/TeamAPI.js
+++ b/asreview/webapp/src/api/TeamAPI.js
@@ -2,11 +2,9 @@ import { axiosErrorHandler } from "./axiosErrorHandler";
import { api_url } from "../globals.js";
import axios from "axios";
-
class TeamAPI {
-
static getProjectInvitations() {
- const url = api_url + `invitations`
+ const url = api_url + `invitations`;
return new Promise((resolve, reject) => {
axios
.get(url, { withCredentials: true })
@@ -19,7 +17,6 @@ class TeamAPI {
});
}
-
static fetchCollaborators(projectId) {
if (projectId !== null) {
const url = api_url + `projects/${projectId}/users`;
@@ -34,13 +31,13 @@ class TeamAPI {
});
});
} else {
- return {}
+ return {};
}
}
static inviteUser(projectId, userId) {
if (projectId !== null && userId !== null) {
- const url = api_url + `invitations/projects/${projectId}/users/${userId}`
+ const url = api_url + `invitations/projects/${projectId}/users/${userId}`;
return new Promise((resolve, reject) => {
axios({
method: "post",
@@ -59,7 +56,7 @@ class TeamAPI {
static deleteInvitation(projectId, userId) {
if (projectId !== null && userId !== null) {
- const url = api_url + `invitations/projects/${projectId}/users/${userId}`
+ const url = api_url + `invitations/projects/${projectId}/users/${userId}`;
return new Promise((resolve, reject) => {
axios({
method: "delete",
@@ -76,10 +73,9 @@ class TeamAPI {
}
}
-
static rejectInvitation(projectId) {
if (projectId !== null) {
- const url = api_url + `invitations/projects/${projectId}/reject`
+ const url = api_url + `invitations/projects/${projectId}/reject`;
return new Promise((resolve, reject) => {
axios({
method: "delete",
@@ -98,7 +94,7 @@ class TeamAPI {
static acceptInvitation(projectId) {
if (projectId !== null) {
- const url = api_url + `invitations/projects/${projectId}/accept`
+ const url = api_url + `invitations/projects/${projectId}/accept`;
return new Promise((resolve, reject) => {
axios({
method: "post",
@@ -117,7 +113,7 @@ class TeamAPI {
static endCollaboration(projectId, userId) {
if (userId !== null && projectId !== null) {
- const url = api_url + `projects/${projectId}/users/${userId}`
+ const url = api_url + `projects/${projectId}/users/${userId}`;
return new Promise((resolve, reject) => {
axios({
method: "delete",
diff --git a/asreview/webapp/src/hooks/SettingsHooks.js b/asreview/webapp/src/hooks/SettingsHooks.js
index f5736bfa6..3bcace6cd 100644
--- a/asreview/webapp/src/hooks/SettingsHooks.js
+++ b/asreview/webapp/src/hooks/SettingsHooks.js
@@ -49,7 +49,7 @@ const useFontSize = () => {
const handleFontSizeChange = (size) => {
window.localStorage.setItem(
"fontSize",
- JSON.stringify([size.value, size.label])
+ JSON.stringify([size.value, size.label]),
);
setFontSize(size);
};
diff --git a/asreview/webapp/src/hooks/useAuth.js b/asreview/webapp/src/hooks/useAuth.js
index 0a6b3c035..dc11a8590 100644
--- a/asreview/webapp/src/hooks/useAuth.js
+++ b/asreview/webapp/src/hooks/useAuth.js
@@ -4,7 +4,7 @@ import AuthContext from "../context/AuthProvider";
const useAuth = () => {
const { auth } = React.useContext(AuthContext);
React.useDebugValue(auth, (auth) =>
- auth?.logged_in ? "Signed In" : "Signed Out"
+ auth?.logged_in ? "Signed In" : "Signed Out",
);
return React.useContext(AuthContext);
};
diff --git a/asreview/webapp/src/icons/Orcid.js b/asreview/webapp/src/icons/Orcid.js
index 4d73ace2c..df2024a32 100644
--- a/asreview/webapp/src/icons/Orcid.js
+++ b/asreview/webapp/src/icons/Orcid.js
@@ -5,15 +5,35 @@ function Orcid(props) {
return (
-
-
+
+
);
}
-export default Orcid;
\ No newline at end of file
+export default Orcid;
diff --git a/asreview/webapp/src/index.js b/asreview/webapp/src/index.js
index 80c25e4ca..d13c976cf 100644
--- a/asreview/webapp/src/index.js
+++ b/asreview/webapp/src/index.js
@@ -20,5 +20,5 @@ render(
,
- document.getElementById("root")
+ document.getElementById("root"),
);
diff --git a/asreview/webapp/src/redux/actions/index.js b/asreview/webapp/src/redux/actions/index.js
index bdb189435..b149cb72c 100644
--- a/asreview/webapp/src/redux/actions/index.js
+++ b/asreview/webapp/src/redux/actions/index.js
@@ -11,7 +11,7 @@ import {
// note: I am not too sure about these functions, they
// shield the dispatch type from the developer, but
// it complicates the API by adding yet another layer
-// of functions. As far as I am concerned these can go.
+// of functions. As far as I am concerned these can go.
export function setASReviewVersion(data) {
return { type: SET_ASREVIEW_VERSION, asreview_version: data };
}
@@ -38,4 +38,4 @@ export function setMyProjects(data) {
export function setOAuthServices(data) {
return { type: OAUTH_SERVICES, data: data };
-}
\ No newline at end of file
+}
diff --git a/asreview/webapp/src/redux/reducers/index.js b/asreview/webapp/src/redux/reducers/index.js
index 440b32cb0..458b96b8a 100644
--- a/asreview/webapp/src/redux/reducers/index.js
+++ b/asreview/webapp/src/redux/reducers/index.js
@@ -17,8 +17,8 @@ const initialState = {
allow_teams: undefined,
oAuthData: {
services: {},
- compareKey: 'oAuthCompareKey', // these 2 values are used when the oAuth
- messageType: 'oAuthMessage' // popup has to communicate with the opener
+ compareKey: "oAuthCompareKey", // these 2 values are used when the oAuth
+ messageType: "oAuthMessage", // popup has to communicate with the opener
},
status: undefined,
project_id: null,
@@ -41,7 +41,7 @@ function rootReducer(state = initialState, action) {
project_id: action.project_id,
});
case TOGGLE_HELP_DIALOG:
- return Object.assign({}, state, {
+ return Object.assign({}, state, {
onHelpDialog: !state.onHelpDialog,
});
// set boot data
@@ -58,16 +58,16 @@ function rootReducer(state = initialState, action) {
// set my projects list
case MY_PROJECTS:
return Object.assign({}, state, {
- myProjects: action.data
+ myProjects: action.data,
});
// set OAuth services
case OAUTH_SERVICES: {
const newState = {
...state.oAuthData,
- services: action.data
- }
+ services: action.data,
+ };
return Object.assign({}, state, {
- oAuthData: newState
+ oAuthData: newState,
});
}
// default
diff --git a/asreview/webapp/src/serviceWorker.js b/asreview/webapp/src/serviceWorker.js
index b719ab46c..0777a3fc2 100644
--- a/asreview/webapp/src/serviceWorker.js
+++ b/asreview/webapp/src/serviceWorker.js
@@ -16,8 +16,8 @@ const isLocalhost = Boolean(
window.location.hostname === "[::1]" ||
// 127.0.0.1/8 is considered localhost for IPv4.
window.location.hostname.match(
- /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
- )
+ /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/,
+ ),
);
export function register(config) {
@@ -43,7 +43,7 @@ export function register(config) {
navigator.serviceWorker.ready.then(() => {
console.log(
"This web app is being served cache-first by a service " +
- "worker. To learn more, visit https://bit.ly/CRA-PWA"
+ "worker. To learn more, visit https://bit.ly/CRA-PWA",
);
});
} else {
@@ -71,7 +71,7 @@ function registerValidSW(swUrl, config) {
// content until all client tabs are closed.
console.log(
"New content is available and will be used when all " +
- "tabs for this page are closed. See https://bit.ly/CRA-PWA."
+ "tabs for this page are closed. See https://bit.ly/CRA-PWA.",
);
// Execute callback
@@ -121,7 +121,7 @@ function checkValidServiceWorker(swUrl, config) {
})
.catch(() => {
console.log(
- "No internet connection found. App is running in offline mode."
+ "No internet connection found. App is running in offline mode.",
);
});
}
diff --git a/asreview/webapp/templates/emails/confirm_account.html b/asreview/webapp/templates/emails/confirm_account.html
index 5e013ec82..b5ae50494 100644
--- a/asreview/webapp/templates/emails/confirm_account.html
+++ b/asreview/webapp/templates/emails/confirm_account.html
@@ -1,14 +1,17 @@
Hello {{ name }},
-Thank you for joining ASReview. You are almost ready!
- Please click on the following link to confirm your account:
+
+ Thank you for joining ASReview. You are almost ready! Please click on the
+ following link to confirm your account:
+
{{ url }}
-After confirmation you will be redirected to the signin page.
- Use your account credentials and start using ASReview.
+
+ After confirmation you will be redirected to the signin page. Use your account
+ credentials and start using ASReview.
Regards,
-The ASReview Team
\ No newline at end of file
+The ASReview Team
diff --git a/asreview/webapp/templates/emails/forgot_password.html b/asreview/webapp/templates/emails/forgot_password.html
index cb42cfffa..8e7bc97b9 100644
--- a/asreview/webapp/templates/emails/forgot_password.html
+++ b/asreview/webapp/templates/emails/forgot_password.html
@@ -6,4 +6,4 @@
Regards,
-The ASReview Team
\ No newline at end of file
+The ASReview Team
diff --git a/asreview/webapp/tests/README.md b/asreview/webapp/tests/README.md
index 102466601..9641a7267 100644
--- a/asreview/webapp/tests/README.md
+++ b/asreview/webapp/tests/README.md
@@ -2,19 +2,19 @@
This folder contains the test suite of the ASReview app. It is organized in the following folders:
-* __config__: Contains data to create user accounts and a number of json files to start the ASReview app in different modes (e.g. authenticated, authentication with verification, etc).
+- **config**: Contains data to create user accounts and a number of json files to start the ASReview app in different modes (e.g. authenticated, authentication with verification, etc).
-* __data__: Contains project data used in tests.
+- **data**: Contains project data used in tests.
-* __integration_tests__: Forthcoming.
+- **integration_tests**: Forthcoming.
-* __test_api__: Contains API related tests. These tests are independent, unit-like tests.
+- **test_api**: Contains API related tests. These tests are independent, unit-like tests.
-* __test_database_and_models__: Contains tests that focus on basic database operations and several SQL_Alchemy models that are used in the authenticated version of the ASReview app.
+- **test_database_and_models**: Contains tests that focus on basic database operations and several SQL_Alchemy models that are used in the authenticated version of the ASReview app.
-* __test_extensions__: Forthcoming.
+- **test_extensions**: Forthcoming.
-* __utils__: Contains various helper files that facilitate writing tests.
+- **utils**: Contains various helper files that facilitate writing tests.
## Requirements
@@ -23,7 +23,7 @@ This folder contains the test suite of the ASReview app. It is organized in the
## Fixtures
-If you are unfamiliar with Pytest: fixtures enable a setup and teardown mechanism for all tests. They ensure a controlled initial state and clean up afterwards to make sure the next test is conducted with a clean slate.
+If you are unfamiliar with Pytest: fixtures enable a setup and teardown mechanism for all tests. They ensure a controlled initial state and clean up afterwards to make sure the next test is conducted with a clean slate.
In this suite, all fixtures are defined in `conftest.py` files. These fixtures are automatically picked up by Pytest and can be found in the `/webapp/tests`-folder, but also in nested folders. The nested conftest modules use fixtures defined in the tests-folder without actually importing them: Pytest finds the required fixture if you use their function-name as parameter in either a newly defined fixture or test function.
@@ -35,7 +35,8 @@ Ideally a test function tests one particular feature and can be executed indepen
## Running the tests
-__Important__: if you run the entire test stuite, please make sure you have compiles the app's assets:
+**Important**: if you run the entire test stuite, please make sure you have compiles the app's assets:
+
```
python setup.py compile_assets
```
@@ -52,8 +53,8 @@ The `-s` option enables capturing stdout (shows your print statements if there a
pytest --random-order -s -v ./asreview/webapp/tests/test_api/
```
-If you are in the middle of writing your tests, and your module contains many tests, it is more efficient to run a small cluster or a single test. One of the many possibilities is the `-k` option that executes only tests with a function name that ends with a certain postfix. In the next example we execute only test functions that end with the 'current` postfix in the `test_projects.py` module:
+If you are in the middle of writing your tests, and your module contains many tests, it is more efficient to run a small cluster or a single test. One of the many possibilities is the `-k` option that executes only tests with a function name that ends with a certain postfix. In the next example we execute only test functions that end with the 'current`postfix in the`test_projects.py` module:
```
pytest --random-order -s -v ./asreview/webapp/tests/test_api/test_projects.py -k current
-```
\ No newline at end of file
+```