📈 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
added other page for shared projects and added paggination
kruzhambusf121cb165c35
diff --git a/src/pages/Auth/Signin/Signin.container.jsx b/src/pages/Auth/Signin/Signin.container.jsxindex d03491ff2..30069f9e5 100644--- a/src/pages/Auth/Signin/Signin.container.jsx+++ b/src/pages/Auth/Signin/Signin.container.jsx@@ -12,6 +12,7 @@ const mapDispatchToProps = (dispatch) => ({loginSuccess: (user) => {dispatch(authActions.loginSuccess(user))dispatch(UIActions.loadProjects())+ dispatch(UIActions.loadSharedProjects())},loginFailed: (error) => {dispatch(errorsActions.loginFailed(error))diff --git a/src/pages/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsxindex 47a643a3b..47c42d7a5 100644--- a/src/pages/Dashboard/Dashboard.container.jsx+++ b/src/pages/Dashboard/Dashboard.container.jsx@@ -7,19 +7,22 @@ import Dashboard from './Dashboard'const mapStateToProps = (state) => ({projects: state.ui.projects.projects,+ sharedProjects: state.ui.projects.sharedProjects,user: state.auth.user,isLoading: state.ui.projects.isLoading,total: state.ui.projects.total,+ sharedTotal: state.ui.projects.sharedTotal,error: state.ui.projects.error,dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,+ dashboardTabs: state.ui.projects.dashboardTabs,})const mapDispatchToProps = (dispatch) => ({deleteProjectFailed: (message) => {dispatch(errorsActions.deleteProjectFailed(message))},- setProjectsShareData: (data, id) => {- dispatch(UIActions.setProjectsShareData(data, id))+ setProjectsShareData: (data, id, shared) => {+ dispatch(UIActions.setProjectsShareData(data, id, shared))},setUserShareData: (data, id) => {dispatch(authActions.setUserShareData(data, id))@@ -39,6 +42,9 @@ const mapDispatchToProps = (dispatch) => ({setDashboardPaginationPage: (page) => {dispatch(UIActions.setDashboardPaginationPage(page))},+ setDashboardTabs: (tab) => {+ dispatch(UIActions.setDashboardTabs(tab))+ },})export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex 8b2818b94..80bcc7445 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -46,7 +46,7 @@ const ProjectCart = ({try {await acceptShareProject(pid)- setProjectsShareData({ confirmed: true }, id)+ setProjectsShareData({ confirmed: true }, id, true)setUserShareData({ confirmed: true }, pid)userSharedUpdate(t('apiNotifications.acceptInvitation'))} catch (e) {@@ -174,12 +174,15 @@ const NoProjects = ({ t }) => ()const Dashboard = ({- projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData, setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects, total, setDashboardPaginationPage, dashboardPaginationPage,+ projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData,+ setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects,+ total, setDashboardPaginationPage, dashboardPaginationPage, sharedProjects, dashboardTabs,+ setDashboardTabs, sharedTotal,}) => {const { t, i18n: { language } } = useTranslation('common')const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)const history = useHistory()- const [tabProjects, setTabProjects] = useState(tabForOwnedProject)+ const [tabProjects, setTabProjects] = useState(dashboardTabs)const pageAmount = useMemo(() => _ceil(total / ENTRIES_PER_PAGE_DASHBOARD), [total])const onNewProject = () => {@@ -191,15 +194,18 @@ const Dashboard = ({}useEffect(() => {- loadProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [dashboardPaginationPage])+ setDashboardTabs(tabProjects)+ }, [tabProjects, setDashboardTabs])useEffect(() => {+ if (tabProjects === tabForOwnedProject) {+ loadProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)+ }if (tabProjects === tabForSharedProject) {loadSharedProjects(ENTRIES_PER_PAGE_DASHBOARD, (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD)}- }, [tabProjects, tabForSharedProject])+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [dashboardPaginationPage])if (error && !isLoading) {return (@@ -236,24 +242,26 @@ const Dashboard = ({</span></div><div className='mt-6'>- <nav className='-mb-px flex space-x-8'>- {_map(tabsForDashboard, (tab) => (- <button- key={tab.name}- type='button'- onClick={() => setTabProjects(tab.name)}- className={cx(- tabProjects === tab.name- ? 'border-indigo-500 text-indigo-600'- : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300',- 'whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md',- )}- aria-current={tab.name === tabProjects ? 'page' : undefined}- >- {t(tab.label)}- </button>- ))}- </nav>+ {sharedTotal > 0 && (+ <nav className='-mb-px flex space-x-8'>+ {_map(tabsForDashboard, (tab) => (+ <button+ key={tab.name}+ type='button'+ onClick={() => setTabProjects(tab.name)}+ className={cx(+ tabProjects === tab.name+ ? 'border-indigo-500 text-indigo-600'+ : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300',+ 'whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md',+ )}+ aria-current={tab.name === tabProjects ? 'page' : undefined}+ >+ {t(tab.label)}+ </button>+ ))}+ </nav>+ )}</div>{_isEmpty(projects) ? (<NoProjects t={t} />@@ -262,28 +270,23 @@ const Dashboard = ({{tabProjects === tabForOwnedProject && (<ul className='divide-y divide-gray-200 dark:divide-gray-500'>{_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({- name, id, created, active, overall, live, public: isPublic, confirmed, shared,+ name, id, created, active, overall, live, public: isPublic, confirmed, shared = false,}) => (<div key={confirmed ? `${id}-confirmed` : id}>- <ProjectCart- t={t}- id={id}- language={language}- name={name}- created={created}- shared={shared}- active={active}- isPublic={isPublic}- overall={overall}- confirmed={confirmed}- sharedProjects={user.sharedProjects}- setProjectsShareData={setProjectsShareData}- setUserShareData={setUserShareData}- live={_isNumber(live) ? live : 'N/A'}- userSharedUpdate={userSharedUpdate}- sharedProjectError={sharedProjectError}- deleteProjectFailed={deleteProjectFailed}- />+ <Link to={_replace(routes.project, ':id', id)}>+ <ProjectCart+ t={t}+ language={language}+ name={name}+ created={created}+ shared={shared}+ active={active}+ isPublic={isPublic}+ confirmed={confirmed}+ overall={overall}+ live={_isNumber(live) ? live : 'N/A'}+ />+ </Link></div>))}</ul>@@ -291,42 +294,42 @@ const Dashboard = ({{tabProjects === tabForSharedProject && (<ul className='divide-y divide-gray-200 dark:divide-gray-500'>- {_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({- name, id, created, active, overall, live, public: isPublic, confirmed, shared,+ {_map(_filter(sharedProjects, ({ uiHidden }) => !uiHidden), ({+ project, confirmed, shared = true,}) => (- <div key={confirmed ? `${id}-confirmed` : id}>+ <div key={confirmed ? `${project.id}-confirmed` : project.id}>{(_isUndefined(confirmed) || confirmed) ? (- <Link to={_replace(routes.project, ':id', id)}>+ <Link to={_replace(routes.project, ':id', project.id)}><ProjectCartt={t}language={language}- name={name}- created={created}+ name={project.name}+ created={project.created}shared={shared}- active={active}- isPublic={isPublic}+ active={project.active}+ isPublic={project.public}confirmed={confirmed}- overall={overall}- live={_isNumber(live) ? live : 'N/A'}+ overall={project.overall}+ live={_isNumber(project.live) ? project.live : 'N/A'}/></Link>) : (<ProjectCartt={t}- id={id}+ id={project.id}language={language}- name={name}- created={created}+ name={project.name}+ created={project.created}shared={shared}- active={active}- isPublic={isPublic}- overall={overall}+ active={project.active}+ isPublic={project.public}+ overall={project.overall}confirmed={confirmed}sharedProjects={user.sharedProjects}setProjectsShareData={setProjectsShareData}setUserShareData={setUserShareData}- live={_isNumber(live) ? live : 'N/A'}+ live={_isNumber(project.live) ? project.live : 'N/A'}userSharedUpdate={userSharedUpdate}sharedProjectError={sharedProjectError}deleteProjectFailed={deleteProjectFailed}@@ -372,6 +375,7 @@ const Dashboard = ({Dashboard.propTypes = {projects: PropTypes.arrayOf(PropTypes.object).isRequired,+ sharedProjects: PropTypes.arrayOf(PropTypes.object).isRequired,user: PropTypes.object.isRequired,isLoading: PropTypes.bool.isRequired,error: PropTypes.string,@@ -384,6 +388,9 @@ Dashboard.propTypes = {total: PropTypes.number.isRequired,setDashboardPaginationPage: PropTypes.func.isRequired,dashboardPaginationPage: PropTypes.number.isRequired,+ dashboardTabs: PropTypes.string.isRequired,+ setDashboardTabs: PropTypes.func.isRequired,+ sharedTotal: PropTypes.number.isRequired,}Dashboard.defaultProps = {diff --git a/src/pages/Project/Settings/ProjectSettings.container.jsx b/src/pages/Project/Settings/ProjectSettings.container.jsxindex 4565a444d..4c5f2f012 100644--- a/src/pages/Project/Settings/ProjectSettings.container.jsx+++ b/src/pages/Project/Settings/ProjectSettings.container.jsx@@ -7,8 +7,10 @@ import ProjectSettings from './ProjectSettings'const mapStateToProps = (state) => ({projects: state.ui.projects.projects,+ sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,user: state.auth.user,+ isSharedProject: false,})const mapDispatchToProps = (dispatch) => ({@@ -27,11 +29,15 @@ const mapDispatchToProps = (dispatch) => ({deleteProjectFailed: (message) => {dispatch(errorsActions.deleteProjectFailed(message))},- loadProjects: () => {- dispatch(UIActions.loadProjects())+ loadProjects: (shared) => {+ if (shared) {+ dispatch(UIActions.loadSharedProjects())+ } else {+ dispatch(UIActions.loadProjects())+ }},- removeProject: (pid) => {- dispatch(UIActions.removeProject(pid))+ removeProject: (pid, shared) => {+ dispatch(UIActions.removeProject(pid, shared))},showError: (message) => {dispatch(errorsActions.genericError(message))diff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsxindex c980800b1..fad8b2702 100644--- a/src/pages/Project/Settings/ProjectSettings.jsx+++ b/src/pages/Project/Settings/ProjectSettings.jsx@@ -13,6 +13,7 @@ import _join from 'lodash/join'import _isString from 'lodash/isString'import _split from 'lodash/split'import _keys from 'lodash/keys'+import _map from 'lodash/map'import PropTypes from 'prop-types'import Title from 'components/Title'@@ -34,12 +35,12 @@ const MAX_ORIGINS_LENGTH = 300const ProjectSettings = ({updateProjectFailed, createNewProjectFailed, newProject, projectDeleted, deleteProjectFailed,- loadProjects, isLoading, projects, showError, removeProject, user,+ loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,}) => {const { t } = useTranslation('common')const { pathname } = useLocation()const { id } = useParams()- const project = useMemo(() => _find(projects, p => p.id === id) || {}, [projects, id])+ const project = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => item.project)], p => p.id === id) || {}, [projects, id, sharedProjects])const isSettings = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)const history = useHistory()@@ -93,7 +94,7 @@ const ProjectSettings = ({newProject(t('project.settings.created'))}- loadProjects()+ loadProjects(isSharedProject)history.push(routes.dashboard)} catch (e) {if (isSettings) {@@ -113,7 +114,7 @@ const ProjectSettings = ({setProjectDeleting(true)try {await deleteProject(id)- removeProject(id)+ removeProject(id, isSharedProject)projectDeleted()history.push(routes.dashboard)} catch (e) {@@ -308,6 +309,7 @@ ProjectSettings.propTypes = {showError: PropTypes.func.isRequired,isLoading: PropTypes.bool.isRequired,user: PropTypes.object.isRequired,+ isSharedProject: PropTypes.bool.isRequired,}export default memo(withAuthentication(ProjectSettings, auth.authenticated))diff --git a/src/pages/Project/View/ViewProject.container.jsx b/src/pages/Project/View/ViewProject.container.jsxindex 0668018a6..597b5715b 100644--- a/src/pages/Project/View/ViewProject.container.jsx+++ b/src/pages/Project/View/ViewProject.container.jsx@@ -1,10 +1,12 @@import { connect } from 'react-redux'import { errorsActions } from 'redux/actions/errors'import UIActions from 'redux/actions/ui'+import ViewProject from './ViewProject'const mapStateToProps = (state) => ({projects: state.ui.projects.projects,+ sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,cache: state.ui.cache.analytics,projectViewPrefs: state.ui.cache.projectViewPrefs,diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 3420a3b07..df6f03c8a 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -317,14 +317,14 @@ const Filters = ({const ViewProject = ({projects, isLoading: _isLoading, showError, cache, setProjectCache, projectViewPrefs, setProjectViewPrefs, setPublicProject,- setLiveStatsForProject, authenticated, timezone, user,+ setLiveStatsForProject, authenticated, timezone, user, sharedProjects,}) => {const { t, i18n: { language } } = useTranslation('common')const [periodPairs, setPeriodPairs] = useState(tbPeriodPairs(t))const dashboardRef = useRef(null)const { id } = useParams()const history = useHistory()- const project = useMemo(() => _find(projects, p => p.id === id) || {}, [projects, id])+ const project = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => item.project)], p => p.id === id) || {}, [projects, id, sharedProjects])const [isProjectPublic, setIsProjectPublic] = useState(false)const [panelsData, setPanelsData] = useState({})const [isPanelsDataEmpty, setIsPanelsDataEmpty] = useState(false)@@ -832,6 +832,7 @@ const ViewProject = ({ViewProject.propTypes = {projects: PropTypes.arrayOf(PropTypes.object).isRequired,+ sharedProjects: PropTypes.arrayOf(PropTypes.object).isRequired,cache: PropTypes.objectOf(PropTypes.object).isRequired,projectViewPrefs: PropTypes.objectOf(PropTypes.object).isRequired,showError: PropTypes.func.isRequired,diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex 42f70e801..c817495ca 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -10,10 +10,11 @@ const loadSharedProjects = (take, skip) => ({payload: { take, skip },})-const setProjects = (projects) => ({+const setProjects = (projects, shared) => ({type: types.SET_PROJECTS,payload: {projects,+ shared,},})@@ -24,10 +25,11 @@ const setTotalMonthlyEvents = (totalMonthlyEvents) => ({},})-const setTotal = (total) => ({+const setTotal = (total, shared) => ({type: types.SET_TOTAL,payload: {total,+ shared,},})@@ -45,31 +47,34 @@ const setShowNoEventsLeftBanner = (showNoEventsLeftBanner) => ({},})-const setLiveStats = (data) => ({+const setLiveStats = (data, shared) => ({type: types.SET_LIVE_STATS,payload: {data,+ shared,},})-const setLiveStatsForProject = (id, count) => ({+const setLiveStatsForProject = (id, count, shared) => ({type: types.SET_LIVE_STATS_PROJECT,payload: {- id, count,+ id, count, shared,},})-const setPublicProject = (project) => ({+const setPublicProject = (project, shared) => ({type: types.SET_PUBLIC_PROJECT,payload: {project,+ shared,},})-const removeProject = (pid) => ({+const removeProject = (pid, shared) => ({type: types.REMOVE_PROJECT,payload: {pid,+ shared,},})@@ -129,11 +134,12 @@ const setPaddleLastEvent = (event) => ({},})-const setProjectsShareData = (data, id) => ({+const setProjectsShareData = (data, id, shared) => ({type: types.SET_PROJECTS_SHARE_DATA,payload: {data,id,+ shared,},})@@ -142,6 +148,11 @@ const shareVerifyAsync = (data, successfulCallback, errorCallback) => ({payload: { data, successfulCallback, errorCallback },})+const setDashboardTabs = (tab) => ({+ type: types.SET_DASHBOARD_TABS,+ payload: { tab },+})+const UIActions = {loadProjects,loadSharedProjects,@@ -164,6 +175,7 @@ const UIActions = {setShowNoEventsLeftBanner,setProjectsShareData,shareVerifyAsync,+ setDashboardTabs,}export default UIActionsdiff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.jsindex d064cde9d..136a940d4 100644--- a/src/redux/actions/ui/types.js+++ b/src/redux/actions/ui/types.js@@ -20,4 +20,5 @@ export const types = {SET_PROJECTS_SHARE_DATA: 'UI_SET_PROJECTS_SHARE_DATA',SHARE_VERIFY_ASYNC: 'UI_SHARE_VERIFY_ASYNC',LOAD_SHARED_PROJECTS: 'UI_LOAD_SHARED_PROJECTS',+ SET_DASHBOARD_TABS: 'UI_SET_DASHBOARD_TABS',}diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.jsindex b52603387..4ca3e09e0 100644--- a/src/redux/reducers/ui/projects.js+++ b/src/redux/reducers/ui/projects.js@@ -2,15 +2,19 @@ import { types } from 'redux/actions/ui/types'import _filter from 'lodash/filter'import _findIndex from 'lodash/findIndex'import _map from 'lodash/map'+import { tabForOwnedProject } from 'redux/constants'const getInitialState = () => {return {projects: [],+ sharedProjects: [],isLoading: true,error: null,totalMonthlyEvents: null,total: 0,+ sharedTotal: 0,dashboardPaginationPage: 1,+ dashboardTabs: tabForOwnedProject,}}@@ -18,7 +22,15 @@ const getInitialState = () => {const projectsReducer = (state = getInitialState(), { type, payload }) => {switch (type) {case types.SET_PROJECTS: {- const { projects } = payload+ const { projects, shared = false } = payload+ if (shared) {+ return {+ ...state,+ sharedProjects: projects,+ isLoading: false,+ }+ }+return {...state,projects,@@ -43,7 +55,15 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_TOTAL: {- const { total } = payload+ const { total, shared } = payload++ if (shared) {+ return {+ ...state,+ sharedTotal: total,+ }+ }+return {...state,total,@@ -51,7 +71,20 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_LIVE_STATS: {- const { data } = payload+ const { data, shared = false } = payload++ if (shared) {+ return {+ ...state,+ sharedProjects: _map(state.sharedProjects, res => ({+ ...res,+ project: {+ ...res.project,+ live: data[res.project.id],+ },+ })),+ }+ }return {...state,@@ -63,7 +96,23 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_LIVE_STATS_PROJECT: {- const { id, count } = payload+ const { id, count, shared = false } = payload++ if (shared) {+ return {+ ...state,+ sharedProjects: _map(state.sharedProjects, res => {+ if (res.id === id) {+ return {+ ...res,+ live: count,+ }+ }++ return res+ }),+ }+ }return {...state,@@ -81,7 +130,23 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_PUBLIC_PROJECT: {- const { project } = payload+ const { project, shared = false } = payload++ if (shared) {+ return {+ ...state,+ sharedProjects: _findIndex(state.sharedProjects, (el) => el.id === project.id) >= 0+ ? state.sharedProjects+ : [+ ...state.sharedProjects,+ {+ ...project,+ uiHidden: true,+ },+ ],+ }+ }+return {...state,projects: _findIndex(state.projects, (el) => el.id === project.id) >= 0@@ -97,7 +162,23 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_PROJECTS_SHARE_DATA: {- const { data, id } = payload+ const { data, id, shared = false } = payload++ if (shared) {+ return {+ ...state,+ sharedProjects: _map(state.sharedProjects, (item) => {+ if (item.project.id === id) {+ return {+ ...item,+ ...data,+ }+ }++ return item+ }),+ }+ }return {...state,@@ -123,7 +204,15 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}case types.REMOVE_PROJECT: {- const { pid } = payload+ const { pid, shared = false } = payload++ if (shared) {+ return {+ ...state,+ sharedProjects: _filter(state.sharedProjects, (project) => project.id !== pid),+ }+ }+return {...state,projects: _filter(state.projects, (project) => project.id !== pid),@@ -138,6 +227,14 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {}}+ case types.SET_DASHBOARD_TABS: {+ const { tab } = payload+ return {+ ...state,+ dashboardTabs: tab,+ }+ }+default:return state}diff --git a/src/redux/sagas/auth/workers/signin.js b/src/redux/sagas/auth/workers/signin.jsindex c8ee1c222..391261d5e 100644--- a/src/redux/sagas/auth/workers/signin.js+++ b/src/redux/sagas/auth/workers/signin.js@@ -24,6 +24,7 @@ export default function* singinWorker({ payload: { credentials, callback } }) {yield put(authActions.loginSuccess(user))yield call(setAccessToken, accessToken, dontRemember)yield put(UIActions.loadProjects())+ yield put(UIActions.loadSharedProjects())callback(true, false)} catch (error) {const err = _isObject(error) ? error.message : errordiff --git a/src/redux/sagas/auth/workers/signup.js b/src/redux/sagas/auth/workers/signup.jsindex 42408d4cb..c76f45bbd 100644--- a/src/redux/sagas/auth/workers/signup.js+++ b/src/redux/sagas/auth/workers/signup.js@@ -16,6 +16,7 @@ export default function* signupWorder({ payload: { data: rawData, callback, t }yield call(setAccessToken, response.access_token, dontRemember)yield put(authActions.setDontRemember(dontRemember))yield put(UIActions.loadProjects())+ yield put(UIActions.loadSharedProjects())callback(true)} catch (error) {const message = error.message || (typeof error === 'string' ? error : error[0])diff --git a/src/redux/sagas/ui/index.js b/src/redux/sagas/ui/index.jsindex 64fcc6a23..768fbe05d 100644--- a/src/redux/sagas/ui/index.js+++ b/src/redux/sagas/ui/index.js@@ -18,8 +18,8 @@ function* mainUISaga() {yield fork(isEventsAvailable)// yield fork(generalStats)yield takeEvery(types.SET_PROJECT_VIEW_PREFS, setProjectViewPrefs)- yield takeEvery(types.LOAD_PROJECTS, loadProjects)yield takeEvery(types.LOAD_SHARED_PROJECTS, loadSharedProjects)+ yield takeEvery(types.LOAD_PROJECTS, loadProjects)yield takeEvery(authTypes.LOGOUT, logout)yield takeLatest(types.SHARE_VERIFY_ASYNC, shareVerify)}diff --git a/src/redux/sagas/ui/initialise.js b/src/redux/sagas/ui/initialise.jsindex 059718c2d..87cf22202 100644--- a/src/redux/sagas/ui/initialise.js+++ b/src/redux/sagas/ui/initialise.js@@ -12,6 +12,7 @@ export default function* initialise() {if (token) {yield put(UIActions.loadProjects())+ yield put(UIActions.loadSharedProjects())}} catch (e) {debug('An error occured whilst initialising: %s', e)diff --git a/src/redux/sagas/ui/load_projects.js b/src/redux/sagas/ui/load_projects.jsindex 322565df7..284e45751 100644--- a/src/redux/sagas/ui/load_projects.js+++ b/src/redux/sagas/ui/load_projects.js@@ -18,17 +18,10 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBlet {// eslint-disable-next-line prefer-const- results, totalMonthlyEvents, shared, total,+ results, totalMonthlyEvents, total,} = yield call(getProjects, take, skip)- const projectWithShared = [..._map(shared, (item) => {- return {- shared: true,- confirmed: item.confirmed,- ...item.project,- }- }), ...results]-- const pids = _map(projectWithShared, result => result.id)++ const pids = _map(results, result => result.id)let overalltry {@@ -37,7 +30,7 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBdebug('failed to overall stats: %s', e)}- results = _map(projectWithShared, res => ({+ results = _map(results, res => ({...res,overall: overall?.[res.id],}))diff --git a/src/redux/sagas/ui/load_shared_projects.js b/src/redux/sagas/ui/load_shared_projects.jsindex 952ce105a..30761c03f 100644--- a/src/redux/sagas/ui/load_shared_projects.js+++ b/src/redux/sagas/ui/load_shared_projects.js@@ -20,8 +20,16 @@ export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE// eslint-disable-next-line prefer-constresults, totalMonthlyEvents, total,} = yield call(getSharedProjects, take, skip)-- const pids = _map(results, result => result.id)+ const projectsWithShared = _map(results, (project) => {+ return {+ ...project,+ project: {+ ...project.project,+ shared: true,+ },+ }+ })+ const pids = _map(projectsWithShared, ({ project }) => project.id)let overalltry {@@ -30,17 +38,20 @@ export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGEdebug('failed to overall stats: %s', e)}- results = _map(results, res => ({+ results = _map(projectsWithShared, res => ({...res,- overall: overall?.[res.id],+ project: {+ ...res.project,+ overall: overall?.[res.project.id],+ },}))- yield put(UIActions.setProjects(results))+ yield put(UIActions.setProjects(results, true))yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))- yield put(UIActions.setTotal(total))+ yield put(UIActions.setTotal(total, true))const liveStats = yield call(getLiveVisitors, pids)- yield put(UIActions.setLiveStats(liveStats))+ yield put(UIActions.setLiveStats(liveStats, true))} catch ({ message }) {if (_isString(message)) {yield put(UIActions.setProjectsError(message))diff --git a/src/redux/sagas/ui/share_verify.js b/src/redux/sagas/ui/share_verify.jsindex 9925d6d69..4bd036917 100644--- a/src/redux/sagas/ui/share_verify.js+++ b/src/redux/sagas/ui/share_verify.js@@ -7,6 +7,7 @@ export default function* shareVerify({ payload: { data, successfulCallback, errotry {yield call(verifyShare, data)yield put(UIActions.loadProjects())+ yield put(UIActions.loadSharedProjects())successfulCallback()} catch (error) {errorCallback(error)diff --git a/src/redux/sagas/ui/worker_live_visitors.js b/src/redux/sagas/ui/worker_live_visitors.jsindex 3ff9cd445..ba999818d 100644--- a/src/redux/sagas/ui/worker_live_visitors.js+++ b/src/redux/sagas/ui/worker_live_visitors.js@@ -7,25 +7,44 @@ import _isEmpty from 'lodash/isEmpty'import { getLiveVisitors } from 'api'import UIActions from 'redux/actions/ui'-import { LIVE_VISITORS_UPDATE_INTERVAL } from 'redux/constants'+import { LIVE_VISITORS_UPDATE_INTERVAL, tabForSharedProject } from 'redux/constants'export default function* liveVisitors() {while (true) {yield delay(LIVE_VISITORS_UPDATE_INTERVAL)- const projects = yield select(state => state.ui.projects.projects)+ const tab = yield select(state => state.ui.projects.dashboardTabs)- if (_isEmpty(projects)) {- continue- }+ if (tabForSharedProject === tab) {+ const sharedProjects = yield select(state => state.ui.projects.sharedProjects)- const pids = _map(_filter(projects, ({ uiHidden }) => !uiHidden), project => project.id)+ if (_isEmpty(sharedProjects)) {+ continue+ }- if (_isEmpty(pids)) {- continue- }+ const pids = _map(_filter(sharedProjects, ({ project }) => !project.uiHidden), item => item.project.id)++ if (_isEmpty(pids)) {+ continue+ }++ const liveStats = yield call(getLiveVisitors, pids)- const liveStats = yield call(getLiveVisitors, pids)+ yield put(UIActions.setLiveStats(liveStats, true))+ } else {+ const projects = yield select(state => state.ui.projects.projects)+ if (_isEmpty(projects)) {+ continue+ }- yield put(UIActions.setLiveStats(liveStats))+ const pids = _map(_filter(projects, ({ uiHidden }) => !uiHidden), project => project.id)++ if (_isEmpty(pids)) {+ continue+ }++ const liveStats = yield call(getLiveVisitors, pids)++ yield put(UIActions.setLiveStats(liveStats))+ }}}