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!

dashboard to ts

kruzhambusdafcc7681ffd
diff --git a/src/pages/Captcha/View/ViewCaptcha.tsx b/src/pages/Captcha/View/ViewCaptcha.tsx
index 59eeaf5b5..4e497d90b 100644
--- a/src/pages/Captcha/View/ViewCaptcha.tsx
+++ b/src/pages/Captcha/View/ViewCaptcha.tsx
@@ -140,6 +140,7 @@ const ViewProject = ({
const { name } = project as IProject
+ // @ts-ignore
const sharedRoles = useMemo(() => _find(user.sharedProjects, p => p.project.id === id)?.role || {}, [user, id])
const chartMetrics = useMemo(() => {
diff --git a/src/pages/Dashboard/Dashboard.container.jsx b/src/pages/Dashboard/Dashboard.container.jsx
deleted file mode 100644
index 64267b433..000000000
--- a/src/pages/Dashboard/Dashboard.container.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { connect } from 'react-redux'
-import { errorsActions } from 'redux/reducers/errors'
-import UIActions from 'redux/reducers/ui'
-import { authActions } from 'redux/reducers/auth'
-import { alertsActions } from 'redux/reducers/alerts'
-import Dashboard from './Dashboard'
-
-const mapStateToProps = (state) => ({
- projects: state.ui.projects.projects,
- sharedProjects: state.ui.projects.sharedProjects,
- captchaProjects: state.ui.projects.captchaProjects,
- user: state.auth.user,
- isLoading: state.ui.projects.isLoading,
- total: state.ui.projects.total,
- sharedTotal: state.ui.projects.sharedTotal,
- captchaTotal: state.ui.projects.captchaTotal,
- error: state.ui.projects.error,
- dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,
- dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,
- dashboardPaginationPageCaptcha: state.ui.projects.dashboardPaginationPageCaptcha,
- dashboardTabs: state.ui.projects.dashboardTabs,
-})
-
-const mapDispatchToProps = (dispatch) => ({
- deleteProjectFailed: (message) => {
- dispatch(errorsActions.deleteProjectFailed(message))
- },
- setProjectsShareData: (data, id, shared) => {
- dispatch(UIActions.setProjectsShareData(data, id, shared))
- },
- setUserShareData: (data, id) => {
- dispatch(authActions.setUserShareData(data, id))
- },
- userSharedUpdate: (message) => {
- dispatch(alertsActions.userSharedUpdate(message))
- },
- sharedProjectError: (message) => {
- dispatch(errorsActions.sharedProjectFailed(message))
- },
- loadProjects: (take, skip) => {
- dispatch(UIActions.loadProjects(take, skip))
- },
- loadSharedProjects: (take, skip) => {
- dispatch(UIActions.loadSharedProjects(take, skip))
- },
- setDashboardPaginationPage: (page) => {
- dispatch(UIActions.setDashboardPaginationPage(page))
- },
- setDashboardPaginationPageShared: (page) => {
- dispatch(UIActions.setDashboardPaginationPageShared(page))
- },
- setDashboardTabs: (tab) => {
- dispatch(UIActions.setDashboardTabs(tab))
- },
- loadProjectsCaptcha: (take, skip) => {
- dispatch(UIActions.loadProjectsCaptcha(take, skip))
- },
- setDashboardPaginationPageCaptcha: (page) => {
- dispatch(UIActions.setDashboardPaginationPageCaptcha(page))
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)
diff --git a/src/pages/Dashboard/Dashboard.container.tsx b/src/pages/Dashboard/Dashboard.container.tsx
new file mode 100644
index 000000000..3cdbe4f46
--- /dev/null
+++ b/src/pages/Dashboard/Dashboard.container.tsx
@@ -0,0 +1,80 @@
+import { connect } from 'react-redux'
+import { errorsActions } from 'redux/reducers/errors'
+import UIActions from 'redux/reducers/ui'
+import sagaActions from 'redux/sagas/actions'
+import { authActions } from 'redux/reducers/auth'
+import { alertsActions } from 'redux/reducers/alerts'
+import { StateType, AppDispatch } from 'redux/store'
+import { IProject } from 'redux/models/IProject'
+import { ISharedProject } from 'redux/models/ISharedProject'
+import Dashboard from './Dashboard'
+
+const mapStateToProps = (state: StateType) => ({
+ projects: state.ui.projects.projects,
+ sharedProjects: state.ui.projects.sharedProjects,
+ captchaProjects: state.ui.projects.captchaProjects,
+ user: state.auth.user,
+ isLoading: state.ui.projects.isLoading,
+ total: state.ui.projects.total,
+ sharedTotal: state.ui.projects.sharedTotal,
+ captchaTotal: state.ui.projects.captchaTotal,
+ error: state.ui.projects.error,
+ dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,
+ dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,
+ dashboardPaginationPageCaptcha: state.ui.projects.dashboardPaginationPageCaptcha,
+ dashboardTabs: state.ui.projects.dashboardTabs,
+})
+
+const mapDispatchToProps = (dispatch: AppDispatch) => ({
+ deleteProjectFailed: (message: string) => {
+ dispatch(errorsActions.deleteProjectFailed({
+ message,
+ }))
+ },
+ setProjectsShareData: (data: IProject | ISharedProject, id: string, shared?: boolean) => {
+ dispatch(UIActions.setProjectsShareData({
+ data,
+ id,
+ shared,
+ }))
+ },
+ setUserShareData: (data: ISharedProject, id: string) => {
+ dispatch(authActions.setUserShareData({
+ data,
+ id,
+ }))
+ },
+ userSharedUpdate: (message: string) => {
+ dispatch(alertsActions.userSharedUpdate({
+ message,
+ }))
+ },
+ sharedProjectError: (message: string) => {
+ dispatch(errorsActions.sharedProjectFailed({
+ message,
+ }))
+ },
+ loadProjects: (take: number, skip: number) => {
+ dispatch(sagaActions.loadProjects(take, skip))
+ },
+ loadSharedProjects: (take: number, skip: number) => {
+ dispatch(sagaActions.loadSharedProjects(take, skip))
+ },
+ setDashboardPaginationPage: (page: number) => {
+ dispatch(UIActions.setDashboardPaginationPage(page))
+ },
+ setDashboardPaginationPageShared: (page: number) => {
+ dispatch(UIActions.setDashboardPaginationPageShared(page))
+ },
+ setDashboardTabs: (tab: string) => {
+ dispatch(UIActions.setDashboardTabs(tab))
+ },
+ loadProjectsCaptcha: (take: number, skip: number) => {
+ dispatch(sagaActions.loadProjectsCaptcha(take, skip))
+ },
+ setDashboardPaginationPageCaptcha: (page: number) => {
+ dispatch(UIActions.setDashboardPaginationPageCaptcha(page))
+ },
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.tsx
similarity index 77%
rename from src/pages/Dashboard/Dashboard.jsx
rename to src/pages/Dashboard/Dashboard.tsx
index 8a504c90b..2cee6a1ea 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.tsx
@@ -35,27 +35,58 @@ import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import { acceptShareProject } from 'api'
import Pagination from 'ui/Pagination'
+import { ISharedProject } from 'redux/models/ISharedProject'
+import { IProject, IOvervallObject, ICaptchaProject } from 'redux/models/IProject'
+import { IUser } from 'redux/models/IUser'
const DASHBOARD_TABS_VALUES = _values(DASHBOARD_TABS)
+interface IProjectCart {
+ name?: string
+ created?: string
+ active?: boolean
+ overall?: IOvervallObject
+ t: (key: string, options?: {
+ [key: string]: string | number | null | undefined
+ }) => string
+ language: string
+ live?: string | number
+ isPublic?: boolean
+ confirmed?: boolean
+ id?: string
+ deleteProjectFailed: (message: string) => void
+ sharedProjects: ISharedProject[]
+ setProjectsShareData: (data: ISharedProject, id: string, shared?: boolean) => void
+ setUserShareData: (data: ISharedProject, id: string) => void
+ shared?: boolean
+ userSharedUpdate: (message: string) => void
+ sharedProjectError: (message: string) => void
+ captcha?: boolean
+}
+
const ProjectCart = ({
name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed,
sharedProjects, setProjectsShareData, setUserShareData, shared, userSharedUpdate, sharedProjectError,
captcha,
-}) => {
- const statsDidGrowUp = overall?.percChange >= 0
+}: IProjectCart): JSX.Element => {
+ const statsDidGrowUp = overall?.percChange ? overall?.percChange >= 0 : false
const [showInviteModal, setShowInviteModal] = useState(false)
const onAccept = async () => {
- const pid = _find(sharedProjects, item => item.project.id === id).id
+ // @ts-ignore
+ const pid: string = _find(sharedProjects, (item: ISharedProject) => item.project && item.project.id === id)?.id
try {
+ if (!pid || !id) {
+ throw new Error('Project not found')
+ }
await acceptShareProject(pid)
setProjectsShareData({ confirmed: true }, id, true)
setUserShareData({ confirmed: true }, pid)
userSharedUpdate(t('apiNotifications.acceptInvitation'))
} catch (e) {
sharedProjectError(t('apiNotifications.acceptInvitationError'))
+ // @ts-ignore
deleteProjectFailed(e)
}
}
@@ -169,7 +200,26 @@ const ProjectCart = ({
)
}
-const NoProjects = ({ t }) => (
+ProjectCart.defaultProps = {
+ isPublic: false,
+ created: '',
+ overall: {
+ percChange: 0,
+ total: 0,
+ thisWeek: 0,
+ },
+ active: false,
+ shared: false,
+ captcha: false,
+ confirmed: false,
+ id: '',
+ name: '',
+ live: 'N/A',
+}
+
+const NoProjects = ({ t }: {
+ t: (key: string) => string
+}): JSX.Element => (
<div className='mt-5'>
<h3 className='text-center dark:text-gray-50'>
{t('dashboard.noProjects')}
@@ -180,20 +230,56 @@ const NoProjects = ({ t }) => (
</div>
)
+interface DashboardProps {
+ projects: IProject[]
+ isLoading: boolean
+ error: string
+ user: IUser
+ deleteProjectFailed: (error: string) => void
+ setProjectsShareData: (data: ISharedProject) => void
+ setUserShareData: (data: ISharedProject) => void
+ userSharedUpdate: (message: string) => void
+ sharedProjectError: (error: string) => void
+ loadProjects: (take: number, skip: number) => void
+ loadSharedProjects: (take: number, skip: number) => void
+ total: number
+ setDashboardPaginationPage: (page: number) => void
+ dashboardPaginationPage: number
+ sharedProjects: ISharedProject[]
+ dashboardTabs: string
+ setDashboardTabs: (tab: string) => void
+ sharedTotal: number
+ setDashboardPaginationPageShared: (page: number) => void
+ dashboardPaginationPageShared: number
+ captchaProjects: ICaptchaProject[]
+ captchaTotal: number
+ dashboardPaginationPageCaptcha: number
+ setDashboardPaginationPageCaptcha: (page: number) => void
+ loadProjectsCaptcha: (take: number, skip: number) => void
+ projectTab: string
+}
+
const Dashboard = ({
projects, isLoading, error, user, deleteProjectFailed, setProjectsShareData,
setUserShareData, userSharedUpdate, sharedProjectError, loadProjects, loadSharedProjects,
total, setDashboardPaginationPage, dashboardPaginationPage, sharedProjects, dashboardTabs,
setDashboardTabs, sharedTotal, setDashboardPaginationPageShared, dashboardPaginationPageShared, captchaProjects, captchaTotal, dashboardPaginationPageCaptcha, setDashboardPaginationPageCaptcha,
loadProjectsCaptcha, projectTab,
-}) => {
- const { t, i18n: { language } } = useTranslation('common')
- const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)
+}: DashboardProps): JSX.Element => {
+ const { t, i18n: { language } }: {
+ t: (key: string, options?: {
+ [key: string]: string | number | null | undefined
+ }) => string
+ i18n: {
+ language: string
+ }
+ } = useTranslation('common')
+ const [showActivateEmailModal, setShowActivateEmailModal] = useState<boolean>(false)
const history = useHistory()
- const [tabProjects, setTabProjects] = useState(dashboardTabs)
- const pageAmountShared = Math.ceil(sharedTotal / ENTRIES_PER_PAGE_DASHBOARD)
- const pageAmount = Math.ceil(total / ENTRIES_PER_PAGE_DASHBOARD)
- const pageAmountCaptcha = Math.ceil(captchaTotal / ENTRIES_PER_PAGE_DASHBOARD)
+ const [tabProjects, setTabProjects] = useState<string>(dashboardTabs)
+ const pageAmountShared: number = Math.ceil(sharedTotal / ENTRIES_PER_PAGE_DASHBOARD)
+ const pageAmount: number = Math.ceil(total / ENTRIES_PER_PAGE_DASHBOARD)
+ const pageAmountCaptcha: number = Math.ceil(captchaTotal / ENTRIES_PER_PAGE_DASHBOARD)
const onNewProject = () => {
if (user.isActive || isSelfhosted) {
@@ -229,7 +315,8 @@ const Dashboard = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [dashboardPaginationPage, dashboardPaginationPageShared])
- const [activeDashTab, setActiveDashTab] = useState(() => {
+ const [activeDashTab, setActiveDashTab] = useState<string | null>(() => {
+ // @ts-ignore
const url = new URL(window.location)
const { searchParams } = url
const tab = searchParams.get('tab')
@@ -307,8 +394,8 @@ const Dashboard = ({
labelExtractor={(item) => t(item.label)}
onSelect={(label) => {
const selected = _find(dashboardLocTabs, (tab) => t(tab.label) === label)
- setTabProjects(selected.name)
- setActiveDashTab(selected.id)
+ setTabProjects(selected?.name ? selected.name : tabForOwnedProject)
+ setActiveDashTab(selected?.id ? selected.id : DASHBOARD_TABS.owned)
}}
title={activeDashTabLabel}
/>
@@ -352,21 +439,26 @@ const Dashboard = ({
<div className='shadow overflow-hidden sm:rounded-md'>
<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 = false,
+ name, id, created, active, overall, live, public: isPublic,
}) => (
- <div key={confirmed ? `${id}-confirmed` : id}>
+ <div key={id}>
<Link to={_replace(routes.project, ':id', id)}>
<ProjectCart
t={t}
language={language}
name={name}
created={created}
- shared={shared}
active={active}
isPublic={isPublic}
- confirmed={confirmed}
+ confirmed={false}
overall={overall}
live={_isNumber(live) ? live : 'N/A'}
+ setUserShareData={() => {}}
+ deleteProjectFailed={() => {}}
+ userSharedUpdate={() => {}}
+ sharedProjects={[]}
+ setProjectsShareData={() => {}}
+ sharedProjectError={() => {}}
/>
</Link>
</div>
@@ -384,22 +476,26 @@ const Dashboard = ({
<div className='shadow overflow-hidden sm:rounded-md'>
<ul className='divide-y divide-gray-200 dark:divide-gray-500'>
{_map(_filter(captchaProjects, ({ uiHidden }) => !uiHidden), ({
- name, id, created, active, overall, live, public: isPublic, confirmed, shared = false,
+ name, id, created, active, overall, live, public: isPublic,
}) => (
- <div key={confirmed ? `${id}-confirmed` : id}>
+ <div key={id}>
<Link to={_replace(routes.captcha, ':id', id)}>
<ProjectCart
t={t}
language={language}
name={name}
created={created}
- shared={shared}
captcha
active={active}
isPublic={isPublic}
- confirmed={confirmed}
overall={overall}
live={_isNumber(live) ? live : 'N/A'}
+ deleteProjectFailed={() => {}}
+ sharedProjects={[]}
+ setProjectsShareData={() => {}}
+ setUserShareData={() => {}}
+ userSharedUpdate={() => {}}
+ sharedProjectError={() => {}}
/>
</Link>
</div>
@@ -418,41 +514,47 @@ const Dashboard = ({
<div className='shadow overflow-hidden sm:rounded-md'>
<ul className='divide-y divide-gray-200 dark:divide-gray-500'>
{_map(_filter(sharedProjects, ({ uiHidden }) => !uiHidden), ({
- project, confirmed, shared = true,
+ project, confirmed,
}) => (
- <div key={confirmed ? `${project.id}-confirmed` : project.id}>
+ <div key={confirmed ? `${project?.id}-confirmed` : project?.id}>
{
(_isUndefined(confirmed) || confirmed) ? (
- <Link to={_replace(routes.project, ':id', project.id)}>
+ <Link to={_replace(routes.project, ':id', project?.id ? project?.id : '')}>
<ProjectCart
t={t}
language={language}
- name={project.name}
- created={project.created}
- shared={shared}
- active={project.active}
- isPublic={project.public}
+ name={project?.name}
+ created={project?.created}
+ shared
+ active={project?.active}
+ isPublic={project?.public}
confirmed={confirmed}
- overall={project.overall}
- live={_isNumber(project.live) ? project.live : 'N/A'}
+ overall={project?.overall}
+ live='N/A'
+ setUserShareData={() => {}}
+ deleteProjectFailed={() => {}}
+ sharedProjects={[]}
+ setProjectsShareData={() => {}}
+ userSharedUpdate={() => {}}
+ sharedProjectError={() => {}}
/>
</Link>
) : (
<ProjectCart
t={t}
- id={project.id}
+ id={project?.id}
language={language}
- name={project.name}
- created={project.created}
- shared={shared}
- active={project.active}
- isPublic={project.public}
- overall={project.overall}
+ name={project?.name}
+ created={project?.created}
+ shared
+ active={project?.active}
+ isPublic={project?.public}
+ overall={project?.overall}
confirmed={confirmed}
sharedProjects={user.sharedProjects}
setProjectsShareData={setProjectsShareData}
setUserShareData={setUserShareData}
- live={_isNumber(project.live) ? project.live : 'N/A'}
+ live={_isNumber(project?.live) ? project?.live : 'N/A'}
userSharedUpdate={userSharedUpdate}
sharedProjectError={sharedProjectError}
deleteProjectFailed={deleteProjectFailed}
diff --git a/src/pages/Dashboard/index.jsx b/src/pages/Dashboard/index.tsx
similarity index 100%
rename from src/pages/Dashboard/index.jsx
rename to src/pages/Dashboard/index.tsx
diff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.ts
index 34543614a..0bf105147 100644
--- a/src/redux/models/IProject.ts
+++ b/src/redux/models/IProject.ts
@@ -1,8 +1,11 @@
-interface IOvervallObject {
- thisWeek: number
- lastWeek: number
- thisWeekUnique: number
- lastWeekUnique: number
+export interface IOvervallObject {
+ thisWeek?: number
+ lastWeek?: number
+ thisWeekUnique?: number
+ lastWeekUnique?: number
+ percChange?: number
+ total?: number
+ percChangeUnique?: number
}
export interface IOverall {
@@ -40,7 +43,7 @@ export interface IProject {
created?: string
share?: IShareOwnerProject[]
isOwner?: boolean
- overall?: IOverall
+ overall?: IOvervallObject
live?: number
uiHidden?: boolean
}
@@ -58,7 +61,7 @@ export interface ICaptchaProject {
captchaSecretKey?: string | null
created?: string
isOwner?: boolean
- overall?: IOverall
+ overall?: IOvervallObject
live?: number
uiHidden?: boolean
}
diff --git a/src/redux/models/ISharedProject.ts b/src/redux/models/ISharedProject.ts
index 5d175f751..1a9e9eaf2 100644
--- a/src/redux/models/ISharedProject.ts
+++ b/src/redux/models/ISharedProject.ts
@@ -1,11 +1,11 @@
import { IProject } from './IProject'
export interface ISharedProject {
- id: string
- confirmed: boolean
- role: string
- created: string
- updated: string
- project: IProject
- uiHidden: boolean
+ id?: string
+ confirmed?: boolean
+ role?: string
+ created?: string
+ updated?: string
+ project?: IProject
+ uiHidden?: boolean
}
diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.ts
index cc30acb0a..6f270b324 100644
--- a/src/redux/reducers/ui/projects.ts
+++ b/src/redux/reducers/ui/projects.ts
@@ -9,25 +9,6 @@ import { ISharedProject } from 'redux/models/ISharedProject'
import { IAlerts } from 'redux/models/IAlerts'
import { toNumber } from 'lodash'
-// projects: [],
-// sharedProjects: [],
-// captchaProjects: [],
-// isLoading: true,
-// isLoadingShared: true,
-// isLoadingCaptcha: true,
-// error: null,
-// totalMonthlyEvents: null,
-// total: 0,
-// sharedTotal: 0,
-// captchaTotal: 0,
-// dashboardPaginationPage: 1,
-// dashboardPaginationPageShared: 1,
-// dashboardPaginationPageCaptcha: 1,
-// dashboardTabs: getItem('dashboardTabs') || tabForOwnedProject,
-// projectTab: PROJECT_TABS.traffic,
-// alerts: [],
-// subscribers: [],
-
interface IInitialState {
projects: IProject[]
sharedProjects: ISharedProject[]
@@ -75,14 +56,15 @@ const projectsSlice = createSlice({
initialState,
reducers: {
setProjects(state, { payload }: PayloadAction<{
- projects: IProject[] | ISharedProject[]
- shared?: boolean
- }>) {
+ projects: IProject[] | ISharedProject[]
+ shared?: boolean
+ }>) {
if (payload.shared) {
state.isLoadingShared = false
state.sharedProjects = payload.projects as ISharedProject[]
} else {
state.isLoading = false
+ console.log('payload.projects', payload.projects)
state.projects = payload.projects as IProject[]
}
},
@@ -121,11 +103,12 @@ const projectsSlice = createSlice({
setLiveStats(state, { payload }: PayloadAction<{ data: any[], shared: boolean }>) {
const { data, shared = false } = payload
if (shared) {
+ // @ts-ignore
state.sharedProjects = _map(state.sharedProjects, (res) => ({
...res,
project: {
...res.project,
- live: data[toNumber(res.project.id)],
+ live: res.project && data[toNumber(res.project.id)],
},
}))
} else {
@@ -185,12 +168,12 @@ const projectsSlice = createSlice({
]
}
},
- setProjectsShareData(state, { payload }: PayloadAction<{ data: IProject[] | ISharedProject[], id: string, shared: boolean }>) {
+ setProjectsShareData(state, { payload }: PayloadAction<{ data: IProject | ISharedProject, id: string, shared?: boolean }>) {
const { data, id, shared = false } = payload
if (shared) {
state.sharedProjects = _map(state.sharedProjects, (res) => {
- if (res.project.id === id) {
+ if (res.project && res.project.id === id) {
return {
...res,
...data,
diff --git a/src/redux/sagas/ui/load_projects.ts b/src/redux/sagas/ui/load_projects.ts
index aaec70612..9ddc79526 100644
--- a/src/redux/sagas/ui/load_projects.ts
+++ b/src/redux/sagas/ui/load_projects.ts
@@ -25,7 +25,7 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHB
}
let {
- // eslint-disable-next-line prefer-const
+ // eslint-disable-next-line prefer-const, camelcase
results, totalMonthlyEvents, total,
} = yield call(getProjects, take, skip, isCaptcha)
@@ -56,9 +56,13 @@ export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHB
yield put(UIActions.setCaptchaProjects(results))
yield put(UIActions.setCaptchaTotal(total))
} else {
- yield put(UIActions.setProjects(results))
+ yield put(UIActions.setProjects({
+ projects: results,
+ }))
yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))
- yield put(UIActions.setTotal(total))
+ yield put(UIActions.setTotal({
+ total,
+ }))
}
const liveStats: any[] = yield call(getLiveVisitors, pids)
diff --git a/src/redux/sagas/ui/worker_live_visitors.ts b/src/redux/sagas/ui/worker_live_visitors.ts
index 3760edf96..cef4e0cd1 100644
--- a/src/redux/sagas/ui/worker_live_visitors.ts
+++ b/src/redux/sagas/ui/worker_live_visitors.ts
@@ -23,7 +23,7 @@ export default function* liveVisitors() {
continue
}
- const pids = _map(_filter(sharedProjects, ({ project }) => !project.uiHidden), item => item.project.id)
+ const pids = _map(_filter(sharedProjects, ({ project }) => !project?.uiHidden), item => (item?.project?.id ? item.project.id : ''))
if (_isEmpty(pids)) {
continue