📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
add delete shared projects, modal dashboard rejects, delete shared users, some fix with redux state
kruzhambusb71eb9ff27b2
diff --git a/src/api/index.js b/src/api/index.jsindex 808ffd3aa..5d29cc3f0 100644--- a/src/api/index.js+++ b/src/api/index.js@@ -271,7 +271,7 @@ export const shareProject = (pid, data) =>: error.response.data.message})-export const deleteShareProject = (pid, userId) =>+export const deleteShareProjectUsers = (pid, userId) =>api.delete(`/project/${pid}/${userId}`).then((response) => response.data)@@ -281,3 +281,14 @@ export const deleteShareProject = (pid, userId) =>? error.response.data: error.response.data.message})++export const deleteShareProject = (pid) =>+ api+ .delete(`user/share/${pid}`)+ .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/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsxindex d64f7f401..2fc403c37 100644--- a/src/pages/Dashboard/Dashboard.container.jsx+++ b/src/pages/Dashboard/Dashboard.container.jsx@@ -1,4 +1,5 @@import { connect } from 'react-redux'+import { errorsActions } from 'redux/actions/errors'import Dashboard from './Dashboard'const mapStateToProps = (state) => ({@@ -8,4 +9,10 @@ const mapStateToProps = (state) => ({error: state.ui.projects.error,})-export default connect(mapStateToProps)(Dashboard)+const mapDispatchToProps = (dispatch) => ({+ deleteProjectFailed: (message) => {+ dispatch(errorsActions.deleteProjectFailed(message))+ },+})++export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex ea7430b01..0ed0cfde4 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -23,12 +23,24 @@ import routes from 'routes'import { isSelfhosted } from 'redux/constants'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'+import { deleteShareProject } from 'api'+const ProjectCart = ({- name, created, active, overall, t, language, live, isPublic, confirmed,+ name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed,}) => {const statsDidGrowUp = overall?.percChange >= 0const [showInviteModal, setShowInviteModal] = useState(false)+ const deleteProject = async (pid) => {+ await deleteShareProject(pid)+ .then((results) => {+ console.log(results)+ })+ .catch((err) => {+ deleteProjectFailed(err)+ })+ }+return (<li><div onClick={() => { return confirmed === false ? setShowInviteModal(true) : () => {} }} className='block cursor-pointer hover:bg-gray-50 dark:bg-gray-700 dark:hover:bg-gray-800 dark:border-gray-700'>@@ -119,7 +131,7 @@ const ProjectCart = ({{!confirmed && (<Modal- onClose={() => { setShowInviteModal(false) }}+ onClose={() => { setShowInviteModal(false); deleteProject(id) }}onSubmit={() => { setShowInviteModal(false) }}submitText='Accept & Continue'type='confirmed'@@ -146,7 +158,7 @@ const NoProjects = ({ t }) => ()const Dashboard = ({- projects, isLoading, error, user,+ projects, isLoading, error, user, deleteProjectFailed,}) => {const { t, i18n: { language } } = useTranslation('common')const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)@@ -207,6 +219,7 @@ const Dashboard = ({confirmed === false ? (<ProjectCartt={t}+ id={id}language={language}name={name}created={created}@@ -215,6 +228,7 @@ const Dashboard = ({overall={overall}confirmed={confirmed}live={_isNumber(live) ? live : 'N/A'}+ deleteProjectFailed={deleteProjectFailed}/>) : (<Link to={_replace(routes.project, ':id', id)}>diff --git a/src/pages/Project/Settings/People/People.container.jsx b/src/pages/Project/Settings/People/People.container.jsxindex 0c3ea8366..d204627c5 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))},- loadProjects: () => {- dispatch(UIActions.loadProjects())+ setProjectShare: (projectId, share) => {+ dispatch(UIActions.setProjectsShare(projectId, share))},})diff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsxindex b42b28539..c8a11d591 100644--- a/src/pages/Project/Settings/People/People.jsx+++ b/src/pages/Project/Settings/People/People.jsx@@ -11,8 +11,8 @@ import _keys from 'lodash/keys'import _isEmpty from 'lodash/isEmpty'import cx from 'clsx'import _map from 'lodash/map'-import { deleteShareProject, shareProject } from 'api'-+import { deleteShareProjectUsers, shareProject } from 'api'+import _filter from 'lodash/filter'import PropTypes from 'prop-types'const roles = [@@ -140,7 +140,9 @@ UsersList.defaultProps = {onRemove: () => {},}-const People = ({ project, updateProjectFailed, loadProjects }) => {+const People = ({+ project, updateProjectFailed, setProjectShare,+}) => {const [showModal, setShowModal] = useState(false)const { t } = useTranslation('common')const [form, setForm] = useState({@@ -190,8 +192,8 @@ const People = ({ project, updateProjectFailed, loadProjects }) => {setErrors({})setValidated(false)shareProject(id, { email: form.email, role: form.role })- .then(() => {- loadProjects()+ .then((results) => {+ setProjectShare(results.share, id)}).catch((e) => {updateProjectFailed(e)@@ -216,10 +218,10 @@ const People = ({ project, updateProjectFailed, loadProjects }) => {}const onRemove = userId => {- deleteShareProject(id, userId)- .then((data) => {- console.log(data)- loadProjects()+ deleteShareProjectUsers(id, userId)+ .then(() => {+ const newShared = _map(_filter(share, s => s.id !== userId), s => s)+ setProjectShare(newShared, id)}).catch((e) => {updateProjectFailed(e)@@ -348,12 +350,12 @@ People.propTypes = {// eslint-disable-next-line react/forbid-prop-typesproject: PropTypes.object.isRequired,updateProjectFailed: PropTypes.func,- loadProjects: PropTypes.func,+ setProjectShare: PropTypes.func,}People.defaultProps = {updateProjectFailed: () => {},- loadProjects: () => {},+ setProjectShare: () => {},}export default Peoplediff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsxindex e8f1f674a..dbeefe08e 100644--- a/src/pages/Project/Settings/ProjectSettings.jsx+++ b/src/pages/Project/Settings/ProjectSettings.jsx@@ -40,6 +40,7 @@ const ProjectSettings = ({const project = useMemo(() => _find(projects, p => p.id === id) || {}, [projects, id])const isSettings = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)const history = useHistory()+ console.log(project)const [form, setForm] = useState({name: '',id: id || nanoid(),diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsxindex 6165e2d9c..df196fa12 100644--- a/src/pages/UserSettings/UserSettings.container.jsx+++ b/src/pages/UserSettings/UserSettings.container.jsx@@ -97,12 +97,17 @@ const UserSettingsContainer = () => {}}+ const deleteProjectFailed = (message) => {+ dispatch(errorsActions.deleteProjectFailed(message))+ }+return (<UserSettingst={t}onDelete={onDelete}onExport={onExport}onSubmit={onSubmit}+ deleteProjectFailed={deleteProjectFailed}onEmailConfirm={onEmailConfirm}onDeleteProjectCache={onDeleteProjectCache}/>diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsxindex b2fcd8be6..7c478683a 100644--- a/src/pages/UserSettings/UserSettings.jsx+++ b/src/pages/UserSettings/UserSettings.jsx@@ -21,9 +21,21 @@ import {isValidEmail, isValidPassword, MIN_PASSWORD_CHARS,} from 'utils/validator'-const ProjectList = ({ item, t }) => {+import { deleteShareProject } from 'api'++const ProjectList = ({ item, t, deleteProjectFailed }) => {const [showDeleteModal, setShowDeleteModal] = useState(false)+ const deleteProject = async (pid) => {+ await deleteShareProject(pid)+ .then((results) => {+ console.log(results)+ })+ .catch((err) => {+ deleteProjectFailed(err)+ })+ }+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'>@@ -35,7 +47,7 @@ const ProjectList = ({ item, t }) => {<td className='relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6'>{item.confirmed === false ? (<>- <Button className='mr-2' onClick={() => {}} primary small>+ <Button className='mr-2' onClick={() => setShowDeleteModal(true)} primary small>Reject</Button><Button onClick={() => {}} primary small>@@ -43,37 +55,36 @@ const ProjectList = ({ item, t }) => {</Button></>) : (- <>- <button- type='button'- className='text-indigo-600 hover:text-indigo-900'- onClick={() => setShowDeleteModal(true)}- >- Delete- </button>- <Modal- onClose={() => {- setShowDeleteModal(false)- }}- onSubmit={() => {- setShowDeleteModal(false)- }}- submitText={t('common.yes')}- type='confirmed'- closeText={t('common.no')}- title={`Delete ${item.id}?`}- message='Are you sure you want to delete this project?'- isOpened={showDeleteModal}- />- </>+ <button+ type='button'+ className='text-indigo-600 hover:text-indigo-900'+ onClick={() => setShowDeleteModal(true)}+ >+ Delete+ </button>)}+ <Modal+ onClose={() => {+ setShowDeleteModal(false)+ }}+ onSubmit={() => {+ setShowDeleteModal(false)+ deleteProject(item.id)+ }}+ submitText={t('common.yes')}+ type='confirmed'+ closeText={t('common.no')}+ title={`Delete ${item.id}?`}+ message='Are you sure you want to delete this project?'+ isOpened={showDeleteModal}+ /></td></tr>)}const UserSettings = ({- onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t,+ onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t, deleteProjectFailed,}) => {const { user } = useSelector(state => state.auth)@@ -280,7 +291,7 @@ const UserSettings = ({<tbody className='divide-y divide-gray-300 dark:divide-gray-600'>{_map(user.sharedProjects, (item) => (- <ProjectList key={item.id} item={item} t={t} />+ <ProjectList key={item.id} item={item} t={t} deleteProjectFailed={deleteProjectFailed} />))}</tbody>@@ -290,10 +301,6 @@ const UserSettings = ({</div></div></div>-- <Button className='mt-4' onClick={handleReportSave} primary large>- {t('common.save')}- </Button><hr className='mt-5' />{!user.isActive && (<div href='#' className='flex cursor-pointer mt-4 pl-0 underline text-blue-600 hover:text-indigo-800' onClick={() => onEmailConfirm(setError)}>diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex 684640471..bb8555af9 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -109,6 +109,14 @@ const setPaddleLastEvent = (event) => ({},})+const setProjectsShare = (share, id) => ({+ type: types.SET_PROJECTS_SHARE,+ payload: {+ share,+ id,+ },+})+const UIActions = {loadProjects,setProjects,@@ -126,6 +134,7 @@ const UIActions = {setPaddleLastEvent,setTotalMonthlyEvents,setShowNoEventsLeftBanner,+ setProjectsShare,}export default UIActionsdiff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.jsindex 86b093b2f..b94eadcb2 100644--- a/src/redux/actions/ui/types.js+++ b/src/redux/actions/ui/types.js@@ -15,4 +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',}diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.jsindex 95b2c64c1..d437bd94a 100644--- a/src/redux/reducers/ui/projects.js+++ b/src/redux/reducers/ui/projects.js@@ -78,6 +78,24 @@ 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_ERROR: {const { error } = payloadreturn {diff --git a/src/redux/sagas/ui/load_projects.js b/src/redux/sagas/ui/load_projects.jsindex ba67d81b8..fe83f90f4 100644--- a/src/redux/sagas/ui/load_projects.js+++ b/src/redux/sagas/ui/load_projects.js@@ -20,7 +20,8 @@ export default function* loadProjects() {...item.project,}}), ...results]- const pids = _map(results, result => result.id)++ const pids = _map(projectWithShared, result => result.id)let overalltry {