📈 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
working with accept shared project
kruzhambus079905e049f6
diff --git a/src/pages/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsxindex 262321a37..6642f00e8 100644--- a/src/pages/Dashboard/Dashboard.container.jsx+++ b/src/pages/Dashboard/Dashboard.container.jsx@@ -21,6 +21,12 @@ const mapDispatchToProps = (dispatch) => ({removeShareProject: (id) => {dispatch(authActions.deleteShareProject(id))},+ setProjectsShareData: (data, id) => {+ dispatch(UIActions.setProjectsShareData(data, id))+ },+ setUserShareData: (data, id) => {+ dispatch(authActions.setUserShareData(data, id))+ },})export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex 4561d7c34..bd342e01f 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -27,7 +27,7 @@ import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import { deleteShareProject, acceptShareProject } from 'api'const ProjectCart = ({- name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed, sharedProjects, removeProject, removeShareProject,+ name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed, sharedProjects, removeProject, removeShareProject, setProjectsShareData, setUserShareData,}) => {const statsDidGrowUp = overall?.percChange >= 0const [showInviteModal, setShowInviteModal] = useState(false)@@ -47,10 +47,11 @@ const ProjectCart = ({const onAccept = async () => {const pid = _find(sharedProjects, item => item.project.id === id).id- console.log(sharedProjects)+await acceptShareProject(pid).then((results) => {- console.log(results)+ setProjectsShareData({ confirmed: true }, id)+ setUserShareData({ confirmed: true }, pid)}).catch((err) => {deleteProjectFailed(err)@@ -174,7 +175,7 @@ const NoProjects = ({ t }) => ()const Dashboard = ({- projects, isLoading, error, user, deleteProjectFailed, removeProject, removeShareProject,+ projects, isLoading, error, user, deleteProjectFailed, removeProject, removeShareProject, setProjectsShareData, setUserShareData,}) => {const { t, i18n: { language } } = useTranslation('common')const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)@@ -246,6 +247,8 @@ const Dashboard = ({confirmed={confirmed}sharedProjects={user.sharedProjects}removeShareProject={removeShareProject}+ setProjectsShareData={setProjectsShareData}+ setUserShareData={setUserShareData}live={_isNumber(live) ? live : 'N/A'}deleteProjectFailed={deleteProjectFailed}/>@@ -302,6 +305,8 @@ Dashboard.propTypes = {deleteProjectFailed: PropTypes.func,removeProject: PropTypes.func,removeShareProject: PropTypes.func,+ setProjectsShareData: PropTypes.func,+ setUserShareData: PropTypes.func,}Dashboard.defaultProps = {@@ -309,6 +314,8 @@ Dashboard.defaultProps = {removeProject: () => {},deleteProjectFailed: (e) => console.log(e),removeShareProject: () => {},+ setProjectsShareData: () => {},+ setUserShareData: () => {},}export default memo(withAuthentication(Dashboard, auth.authenticated))diff --git a/src/pages/Project/View/ViewProject.container.jsx b/src/pages/Project/View/ViewProject.container.jsxindex 58c2771c3..0668018a6 100644--- a/src/pages/Project/View/ViewProject.container.jsx+++ b/src/pages/Project/View/ViewProject.container.jsx@@ -10,6 +10,7 @@ const mapStateToProps = (state) => ({projectViewPrefs: state.ui.cache.projectViewPrefs,authenticated: state.auth.authenticated,timezone: state.auth.user.timezone,+ user: state.auth.user,})const mapDispatchToProps = (dispatch) => ({diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 45708def9..da950ee21 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -334,7 +334,7 @@ const Filters = ({const ViewProject = ({projects, isLoading: _isLoading, showError, cache, setProjectCache, projectViewPrefs, setProjectViewPrefs, setPublicProject,- setLiveStatsForProject, authenticated, timezone,+ setLiveStatsForProject, authenticated, timezone, user,}) => {const { t, i18n: { language } } = useTranslation('common')const [periodPairs, setPeriodPairs] = useState(tbPeriodPairs(t))@@ -365,6 +365,8 @@ const ViewProject = ({const { name } = project+ const sharedRoles = useMemo(() => _find(user.sharedProjects, p => p.project.id === id).role || {}, [user, id])+const onErrorLoading = () => {showError(t('project.noExist'))history.push(routes.dashboard)@@ -685,7 +687,7 @@ const ViewProject = ({onSelect={item => item.onClick(panelsData, t)}/></div>- {!isProjectPublic && (+ {(!isProjectPublic && !(sharedRoles === 'viewer')) && (<div className='h-full ml-3'><ButtononClick={openSettingsHandler}diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsxindex 2cf000682..8c1986517 100644--- a/src/pages/UserSettings/UserSettings.container.jsx+++ b/src/pages/UserSettings/UserSettings.container.jsx@@ -109,6 +109,13 @@ const UserSettingsContainer = () => {dispatch(authActions.deleteShareProject(id))}+ const setProjectsShareData = (data, id) => {+ dispatch(UIActions.setProjectsShareData(data, id))+ }+ const setUserShareData = (data, id) => {+ dispatch(authActions.setUserShareData(data, id))+ }+return (<UserSettingst={t}@@ -116,6 +123,8 @@ const UserSettingsContainer = () => {onExport={onExport}removeProject={removeProject}removeShareProject={removeShareProject}+ setProjectsShareData={setProjectsShareData}+ setUserShareData={setUserShareData}onSubmit={onSubmit}deleteProjectFailed={deleteProjectFailed}onEmailConfirm={onEmailConfirm}diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsxindex f4146b3d7..09006aff4 100644--- a/src/pages/UserSettings/UserSettings.jsx+++ b/src/pages/UserSettings/UserSettings.jsx@@ -22,10 +22,10 @@ import {isValidEmail, isValidPassword, MIN_PASSWORD_CHARS,} from 'utils/validator'-import { deleteShareProject } from 'api'+import { deleteShareProject, acceptShareProject } from 'api'const ProjectList = ({- item, t, deleteProjectFailed, removeShareProject, removeProject,+ item, t, deleteProjectFailed, removeShareProject, removeProject, setProjectsShareData, setUserShareData,}) => {const [showDeleteModal, setShowDeleteModal] = useState(false)@@ -40,10 +40,21 @@ const ProjectList = ({})}+ const onAccept = async () => {+ await acceptShareProject(item.id)+ .then((results) => {+ setProjectsShareData({ confirmed: true }, item.project.id)+ setUserShareData({ confirmed: true }, item.id)+ })+ .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'>- {item.id}+ {item.project.name}</td><td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-white'>{item.role}@@ -54,7 +65,7 @@ const ProjectList = ({<Button className='mr-2' onClick={() => setShowDeleteModal(true)} primary small>Reject</Button>- <Button onClick={() => {}} primary small>+ <Button onClick={() => onAccept()} primary small>Accept</Button></>@@ -101,7 +112,7 @@ ProjectList.defaultProps = {}const UserSettings = ({- onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t, deleteProjectFailed, removeProject, removeShareProject,+ onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t, deleteProjectFailed, removeProject, removeShareProject, setUserShareData, setProjectsShareData,}) => {const { user } = useSelector(state => state.auth)@@ -308,7 +319,16 @@ 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} deleteProjectFailed={deleteProjectFailed} removeProject={removeProject} removeShareProject={removeShareProject} />+ <ProjectList+ key={item.id}+ item={item}+ t={t}+ deleteProjectFailed={deleteProjectFailed}+ removeProject={removeProject}+ removeShareProject={removeShareProject}+ setUserShareData={setUserShareData}+ setProjectsShareData={setProjectsShareData}+ />))}</tbody>@@ -387,6 +407,8 @@ UserSettings.propTypes = {onDeleteProjectCache: PropTypes.func.isRequired,removeProject: PropTypes.func.isRequired,removeShareProject: PropTypes.func.isRequired,+ setUserShareData: PropTypes.func.isRequired,+ setProjectsShareData: PropTypes.func.isRequired,}UserSettings.defaultProps = {diff --git a/src/redux/actions/auth/index.js b/src/redux/actions/auth/index.jsindex 0f5f05859..74ba37ecd 100644--- a/src/redux/actions/auth/index.js+++ b/src/redux/actions/auth/index.js@@ -116,4 +116,12 @@ export const authActions = {payload: { id },}},++ setUserShareData(data, id) {+ return {+ type: types.SET_USER_SHARE_DATA,+ payload: { data, id },+ }+ },+}diff --git a/src/redux/actions/auth/types.js b/src/redux/actions/auth/types.jsindex 236a05585..e5bf24879 100644--- a/src/redux/actions/auth/types.js+++ b/src/redux/actions/auth/types.js@@ -9,6 +9,8 @@ export const types = {LOGOUT: 'LOGOUT',SAVE_PATH: 'SAVE_PATH',DELETE_ACCOUNT_SUCCESS: 'DELETE_ACCOUNT_SUCCESS',+ DELETE_SHARE_PROJECT: 'DELETE_SHARE_PROJECT',+ SET_USER_SHARE_DATA: 'SET_USER_SHARE_DATA',// AsynchronousLOGIN_ASYNC: 'LOGIN_ASYNC',@@ -16,5 +18,4 @@ export const types = {EMAIL_VERIFY_ASYNC: 'EMAIL_VERIFY_ASYNC',UPDATE_USER_PROFILE_ASYNC: 'UPDATE_USER_PROFILE_ASYNC',DELETE_ACCOUNT_ASYNC: 'DELETE_ACCOUNT_ASYNC',- DELETE_SHARE_PROJECT: 'DELETE_SHARE_PROJECT',}diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex bb8555af9..843a55904 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -117,6 +117,14 @@ const setProjectsShare = (share, id) => ({},})+const setProjectsShareData = (data, id) => ({+ type: types.SET_PROJECTS_SHARE_DATA,+ payload: {+ data,+ id,+ },+})+const UIActions = {loadProjects,setProjects,@@ -135,6 +143,7 @@ const UIActions = {setTotalMonthlyEvents,setShowNoEventsLeftBanner,setProjectsShare,+ setProjectsShareData,}export default UIActionsdiff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.jsindex b94eadcb2..23e3f6a9c 100644--- a/src/redux/actions/ui/types.js+++ b/src/redux/actions/ui/types.js@@ -16,4 +16,5 @@ export const types = {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/auth.js b/src/redux/reducers/auth.jsindex 95d6ecd57..ae47d2bb1 100644--- a/src/redux/reducers/auth.js+++ b/src/redux/reducers/auth.js@@ -1,5 +1,6 @@import { types } from 'redux/actions/auth/types'import _filter from 'lodash/filter'+import _map from 'lodash/map'const initialState = {redirectPath: null,@@ -31,10 +32,29 @@ const authReducer = (state = initialState, { type, payload }) => {case types.FINISH_LOADING:return { ...state, loading: false }- case types.DELETE_SHARE_PROJECT:+ case types.DELETE_SHARE_PROJECT: {// eslint-disable-next-line no-case-declarationsconst { id } = payloadreturn { ...state, user: { ...state.user, sharedProjects: _filter(state.user.sharedProjects, (item) => item.id !== id) } }+ }++ case types.SET_USER_SHARE_DATA: {+ // eslint-disable-next-line no-case-declarations+ const { data, id } = payload+ return {+ ...state,+ user: {+ ...state.user,+ sharedProjects: _map(state.user.sharedProjects, (item) => {+ if (item.id === id) {+ return { ...item, ...data }+ }++ return item+ }),+ },+ }+ }default:return statediff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.jsindex d437bd94a..d3a988f7b 100644--- a/src/redux/reducers/ui/projects.js+++ b/src/redux/reducers/ui/projects.js@@ -96,6 +96,24 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}}+ case types.SET_PROJECTS_SHARE_DATA: {+ const { data, id } = payload++ return {+ ...state,+ projects: _map(state.projects, (item) => {+ if (item.id === id) {+ return {+ ...item,+ ...data,+ }+ }++ return item+ }),+ }+ }+case types.SET_PROJECTS_ERROR: {const { error } = payloadreturn {