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 update

kruzhambusac31c93ef14f
diff --git a/src/api/index.js b/src/api/index.js
index f7dc439b8..808ffd3aa 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -260,12 +260,24 @@ export const getGeneralStats = () =>
: error.response.data.message
})
-export const shareProject = (pid, data) => api
- .post(`/project/${pid}/share`, data)
- .then((response) => response.data)
- .catch((error) => {
- debug('%s', error)
- throw _isEmpty(error.response.data?.message)
- ? error.response.data
- : error.response.data.message
- })
+export const shareProject = (pid, data) =>
+ api
+ .post(`/project/${pid}/share`, data)
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
+
+export const deleteShareProject = (pid, userId) =>
+ api
+ .delete(`/project/${pid}/${userId}`)
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
diff --git a/src/pages/Project/Settings/People/People.container.jsx b/src/pages/Project/Settings/People/People.container.jsx
new file mode 100644
index 000000000..0c3ea8366
--- /dev/null
+++ b/src/pages/Project/Settings/People/People.container.jsx
@@ -0,0 +1,16 @@
+import { connect } from 'react-redux'
+import UIActions from 'redux/actions/ui'
+import { errorsActions } from 'redux/actions/errors'
+
+import People from './People'
+
+const mapDispatchToProps = (dispatch) => ({
+ updateProjectFailed: (message) => {
+ dispatch(errorsActions.updateProjectFailed(message))
+ },
+ loadProjects: () => {
+ dispatch(UIActions.loadProjects())
+ },
+})
+
+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 18c8e2f36..e8ef14c36 100644
--- a/src/pages/Project/Settings/People/People.jsx
+++ b/src/pages/Project/Settings/People/People.jsx
@@ -12,7 +12,7 @@ import cx from 'clsx'
import _map from 'lodash/map'
import _filter from 'lodash/filter'
-import { shareProject } from 'api'
+import { deleteShareProject, shareProject } from 'api'
const roles = [
{
@@ -27,6 +27,16 @@ const roles = [
},
]
+const NoEvents = () => (
+ <div className='flex flex-col py-6 sm:px-6 lg:px-8'>
+ <div className='max-w-7xl w-full mx-auto text-gray-900 dark:text-gray-50'>
+ <h2 className='text-2xl mb-8 text-center leading-snug'>
+ No people have been added to this project yet.
+ </h2>
+ </div>
+ </div>
+)
+
const UsersList = ({ data, onRemove }) => {
const [open, setOpen] = useState(false)
@@ -34,17 +44,17 @@ const UsersList = ({ data, onRemove }) => {
<li className='py-4'>
<div className='flex justify-between'>
<p className='text-gray-700 dark:text-gray-200'>
- {data.gmail}
+ {data.id}
</p>
<div className='relative'>
{
- data.pandding ? (
+ !data.confirmed ? (
<>
<ActivePin
label='Pannding'
className='inline-flex items-center shadow-sm px-2.5 py-0.5 mr-3'
/>
- <span onClick={() => onRemove(data.gmail)}>
+ <span onClick={() => onRemove(data.id)}>
<InactivePin
label='Remove'
className='cursor-pointer inline-flex items-center shadow-sm px-2.5 py-0.5 hover:text-red-400 hover:dark:text-red-400'
@@ -76,7 +86,7 @@ const UsersList = ({ data, onRemove }) => {
{description}
</p>
</div>
- { role === 'admin' && (
+ { data.role === role && (
<span className='text-indigo-600 group-hover:text-gray-200'>
<CheckIcon className='w-7 h-7 pt-px ml-1' />
</span>
@@ -102,7 +112,7 @@ const UsersList = ({ data, onRemove }) => {
)
}
-const People = ({ project }) => {
+const People = ({ project, updateProjectFailed }) => {
const [showModal, setShowModal] = useState(false)
const { t } = useTranslation('common')
const [form, setForm] = useState({
@@ -113,38 +123,8 @@ const People = ({ project }) => {
const [errors, setErrors] = useState({})
const [validated, setValidated] = useState(false)
const { id, name, share } = project
- const [users, setUsers] = useState([
- {
- gmail: '[email protected]',
- pandding: true,
- role: 'admin',
- },
- {
- gmail: '[email protected]',
- pandding: false,
- role: 'viewer',
- },
- {
- gmail: '[email protected]',
- pandding: false,
- role: 'viewer',
- },
- {
- gmail: '[email protected]',
- pandding: false,
- role: 'admin',
- },
- {
- gmail: '[email protected]',
- pandding: true,
- role: 'admin',
- },
- {
- gmail: '[email protected]',
- pandding: true,
- role: 'admin',
- },
- ])
+
+ const [users, setUsers] = useState(share)
const validate = () => {
const allErrors = {}
@@ -180,20 +160,16 @@ const People = ({ project }) => {
const onSubmit = () => {
setShowModal(false)
- setUsers((oldUsers) => {
- return [
- {
- gmail: form.email,
- pandding: true,
- role: form.role,
- },
- ...oldUsers,
- ]
- })
setForm({ email: '', role: '' })
setErrors({})
setValidated(false)
shareProject(id, { email: form.email, role: form.role })
+ .then((data) => {
+ setUsers(data.share)
+ })
+ .catch((e) => {
+ updateProjectFailed(e)
+ })
}
const handleSubmit = e => {
@@ -213,9 +189,17 @@ const People = ({ project }) => {
setErrors({})
}
- const onRemove = gmail => {
- setUsers(oldUsers => _filter(oldUsers, user => user.gmail !== gmail))
+ const onRemove = userId => {
+ deleteShareProject(id, userId)
+ .then((data) => {
+ console.log(data)
+ setUsers(oldUsers => _filter(oldUsers, user => user.id !== userId))
+ })
+ .catch((e) => {
+ updateProjectFailed(e)
+ })
}
+
return (
<div className='mt-6 mb-6'>
<div className='flex justify-between items-center mb-3'>
@@ -238,9 +222,15 @@ const People = ({ project }) => {
</Button>
</div>
<div>
- <ul className='divide-y divide-gray-200 dark:divide-gray-700'>
- {_map(users, user => (<UsersList data={user} key={user.gmail} onRemove={onRemove} />))}
- </ul>
+ {
+ !users ? (
+ <NoEvents />
+ ) : (
+ <ul className='divide-y divide-gray-200 dark:divide-gray-700'>
+ {_map(users, user => (<UsersList data={user} key={user.id} onRemove={onRemove} />))}
+ </ul>
+ )
+ }
</div>
<Modal
onClose={closeModal}
@@ -324,9 +314,6 @@ const People = ({ project }) => {
)}
isOpened={showModal}
/>
- <Button type='submit' className='mt-3' primary regular>
- save
- </Button>
</div>
)
}
diff --git a/src/pages/Project/Settings/People/index.jsx b/src/pages/Project/Settings/People/index.jsx
new file mode 100644
index 000000000..e1573d0ef
--- /dev/null
+++ b/src/pages/Project/Settings/People/index.jsx
@@ -0,0 +1,3 @@
+import People from './People.container'
+
+export default People
diff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsx
index 432bf274c..e8f1f674a 100644
--- a/src/pages/Project/Settings/ProjectSettings.jsx
+++ b/src/pages/Project/Settings/ProjectSettings.jsx
@@ -25,7 +25,7 @@ import Modal from 'ui/Modal'
import { nanoid } from 'utils/random'
import routes from 'routes'
-import People from './People/People'
+import People from './People'
const MAX_NAME_LENGTH = 50
const MAX_ORIGINS_LENGTH = 300