Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

added notifications, did refactoring and optimisations

Blue Mousefb1d852fae83
diff --git a/public/locales/en.json b/public/locales/en.json
index ef92ea21a..70e2b7d7b 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -6,7 +6,17 @@
"rateLimitHit": "Too many requests, please try again later",
"cancelSubFirst": "Please cancel your paid subscription first",
"accountDeleted": "Your account has been deleted",
- "accountDeleteError": "Error while deleting your account"
+ "accountDeleteError": "Error while deleting your account",
+ "roleUpdated": "User's role has been changed",
+ "roleUpdateError": "Error occured while changing user's role",
+ "userInvited": "The user has been invited to your project",
+ "userInviteError": "Error occured while inviting the user to your project",
+ "userRemoved": "The user has been removed from your project",
+ "userRemoveError": "Error occured while removing the user from your project",
+ "quitProjectError": "Error occured while quitting the project",
+ "quitProject": "You have quit the project",
+ "acceptInvitationError": "Error occured while accepting the project invitation",
+ "acceptInvitation": "The project invitation has been accepted"
},
"common": {
"features": "Features",
diff --git a/src/pages/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsx
index 08b1ab06a..2b8efc946 100644
--- a/src/pages/Dashboard/Dashboard.container.jsx
+++ b/src/pages/Dashboard/Dashboard.container.jsx
@@ -2,6 +2,7 @@ import { connect } from 'react-redux'
import { errorsActions } from 'redux/actions/errors'
import UIActions from 'redux/actions/ui'
import { authActions } from 'redux/actions/auth'
+import { alertsActions } from 'redux/actions/alerts'
import Dashboard from './Dashboard'
const mapStateToProps = (state) => ({
@@ -21,6 +22,12 @@ const mapDispatchToProps = (dispatch) => ({
setUserShareData: (data, id) => {
dispatch(authActions.setUserShareData(data, id))
},
+ userSharedUpdate: (message) => {
+ dispatch(alertsActions.userSharedUpdate(message))
+ },
+ sharedProjectError: (message) => {
+ dispatch(errorsActions.sharedProjectFailed(message))
+ },
})
export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
index d18856e37..e58b8aba1 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -8,6 +8,7 @@ import _isEmpty from 'lodash/isEmpty'
import _isNumber from 'lodash/isNumber'
import _replace from 'lodash/replace'
import _map from 'lodash/map'
+import _isUndefined from 'lodash/isUndefined'
import _filter from 'lodash/filter'
import _find from 'lodash/find'
import { useTranslation } from 'react-i18next'
@@ -27,7 +28,8 @@ import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import { acceptShareProject } from 'api'
const ProjectCart = ({
- name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed, sharedProjects, setProjectsShareData, setUserShareData, shared,
+ name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed,
+ sharedProjects, setProjectsShareData, setUserShareData, shared, userSharedUpdate, sharedProjectError,
}) => {
const statsDidGrowUp = overall?.percChange >= 0
const [showInviteModal, setShowInviteModal] = useState(false)
@@ -35,14 +37,15 @@ const ProjectCart = ({
const onAccept = async () => {
const pid = _find(sharedProjects, item => item.project.id === id).id
- await acceptShareProject(pid)
- .then(() => {
- setProjectsShareData({ confirmed: true }, id)
- setUserShareData({ confirmed: true }, pid)
- })
- .catch((err) => {
- deleteProjectFailed(err)
- })
+ try {
+ await acceptShareProject(pid)
+ setProjectsShareData({ confirmed: true }, id)
+ setUserShareData({ confirmed: true }, pid)
+ userSharedUpdate(t('apiNotifications.acceptInvitation'))
+ } catch (e) {
+ sharedProjectError(t('apiNotifications.acceptInvitationError'))
+ deleteProjectFailed(e)
+ }
}
return (
@@ -164,7 +167,7 @@ const NoProjects = ({ t }) => (
)
const Dashboard = ({
- projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData, setUserShareData,
+ projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData, setUserShareData, userSharedUpdate, sharedProjectError,
}) => {
const { t, i18n: { language } } = useTranslation('common')
const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)
@@ -222,41 +225,43 @@ const Dashboard = ({
}) => (
<div key={confirmed ? `${id}-confirmed` : id}>
{
- confirmed === false ? (
- <ProjectCart
- t={t}
- id={id}
- language={language}
- name={name}
- created={created}
- shared={shared}
- active={active}
- isPublic={isPublic}
- overall={overall}
- confirmed={confirmed}
- sharedProjects={user.sharedProjects}
- setProjectsShareData={setProjectsShareData}
- setUserShareData={setUserShareData}
- live={_isNumber(live) ? live : 'N/A'}
- deleteProjectFailed={deleteProjectFailed}
- />
- ) : (
- <Link to={_replace(routes.project, ':id', id)}>
+ (_isUndefined(confirmed) || confirmed) ? (
+ <Link to={_replace(routes.project, ':id', id)}>
+ <ProjectCart
+ t={t}
+ language={language}
+ name={name}
+ created={created}
+ shared={shared}
+ active={active}
+ isPublic={isPublic}
+ confirmed={confirmed}
+ overall={overall}
+ live={_isNumber(live) ? live : 'N/A'}
+ />
+ </Link>
+ ) : (
<ProjectCart
t={t}
+ id={id}
language={language}
name={name}
created={created}
shared={shared}
active={active}
isPublic={isPublic}
- confirmed={confirmed}
overall={overall}
+ confirmed={confirmed}
+ sharedProjects={user.sharedProjects}
+ setProjectsShareData={setProjectsShareData}
+ setUserShareData={setUserShareData}
live={_isNumber(live) ? live : 'N/A'}
+ userSharedUpdate={userSharedUpdate}
+ sharedProjectError={sharedProjectError}
+ deleteProjectFailed={deleteProjectFailed}
/>
- </Link>
- )
- }
+ )
+ }
</div>
))}
</ul>
@@ -295,6 +300,8 @@ Dashboard.propTypes = {
deleteProjectFailed: PropTypes.func.isRequired,
setProjectsShareData: PropTypes.func.isRequired,
setUserShareData: PropTypes.func.isRequired,
+ sharedProjectError: PropTypes.func.isRequired,
+ userSharedUpdate: PropTypes.func.isRequired,
}
Dashboard.defaultProps = {
diff --git a/src/pages/Project/Settings/People/People.container.jsx b/src/pages/Project/Settings/People/People.container.jsx
index 43f4cb887..c9648dcda 100644
--- a/src/pages/Project/Settings/People/People.container.jsx
+++ b/src/pages/Project/Settings/People/People.container.jsx
@@ -1,6 +1,7 @@
import { connect } from 'react-redux'
import UIActions from 'redux/actions/ui'
import { errorsActions } from 'redux/actions/errors'
+import { alertsActions } from 'redux/actions/alerts'
import People from './People'
@@ -11,6 +12,15 @@ const mapDispatchToProps = (dispatch) => ({
setProjectShareData: (projectId, share) => {
dispatch(UIActions.setProjectsShareData(projectId, share))
},
+ roleUpdatedNotification: (message, type = 'success') => {
+ dispatch(alertsActions.roleUpdated(message, type))
+ },
+ inviteUserNotification: (message, type = 'success') => {
+ dispatch(alertsActions.inviteUser(message, type))
+ },
+ removeUserNotification: (message, type = 'success') => {
+ dispatch(alertsActions.removeUser(message, type))
+ },
})
export default connect(null, mapDispatchToProps)(People)
diff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsx
index b434f41d8..4cd0ba9ba 100644
--- a/src/pages/Project/Settings/People/People.jsx
+++ b/src/pages/Project/Settings/People/People.jsx
@@ -33,97 +33,106 @@ const NoEvents = ({ t }) => (
)
const UsersList = ({
- data, onRemove, t, share, setProjectShareData, pid, updateProjectFailed, language,
+ data, onRemove, t, share, setProjectShareData, pid, updateProjectFailed, language, roleUpdatedNotification,
}) => {
const [open, setOpen] = useState(false)
const [showDeleteModal, setShowDeleteModal] = useState(false)
const openRef = useRef()
useOnClickOutside(openRef, () => setOpen(false))
+ const {
+ id, created, confirmed, role, user,
+ } = data
- const changeRole = async (role) => {
- await changeShareRole(data.id, { role })
- .then((results) => {
- const newShared = _map(share, (user) => { if (user.id === results.id) { return { ...results, user: user.user } } return user })
- setProjectShareData({ share: newShared }, pid)
- setOpen(false)
- })
- .catch((e) => {
- updateProjectFailed(e)
- setOpen(false)
+ const changeRole = async (newRole) => {
+ try {
+ const results = await changeShareRole(id, { role: newRole })
+ const newShared = _map(share, (itShare) => {
+ if (itShare.id === results.id) {
+ return { ...results, user: itShare.user }
+ }
+ return itShare
})
+ setProjectShareData({ share: newShared }, pid)
+ roleUpdatedNotification(t('apiNotifications.roleUpdated'))
+ } catch (e) {
+ console.error(`[ERROR] Error while updating user's role: ${e}`)
+ updateProjectFailed(t('apiNotifications.roleUpdateError'))
+ }
+
+ setOpen(false)
}
return (
<tr className='dark:bg-gray-700'>
<td className='whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-white sm:pl-6'>
- {data.user.email}
+ {user.email}
</td>
<td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-white'>
{language === 'en'
- ? dayjs(data.created).locale(language).format('MMMM D, YYYY')
- : dayjs(data.created).locale(language).format('D MMMM, YYYY')}
+ ? dayjs(created).locale(language).format('MMMM D, YYYY')
+ : dayjs(created).locale(language).format('D MMMM, YYYY')}
</td>
- <td className={cx('relative whitespace-nowrap py-4 text-right text-sm font-medium pr-2', { '': !data.confirmed })}>
+ <td className='relative whitespace-nowrap py-4 text-right text-sm font-medium pr-2'>
{
- !data.confirmed ? (
- <>
- <WarningPin
- label={t('common.pending')}
- className='inline-flex items-center shadow-sm px-2.5 py-0.5 mr-3'
+ confirmed ? (
+ <div ref={openRef}>
+ <button
+ onClick={() => setOpen(!open)}
+ type='button'
+ className='inline-flex items-center shadow-sm pl-2 pr-1 py-0.5 border border-gray-200 dark:border-gray-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'
+ >
+ {t(`project.settings.roles.${role}.name`)}
+ <ChevronDownIcon
+ style={{ transform: open ? 'rotate(180deg)' : '' }}
+ className='w-4 h-4 pt-px ml-0.5'
/>
- <Button
- type='button'
- className='bg-white text-indigo-600 border border-transparent rounded-md text-base font-medium hover:bg-indigo-50 dark:text-gray-50 dark:border-gray-800 dark:bg-gray-700 dark:hover:bg-gray-600'
- small
- onClick={() => { setShowDeleteModal(true) }}
- >
- <TrashIcon className='h-4 w-4' />
- </Button>
- </>
- ) : (
- <div ref={openRef}>
- <button
- onClick={() => { setOpen(!open) }}
- type='button'
- className='inline-flex items-center shadow-sm pl-2 pr-1 py-0.5 border border-gray-200 dark:border-gray-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'
- >
- {t(`project.settings.roles.${data.role}.name`)}
- <ChevronDownIcon
- style={{ transform: open ? 'rotate(180deg)' : '' }}
- className='w-4 h-4 pt-px ml-0.5'
- />
- </button>
- {open && (
- <ul className='text-left origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>
- {_map(roles, (role) => (
- <li onClick={() => changeRole(role)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={role}>
- <div>
- <p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>
- {t(`project.settings.roles.${role}.name`)}
- </p>
- <p className='mt-1 text-sm text-gray-500 group-hover:text-gray-200'>
- {t(`project.settings.roles.${role}.shortDesc`)}
- </p>
- </div>
- {data.role === role && (
- <span className='text-indigo-600 group-hover:text-gray-200'>
- <CheckIcon className='w-7 h-7 pt-px ml-1' />
- </span>
- )}
- </li>
- ))}
- <li onClick={() => { setOpen(false); setShowDeleteModal(true) }} className='p-4 hover:bg-gray-300 dark:hover:bg-gray-700 group cursor-pointer flex justify-between items-center'>
+ </button>
+ {open && (
+ <ul className='text-left origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>
+ {_map(roles, (itRole) => (
+ <li onClick={() => changeRole(itRole)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={itRole}>
<div>
- <p className='font-bold text-red-600 dark:text-red-500'>
- {t('project.settings.removeMember')}
+ <p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>
+ {t(`project.settings.roles.${itRole}.name`)}
+ </p>
+ <p className='mt-1 text-sm text-gray-500 group-hover:text-gray-200'>
+ {t(`project.settings.roles.${itRole}.shortDesc`)}
</p>
</div>
+ {role === itRole && (
+ <span className='text-indigo-600 group-hover:text-gray-200'>
+ <CheckIcon className='w-7 h-7 pt-px ml-1' />
+ </span>
+ )}
</li>
- </ul>
- )}
- </div>
- )
- }
+ ))}
+ <li onClick={() => { setOpen(false); setShowDeleteModal(true) }} className='p-4 hover:bg-gray-300 dark:hover:bg-gray-700 group cursor-pointer flex justify-between items-center'>
+ <div>
+ <p className='font-bold text-red-600 dark:text-red-500'>
+ {t('project.settings.removeMember')}
+ </p>
+ </div>
+ </li>
+ </ul>
+ )}
+ </div>
+ ) : (
+ <div className='flex items-center justify-end'>
+ <WarningPin
+ label={t('common.pending')}
+ className='inline-flex items-center shadow-sm px-2.5 py-0.5 mr-3'
+ />
+ <Button
+ type='button'
+ className='bg-white text-indigo-700 rounded-md text-base font-medium hover:bg-indigo-50 dark:text-gray-50 dark:bg-gray-600 dark:hover:bg-gray-700'
+ small
+ onClick={() => setShowDeleteModal(true)}
+ >
+ <TrashIcon className='h-4 w-4' />
+ </Button>
+ </div>
+ )
+ }
</td>
<Modal
onClose={() => {
@@ -131,12 +140,12 @@ const UsersList = ({
}}
onSubmit={() => {
setShowDeleteModal(false)
- onRemove(data.id)
+ onRemove(id)
}}
submitText={t('common.yes')}
type='confirmed'
closeText={t('common.no')}
- title={t('project.settings.removeUser', { user: data.user?.email })}
+ title={t('project.settings.removeUser', { user: user.email })}
message={t('project.settings.removeConfirm')}
isOpened={showDeleteModal}
/>
@@ -146,15 +155,19 @@ const UsersList = ({
UsersList.propTypes = {
share: PropTypes.arrayOf(PropTypes.object).isRequired, // eslint-disable-line react/forbid-prop-types
- data: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+ data: PropTypes.object, // eslint-disable-line react/forbid-prop-types
pid: PropTypes.string.isRequired,
onRemove: PropTypes.func.isRequired,
updateProjectFailed: PropTypes.func.isRequired,
language: PropTypes.string.isRequired,
}
+UsersList.defaultProps = {
+ data: {},
+}
+
const People = ({
- project, updateProjectFailed, setProjectShareData,
+ project, updateProjectFailed, setProjectShareData, roleUpdatedNotification, inviteUserNotification, removeUserNotification,
}) => {
const [showModal, setShowModal] = useState(false)
const { t, i18n: { language } } = useTranslation('common')
@@ -199,19 +212,22 @@ const People = ({
}))
}
- const onSubmit = () => {
+ const onSubmit = async () => {
setShowModal(false)
setErrors({})
setValidated(false)
+
+ try {
+ const results = await shareProject(id, { email: form.email, role: form.role })
+ setProjectShareData({ share: results.share }, id)
+ inviteUserNotification(t('apiNotifications.userInvited'))
+ } catch (e) {
+ console.error(`[ERROR] Error while inviting a user: ${e}`)
+ inviteUserNotification(t('apiNotifications.userInviteError'), 'error')
+ }
+
// a timeout is needed to prevent the flicker of data fields in the modal when closing
setTimeout(() => setForm({ email: '', role: '' }), 300)
- shareProject(id, { email: form.email, role: form.role })
- .then((results) => {
- setProjectShareData({ share: results.share }, id)
- })
- .catch((e) => {
- updateProjectFailed(e)
- })
}
const handleSubmit = e => {
@@ -232,15 +248,16 @@ const People = ({
setErrors({})
}
- const onRemove = userId => {
- deleteShareProjectUsers(id, userId)
- .then(() => {
- const newShared = _map(_filter(share, s => s.id !== userId), s => s)
- setProjectShareData({ share: newShared }, id)
- })
- .catch((e) => {
- updateProjectFailed(e)
- })
+ const onRemove = async (userId) => {
+ try {
+ await deleteShareProjectUsers(id, userId)
+ const newShared = _map(_filter(share, s => s.id !== userId), s => s)
+ setProjectShareData({ share: newShared }, id)
+ removeUserNotification(t('apiNotifications.userRemoved'))
+ } catch (e) {
+ console.error(`[ERROR] Error while deleting a user: ${e}`)
+ updateProjectFailed(t('apiNotifications.userRemoveError'))
+ }
}
return (
@@ -278,14 +295,12 @@ const People = ({
<thead>
<tr className='dark:bg-gray-700'>
<th scope='col' className='py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 dark:text-white'>
- {t('profileSettings.sharedTable.project')}
+ {t('auth.common.email')}
</th>
<th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-white'>
{t('profileSettings.sharedTable.joinedOn')}
</th>
- <th scope='col' className='px-3 pr-8 py-3.5 text-right text-sm font-semibold text-gray-900 dark:text-white'>
- {t('profileSettings.sharedTable.role')}
- </th>
+ <th scope='col' className='px-3 pr-8 py-3.5 text-right text-sm font-semibold text-gray-900 dark:text-white' />
</tr>
</thead>
<tbody className='divide-y divide-gray-300 dark:divide-gray-600'>
@@ -299,6 +314,7 @@ const People = ({
share={project.share}
setProjectShareData={setProjectShareData}
updateProjectFailed={updateProjectFailed}
+ roleUpdatedNotification={roleUpdatedNotification}
pid={id}
/>
))}
@@ -398,13 +414,11 @@ const People = ({
People.propTypes = {
// eslint-disable-next-line react/forbid-prop-types
project: PropTypes.object.isRequired,
- updateProjectFailed: PropTypes.func,
- setProjectShareData: PropTypes.func,
-}
-
-People.defaultProps = {
- updateProjectFailed: () => { },
- setProjectShareData: () => { },
+ updateProjectFailed: PropTypes.func.isRequired,
+ setProjectShareData: PropTypes.func.isRequired,
+ roleUpdatedNotification: PropTypes.func.isRequired,
+ inviteUserNotification: PropTypes.func.isRequired,
+ removeUserNotification: PropTypes.func.isRequired,
}
export default People
diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsx
index bcf22a584..36cb88f3d 100644
--- a/src/pages/UserSettings/UserSettings.container.jsx
+++ b/src/pages/UserSettings/UserSettings.container.jsx
@@ -97,8 +97,12 @@ const UserSettingsContainer = () => {
}
}
- const deleteProjectFailed = (message) => {
- dispatch(errorsActions.deleteProjectFailed(message))
+ const userSharedUpdate = (message) => {
+ dispatch(alertsActions.userSharedUpdate(message))
+ }
+
+ const sharedProjectError = (message) => {
+ dispatch(errorsActions.sharedProjectFailed(message))
}
const removeProject = (projectId) => {
@@ -112,6 +116,7 @@ const UserSettingsContainer = () => {
const setProjectsShareData = (data, id) => {
dispatch(UIActions.setProjectsShareData(data, id))
}
+
const setUserShareData = (data, id) => {
dispatch(authActions.setUserShareData(data, id))
}
@@ -127,7 +132,8 @@ const UserSettingsContainer = () => {
setProjectsShareData={setProjectsShareData}
setUserShareData={setUserShareData}
onSubmit={onSubmit}
- deleteProjectFailed={deleteProjectFailed}
+ userSharedUpdate={userSharedUpdate}
+ sharedProjectError={sharedProjectError}
onEmailConfirm={onEmailConfirm}
onDeleteProjectCache={onDeleteProjectCache}
/>
diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsx
index d89261e57..07014fc6a 100644
--- a/src/pages/UserSettings/UserSettings.jsx
+++ b/src/pages/UserSettings/UserSettings.jsx
@@ -26,47 +26,57 @@ import {
import { deleteShareProject, acceptShareProject } from 'api'
const ProjectList = ({
- item, t, deleteProjectFailed, removeShareProject, removeProject, setProjectsShareData, setUserShareData, language,
+ item, t, removeShareProject, removeProject, setProjectsShareData, setUserShareData,
+ language, userSharedUpdate, sharedProjectError,
}) => {
const [showDeleteModal, setShowDeleteModal] = useState(false)
+ const {
+ created, confirmed, id, role, project,
+ } = item
const deleteProject = async (pid) => {
- await deleteShareProject(pid)
- .then(() => {
- removeShareProject(pid)
- removeProject(item.project.id)
- })
- .catch((err) => {
- deleteProjectFailed(err)
- })
+ try {
+ await deleteShareProject(pid)
+ removeShareProject(pid)
+ removeProject(project.id)
+ userSharedUpdate(t('apiNotifications.quitProject'))
+ } catch (e) {
+ console.error(`[ERROR] Error while quitting project: ${e}`)
+ sharedProjectError(t('apiNotifications.quitProjectError'))
+ }
}
const onAccept = async () => {
- await acceptShareProject(item.id)
- .then(() => {
- setProjectsShareData({ confirmed: true }, item.project.id)
- setUserShareData({ confirmed: true }, item.id)
- })
- .catch((err) => {
- deleteProjectFailed(err)
- })
+ try {
+ await acceptShareProject(id)
+ setProjectsShareData({ confirmed: true }, project.id)
+ setUserShareData({ confirmed: true }, id)
+ userSharedUpdate(t('apiNotifications.acceptInvitation'))
+ } catch (e) {
+ console.error(`[ERROR] Error while accepting project invitation: ${e}`)
+ sharedProjectError(t('apiNotifications.acceptInvitationError'))
+ }
}
return (
<tr className='dark:bg-gray-700'>
<td className='whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-white sm:pl-6'>
- {item.project.name}
+ {project.name}
</td>
<td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-white'>
- {t(`project.settings.roles.${item.role}.name`)}
+ {t(`project.settings.roles.${role}.name`)}
</td>
<td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-white'>
{language === 'en'
- ? dayjs(item.created).locale(language).format('MMMM D, YYYY')
- : dayjs(item.created).locale(language).format('D MMMM, YYYY')}
+ ? dayjs(created).locale(language).format('MMMM D, YYYY')
+ : dayjs(created).locale(language).format('D MMMM, YYYY')}
</td>
<td className='relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6'>
- {item.confirmed === false ? (
+ {confirmed ? (
+ <Button onClick={() => setShowDeleteModal(true)} danger small>
+ {t('common.quit')}
+ </Button>
+ ) : (
<>
<Button className='mr-2' onClick={() => setShowDeleteModal(true)} primary small>
{t('common.reject')}
@@ -75,10 +85,6 @@ const ProjectList = ({
{t('common.accept')}
</Button>
</>
- ) : (
- <Button onClick={() => setShowDeleteModal(true)} danger small>
- {t('common.quit')}
- </Button>
)}
<Modal
onClose={() => {
@@ -86,12 +92,12 @@ const ProjectList = ({
}}
onSubmit={() => {
setShowDeleteModal(false)
- deleteProject(item.id)
+ deleteProject(id)
}}
submitText={t('common.yes')}
type='confirmed'
closeText={t('common.no')}
- title={t('profileSettings.quitProjectTitle', { project: item.project.name })}
+ title={t('profileSettings.quitProjectTitle', { project: project.name })}
message={t('profileSettings.quitProject')}
isOpened={showDeleteModal}
/>
@@ -103,9 +109,10 @@ const ProjectList = ({
ProjectList.propTypes = {
item: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
t: PropTypes.func.isRequired,
- deleteProjectFailed: PropTypes.func.isRequired,
+ sharedProjectError: PropTypes.func.isRequired,
removeProject: PropTypes.func.isRequired,
removeShareProject: PropTypes.func.isRequired,
+ userSharedUpdate: PropTypes.func.isRequired,
}
const NoSharedProjects = ({ t }) => (
@@ -119,8 +126,9 @@ const NoSharedProjects = ({ t }) => (
)
const UserSettings = ({
- onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t, deleteProjectFailed,
+ onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t,
removeProject, removeShareProject, setUserShareData, setProjectsShareData, language,
+ userSharedUpdate, sharedProjectError,
}) => {
const { user } = useSelector(state => state.auth)
@@ -335,11 +343,12 @@ const UserSettings = ({
item={item}
language={language}
t={t}
- deleteProjectFailed={deleteProjectFailed}
removeProject={removeProject}
removeShareProject={removeShareProject}
setUserShareData={setUserShareData}
setProjectsShareData={setProjectsShareData}
+ userSharedUpdate={userSharedUpdate}
+ sharedProjectError={sharedProjectError}
/>
))
}
@@ -417,7 +426,6 @@ UserSettings.propTypes = {
onEmailConfirm: PropTypes.func.isRequired,
onExport: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired,
- deleteProjectFailed: PropTypes.func.isRequired,
t: PropTypes.func.isRequired,
onDeleteProjectCache: PropTypes.func.isRequired,
removeProject: PropTypes.func.isRequired,
@@ -425,6 +433,8 @@ UserSettings.propTypes = {
setUserShareData: PropTypes.func.isRequired,
setProjectsShareData: PropTypes.func.isRequired,
language: PropTypes.string.isRequired,
+ userSharedUpdate: PropTypes.func.isRequired,
+ sharedProjectError: PropTypes.string.isRequired,
}
export default memo(UserSettings)
diff --git a/src/redux/actions/alerts/index.js b/src/redux/actions/alerts/index.js
index a92ca0a91..4bdfe3de0 100644
--- a/src/redux/actions/alerts/index.js
+++ b/src/redux/actions/alerts/index.js
@@ -36,6 +36,34 @@ export const alertsActions = {
}
},
+ roleUpdated(message, type = 'success') {
+ return {
+ type: types.ROLE_UPDATED,
+ payload: { message, type },
+ }
+ },
+
+ inviteUser(message, type = 'success') {
+ return {
+ type: types.INVITE_USER,
+ payload: { message, type },
+ }
+ },
+
+ removeUser(message, type = 'success') {
+ return {
+ type: types.REMOVE_USER,
+ payload: { message, type },
+ }
+ },
+
+ userSharedUpdate(message, type = 'success') {
+ return {
+ type: types.USER_SHARED_UPDATE,
+ payload: { message, type },
+ }
+ },
+
clearAlerts() {
return {
type: types.CLEAR_ALERTS,
diff --git a/src/redux/actions/alerts/types.js b/src/redux/actions/alerts/types.js
index 9e3cf1bc9..2c64ec49d 100644
--- a/src/redux/actions/alerts/types.js
+++ b/src/redux/actions/alerts/types.js
@@ -1,11 +1,15 @@
export const types = {
- ACCOUNT_DELETED: 'ACCOUNT_DELETED',
- ACCOUNT_UPDATED: 'ACCOUNT_UPDATED',
- NEW_PASSWORD: 'NEW_PASSWORD',
+ ACCOUNT_DELETED: 'ALERT_ACCOUNT_DELETED',
+ ACCOUNT_UPDATED: 'ALERT_ACCOUNT_UPDATED',
+ NEW_PASSWORD: 'ALERT_NEW_PASSWORD',
// Projects
- CREATE_NEW_PROJECT_SUCCESS: 'CREATE_NEW_PROJECT_SUCCESS',
- DELETE_PROJECT_SUCCESS: 'DELETE_PROJECT_SUCCESS',
+ CREATE_NEW_PROJECT_SUCCESS: 'ALERT_CREATE_NEW_PROJECT_SUCCESS',
+ DELETE_PROJECT_SUCCESS: 'ALERT_DELETE_PROJECT_SUCCESS',
+ ROLE_UPDATED: 'ALERT_ROLE_UPDATED',
+ INVITE_USER: 'ALERT_INVITE_USER',
+ REMOVE_USER: 'ALERT_REMOVE_USER',
+ USER_SHARED_UPDATE: 'ALERT_USER_SHARED_UPDATE',
// Common
CLEAR_ALERTS: 'CLEAR_ALERTS',
diff --git a/src/redux/actions/errors/index.js b/src/redux/actions/errors/index.js
index 96ffc791f..36d277575 100644
--- a/src/redux/actions/errors/index.js
+++ b/src/redux/actions/errors/index.js
@@ -65,6 +65,13 @@ export const errorsActions = {
}
},
+ sharedProjectFailed(error) {
+ return {
+ type: types.SHARED_PROJECT_FAILED,
+ payload: { error },
+ }
+ },
+
genericError(error) {
return {
type: types.GENERIC_ERROR,
diff --git a/src/redux/actions/errors/types.js b/src/redux/actions/errors/types.js
index c22ebe891..6f869de88 100644
--- a/src/redux/actions/errors/types.js
+++ b/src/redux/actions/errors/types.js
@@ -13,6 +13,7 @@ export const types = {
CREATE_NEW_PROJECT_FAILED: 'CREATE_NEW_PROJECT_FAILED',
UPDATE_PROJECT_FAILED: 'UPDATE_PROJECT_FAILED',
DELETE_PROJECT_FAILED: 'DELETE_PROJECT_FAILED',
+ SHARED_PROJECT_FAILED: 'SHARED_PROJECT_FAILED',
GENERIC_ERROR: 'GENERIC_ERROR',
diff --git a/src/redux/reducers/alerts.js b/src/redux/reducers/alerts.js
index bf684dd1d..e1cdd1c47 100644
--- a/src/redux/reducers/alerts.js
+++ b/src/redux/reducers/alerts.js
@@ -13,6 +13,10 @@ const alertsReducer = (state = initialState, { type, payload }) => {
case types.NEW_PASSWORD:
case types.DELETE_PROJECT_SUCCESS:
case types.CREATE_NEW_PROJECT_SUCCESS:
+ case types.ROLE_UPDATED:
+ case types.INVITE_USER:
+ case types.REMOVE_USER:
+ case types.USER_SHARED_UPDATE:
return { ...state, message: payload.message, type: payload.type }
case types.CLEAR_ALERTS:
diff --git a/src/redux/reducers/errors.js b/src/redux/reducers/errors.js
index c17f0acb8..0e6a2be27 100644
--- a/src/redux/reducers/errors.js
+++ b/src/redux/reducers/errors.js
@@ -17,6 +17,7 @@ const errorsReducer = (state = initialState, { type, payload }) => {
case types.UPDATE_PROJECT_FAILED:
case types.DELETE_PROJECT_FAILED:
case types.GDPR_EXPORT_FAILED:
+ case types.SHARED_PROJECT_FAILED:
return { ...state, error: payload.error }
case types.CLEAR_ERRORS:
diff --git a/src/ui/Modal.jsx b/src/ui/Modal.jsx
index 925c0a77e..e94902176 100644
--- a/src/ui/Modal.jsx
+++ b/src/ui/Modal.jsx
@@ -46,27 +46,27 @@ const Modal = ({
>
<div className='sm:flex sm:items-start'>
{type === 'success' && (
- <div className='mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:h-10 sm:w-10'>
+ <div className='sm:mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:h-10 sm:w-10'>
<CheckIcon className='h-6 w-6 text-green-600' aria-hidden='true' />
</div>
)}
{type === 'error' && (
- <div className='mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:h-10 sm:w-10'>
+ <div className='sm:mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:h-10 sm:w-10'>
<ExclamationIcon className='h-6 w-6 text-red-600' aria-hidden='true' />
</div>
)}
{type === 'info' && (
- <div className='mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:h-10 sm:w-10'>
+ <div className='sm:mr-3 mx-auto flex-shrink-0 flex items-center text-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:h-10 sm:w-10'>
<InformationCircleIcon className='h-6 w-6 text-blue-600' aria-hidden='true' />
</div>
)}
{type === 'warning' && (
- <div className='mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-orange-100 sm:h-10 sm:w-10'>
+ <div className='sm:mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-orange-100 sm:h-10 sm:w-10'>
<ExclamationIcon className='h-6 w-6 text-amber-600' aria-hidden='true' />
</div>
)}
{type === 'confirmed' && (
- <div className='mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:h-10 sm:w-10'>
+ <div className='sm:mr-3 mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:h-10 sm:w-10'>
<UserGroupIcon className='h-6 w-6 text-green-600' aria-hidden='true' />
</div>
)}