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!

some fix hooks outSideClick, change state on change role

kruzhambus9f7e571af1d2
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
index 2dbf8dcad..d18856e37 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -36,7 +36,7 @@ const ProjectCart = ({
const pid = _find(sharedProjects, item => item.project.id === id).id
await acceptShareProject(pid)
- .then((results) => {
+ .then(() => {
setProjectsShareData({ confirmed: true }, id)
setUserShareData({ confirmed: true }, pid)
})
diff --git a/src/pages/Project/Settings/People/People.container.jsx b/src/pages/Project/Settings/People/People.container.jsx
index d204627c5..43f4cb887 100644
--- a/src/pages/Project/Settings/People/People.container.jsx
+++ b/src/pages/Project/Settings/People/People.container.jsx
@@ -8,8 +8,8 @@ const mapDispatchToProps = (dispatch) => ({
updateProjectFailed: (message) => {
dispatch(errorsActions.updateProjectFailed(message))
},
- setProjectShare: (projectId, share) => {
- dispatch(UIActions.setProjectsShare(projectId, share))
+ setProjectShareData: (projectId, share) => {
+ dispatch(UIActions.setProjectsShareData(projectId, share))
},
})
diff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsx
index b34777cbc..7b596b878 100644
--- a/src/pages/Project/Settings/People/People.jsx
+++ b/src/pages/Project/Settings/People/People.jsx
@@ -31,7 +31,9 @@ const NoEvents = ({ t }) => (
</div>
)
-const UsersList = ({ data, onRemove, t }) => {
+const UsersList = ({
+ data, onRemove, t, share, setProjectShareData, pid, updateProjectFailed,
+}) => {
const [open, setOpen] = useState(false)
const [showDeleteModal, setShowDeleteModal] = useState(false)
const openRef = useRef()
@@ -40,11 +42,12 @@ const UsersList = ({ data, onRemove, t }) => {
const changeRole = async (role) => {
await changeShareRole(data.id, { role })
.then((results) => {
- console.log(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) => {
- console.log(e)
+ updateProjectFailed(e)
setOpen(false)
})
}
@@ -73,7 +76,7 @@ const UsersList = ({ data, onRemove, t }) => {
</Button>
</>
) : (
- <>
+ <div ref={openRef}>
<button
onClick={() => { setOpen(!open) }}
type='button'
@@ -86,7 +89,7 @@ const UsersList = ({ data, onRemove, t }) => {
/>
</button>
{open && (
- <ul ref={openRef} className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>
+ <ul className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden 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>
@@ -113,7 +116,7 @@ const UsersList = ({ data, onRemove, t }) => {
</li>
</ul>
)}
- </>
+ </div>
)
}
</div>
@@ -138,17 +141,22 @@ const UsersList = ({ data, onRemove, t }) => {
}
UsersList.propTypes = {
+ // eslint-disable-next-line react/forbid-prop-types
+ share: PropTypes.arrayOf(PropTypes.object).isRequired,
// eslint-disable-next-line react/forbid-prop-types
data: PropTypes.object.isRequired,
+ pid: PropTypes.string.isRequired,
onRemove: PropTypes.func,
+ updateProjectFailed: PropTypes.func,
}
UsersList.defaultProps = {
onRemove: () => { },
+ updateProjectFailed: (e) => console.log(e),
}
const People = ({
- project, updateProjectFailed, setProjectShare,
+ project, updateProjectFailed, setProjectShareData,
}) => {
const [showModal, setShowModal] = useState(false)
const { t } = useTranslation('common')
@@ -201,7 +209,7 @@ const People = ({
setTimeout(() => setForm({ email: '', role: '' }), 300)
shareProject(id, { email: form.email, role: form.role })
.then((results) => {
- setProjectShare(results.share, id)
+ setProjectShareData({ share: results.share }, id)
})
.catch((e) => {
updateProjectFailed(e)
@@ -230,7 +238,7 @@ const People = ({
deleteShareProjectUsers(id, userId)
.then(() => {
const newShared = _map(_filter(share, s => s.id !== userId), s => s)
- setProjectShare(newShared, id)
+ setProjectShareData({ share: newShared }, id)
})
.catch((e) => {
updateProjectFailed(e)
@@ -265,7 +273,18 @@ const People = ({
<NoEvents t={t} />
) : (
<ul className='divide-y divide-gray-200 dark:divide-gray-700'>
- {_map(share, user => (<UsersList data={user} key={user.id} onRemove={onRemove} t={t} />))}
+ {_map(share, user => (
+ <UsersList
+ data={user}
+ key={user.id}
+ onRemove={onRemove}
+ t={t}
+ share={project.share}
+ setProjectShareData={setProjectShareData}
+ updateProjectFailed={updateProjectFailed}
+ pid={id}
+ />
+ ))}
</ul>
)
}
@@ -358,12 +377,12 @@ People.propTypes = {
// eslint-disable-next-line react/forbid-prop-types
project: PropTypes.object.isRequired,
updateProjectFailed: PropTypes.func,
- setProjectShare: PropTypes.func,
+ setProjectShareData: PropTypes.func,
}
People.defaultProps = {
updateProjectFailed: () => { },
- setProjectShare: () => { },
+ setProjectShareData: () => { },
}
export default People
diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsx
index 97f4496a4..8109cfc89 100644
--- a/src/pages/UserSettings/UserSettings.jsx
+++ b/src/pages/UserSettings/UserSettings.jsx
@@ -32,7 +32,7 @@ const ProjectList = ({
const deleteProject = async (pid) => {
await deleteShareProject(pid)
- .then((results) => {
+ .then(() => {
removeShareProject(pid)
removeProject(item.project.id)
})
@@ -43,7 +43,7 @@ const ProjectList = ({
const onAccept = async () => {
await acceptShareProject(item.id)
- .then((results) => {
+ .then(() => {
setProjectsShareData({ confirmed: true }, item.project.id)
setUserShareData({ confirmed: true }, item.id)
})
diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.js
index 843a55904..1124be596 100644
--- a/src/redux/actions/ui/index.js
+++ b/src/redux/actions/ui/index.js
@@ -109,14 +109,6 @@ const setPaddleLastEvent = (event) => ({
},
})
-const setProjectsShare = (share, id) => ({
- type: types.SET_PROJECTS_SHARE,
- payload: {
- share,
- id,
- },
-})
-
const setProjectsShareData = (data, id) => ({
type: types.SET_PROJECTS_SHARE_DATA,
payload: {
@@ -142,7 +134,6 @@ const UIActions = {
setPaddleLastEvent,
setTotalMonthlyEvents,
setShowNoEventsLeftBanner,
- setProjectsShare,
setProjectsShareData,
}
diff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.js
index 23e3f6a9c..fd80f451f 100644
--- a/src/redux/actions/ui/types.js
+++ b/src/redux/actions/ui/types.js
@@ -15,6 +15,5 @@ export const types = {
SET_PADDLE_LAST_EVENT: 'UI_SET_PADDLE_LAST_EVENT',
SET_TOTAL_MONTHLY_EVENTS: 'UI_SET_TOTAL_MONTHLY_EVENTS',
SET_SHOW_NO_EVENTS_LEFT: 'UI_SET_SHOW_NO_EVENTS_LEFT',
- SET_PROJECTS_SHARE: 'UI_SET_PROJECTS_SHARE',
SET_PROJECTS_SHARE_DATA: 'UI_SET_PROJECTS_SHARE_DATA',
}
diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.js
index d3a988f7b..68d01f968 100644
--- a/src/redux/reducers/ui/projects.js
+++ b/src/redux/reducers/ui/projects.js
@@ -78,24 +78,6 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {
}
}
- case types.SET_PROJECTS_SHARE: {
- const { share, id } = payload
-
- return {
- ...state,
- projects: _map(state.projects, (item) => {
- if (item.id === id) {
- return {
- ...item,
- share,
- }
- }
-
- return item
- }),
- }
- }
-
case types.SET_PROJECTS_SHARE_DATA: {
const { data, id } = payload