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!

add: delete members

kruzhambusa8f4c4625a76
diff --git a/src/App.js b/src/App.js
index 37662c5ec..cf132c5b6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -50,6 +50,7 @@ const Changelog = lazy(() => import('pages/Changelog'))
const About = lazy(() => import('pages/About'))
const ProjectAlertsSettings = lazy(() => import('pages/Project/Alerts/Settings'))
const CookiePolicy = lazy(() => import('pages/CookiePolicy'))
+const ConfirmReportsShare = lazy(() => import('pages/Project/Settings/Emails/ConfirmReportsShare'))
const minimalFooterPages = [
'/projects', '/dashboard', '/settings', '/contact',
@@ -207,6 +208,7 @@ const App = () => {
<Route path={routes.alert_settings} component={ProjectAlertsSettings} exact />
<Route path={routes.create_alert} component={ProjectAlertsSettings} exact />
<Route path={routes.cookiePolicy} component={CookiePolicy} exact />
+ <Route path={routes.confirm_subcription} component={ConfirmReportsShare} exact />
<Route path='*' component={NotFound} />
</Switch>
</Suspense>
diff --git a/src/api/index.js b/src/api/index.js
index 61ecbdfbf..47d6b8421 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -624,3 +624,14 @@ export const removeSubscriber = (id, subscriberId) =>
? error.response.data
: error.response.data.message
})
+
+export const confirmSubscriberInvite = (id, token) =>
+ api
+ .get(`project/${id}/subscribers/invite?token=${token}`)
+ .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/Emails/ConfirmReportsShare/index.jsx b/src/pages/Project/Settings/Emails/ConfirmReportsShare/index.jsx
index 4bd2e1121..1625df669 100644
--- a/src/pages/Project/Settings/Emails/ConfirmReportsShare/index.jsx
+++ b/src/pages/Project/Settings/Emails/ConfirmReportsShare/index.jsx
@@ -1,36 +1,42 @@
import React, { useState, useEffect, memo } from 'react'
-import { useDispatch } from 'react-redux'
import { useParams } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'
-import _split from 'lodash/split'
import Title from 'components/Title'
-import UIActions from 'redux/actions/ui'
import Loader from 'ui/Loader'
-const ConfirmShare = () => {
+import { confirmSubscriberInvite } from 'api'
+
+const ConfirmReportsShare = () => {
const { t } = useTranslation('common')
- const dispatch = useDispatch()
const { id } = useParams()
const [loading, setLoading] = useState(true)
const [error, setError] = useState('')
+ const handleConfirm = async (token) => {
+ try {
+ await confirmSubscriberInvite(id, token)
+ } catch (e) {
+ setError(t('apiNotifications.invalidToken'))
+ } finally {
+ setLoading(false)
+ }
+ }
+
useEffect(() => {
setLoading(true)
- const path = _split(window.location.pathname, '/')[1]
+ const query = new URLSearchParams(window.location.search)
+ const token = query.get('token')
- dispatch(
- UIActions.shareVerifyAsync(
- { path, id },
- () => setLoading(false),
- (verifyError) => {
- setError(verifyError)
- setLoading(false)
- },
- ),
- )
- }, [id]) // eslint-disable-line
+ if (!token) {
+ setError(t('apiNotifications.invalidToken'))
+ setLoading(false)
+ return
+ }
+
+ handleConfirm(token)
+ }, []) // eslint-disable-line
if (loading) {
return (
@@ -85,4 +91,4 @@ const ConfirmShare = () => {
)
}
-export default memo(ConfirmShare)
+export default memo(ConfirmReportsShare)
diff --git a/src/pages/Project/Settings/Emails/Emails.container.jsx b/src/pages/Project/Settings/Emails/Emails.container.jsx
index d12af5345..93eec40f9 100644
--- a/src/pages/Project/Settings/Emails/Emails.container.jsx
+++ b/src/pages/Project/Settings/Emails/Emails.container.jsx
@@ -18,6 +18,9 @@ const mapDispatchToProps = (dispatch) => ({
removeEmail: (message, type = 'success') => {
dispatch(alertsActions.generateAlerts(message, type))
},
+ reportTypeNotifiction: (message, type = 'success') => {
+ dispatch(alertsActions.generateAlerts(message, type))
+ },
})
export default connect(mapStateToProps, mapDispatchToProps)(Emails)
diff --git a/src/pages/Project/Settings/Emails/Emails.jsx b/src/pages/Project/Settings/Emails/Emails.jsx
index 5c4367b6e..53e12f59f 100644
--- a/src/pages/Project/Settings/Emails/Emails.jsx
+++ b/src/pages/Project/Settings/Emails/Emails.jsx
@@ -26,7 +26,7 @@ import cx from 'clsx'
import { WarningPin } from 'ui/Pin'
const EmailList = ({
- data, onRemove, t, setEmails, updateEmailFailed, language, emailUpdateNotification,
+ data, onRemove, t, setEmails, emailFailed, language, reportTypeNotifiction,
}) => {
const [open, setOpen] = useState(false)
const [showDeleteModal, setShowDeleteModal] = useState(false)
@@ -48,10 +48,10 @@ const EmailList = ({
})
return newEmails
})
- emailUpdateNotification(t('apiNotifications.roleUpdated'))
+ reportTypeNotifiction(t('apiNotifications.roleUpdated'))
} catch (e) {
console.error(`[ERROR] Error while updating user's role: ${e}`)
- updateEmailFailed(t('apiNotifications.roleUpdateError'))
+ emailFailed(t('apiNotifications.roleUpdateError'))
}
setOpen(false)
@@ -170,7 +170,7 @@ const NoEvents = ({ t }) => (
)
const Emails = ({
- emailFailed, addEmail, removeEmail, projectId, projectName,
+ emailFailed, addEmail, removeEmail, projectId, projectName, reportTypeNotifiction,
}) => {
const [showModal, setShowModal] = useState(false)
const { t, i18n: { language } } = useTranslation('common')
@@ -276,7 +276,8 @@ const Emails = ({
const onRemove = async (email) => {
try {
await removeSubscriber(projectId, email)
- const results = _map(_filter(emails, s => s !== email), s => s)
+ console.log('email', emails)
+ const results = _filter(emails, s => s.id !== email)
setEmails(results)
removeEmail(t('apiNotifications.emailDelete'))
} catch (e) {
@@ -336,7 +337,9 @@ const Emails = ({
t={t}
language={language}
setEmails={setEmails}
+ removeEmail={removeEmail}
emailFailed={emailFailed}
+ reportTypeNotifiction={reportTypeNotifiction}
/>
))}
</tbody>