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!

refactor: remove unnecessary containers, migrate to hooks and get rid of obsolete redux reducers

Blue Mousecf5c86b9ed34
diff --git a/backend/apps/cloud/src/alert/alert.controller.ts b/backend/apps/cloud/src/alert/alert.controller.ts
index 4316c7943..dd7ce4b61 100644
--- a/backend/apps/cloud/src/alert/alert.controller.ts
+++ b/backend/apps/cloud/src/alert/alert.controller.ts
@@ -46,32 +46,56 @@ export class AlertController {
) {}
@ApiBearerAuth()
- @Get('/')
+ @Get('/:alertId')
@UseGuards(JwtAccessTokenGuard, RolesGuard)
@Roles(UserType.ADMIN, UserType.CUSTOMER)
@ApiResponse({ status: 200, type: Alert })
- async getAllAlerts(
+ async getAlert(
@CurrentUserId() userId: string,
+ @Param('alertId') alertId: string,
+ ) {
+ this.logger.log({ userId, alertId }, 'GET /alert/:alertId')
+
+ const alert = await this.alertService.findOne({
+ where: { id: alertId },
+ relations: ['project'],
+ })
+
+ if (_isEmpty(alert)) {
+ throw new NotFoundException('Alert not found')
+ }
+
+ const project = await this.projectService.getFullProject(alert.project.id)
+
+ this.projectService.allowedToView(project, userId)
+
+ return _omit(alert, ['project'])
+ }
+
+ @ApiBearerAuth()
+ @Get('/project/:projectId')
+ @UseGuards(JwtAccessTokenGuard, RolesGuard)
+ @Roles(UserType.ADMIN, UserType.CUSTOMER)
+ @ApiResponse({ status: 200, type: Alert })
+ async getProjectAlerts(
+ @CurrentUserId() userId: string,
+ @Param('projectId') projectId: string,
@Query('take') take: number | undefined,
@Query('skip') skip: number | undefined,
) {
- this.logger.log({ userId, take, skip }, 'GET /alert')
+ this.logger.log({ userId, projectId, take, skip }, 'GET /alert/:projectId')
- const projects = await this.projectService.find({
- where: {
- admin: { id: userId },
- },
- })
+ const project = await this.projectService.getFullProject(projectId)
- if (_isEmpty(projects)) {
- return []
+ if (_isEmpty(project)) {
+ throw new NotFoundException('Project not found')
}
- const pids = _map(projects, project => project.id)
+ this.projectService.allowedToView(project, userId)
const result = await this.alertService.paginate(
{ take, skip },
- { project: In(pids) },
+ { project: { id: projectId } },
['project'],
)
diff --git a/web/app/App.tsx b/web/app/App.tsx
index d7cac8417..42546dfa3 100644
--- a/web/app/App.tsx
+++ b/web/app/App.tsx
@@ -21,8 +21,6 @@ import routesPath from 'utils/routes'
import { getPageMeta } from 'utils/server'
import { authMe } from './api'
-const minimalFooterPages = ['/projects', '/dashboard', '/contact', '/captchas']
-
interface AppProps {
ssrTheme: 'dark' | 'light'
ssrAuthenticated: boolean
@@ -68,8 +66,6 @@ const App = ({ ssrTheme, ssrAuthenticated }: AppProps) => {
document.title = title
}, [t, pathname])
- const isMinimalFooter = _some(minimalFooterPages, (page) => _includes(pathname, page))
-
const isReferralPage = _startsWith(pathname, '/ref/')
const isProjectViewPage =
_startsWith(pathname, '/projects/') &&
@@ -101,7 +97,7 @@ const App = ({ ssrTheme, ssrAuthenticated }: AppProps) => {
duration: 5000,
}}
/>
- {!isReferralPage && !isProjectViewPage && <Footer minimal={isMinimalFooter} authenticated={authenticated} />}
+ {!isReferralPage && !isProjectViewPage && <Footer authenticated={authenticated} />}
</>
)
}
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index 4fc195ba3..8488b3f53 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -13,7 +13,7 @@ import { getRefreshToken, removeRefreshToken } from 'utils/refreshToken'
import { DEFAULT_ALERTS_TAKE, API_URL, DEFAULT_MONITORS_TAKE } from 'redux/constants'
import { IUser } from 'redux/models/IUser'
import { IAuth } from 'redux/models/IAuth'
-import { IProject, IOverall } from 'redux/models/IProject'
+import { IProject, IOverall, ILiveStats } from 'redux/models/IProject'
import { IAlerts } from 'redux/models/IAlerts'
import { ISubscribers } from 'redux/models/ISubscribers'
import { IFilter, IProjectViewCustomEvent } from 'pages/Project/View/interfaces/traffic'
@@ -858,7 +858,7 @@ export const getOverallStatsCaptcha = (
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
-export const getLiveVisitors = (pids: string[], password?: string) =>
+export const getLiveVisitors = (pids: string[], password?: string): Promise<ILiveStats> =>
api
.get(`log/hb?pids=[${_map(pids, (pid) => `"${pid}"`).join(',')}]`, {
headers: {
@@ -1019,9 +1019,9 @@ export const removeTgIntegration = (tgID: string) =>
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
-export const getAlerts = (take: number = DEFAULT_ALERTS_TAKE, skip: number = 0) =>
+export const getProjectAlerts = (projectId: string, take: number = DEFAULT_ALERTS_TAKE, skip: number = 0) =>
api
- .get(`alert?take=${take}&skip=${skip}`)
+ .get(`/alert/project/${projectId}?take=${take}&skip=${skip}`)
.then(
(
response,
@@ -1035,6 +1035,14 @@ export const getAlerts = (take: number = DEFAULT_ALERTS_TAKE, skip: number = 0)
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
+export const getAlert = (alertId: string) =>
+ api
+ .get(`/alert/${alertId}`)
+ .then((response): IAlerts => response.data)
+ .catch((error) => {
+ throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
+ })
+
export interface ICreateAlert extends Omit<IAlerts, 'id' | 'lastTrigger' | 'lastTriggered' | 'created'> {}
export const createAlert = (data: ICreateAlert) =>
diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsx
index 5113b9a47..915561aad 100644
--- a/web/app/components/Footer/index.tsx
+++ b/web/app/components/Footer/index.tsx
@@ -211,13 +211,12 @@ const SelfHostedFooter = () => {
)
}
-interface IFooter {
- minimal?: boolean
+interface FooterProps {
authenticated?: boolean
showDBIPMessage?: boolean
}
-const Footer = ({ minimal, authenticated, showDBIPMessage }: IFooter): JSX.Element => {
+const Footer = ({ authenticated, showDBIPMessage }: FooterProps): JSX.Element => {
const {
t,
i18n: { language },
@@ -228,71 +227,6 @@ const Footer = ({ minimal, authenticated, showDBIPMessage }: IFooter): JSX.Eleme
return <SelfHostedFooter />
}
- if (minimal) {
- return (
- <footer className='border-t border-gray-200 bg-gray-50 dark:border-slate-800/50 dark:bg-slate-900'>
- <div className='mx-auto max-w-7xl overflow-hidden px-4 py-8 sm:px-6 lg:px-8'>
- <nav className='relative -mx-5 -my-2 flex flex-wrap justify-center' aria-label='Footer'>
- <div className='px-5 py-2'>
- <Link
- to={routesPath.contact}
- className='leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- >
- {t('footer.contact')}
- </Link>
- </div>
- <div className='px-5 py-2'>
- <Link
- to={routesPath.privacy}
- className='leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- >
- {t('footer.pp')}
- </Link>
- </div>
- <div className='px-5 py-2'>
- <Link
- to={routesPath.terms}
- className='leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- >
- {t('footer.tos')}
- </Link>
- </div>
- <div className='px-5 py-2'>
- <Link
- to={routesPath.about}
- className='leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- >
- {t('footer.about')}
- </Link>
- </div>
- <div className='px-5 py-2'>
- <a
- href={STATUSPAGE_URL}
- className='leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- target='_blank'
- rel='noopener noreferrer'
- aria-label={`${t('footer.status')} (opens in a new tab)`}
- >
- {t('footer.status')}
- </a>
- </div>
- {showDBIPMessage && (
- <a
- className='absolute -bottom-5 leading-6 text-slate-900 hover:text-slate-700 dark:text-gray-300 dark:hover:text-white'
- target='_blank'
- rel='noopener noreferrer'
- href='https://db-ip.com'
- aria-label='IP Geolocation by DB-IP (opens in a new tab)'
- >
- IP Geolocation by DB-IP
- </a>
- )}
- </nav>
- </div>
- </footer>
- )
- }
-
return (
<footer className='bg-gray-800 dark:bg-gray-750' aria-labelledby='footer-heading'>
<h2 id='footer-heading' className='sr-only'>
@@ -450,6 +384,20 @@ const Footer = ({ minimal, authenticated, showDBIPMessage }: IFooter): JSX.Eleme
</li>
)
})}
+
+ {showDBIPMessage && (
+ <li>
+ <a
+ className='text-base text-gray-300 hover:text-white'
+ target='_blank'
+ rel='noopener noreferrer'
+ href='https://db-ip.com'
+ aria-label='IP Geolocation by DB-IP (opens in a new tab)'
+ >
+ IP Geolocation by DB-IP
+ </a>
+ </li>
+ )}
</ul>
</div>
</div>
diff --git a/web/app/hoc/projectProtected.tsx b/web/app/hoc/projectProtected.tsx
deleted file mode 100644
index 0430f3dce..000000000
--- a/web/app/hoc/projectProtected.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-import { useNavigate, useParams } from '@remix-run/react'
-import _find from 'lodash/find'
-import _replace from 'lodash/replace'
-import { StateType } from 'redux/store'
-import routes from 'utils/routes'
-
-type PropsType = {
- [key: string]: any
-}
-
-export const withProjectProtected = <P extends PropsType>(WrappedComponent: any) => {
- const WithProjectProtected = (props: P) => {
- const passwords = useSelector((state: StateType) => state.ui.projects.password)
- const projects = useSelector((state: StateType) => state.ui.projects.projects)
- const navigate = useNavigate()
- const { id }: any = useParams()
- const { queryPassword } = props
- const project = _find(projects, { id })
-
- // If project role is present (i.e. viewer, admin, owner), we don't need to check for password
- // as the user has access to the project
- if (project?.role) {
- return <WrappedComponent {...props} />
- }
-
- if (project?.isPasswordProtected && !passwords[id] && !queryPassword) {
- navigate(_replace(routes.project_protected_password, ':id', id))
- return null
- }
-
- return <WrappedComponent {...props} />
- }
-
- return WithProjectProtected
-}
diff --git a/web/app/pages/Auth/Signin/Signin.tsx b/web/app/pages/Auth/Signin/Signin.tsx
index 635abad99..a3324e1e6 100644
--- a/web/app/pages/Auth/Signin/Signin.tsx
+++ b/web/app/pages/Auth/Signin/Signin.tsx
@@ -111,7 +111,6 @@ const Signin = ({ ssrTheme }: SigninProps) => {
setAccessToken(accessToken)
setRefreshToken(refreshToken)
dispatch(authActions.authSuccessful(user))
- dispatch(sagaActions.loadProjects())
} catch (reason) {
if (_isString(reason)) {
toast.error(reason)
diff --git a/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx b/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx
deleted file mode 100644
index f9df162bd..000000000
--- a/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { connect } from 'react-redux'
-import UIActions from 'redux/reducers/ui'
-import sagaActions from 'redux/sagas/actions'
-import { StateType, AppDispatch } from 'redux/store'
-import CaptchaSettings from './CaptchaSettings'
-
-const mapStateToProps = (state: StateType) => ({
- projects: state.ui.projects.projects,
- isLoading: state.ui.projects.isLoading,
- loading: state.auth.loading,
- user: state.auth.user,
-})
-
-const mapDispatchToProps = (dispatch: AppDispatch) => ({
- loadProjects: () => {
- sagaActions.loadProjects()
- },
- removeProject: (pid: string) => {
- dispatch(UIActions.removeProject({ pid }))
- },
- deleteProjectCache: (pid: string) => {
- dispatch(
- UIActions.deleteProjectCache({
- pid,
- }),
- )
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(CaptchaSettings)
diff --git a/web/app/pages/Captcha/Settings/CaptchaSettings.tsx b/web/app/pages/Captcha/Settings/CaptchaSettings.tsx
index a40d28d1d..737a35bf2 100644
--- a/web/app/pages/Captcha/Settings/CaptchaSettings.tsx
+++ b/web/app/pages/Captcha/Settings/CaptchaSettings.tsx
@@ -1,28 +1,28 @@
-import React, { useState, useEffect, useMemo, memo } from 'react'
-import { useNavigate, useParams } from '@remix-run/react'
+import React, { useState, useEffect, memo } from 'react'
+import { Link, useNavigate } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
import _size from 'lodash/size'
import _replace from 'lodash/replace'
-import _find from 'lodash/find'
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 _includes from 'lodash/includes'
-import { ExclamationTriangleIcon, TrashIcon } from '@heroicons/react/24/outline'
+import { ExclamationTriangleIcon, TrashIcon, XCircleIcon } from '@heroicons/react/24/outline'
import { withAuthentication, auth } from 'hoc/protected'
-import { isSelfhosted, TITLE_SUFFIX } from 'redux/constants'
+import { TITLE_SUFFIX } from 'redux/constants'
import {
createProject,
updateProject,
deleteCaptchaProject,
resetCaptchaProject,
reGenerateCaptchaSecretKey,
+ getProject,
} from 'api'
import Input from 'ui/Input'
import Loader from 'ui/Loader'
@@ -32,7 +32,9 @@ import Modal from 'ui/Modal'
import { trackCustom } from 'utils/analytics'
import routes from 'utils/routes'
import { ICaptchaProject } from 'redux/models/IProject'
-import { IUser } from 'redux/models/IUser'
+import { useRequiredParams } from 'hooks/useRequiredParams'
+import { useSelector } from 'react-redux'
+import { StateType } from 'redux/store'
const MAX_NAME_LENGTH = 50
const MAX_ORIGINS_LENGTH = 300
@@ -47,38 +49,17 @@ interface IForm extends Partial<ICaptchaProject> {
ipBlacklist?: string | null | string[]
}
-interface ICaptchaSettings {
- loadProjects: () => void
- isLoading: boolean
- projects: ICaptchaProject[]
- removeProject: (pid: string) => void
- user: IUser
- deleteProjectCache: (pid: string) => void
- loading: boolean
+interface CaptchaSettingsProps {
isSettings: boolean
}
-const CaptchaSettings = ({
- loadProjects,
- isLoading,
- projects,
- removeProject,
- user,
- deleteProjectCache,
- loading,
- isSettings,
-}: ICaptchaSettings): JSX.Element => {
+const CaptchaSettings = ({ isSettings }: CaptchaSettingsProps): JSX.Element => {
+ const { loading: authLoading } = useSelector((state: StateType) => state.auth)
+
const { t } = useTranslation('common')
- // @ts-ignore
- const {
- id,
- }: {
+ const { id } = useRequiredParams<{
id: string
- } = useParams()
- const project = useMemo<ICaptchaProject>(
- () => _find([...projects], (p) => p.id === id) || ({} as ICaptchaProject),
- [projects, id],
- )
+ }>()
const navigate = useNavigate()
const [form, setForm] = useState<IForm>({
name: '',
@@ -99,32 +80,44 @@ const CaptchaSettings = ({
const [projectDeleting, setProjectDeleting] = useState(false)
const [projectResetting, setProjectResetting] = useState(false)
const [projectSaving, setProjectSaving] = useState(false)
- const [captchaSecretKey, setCaptchaSecretKey] = useState(project?.captchaSecretKey)
+ const [captchaSecretKey, setCaptchaSecretKey] = useState<string | null>(null)
const [showRegenerateSecret, setShowRegenerateSecret] = useState(false)
- useEffect(() => {
- if (loading) {
+ const [project, setProject] = useState<ICaptchaProject | null>(null)
+ const [isLoading, setIsLoading] = useState(false)
+ const [error, setError] = useState<string | null>(null)
+
+ const loadProject = async (projectId: string) => {
+ if (isLoading) {
return
}
+ setIsLoading(true)
- if (!user.isActive && !isSelfhosted) {
- toast.error(t('project.captcha.settings.verify'))
- navigate(routes.dashboard)
+ try {
+ const result = (await getProject(projectId)) as ICaptchaProject
+ setProject(result)
+ setCaptchaSecretKey(result.captchaSecretKey)
+ setForm({
+ ...result,
+ ipBlacklist: _isString(result.ipBlacklist) ? result.ipBlacklist : _join(result.ipBlacklist, ', '),
+ origins: _isString(result.origins) ? result.origins : _join(result.origins, ', '),
+ })
+ } catch (reason: any) {
+ setError(reason)
+ } finally {
+ setIsLoading(false)
}
+ }
- if (!isLoading && isSettings && !projectDeleting) {
- if (_isEmpty(project) || project?.uiHidden) {
- toast.error(t('project.captcha.noExist'))
- navigate(routes.dashboard)
- } else {
- setForm({
- ...project,
- ipBlacklist: _isString(project.ipBlacklist) ? project.ipBlacklist : _join(project.ipBlacklist, ', '),
- origins: _isString(project.origins) ? project.origins : _join(project.origins, ', '),
- })
- }
+ useEffect(() => {
+ if (authLoading) {
+ return
}
- }, [user, project, isLoading, isSettings, navigate, projectDeleting, t, loading])
+
+ loadProject(id)
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [authLoading, id])
const onSubmit = async (data: IForm) => {
if (!projectSaving) {
@@ -158,7 +151,6 @@ const CaptchaSettings = ({
toast.success(t('project.settings.created'))
}
- loadProjects()
navigate(routes.dashboard)
} catch (reason: any) {
toast.error(reason)
@@ -174,7 +166,6 @@ const CaptchaSettings = ({
setProjectDeleting(true)
try {
await deleteCaptchaProject(id)
- removeProject(id)
toast.success(t('project.settings.deleted'))
navigate(routes.dashboard)
} catch (reason: any) {
@@ -191,7 +182,6 @@ const CaptchaSettings = ({
setProjectResetting(true)
try {
await resetCaptchaProject(id)
- deleteProjectCache(id)
toast.success(t('project.settings.resetted'))
navigate(routes.dashboard)
} catch (reason: any) {
@@ -275,7 +265,7 @@ const CaptchaSettings = ({
}
}
- if (loading) {
+ if (isLoading || isLoading === null || !project) {
return (
<div className='flex min-h-min-footer flex-col bg-gray-50 px-4 py-6 dark:bg-slate-900 sm:px-6 lg:px-8'>
<Loader />
@@ -283,6 +273,43 @@ const CaptchaSettings = ({
)
}
+ if (error && !isLoading) {
+ return (
+ <div className='min-h-page bg-gray-50 px-4 py-16 dark:bg-slate-900 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>
+ <div className='mx-auto max-w-max'>
+ <main className='sm:flex'>
+ <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
+ <div className='sm:ml-6'>
+ <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50 sm:text-5xl'>
+ {t('apiNotifications.somethingWentWrong')}
+ </h1>
+ <p className='mt-4 text-2xl font-medium tracking-tight text-gray-700 dark:text-gray-200'>
+ {t('apiNotifications.errorCode', { error })}
+ </p>
+ </div>
+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
+ <button
+ type='button'
+ onClick={() => window.location.reload()}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2'
+ >
+ {t('dashboard.reloadPage')}
+ </button>
+ <Link
+ to={routes.contact}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
+ >
+ {t('notFoundPage.support')}
+ </Link>
+ </div>
+ </div>
+ </main>
+ </div>
+ </div>
+ )
+ }
+
return (
<div
className={cx('flex min-h-min-footer flex-col bg-gray-50 px-4 py-6 dark:bg-slate-900 sm:px-6 lg:px-8', {
diff --git a/web/app/pages/Captcha/Settings/index.tsx b/web/app/pages/Captcha/Settings/index.tsx
index 1ce8f6fd4..f75891d0e 100644
--- a/web/app/pages/Captcha/Settings/index.tsx
+++ b/web/app/pages/Captcha/Settings/index.tsx
@@ -1,3 +1,3 @@
-import ProjectSettings from './CaptchaSettings.container'
+import ProjectSettings from './CaptchaSettings'
export default ProjectSettings
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.container.tsx b/web/app/pages/Captcha/View/ViewCaptcha.container.tsx
deleted file mode 100644
index 4aa90e041..000000000
--- a/web/app/pages/Captcha/View/ViewCaptcha.container.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { connect } from 'react-redux'
-import UIActions from 'redux/reducers/ui'
-import { StateType, AppDispatch } from 'redux/store'
-
-import { IProject } from 'redux/models/IProject'
-import ViewCaptcha from './ViewCaptcha'
-
-const mapStateToProps = (state: StateType) => ({
- projects: state.ui.projects.projects,
- isLoading: state.ui.projects.isLoading,
- cache: state.ui.cache.captchaAnalytics,
- projectViewPrefs: state.ui.cache.captchaProjectsViewPrefs,
- authenticated: state.auth.authenticated,
- timezone: state.auth.user.timezone,
- user: state.auth.user,
- theme: state.ui.theme.theme,
-})
-
-const mapDispatchToProps = (dispatch: AppDispatch) => ({
- setProjectCache: (pid: string, data: any, key: string) => {
- dispatch(
- UIActions.setCaptchaProjectCache({
- pid,
- data,
- key,
- }),
- )
- },
- setProjects: (projects: IProject[]) => {
- dispatch(UIActions.setProjects({ projects }))
- },
- setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[] | null) => {
- dispatch(
- UIActions.setCaptchaProjectViewPrefs({
- pid,
- period,
- timeBucket,
- rangeDate,
- }),
- )
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(ViewCaptcha)
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsx
index 549608439..3ac14aa08 100644
--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx
+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx
@@ -41,7 +41,6 @@ import {
ThemeType,
} from 'redux/constants'
import { ICaptchaProject, IProject } from 'redux/models/IProject'
-import { IUser } from 'redux/models/IUser'
import Loader from 'ui/Loader'
import Dropdown from 'ui/Dropdown'
import Checkbox from 'ui/Checkbox'
@@ -68,6 +67,9 @@ import CCRow from '../../Project/View/components/CCRow'
import NoEvents from './components/NoEvents'
import Filters from 'pages/Project/View/components/Filters'
import { useRequiredParams } from 'hooks/useRequiredParams'
+import { useSelector } from 'react-redux'
+import { StateType, useAppDispatch } from 'redux/store'
+import UIActions from 'redux/reducers/ui'
const PageLoader = () => (
<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>
@@ -75,34 +77,19 @@ const PageLoader = () => (
</div>
)
-interface IViewCaptcha {
- projects: IProject[]
- isLoading: boolean
- cache: any
- setProjectCache: (pid: string, data: any, key: string) => void
- projectViewPrefs: any
- setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[] | null) => void
- authenticated: boolean
- user: IUser
- // eslint-disable-next-line no-unused-vars, no-shadow
- setProjects: (projects: IProject[]) => void
- theme: ThemeType
+interface ViewCaptchaProps {
ssrTheme: ThemeType
}
-const ViewCaptcha = ({
- projects,
- isLoading: _isLoading,
- cache,
- setProjectCache,
- projectViewPrefs,
- setProjectViewPrefs,
- authenticated,
- user,
- setProjects,
- theme,
- ssrTheme,
-}: IViewCaptcha): JSX.Element => {
+const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {
+ const { loading: authLoading, user } = useSelector((state: StateType) => state.auth)
+ const { theme } = useSelector((state: StateType) => state.ui.theme)
+ const { captchaAnalytics: cache, captchaProjectsViewPrefs: projectViewPrefs } = useSelector(
+ (state: StateType) => state.ui.cache,
+ )
+
+ const dispatch = useAppDispatch()
+
const {
t,
i18n: { language },
@@ -111,7 +98,9 @@ const ViewCaptcha = ({
const dashboardRef = useRef(null)
const { id } = useRequiredParams<{ id: string }>()
const navigate = useNavigate()
- const project = useMemo(() => _find(projects, (p) => p.id === id) || ({} as ICaptchaProject), [projects, id])
+
+ const [project, setProject] = useState<ICaptchaProject | null>(null)
+
const [areFiltersParsed, setAreFiltersParsed] = useState(false)
const [areTimeBucketParsed, setAreTimeBucketParsed] = useState(false)
const [arePeriodParsed, setArePeriodParsed] = useState(false)
@@ -146,7 +135,6 @@ const ViewCaptcha = ({
})
const checkIfAllMetricsAreDisabled = useMemo(() => !_some(activeChartMetrics, (value) => value), [activeChartMetrics])
const [filters, setFilters] = useState<any[]>([])
- const isLoading = authenticated ? _isLoading : false
const tnMapping = typeNameMapping(t)
const refCalendar = useRef(null)
const localStorageDateRange = projectViewPrefs ? projectViewPrefs[id]?.rangeDate : null
@@ -204,7 +192,7 @@ const ViewCaptcha = ({
// this function is used for requesting the data from the API
const loadCaptcha = async (forced: boolean = false, newFilters: any = null) => {
- if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {
+ if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {
return
}
@@ -232,7 +220,13 @@ const ViewCaptcha = ({
data = await getCaptchaData(id, timeBucket, period, newFilters || filters, '', '')
}
- setProjectCache(id, data || {}, key)
+ dispatch(
+ UIActions.setCaptchaProjectCache({
+ pid: id,
+ data: data || {},
+ key,
+ }),
+ )
}
if (_isEmpty(data)) {
@@ -380,7 +374,7 @@ const ViewCaptcha = ({
}
const refreshStats = () => {
- if (!isLoading && !dataLoading) {
+ if (!authLoading && !dataLoading) {
loadCaptcha(true)
}
}
@@ -472,7 +466,15 @@ const ViewCaptcha = ({
setPeriodPairs(captchaTbPeriodPairs(t, timeBucketToDays[index].tb, dates, language))
setPeriod('custom')
- setProjectViewPrefs(id, 'custom', timeBucketToDays[4].tb[0], dates)
+
+ dispatch(
+ UIActions.setCaptchaProjectViewPrefs({
+ pid: id,
+ period: 'custom',
+ timeBucket: timeBucketToDays[4].tb[0],
+ rangeDate: dates,
+ }),
+ )
break
}
@@ -507,27 +509,23 @@ const ViewCaptcha = ({
}, [dateRange, t, arePeriodParsed]) // eslint-disable-line
useEffect(() => {
- if (!isLoading && _isEmpty(project)) {
- getProject(id)
- .then((projectRes) => {
- if (!_isEmpty(projectRes)) {
- setProjects([
- ...(projects as any[]),
- {
- ...projectRes,
- live: 'N/A',
- },
- ])
- } else {
- onErrorLoading()
- }
- })
- .catch((e) => {
- console.error(e)
- onErrorLoading()
- })
+ if (authLoading || !_isEmpty(project)) {
+ return
}
- }, [isLoading, project, id]) // eslint-disable-line
+
+ getProject(id)
+ .then((result) => {
+ if (_isEmpty(result)) {
+ onErrorLoading()
+ } else {
+ setProject(result as ICaptchaProject)
+ }
+ })
+ .catch((reason) => {
+ console.error(reason)
+ onErrorLoading()
+ })
+ }, [authLoading, project, id]) // eslint-disable-line
const updatePeriod = (newPeriod: any) => {
const newPeriodFull = _find(periodPairs, (el) => el.period === newPeriod.period)
@@ -548,7 +546,13 @@ const ViewCaptcha = ({
url.searchParams.delete('from')
url.searchParams.delete('to')
url.searchParams.append('period', newPeriod.period)
- setProjectViewPrefs(id, newPeriod.period, tb)
+ dispatch(
+ UIActions.setCaptchaProjectViewPrefs({
+ pid: id,
+ period: newPeriod.period,
+ timeBucket: tb,
+ }),
+ )
setPeriod(newPeriod.period)
setDateRange(null)
}
@@ -564,7 +568,14 @@ const ViewCaptcha = ({
const { pathname, search } = url
navigate(`${pathname}${search}`)
setTimebucket(newTimebucket)
- setProjectViewPrefs(id, period, newTimebucket, dateRange)
+ dispatch(
+ UIActions.setCaptchaProjectViewPrefs({
+ pid: id,
+ period,
+ timeBucket: newTimebucket,
+ rangeDate: dateRange,
+ }),
+ )
}
const openSettingsHandler = () => {
@@ -641,7 +652,7 @@ const ViewCaptcha = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [chartType])
- if (isLoading) {
+ if (authLoading || !project) {
return <PageLoader />
}
@@ -665,7 +676,7 @@ const ViewCaptcha = ({
className={cx(
'relative mr-3 rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',
{
- 'cursor-not-allowed opacity-50': isLoading || dataLoading,
+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,
},
)}
>
diff --git a/web/app/pages/Captcha/View/index.tsx b/web/app/pages/Captcha/View/index.tsx
index 0c9f97005..ec73a2c1b 100644
--- a/web/app/pages/Captcha/View/index.tsx
+++ b/web/app/pages/Captcha/View/index.tsx
@@ -1,3 +1,3 @@
-import ViewProject from './ViewCaptcha.container'
+import ViewCaptcha from './ViewCaptcha'
-export default ViewProject
+export default ViewCaptcha
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index d0e11da5a..fb0f93a6c 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -3,9 +3,7 @@ import { Link } from '@remix-run/react'
import { ClientOnly } from 'remix-utils/client-only'
import _isEmpty from 'lodash/isEmpty'
import _size from 'lodash/size'
-import _isNumber from 'lodash/isNumber'
import _map from 'lodash/map'
-import _filter from 'lodash/filter'
import { useTranslation } from 'react-i18next'
import { FolderPlusIcon, MagnifyingGlassIcon, XMarkIcon } from '@heroicons/react/24/outline'
import { XCircleIcon } from '@heroicons/react/24/solid'
@@ -14,41 +12,41 @@ import Modal from 'ui/Modal'
import { withAuthentication, auth } from 'hoc/protected'
import Loader from 'ui/Loader'
import routes from 'utils/routes'
-import { isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
+import { isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD, LIVE_VISITORS_UPDATE_INTERVAL } from 'redux/constants'
import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import DashboardLockedBanner from 'components/DashboardLockedBanner'
import useDebounce from 'hooks/useDebounce'
import Pagination from 'ui/Pagination'
import { useSelector } from 'react-redux'
-import { StateType, useAppDispatch } from 'redux/store'
-import UIActions from 'redux/reducers/ui'
-import sagaActions from 'redux/sagas/actions'
+import { StateType } from 'redux/store'
import { ProjectCard } from './ProjectCard'
import { NoProjects } from './NoProjects'
import { AddProject } from './AddProject'
+import { IOverall, IProject } from 'redux/models/IProject'
+import { getProjects, getLiveVisitors, getOverallStats, getOverallStatsCaptcha } from 'api'
const Dashboard = () => {
- const { projects, isLoading, error, total, dashboardPaginationPage, liveStats } = useSelector(
- (state: StateType) => state.ui.projects,
- )
const { user } = useSelector((state: StateType) => state.auth)
const { t } = useTranslation('common')
const [isSearchActive, setIsSearchActive] = useState(false)
const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)
- const pageAmount = Math.ceil(total / ENTRIES_PER_PAGE_DASHBOARD)
+
+ const [projects, setProjects] = useState<IProject[]>([])
+ const [paginationTotal, setPaginationTotal] = useState(0)
+ const [page, setPage] = useState(1)
+ const [isLoading, setIsLoading] = useState<boolean | null>(null)
+ const [error, setError] = useState<string | null>(null)
+ const [liveStats, setLiveStats] = useState<Record<string, number>>({})
+ const [overallStats, setOverallStats] = useState<IOverall>({})
+
+ const pageAmount = Math.ceil(paginationTotal / ENTRIES_PER_PAGE_DASHBOARD)
// This search represents what's inside the search input
const [search, setSearch] = useState('')
const debouncedSearch = useDebounce(search, 500)
- const dispatch = useAppDispatch()
-
- const setDashboardPaginationPage = (page: number) => {
- dispatch(UIActions.setDashboardPaginationPage(page))
- }
-
const onNewProject = (e: React.MouseEvent<HTMLAnchorElement>) => {
if (user.isActive || isSelfhosted) {
return
@@ -58,17 +56,79 @@ const Dashboard = () => {
setShowActivateEmailModal(true)
}
+ const loadProjects = async (take: number, skip: number, search?: string) => {
+ if (isLoading) {
+ return
+ }
+ setIsLoading(true)
+
+ try {
+ const result = await getProjects(take, skip, search)
+ setProjects(result.results)
+ setPaginationTotal(result.total)
+ } catch (reason: any) {
+ setError(reason)
+ } finally {
+ setIsLoading(false)
+ }
+ }
+
useEffect(() => {
- dispatch(
- sagaActions.loadProjects(
- ENTRIES_PER_PAGE_DASHBOARD,
- (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD,
- debouncedSearch,
- ),
- )
- }, [dispatch, dashboardPaginationPage, debouncedSearch])
+ loadProjects(ENTRIES_PER_PAGE_DASHBOARD, (page - 1) * ENTRIES_PER_PAGE_DASHBOARD, debouncedSearch)
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [page, debouncedSearch])
+
+ // Set up interval for live visitors
+ useEffect(() => {
+ const updateLiveVisitors = async () => {
+ if (!projects.length) return
+
+ try {
+ const projectIds = projects.map((p) => p.id)
+ const stats = await getLiveVisitors(projectIds)
+ setLiveStats(stats)
+ } catch (error) {
+ console.error('Failed to fetch live visitors:', error)
+ }
+ }
+
+ const updateOverallStats = async (projectIds: string[]) => {
+ if (!projectIds.length) return
+
+ try {
+ const stats = await getOverallStats(projectIds, '7d')
+ setOverallStats(stats)
+ } catch (error) {
+ console.error('Failed to fetch overall stats:', error)
+ }
+ }
+
+ const updateOverallStatsCaptcha = async (projectIds: string[]) => {
+ if (!projectIds.length) return
+
+ try {
+ const stats = await getOverallStatsCaptcha(projectIds, '7d')
+ setOverallStats(stats)
+ } catch (error) {
+ console.error('Failed to fetch overall stats:', error)
+ }
+ }
+
+ const updateAllOverallStats = async () => {
+ await updateOverallStats(projects.filter((p) => p.isCaptchaProject).map((p) => p.id))
+ await updateOverallStatsCaptcha(projects.filter((p) => p.isAnalyticsProject).map((p) => p.id))
+ }
+
+ updateLiveVisitors()
+ updateAllOverallStats()
+
+ const interval = setInterval(updateLiveVisitors, LIVE_VISITORS_UPDATE_INTERVAL)
+
+ return () => clearInterval(interval)
+ }, [projects]) // Reset interval when projects change
- if (error && !isLoading) {
+ if (error && isLoading === false) {
return (
<div className='min-h-page bg-gray-50 px-4 py-16 dark:bg-slate-900 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>
<div className='mx-auto max-w-max'>
@@ -186,7 +246,7 @@ const Dashboard = () => {
</div>
</div>
)}
- {isLoading ? (
+ {isLoading || isLoading === null ? (
<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>
<Loader />
</div>
@@ -200,24 +260,19 @@ const Dashboard = () => {
>
{() => (
<>
- {_isEmpty(_filter(projects, ({ uiHidden }) => !uiHidden)) ? (
+ {_isEmpty(projects) ? (
<NoProjects onClick={onNewProject} />
) : (
<div className='grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>
- {_map(
- _filter(projects, ({ uiHidden }) => !uiHidden),
- (project) => (
- <ProjectCard
- key={project.id}
- project={project}
- live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}
- />
- ),
- )}
- <AddProject
- sitesCount={_size(_filter(projects, ({ uiHidden }) => !uiHidden))}
- onClick={onNewProject}
- />
+ {_map(projects, (project) => (
+ <ProjectCard
+ key={project.id}
+ project={project}
+ live={liveStats[project.id] ?? 'N/A'}
+ overallStats={overallStats[project.id]}
+ />
+ ))}
+ <AddProject sitesCount={_size(projects)} onClick={onNewProject} />
</div>
)}
</>
@@ -227,10 +282,10 @@ const Dashboard = () => {
{pageAmount > 1 ? (
<Pagination
className='mt-2'
- page={dashboardPaginationPage}
+ page={page}
pageAmount={pageAmount}
- setPage={setDashboardPaginationPage}
- total={total}
+ setPage={setPage}
+ total={paginationTotal}
/>
) : null}
</div>
diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsx
index 88916a724..6745cbeeb 100644
--- a/web/app/pages/Dashboard/ProjectCard.tsx
+++ b/web/app/pages/Dashboard/ProjectCard.tsx
@@ -17,14 +17,14 @@ import { nFormatter, calculateRelativePercentage } from 'utils/generic'
import { acceptProjectShare } from 'api'
-import { IProject } from 'redux/models/IProject'
+import { IOverallObject, IProject } from 'redux/models/IProject'
import { useSelector } from 'react-redux'
import { StateType, useAppDispatch } from 'redux/store'
-import UIActions from 'redux/reducers/ui'
import { authActions } from 'redux/reducers/auth'
interface ProjectCardProps {
live?: string | number
+ overallStats?: IOverallObject
project: IProject
}
@@ -70,14 +70,12 @@ const MiniCard = ({ labelTKey, total = 0, percChange }: MiniCardProps) => {
)
}
-export const ProjectCard = ({ live = 'N/A', project }: ProjectCardProps) => {
+export const ProjectCard = ({ live = 'N/A', project, overallStats }: ProjectCardProps) => {
const { t } = useTranslation('common')
const [showInviteModal, setShowInviteModal] = useState(false)
const { user } = useSelector((state: StateType) => state.auth)
- const { birdseye } = useSelector((state: StateType) => state.ui.projects)
-
const dispatch = useAppDispatch()
const shareId = useMemo(() => _find(project.share, (item) => item.user.id === user.id)?.id, [project.share, user.id])
@@ -143,8 +141,6 @@ export const ProjectCard = ({ live = 'N/A', project }: ProjectCardProps) => {
await acceptProjectShare(shareId)
- dispatch(UIActions.setProjectsShareData({ data: { isAccessConfirmed: true }, id }))
-
dispatch(
authActions.mergeUser({
sharedProjects: user.sharedProjects?.map((item) => {
@@ -208,13 +204,13 @@ export const ProjectCard = ({ live = 'N/A', project }: ProjectCardProps) => {
)}
</div>
<div className='mt-4 flex flex-shrink-0 gap-5'>
- {birdseye[id] && (
+ {overallStats ? (
<MiniCard
labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}
- total={birdseye[id].current.all}
- percChange={calculateRelativePercentage(birdseye[id].previous.all, birdseye[id].current.all)}
+ total={overallStats.current.all}
+ percChange={calculateRelativePercentage(overallStats.previous.all, overallStats.current.all)}
/>
- )}
+ ) : null}
{project.isAnalyticsProject && <MiniCard labelTKey='dashboard.liveVisitors' total={live} />}
</div>
</div>
diff --git a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx
deleted file mode 100644
index 50abd3976..000000000
--- a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux'
-import UIActions from 'redux/reducers/ui'
-import { StateType, AppDispatch } from 'redux/store'
-import { IAlerts } from 'redux/models/IAlerts'
-import ProjectAlerts from './ProjectAlertsSettings'
-
-const mapStateToProps = (state: StateType) => ({
- alerts: state.ui.alerts.alerts,
- user: state.auth.user,
- loading: state.auth.loading,
- total: state.ui.alerts.total,
-})
-
-const mapDispatchToProps = (dispatch: AppDispatch) => ({
- setProjectAlerts: (alerts: IAlerts[]) => {
- dispatch(UIActions.setProjectAlerts(alerts))
- },
- setProjectAlertsTotal: (total: number) => {
- dispatch(
- UIActions.setProjectAlertsTotal({
- total,
- }),
- )
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(ProjectAlerts)
diff --git a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
index ca479a869..91df14671 100644
--- a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
+++ b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
@@ -1,16 +1,13 @@
import React, { useEffect, useMemo, useState } from 'react'
-import { useNavigate, useParams, useLocation, Link } from '@remix-run/react'
+import { useNavigate, Link } from '@remix-run/react'
import { useTranslation, Trans } from 'react-i18next'
import { toast } from 'sonner'
-import { ExclamationTriangleIcon } from '@heroicons/react/24/outline'
+import { ExclamationTriangleIcon, XCircleIcon } from '@heroicons/react/24/outline'
import _isEmpty from 'lodash/isEmpty'
import _size from 'lodash/size'
-import _replace from 'lodash/replace'
-import _find from 'lodash/find'
import _split from 'lodash/split'
import _keys from 'lodash/keys'
-import _filter from 'lodash/filter'
import _reduce from 'lodash/reduce'
import _values from 'lodash/values'
import _findKey from 'lodash/findKey'
@@ -21,39 +18,28 @@ import Button from 'ui/Button'
import Checkbox from 'ui/Checkbox'
import Modal from 'ui/Modal'
import { PROJECT_TABS, QUERY_CONDITION, QUERY_METRIC, QUERY_TIME } from 'redux/constants'
-import { createAlert, updateAlert, deleteAlert, ICreateAlert } from 'api'
+import { createAlert, updateAlert, deleteAlert, ICreateAlert, getAlert } from 'api'
import { withAuthentication, auth } from 'hoc/protected'
import routes from 'utils/routes'
import Select from 'ui/Select'
import { IAlerts } from 'redux/models/IAlerts'
-import { IUser } from 'redux/models/IUser'
+import { StateType } from 'redux/store'
+import { useSelector } from 'react-redux'
+import { useRequiredParams } from 'hooks/useRequiredParams'
+import Loader from 'ui/Loader'
const INTEGRATIONS_LINK = `${routes.user_settings}#integrations`
-interface IProjectAlertsSettings {
- alerts: IAlerts[]
- setProjectAlerts: (item: IAlerts[]) => void
- user: IUser
- setProjectAlertsTotal: (num: number) => void
- total: number
- loading: boolean
+interface ProjectAlertsSettingsProps {
+ isSettings?: boolean
}
-const ProjectAlertsSettings = ({
- alerts,
- setProjectAlerts,
- user,
- setProjectAlertsTotal,
- total,
- loading,
-}: IProjectAlertsSettings): JSX.Element => {
+const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {
+ const { user, loading: authLoading } = useSelector((state: StateType) => state.auth)
+
const navigate = useNavigate()
- const { id, pid } = useParams()
- const { pathname } = useLocation()
+ const { id, pid } = useRequiredParams<{ id: string; pid: string }>()
const { t } = useTranslation('common')
- const isSettings: boolean =
- !_isEmpty(id) && _replace(_replace(routes.alert_settings, ':id', id as string), ':pid', pid as string) === pathname
- const alert = useMemo(() => _find(alerts, { id }), [alerts, id])
const [form, setForm] = useState<Partial<IAlerts>>({
pid,
name: '',
@@ -70,6 +56,10 @@ const ProjectAlertsSettings = ({
const [beenSubmitted, setBeenSubmitted] = useState(false)
const [showModal, setShowModal] = useState(false)
+ const [alert, setAlert] = useState<IAlerts | null>(null)
+ const [isLoading, setIsLoading] = useState<boolean | null>(null)
+ const [error, setError] = useState<string | null>(null)
+
const isIntegrationLinked = useMemo(() => {
if (_isEmpty(user)) {
return false
@@ -80,6 +70,39 @@ const ProjectAlertsSettings = ({
)
}, [user])
+ const loadAlert = async (alertId: string) => {
+ if (!isSettings) {
+ setIsLoading(false)
+ return
+ }
+
+ if (isLoading) {
+ return
+ }
+
+ setIsLoading(true)
+
+ try {
+ const result = await getAlert(alertId)
+ setAlert(result)
+ setForm(result)
+ } catch (reason: any) {
+ setError(reason)
+ } finally {
+ setIsLoading(false)
+ }
+ }
+
+ useEffect(() => {
+ if (authLoading) {
+ return
+ }
+
+ loadAlert(id)
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [authLoading, id, isSettings])
+
const queryTimeTMapping: {
[key: string]: string
} = useMemo(() => {
@@ -176,7 +199,7 @@ const ProjectAlertsSettings = ({
updateAlert(id as string, data)
.then((res) => {
navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)
- setProjectAlerts([..._filter(alerts, (a) => a.id !== id), res])
+ setAlert(res)
toast.success(t('alertsSettings.alertUpdated'))
})
.catch((reason) => {
@@ -186,8 +209,6 @@ const ProjectAlertsSettings = ({
createAlert(data as ICreateAlert)
.then((res) => {
navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)
- setProjectAlerts([...alerts, res])
- setProjectAlertsTotal(total + 1)
toast.success(t('alertsSettings.alertCreated'))
})
.catch((reason) => {
@@ -204,8 +225,6 @@ const ProjectAlertsSettings = ({
deleteAlert(id)
.then(() => {
- setProjectAlerts(_filter(alerts, (a) => a.id !== id))
- setProjectAlertsTotal(total - 1)
navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)
toast.success(t('alertsSettings.alertDeleted'))
})
@@ -214,10 +233,6 @@ const ProjectAlertsSettings = ({
})
}
- const onCancel = () => {
- navigate(`/projects/${pid}?tab=${PROJECT_TABS.alerts}`)
- }
-
useEffect(() => {
validate()
}, [form]) // eslint-disable-line
@@ -247,6 +262,51 @@ const ProjectAlertsSettings = ({
})
: t('alert.create')
+ if (isLoading || isLoading === null) {
+ return (
+ <div className='flex min-h-min-footer flex-col bg-gray-50 px-4 py-6 dark:bg-slate-900 sm:px-6 lg:px-8'>
+ <Loader />
+ </div>
+ )
+ }
+
+ if (error && !isLoading) {
+ return (
+ <div className='min-h-page bg-gray-50 px-4 py-16 dark:bg-slate-900 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>
+ <div className='mx-auto max-w-max'>
+ <main className='sm:flex'>
+ <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
+ <div className='sm:ml-6'>
+ <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50 sm:text-5xl'>
+ {t('apiNotifications.somethingWentWrong')}
+ </h1>
+ <p className='mt-4 text-2xl font-medium tracking-tight text-gray-700 dark:text-gray-200'>
+ {t('apiNotifications.errorCode', { error })}
+ </p>
+ </div>
+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
+ <button
+ type='button'
+ onClick={() => window.location.reload()}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2'
+ >
+ {t('dashboard.reloadPage')}
+ </button>
+ <Link
+ to={routes.contact}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
+ >
+ {t('notFoundPage.support')}
+ </Link>
+ </div>
+ </div>
+ </main>
+ </div>
+ </div>
+ )
+ }
+
return (
<div
className={cx('flex min-h-min-footer flex-col bg-gray-50 px-4 py-6 dark:bg-slate-900 sm:px-6 lg:px-8', {
@@ -255,7 +315,7 @@ const ProjectAlertsSettings = ({
>
<form className='mx-auto w-full max-w-7xl' onSubmit={handleSubmit}>
<h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>{title}</h2>
- {!loading && !isIntegrationLinked && (
+ {!authLoading && !isIntegrationLinked && (
<div className='mt-2 flex items-center whitespace-pre-wrap rounded bg-blue-50 px-5 py-3 text-base dark:bg-slate-800 dark:text-gray-50'>
<ExclamationTriangleIcon className='mr-1 h-5 w-5' />
<Trans
@@ -372,7 +432,9 @@ const ProjectAlertsSettings = ({
<div className='flex items-center justify-between'>
<Button
className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- onClick={onCancel}
+ as={Link}
+ // @ts-ignore
+ to={`/projects/${pid}?tab=${PROJECT_TABS.alerts}`}
secondary
regular
>
@@ -387,7 +449,9 @@ const ProjectAlertsSettings = ({
<div className='mt-5 flex items-center justify-between'>
<Button
className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- onClick={onCancel}
+ as={Link}
+ // @ts-ignore
+ to={`/projects/${pid}?tab=${PROJECT_TABS.alerts}`}
secondary
regular
>
diff --git a/web/app/pages/Project/Alerts/Settings/index.tsx b/web/app/pages/Project/Alerts/Settings/index.tsx
index 6a9cc75cf..a8f557fee 100644
--- a/web/app/pages/Project/Alerts/Settings/index.tsx
+++ b/web/app/pages/Project/Alerts/Settings/index.tsx
@@ -1,3 +1,3 @@
-import ProjectAlertsSettings from './ProjectAlertsSettings.container'
+import ProjectAlertsSettings from './ProjectAlertsSettings'
export default ProjectAlertsSettings
diff --git a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
index b0e8e941b..b36e056d5 100644
--- a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx
@@ -1,14 +1,13 @@
-import React, { useMemo, memo, useState } from 'react'
+import React, { useMemo, memo, useState, useEffect } from 'react'
import dayjs from 'dayjs'
import _map from 'lodash/map'
import _isEmpty from 'lodash/isEmpty'
import _replace from 'lodash/replace'
import _values from 'lodash/values'
import _reduce from 'lodash/reduce'
-import _filter from 'lodash/filter'
import { useNavigate, Link } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
-import { useDispatch, useSelector } from 'react-redux'
+import { useSelector } from 'react-redux'
import { toast } from 'sonner'
import {
BellIcon,
@@ -17,16 +16,19 @@ import {
TrashIcon,
PlusCircleIcon,
ExclamationTriangleIcon,
+ XCircleIcon,
} from '@heroicons/react/24/outline'
import routes from 'utils/routes'
import Button from 'ui/Button'
import Modal from 'ui/Modal'
import PaidFeature from 'modals/PaidFeature'
-import { QUERY_METRIC, PLAN_LIMITS } from 'redux/constants'
-import UIActions from 'redux/reducers/ui'
-import { deleteAlert as deleteAlertApi } from 'api'
+import { QUERY_METRIC, PLAN_LIMITS, DEFAULT_ALERTS_TAKE } from 'redux/constants'
+import { deleteAlert as deleteAlertApi, getProjectAlerts } from 'api'
import { StateType } from 'redux/store'
+import { IAlerts } from 'redux/models/IAlerts'
+import Loader from 'ui/Loader'
+import Pagination from 'ui/Pagination'
const Separator = () => (
<svg viewBox='0 0 2 2' className='h-0.5 w-0.5 flex-none fill-gray-400'>
@@ -182,19 +184,45 @@ interface IProjectAlerts {
const ProjectAlerts = ({ projectId }: IProjectAlerts): JSX.Element => {
const { t } = useTranslation()
- const dispatch = useDispatch()
- const { loading, total, alerts } = useSelector((state: StateType) => state.ui.alerts)
const { user, authenticated } = useSelector((state: StateType) => state.auth)
const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)
+
+ const [isLoading, setIsLoading] = useState<boolean | null>(null)
+ const [total, setTotal] = useState(0)
+ const [alerts, setAlerts] = useState<IAlerts[]>([])
+ const [page, setPage] = useState(1)
+
+ const [error, setError] = useState<string | null>(null)
+
+ const pageAmount = Math.ceil(total / DEFAULT_ALERTS_TAKE)
+
const navigate = useNavigate()
const limits = PLAN_LIMITS[user?.planCode] || PLAN_LIMITS.trial
const isLimitReached = authenticated && total >= limits?.maxAlerts
- const projectAlerts = useMemo(() => {
- if (loading) return []
- return _filter(alerts, ({ pid }) => pid === projectId)
- }, [projectId, alerts, loading])
+ const loadAlerts = async (take: number, skip: number, search?: string) => {
+ if (isLoading) {
+ return
+ }
+ setIsLoading(true)
+
+ try {
+ const result = await getProjectAlerts(projectId, take, skip)
+ setAlerts(result.results)
+ setTotal(result.total)
+ } catch (reason: any) {
+ setError(reason)
+ } finally {
+ setIsLoading(false)
+ }
+ }
+
+ useEffect(() => {
+ loadAlerts(DEFAULT_ALERTS_TAKE, (page - 1) * DEFAULT_ALERTS_TAKE)
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [page])
const queryMetricTMapping: {
[key: string]: string
@@ -233,23 +261,61 @@ const ProjectAlerts = ({ projectId }: IProjectAlerts): JSX.Element => {
const onDelete = async (id: string) => {
try {
await deleteAlertApi(id)
- dispatch(UIActions.setProjectAlerts(_filter(alerts, (a) => a.id !== id)))
- dispatch(
- UIActions.setProjectAlertsTotal({
- total: total - 1,
- }),
- )
toast.success(t('alertsSettings.alertDeleted'))
} catch (reason: any) {
toast.error(reason?.response?.data?.message || reason?.message || 'Something went wrong')
}
}
+ if (error && isLoading === false) {
+ return (
+ <div className='bg-gray-50 px-4 py-16 dark:bg-slate-900 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>
+ <div className='mx-auto max-w-max'>
+ <main className='sm:flex'>
+ <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />
+ <div className='sm:ml-6'>
+ <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>
+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50 sm:text-5xl'>
+ {t('apiNotifications.somethingWentWrong')}
+ </h1>
+ <p className='mt-4 text-2xl font-medium tracking-tight text-gray-700 dark:text-gray-200'>
+ {t('apiNotifications.errorCode', { error })}
+ </p>
+ </div>
+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
+ <button
+ type='button'
+ onClick={() => window.location.reload()}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2'
+ >
+ {t('dashboard.reloadPage')}
+ </button>
+ <Link
+ to={routes.contact}
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
+ >
+ {t('notFoundPage.support')}
+ </Link>
+ </div>
+ </div>
+ </main>
+ </div>
+ </div>
+ )
+ }
+
+ if (isLoading || isLoading === null) {
+ return (
+ <div className='mt-4'>
+ <Loader />
+ </div>
+ )
+ }
+
return (
- <div>
+ <>
<div className='mt-4'>
- {loading && <div>{t('common.loading')}</div>}
- {!loading && _isEmpty(projectAlerts) && (
+ {_isEmpty(alerts) ? (
<div className='mt-5 rounded-xl bg-gray-700 p-5'>
<div className='flex items-center text-gray-50'>
<BellIcon className='mr-2 h-8 w-8' />
@@ -262,18 +328,15 @@ const ProjectAlerts = ({ projectId }: IProjectAlerts): JSX.Element => {
secondary
large
>
- <>
- {isLimitReached && <CurrencyDollarIcon className='mr-1 h-5 w-5' />}
- {t('alert.add')}
- </>
+ {isLimitReached && <CurrencyDollarIcon className='mr-1 h-5 w-5' />}
+ {t('alert.add')}
</Button>
</div>
- )}
- {!loading && !_isEmpty(projectAlerts) && (
+ ) : (
<>
{!isIntegrationLinked && <NoNotificationChannelSet />}
<ul className='mt-4 grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>
- {_map(projectAlerts, (alert) => (
+ {_map(alerts, (alert) => (
<AlertCard
key={alert.id}
{...alert}
@@ -288,9 +351,19 @@ const ProjectAlerts = ({ projectId }: IProjectAlerts): JSX.Element => {
</ul>
</>
)}
+ {pageAmount > 1 ? (
+ <Pagination
+ className='mt-4'
+ page={page}
+ pageAmount={pageAmount}
+ setPage={setPage}
+ total={total}
+ pageSize={DEFAULT_ALERTS_TAKE}
+ />
+ ) : null}
</div>
<PaidFeature isOpened={isPaidFeatureOpened} onClose={() => setIsPaidFeatureOpened(false)} />
- </div>
+ </>
)
}
diff --git a/web/app/pages/Project/New/index.tsx b/web/app/pages/Project/New/index.tsx
index 9b1081fd6..693fd9870 100644
--- a/web/app/pages/Project/New/index.tsx
+++ b/web/app/pages/Project/New/index.tsx
@@ -1,14 +1,14 @@
import React, { useState, useEffect, useMemo } from 'react'
import { Link, useNavigate } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
-import { useSelector, useDispatch } from 'react-redux'
+import { useSelector } from 'react-redux'
import { toast } from 'sonner'
import _isEmpty from 'lodash/isEmpty'
import _size from 'lodash/size'
import _keys from 'lodash/keys'
import { withAuthentication, auth } from 'hoc/protected'
-import { isSelfhosted, TITLE_SUFFIX, ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
+import { isSelfhosted, TITLE_SUFFIX } from 'redux/constants'
import { IProject } from 'redux/models/IProject'
import { createProject } from 'api'
import Input from 'ui/Input'
@@ -17,7 +17,6 @@ import Loader from 'ui/Loader'
import { trackCustom } from 'utils/analytics'
import routes from 'utils/routes'
import { useAppDispatch, StateType } from 'redux/store'
-import sagaActions from 'redux/sagas/actions'
import Select from 'ui/Select'
const MAX_NAME_LENGTH = 50
@@ -25,9 +24,7 @@ const MAX_NAME_LENGTH = 50
const DEFAULT_PROJECT_NAME = 'Untitled Project'
const NewProject = () => {
- const { dashboardPaginationPage } = useSelector((state: StateType) => state.ui.projects)
const dispatch = useAppDispatch()
- const _dispatch = useDispatch()
const { user, loading } = useSelector((state: StateType) => state.auth)
const { t } = useTranslation('common')
const navigate = useNavigate()
@@ -78,8 +75,6 @@ const NewProject = () => {
trackCustom('PROJECT_CREATED')
navigate(routes.dashboard)
toast.success(t('project.settings.created'))
-
- _dispatch(sagaActions.loadProjects(dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARD))
} catch (reason: any) {
toast.error(reason)
} finally {
diff --git a/web/app/pages/Project/ProjectProtectedPassword/index.tsx b/web/app/pages/Project/ProjectProtectedPassword/index.tsx
index baf4efc99..2ae63aada 100644
--- a/web/app/pages/Project/ProjectProtectedPassword/index.tsx
+++ b/web/app/pages/Project/ProjectProtectedPassword/index.tsx
@@ -1,5 +1,5 @@
import React, { useState, useEffect, memo } from 'react'
-import { Link, useNavigate, useParams } from '@remix-run/react'
+import { Link, useNavigate } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import _keys from 'lodash/keys'
import _isEmpty from 'lodash/isEmpty'
@@ -14,6 +14,7 @@ import { useDispatch } from 'react-redux'
import UIActions from 'redux/reducers/ui'
import Header from 'components/Header'
import Footer from 'components/Footer'
+import { useRequiredParams } from 'hooks/useRequiredParams'
interface IProjectProtectedPasswordForm {
password: string
@@ -21,15 +22,13 @@ interface IProjectProtectedPasswordForm {
const MAX_PASSWORD_LENGTH = 80
-const ProjectProtectedPassword = ({
- ssrTheme,
- embedded,
- isAuth,
-}: {
+interface ProjectProtectedPasswordProps {
ssrTheme: 'light' | 'dark'
embedded: boolean
isAuth: boolean
-}): JSX.Element => {
+}
+
+const ProjectProtectedPassword = ({ ssrTheme, embedded, isAuth }: ProjectProtectedPasswordProps) => {
const { t } = useTranslation('common')
const [form, setForm] = useState<IProjectProtectedPasswordForm>({
password: '',
@@ -38,7 +37,7 @@ const ProjectProtectedPassword = ({
const [errors, setErrors] = useState<{
password?: string
}>({})
- const { id } = useParams()
+ const { id } = useRequiredParams<{ id: string }>()
const [beenSubmitted, setBeenSubmitted] = useState(false)
const [isLoading, setIsLoading] = useState(false)
const navigate = useNavigate()
@@ -70,17 +69,17 @@ const ProjectProtectedPassword = ({
const onSubmit = async (data: IProjectProtectedPasswordForm) => {
if (!isLoading) {
setIsLoading(true)
- await checkPassword(id as string, data.password)
+ await checkPassword(id, data.password)
.then((res) => {
if (res) {
dispatch(
- UIActions.setProjectProtectedPassword({
- id: id as string,
+ UIActions.setProjectPassword({
+ id,
password: data.password,
}),
)
navigate({
- pathname: _replace(routes.project, ':id', id as string),
+ pathname: _replace(routes.project, ':id', id),
search: `?embedded=${embedded}&theme=${ssrTheme}`,
})
}
@@ -147,7 +146,7 @@ const ProjectProtectedPassword = ({
</div>
</form>
</div>
- {!embedded && <Footer authenticated={isAuth} minimal />}
+ {!embedded && <Footer authenticated={isAuth} />}
</>
)
}
diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsx
index 98da0efbf..0f69add56 100644
--- a/web/app/pages/Project/Settings/People/People.tsx
+++ b/web/app/pages/Project/Settings/People/People.tsx
@@ -7,7 +7,6 @@ import cx from 'clsx'
import dayjs from 'dayjs'
import _keys from 'lodash/keys'
import _isEmpty from 'lodash/isEmpty'
-import _filter from 'lodash/filter'
import _map from 'lodash/map'
import { deleteShareProjectUsers, shareProject, changeShareRole } from 'api'
@@ -22,8 +21,7 @@ import useOnClickOutside from 'hooks/useOnClickOutside'
import { IProject, IShareOwnerProject } from 'redux/models/IProject'
import { Role } from 'redux/models/Organisation'
import { useSelector } from 'react-redux'
-import { StateType, useAppDispatch } from 'redux/store'
-import UIActions from 'redux/reducers/ui'
+import { StateType } from 'redux/store'
const NoPeople = () => {
const { t } = useTranslation('common')
@@ -40,14 +38,11 @@ const NoPeople = () => {
interface UsersListProps {
data: IShareOwnerProject
onRemove: () => void
- share?: IShareOwnerProject[]
- pid: string
language: string
authedUserEmail: string | undefined
}
-const UsersList = ({ data, onRemove, share, pid, language, authedUserEmail }: UsersListProps) => {
- const dispatch = useAppDispatch()
+const UsersList = ({ data, onRemove, language, authedUserEmail }: UsersListProps) => {
const { t } = useTranslation('common')
const [open, setOpen] = useState(false)
const openRef = useRef<HTMLUListElement>(null)
@@ -56,19 +51,7 @@ const UsersList = ({ data, onRemove, share, pid, language, authedUserEmail }: Us
const changeRole = async (newRole: string) => {
try {
- const results = await changeShareRole(id, { role: newRole })
- const newShared: IShareOwnerProject[] = _map(share, (itShare) => {
- if (itShare.id === results.id) {
- return { ...results, user: itShare.user, role: newRole }
- }
- return itShare
- })
- dispatch(
- UIActions.setProjectsShareData({
- data: { share: newShared },
- id: pid,
- }),
- )
+ await changeShareRole(id, { role: newRole })
toast.success(t('apiNotifications.roleUpdated'))
} catch (reason) {
console.error(`[ERROR] Error while updating user's role: ${reason}`)
@@ -162,7 +145,6 @@ interface PeopleProps {
const People = ({ project }: PeopleProps) => {
const { isPaidTierUsed, user: currentUser } = useSelector((state: StateType) => state.auth)
- const dispatch = useAppDispatch()
const [showModal, setShowModal] = useState(false)
const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)
@@ -231,13 +213,7 @@ const People = ({ project }: PeopleProps) => {
setValidated(false)
try {
- const results = await shareProject(id, { email: form.email, role: form.role })
- dispatch(
- UIActions.setProjectsShareData({
- data: { share: results.share },
- id,
- }),
- )
+ await shareProject(id, { email: form.email, role: form.role })
toast.success(t('apiNotifications.userInvited'))
} catch (reason) {
console.error(`[ERROR] Error while inviting a user: ${reason}`)
@@ -281,16 +257,6 @@ const People = ({ project }: PeopleProps) => {
try {
await deleteShareProjectUsers(id, member.id)
- const newShared = _map(
- _filter(share, (s) => s.id !== member.id),
- (s) => s,
- )
- dispatch(
- UIActions.setProjectsShareData({
- data: { share: newShared },
- id,
- }),
- )
toast.success(t('apiNotifications.userRemoved'))
} catch (reason) {
console.error(`[ERROR] Error while deleting a user: ${reason}`)
@@ -352,8 +318,6 @@ const People = ({ project }: PeopleProps) => {
setShowDeleteModal(true)
}}
language={language}
- share={project.share}
- pid={id}
authedUserEmail={currentUser?.email}
/>
))}
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index d476c0ecd..2a5ea749b 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -294,7 +294,7 @@ const ProjectSettings = () => {
const [showProtected, setShowProtected] = useState(false)
const [isLoading, setIsLoading] = useState<boolean | null>(null)
- const [error, setError] = useState<any>(null)
+ const [error, setError] = useState<string | null>(null)
// for reset data via filters
const [activeFilter, setActiveFilter] = useState<string[]>([])
@@ -412,11 +412,6 @@ const ProjectSettings = () => {
setIsDeleting(true)
try {
await deleteProject(id)
- dispatch(
- UIActions.removeProject({
- pid: id,
- }),
- )
toast.success(t('project.settings.deleted'))
navigate(routes.dashboard)
} catch (reason: any) {
@@ -549,15 +544,6 @@ const ProjectSettings = () => {
isPasswordProtected: true,
})
- if (!_isEmpty(form.password) && !_isEmpty(form.id)) {
- dispatch(
- UIActions.setProjectProtectedPassword({
- id: form?.id || '',
- password: form?.password || '',
- }),
- )
- }
-
setForm((prev) => ({
...prev,
isPasswordProtected: true,
diff --git a/web/app/pages/Project/View/ViewProject.container.tsx b/web/app/pages/Project/View/ViewProject.container.tsx
deleted file mode 100644
index c7845f4a6..000000000
--- a/web/app/pages/Project/View/ViewProject.container.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { connect } from 'react-redux'
-import UIActions from 'redux/reducers/ui'
-import { StateType, AppDispatch } from 'redux/store'
-import { IProject } from 'redux/models/IProject'
-import { ISharedProject } from 'redux/models/ISharedProject'
-
-import ViewProject from './ViewProject'
-
-const mapStateToProps = (state: StateType) => {
- return {
- projects: state.ui.projects.projects,
- isLoading: state.ui.projects.isLoading,
- authLoading: state.auth.loading,
- cache: state.ui.cache.analytics,
- cachePerf: state.ui.cache.analyticsPerf,
- cacheFunnels: state.ui.cache.funnels,
- projectViewPrefs: state.ui.cache.projectViewPrefs,
- authenticated: state.auth.authenticated,
- timezone: state.auth.user.timezone,
- extensions: state.ui.misc.extensions,
- user: state.auth.user,
- projectTab: state.ui.projects.projectTab,
- customEventsPrefs: state.ui.cache.customEventsPrefs,
- liveStats: state.ui.projects.liveStats,
- password: state.ui.projects.password,
- theme: state.ui.theme.theme,
- }
-}
-
-const mapDispatchToProps = (dispatch: AppDispatch) => ({
- setProjectCache: (pid: string, data: any, key: string) => {
- dispatch(
- UIActions.setProjectCache({
- pid,
- key,
- data,
- }),
- )
- },
- setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[]) => {
- dispatch(
- UIActions.setProjectViewPrefs({
- pid,
- period,
- timeBucket,
- rangeDate,
- }),
- )
- },
- setProjectCachePerf: (pid: string, data: any, key: string) => {
- dispatch(
- UIActions.setProjectCachePerf({
- pid,
- data,
- key,
- }),
- )
- },
- setFunnelsCache: (pid: string, data: any, key: string) => {
- dispatch(
- UIActions.setFunnelsCache({
- pid,
- data,
- key,
- }),
- )
- },
- setPublicProject: (project: Partial<IProject | ISharedProject>) => {
- dispatch(
- UIActions.setPublicProject({
- project,
- }),
- )
- },
- setProjects: (project: Partial<IProject | ISharedProject>[]) => {
- dispatch(
- UIActions.setProjects({
- projects: project,
- }),
- )
- },
- updateProject: (pid: string, project: Partial<IProject | ISharedProject>) => {
- dispatch(
- UIActions.updateProject({
- pid,
- project,
- }),
- )
- },
- setLiveStatsForProject: (id: string, count: number) => {
- dispatch(
- UIActions.setLiveStatsProject({
- id,
- count,
- }),
- )
- },
- setProjectTab: (tabs: string) => {
- dispatch(UIActions.setProjectTab(tabs))
- },
- setProjectForcastCache: (pid: string, data: any, key: string) => {
- dispatch(
- UIActions.setProjectForecastCache({
- pid,
- data,
- key,
- }),
- )
- },
- setCustomEventsPrefs: (pid: string, data: any) => {
- dispatch(
- UIActions.setCustomEventsPrefs({
- pid,
- data,
- }),
- )
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(ViewProject)
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 6ac0ef872..71a3e2154 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -1,10 +1,8 @@
/* eslint-disable react-hooks/exhaustive-deps */
-/* eslint-disable react/no-unstable-nested-components, react/display-name */
import React, {
useState,
useEffect,
useMemo,
- memo,
useRef,
useCallback,
createContext,
@@ -14,7 +12,7 @@ import React, {
} from 'react'
import { ClientOnly } from 'remix-utils/client-only'
import useSize from 'hooks/useSize'
-import { useNavigate, Link, useSearchParams } from '@remix-run/react'
+import { useNavigate, Link, useSearchParams, useLoaderData } from '@remix-run/react'
import bb from 'billboard.js'
import {
ArrowDownTrayIcon,
@@ -61,8 +59,6 @@ import _truncate from 'lodash/truncate'
import _isString from 'lodash/isString'
import { toast } from 'sonner'
-import { withProjectProtected } from 'hoc/projectProtected'
-
import { periodToCompareDate } from 'utils/compareConvertDate'
import { getTimeFromSeconds, getStringFromTime, getLocaleDisplayName, nLocaleFormatter } from 'utils/generic'
@@ -104,17 +100,9 @@ import {
ERROR_PANELS_ORDER,
ERROR_PERIOD_PAIRS,
FUNNELS_PERIOD_PAIRS,
+ ThemeType,
} from 'redux/constants'
-import { IUser } from 'redux/models/IUser'
-import {
- IProject,
- ILiveStats,
- IFunnel,
- IAnalyticsFunnel,
- IOverallObject,
- IOverallPerformanceObject,
-} from 'redux/models/IProject'
-import { IProjectForShared, ISharedProject } from 'redux/models/ISharedProject'
+import { IProject, IFunnel, IAnalyticsFunnel, IOverallObject, IOverallPerformanceObject } from 'redux/models/IProject'
import { ICountryEntry } from 'redux/models/IEntry'
import Loader from 'ui/Loader'
import Dropdown from 'ui/Dropdown'
@@ -232,6 +220,9 @@ import { AIProcessedResponse, AIResponse } from './interfaces/ai'
import { useRequiredParams } from 'hooks/useRequiredParams'
import BrowserDropdown from './components/BrowserDropdown'
import OSDropdown from './components/OSDropdown'
+import { StateType, useAppDispatch } from 'redux/store'
+import UIActions from 'redux/reducers/ui'
+import { useSelector } from 'react-redux'
const SwetrixSDK = require('@swetrix/sdk')
const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32
@@ -275,85 +266,41 @@ export const useViewProjectContext = () => {
return context
}
-interface IViewProject {
- projects: IProject[]
- extensions: any
- isLoading: boolean
- cache: any
- cachePerf: any
- setProjectCache: (pid: string, data: any, key: string) => void
- projectViewPrefs: {
- [key: string]: {
- period: string
- timeBucket: string
- rangeDate?: Date[]
- }
- } | null
- setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[]) => void
- setPublicProject: (project: Partial<IProject | ISharedProject>) => void
- setLiveStatsForProject: (id: string, count: number) => void
- setProjectCachePerf: (pid: string, data: any, key: string) => void
- setProjectForcastCache: (pid: string, data: any, key: string) => void
- authenticated: boolean
- user: IUser
- timezone: string
- projectTab: string
- setProjectTab: (tab: string) => void
- // eslint-disable-next-line no-unused-vars, no-shadow
- setProjects: (projects: Partial<IProject | ISharedProject>[]) => void
- customEventsPrefs: any
- setCustomEventsPrefs: (pid: string, data: any) => void
- liveStats: ILiveStats
- password: {
- [key: string]: string
- }
- theme: 'dark' | 'light'
- ssrTheme: 'dark' | 'light'
- embedded: boolean
- ssrAuthenticated: boolean
- queryPassword: string | null
- authLoading: boolean
- cacheFunnels: any
- setFunnelsCache: (pid: string, data: any, key: string) => void
- updateProject: (pid: string, project: Partial<IProject | ISharedProject>) => void
- projectQueryTabs: string[]
-}
+const ViewProject = () => {
+ const dispatch = useAppDispatch()
+
+ const {
+ theme: ssrTheme,
+ embedded,
+ isAuth: ssrAuthenticated,
+ queryPassword,
+ tabs: projectQueryTabs,
+ } = useLoaderData<{
+ theme: ThemeType
+ embedded: boolean
+ isAuth: boolean
+ queryPassword: string | null
+ tabs: string[]
+ }>()
+
+ const {
+ analytics: cache,
+ analyticsPerf: cachePerf,
+ funnels: cacheFunnels,
+ projectViewPrefs,
+ customEventsPrefs,
+ } = useSelector((state: StateType) => state.ui.cache)
+
+ const { loading: authLoading, authenticated: csrAuthenticated, user } = useSelector((state: StateType) => state.auth)
+
+ const { theme } = useSelector((state: StateType) => state.ui.theme)
+
+ const { extensions } = useSelector((state: StateType) => state.ui.misc)
+
+ const { password } = useSelector((state: StateType) => state.ui.projects)
-const ViewProject = ({
- projects,
- isLoading: _isLoading,
- cache,
- cachePerf,
- setProjectCache,
- projectViewPrefs,
- setProjectViewPrefs,
- setPublicProject,
- setLiveStatsForProject,
- authenticated: csrAuthenticated,
- timezone = DEFAULT_TIMEZONE,
- user,
- extensions,
- setProjectCachePerf,
- projectTab,
- setProjectTab,
- setProjects,
- setProjectForcastCache,
- customEventsPrefs,
- setCustomEventsPrefs,
- liveStats,
- password,
- theme,
- ssrTheme,
- embedded,
- ssrAuthenticated,
- queryPassword,
- authLoading,
- cacheFunnels,
- setFunnelsCache,
- updateProject,
- projectQueryTabs,
-}: IViewProject) => {
const authenticated = isBrowser ? (authLoading ? ssrAuthenticated : csrAuthenticated) : ssrAuthenticated
+ const { timezone = DEFAULT_TIMEZONE } = user || {}
const {
t,
@@ -377,10 +324,8 @@ const ViewProject = ({
const [searchParams, setSearchParams] = useSearchParams()
- const project: IProjectForShared = useMemo(
- () => _find(projects, (p) => p.id === id) || ({} as IProjectForShared),
- [projects, id],
- )
+ const [project, setProject] = useState<IProject | null>(null)
+ const [liveVisitors, setLiveVisitors] = useState<number>(0)
const projectPassword = useMemo(
() => password[id] || (getItem(PROJECTS_PROTECTED)?.[id] as string) || queryPassword || '',
@@ -451,7 +396,6 @@ const ViewProject = ({
const [filtersSubError, setFiltersSubError] = useState<IFilter[]>([])
const [areFiltersSubErrorParsed, setAreFiltersSubErrorParsed] = useState(false)
- const isLoading = authenticated ? _isLoading : false
const tnMapping = typeNameMapping(t)
const refCalendar = useRef(null)
const refCalendarCompare = useRef(null)
@@ -466,7 +410,7 @@ const ViewProject = ({
return tab
}
- return projectTab || PROJECT_TABS.traffic
+ return PROJECT_TABS.traffic
})
const [isHotkeysHelpOpened, setIsHotkeysHelpOpened] = useState(false)
@@ -588,11 +532,9 @@ const ViewProject = ({
}
try {
- const funnels = await getFunnels(id, projectPassword)
+ await getFunnels(id, projectPassword)
- updateProject(id, {
- funnels,
- })
+ // TODO: Update project was here. Check if it's still needed
} catch (reason: any) {
console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)
}
@@ -616,11 +558,9 @@ const ViewProject = ({
}
try {
- const funnels = await getFunnels(id, projectPassword)
+ await getFunnels(id, projectPassword)
- updateProject(id, {
- funnels,
- })
+ // TODO: Update project was here. Check if it's still needed
} catch (reason: any) {
console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)
}
@@ -644,11 +584,9 @@ const ViewProject = ({
}
try {
- const funnels = await getFunnels(id, projectPassword)
+ await getFunnels(id, projectPassword)
- updateProject(id, {
- funnels,
- })
+ // TODO: Update project was here. Check if it's still needed
} catch (reason: any) {
console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)
}
@@ -729,10 +667,13 @@ const ViewProject = ({
const pgPanelNameMapping = [tnMapping.pg, tnMapping.userFlow]
- const { name } = project
-
useEffect(() => {
- let pageTitle = user?.showLiveVisitorsInTitle ? `πŸ‘€ ${liveStats[id]} - ${name}` : name
+ if (!project) {
+ // TODO: Probably should display something like "Loading..."
+ return
+ }
+
+ let pageTitle = user?.showLiveVisitorsInTitle ? `πŸ‘€ ${liveVisitors} - ${project.name}` : project.name
if (!pageTitle) {
pageTitle = t('titles.main')
@@ -741,7 +682,7 @@ const ViewProject = ({
pageTitle += ` ${TITLE_SUFFIX}`
document.title = pageTitle
- }, [name, user, liveStats, id, t])
+ }, [project, user, liveVisitors, t])
const timeBucketSelectorItems = useMemo(() => {
if (activeTab === PROJECT_TABS.errors) {
@@ -938,7 +879,7 @@ const ViewProject = ({
[t],
)
- const allowedToManage = project.role === 'owner' || project.role === 'admin'
+ const allowedToManage = project?.role === 'owner' || project?.role === 'admin'
const dataNamesFunnel = useMemo(
() => ({
@@ -948,8 +889,9 @@ const ViewProject = ({
[t],
)
+ // @ts-expect-error
const tabs: {
- id: string
+ id: keyof typeof PROJECT_TABS | 'settings'
label: string
icon: any
}[] = useMemo(() => {
@@ -1079,7 +1021,7 @@ const ViewProject = ({
setErrorStatusUpdating(true)
try {
- await updateErrorStatus(project.id, 'resolved', activeEID)
+ await updateErrorStatus(id, 'resolved', activeEID)
await loadError(activeEID)
updateStatusInErrors('resolved')
} catch (reason) {
@@ -1101,7 +1043,7 @@ const ViewProject = ({
setErrorStatusUpdating(true)
try {
- await updateErrorStatus(project.id, 'active', activeEID)
+ await updateErrorStatus(id, 'active', activeEID)
await loadError(activeEID)
updateStatusInErrors('active')
} catch (reason) {
@@ -1191,7 +1133,12 @@ const ViewProject = ({
const events = data?.chart ? data.chart.events : customEventsChartData
- setCustomEventsPrefs(id, events)
+ dispatch(
+ UIActions.setCustomEventsPrefs({
+ pid: id,
+ data: events,
+ }),
+ )
const applyRegions = !_includes(noRegionPeriods, activePeriod?.period)
const bbSettings = getSettings(
@@ -1239,7 +1186,7 @@ const ViewProject = ({
newFilters: IFilter[] | null = null,
newMetrics: IProjectViewCustomEvent[] | null = null,
) => {
- if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {
+ if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {
return
}
@@ -1328,8 +1275,14 @@ const ViewProject = ({
}
}
- // @ts-expect-error
- setProjectCache(id, dataCompare, keyCompare)
+ dispatch(
+ UIActions.setProjectCache({
+ pid: id,
+ // @ts-expect-error
+ data: dataCompare,
+ key: keyCompare,
+ }),
+ )
}
if (dateRange) {
@@ -1399,11 +1352,22 @@ const ViewProject = ({
customEventsChart = customEventsChart?.chart ? customEventsChart.chart.events : customEventsChartData
- setCustomEventsPrefs(id, customEventsChart)
+ dispatch(
+ UIActions.setCustomEventsPrefs({
+ pid: id,
+ data: customEventsChart,
+ }),
+ )
data.overall = rawOverall[id]
- setProjectCache(id, data, key)
+ dispatch(
+ UIActions.setProjectCache({
+ pid: id,
+ data,
+ key,
+ }),
+ )
setOverall(rawOverall[id])
}
@@ -1796,7 +1760,7 @@ const ViewProject = ({
}
const loadAnalyticsPerf = async (forced = false, newFilters: any[] | null = null) => {
- if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {
+ if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {
return
}
@@ -1897,7 +1861,13 @@ const ViewProject = ({
}
}
- setProjectCachePerf(id, dataCompare || {}, keyCompare)
+ dispatch(
+ UIActions.setProjectCachePerf({
+ pid: id,
+ data: dataCompare || {},
+ key: keyCompare,
+ }),
+ )
}
if (dateRange) {
@@ -1953,7 +1923,13 @@ const ViewProject = ({
// @ts-expect-error
dataPerf.overall = rawOverall[id]
- setProjectCachePerf(id, dataPerf || {}, key)
+ dispatch(
+ UIActions.setProjectCachePerf({
+ pid: id,
+ data: dataPerf || {},
+ key,
+ }),
+ )
setOverallPerformance(rawOverall[id])
}
@@ -2050,7 +2026,7 @@ const ViewProject = ({
return
}
- if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {
+ if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {
return
}
@@ -2080,7 +2056,13 @@ const ViewProject = ({
dataFunnel = await getFunnelData(id, period, '', '', timezone, activeFunnel.id, projectPassword)
}
- setFunnelsCache(id, dataFunnel || {}, key)
+ dispatch(
+ UIActions.setFunnelsCache({
+ pid: id,
+ data: dataFunnel || {},
+ key,
+ }),
+ )
}
const { funnel, totalPageviews } = dataFunnel
@@ -2102,7 +2084,13 @@ const ViewProject = ({
setDataLoading(false)
if (key) {
- setFunnelsCache(id, {}, key)
+ dispatch(
+ UIActions.setFunnelsCache({
+ pid: id,
+ data: {},
+ key,
+ }),
+ )
}
console.error('[ERROR](loadFunnelsData) Loading funnels data failed:', reason)
@@ -2115,12 +2103,11 @@ const ViewProject = ({
dataLoading,
dateRange,
id,
- isLoading,
+ authLoading,
period,
project,
projectPassword,
timezone,
- setFunnelsCache,
t,
dataNamesFunnel,
],
@@ -2367,7 +2354,7 @@ const ViewProject = ({
}, [arePeriodParsed])
const refreshStats = async () => {
- if (!isLoading && !dataLoading) {
+ if (!authLoading && !dataLoading) {
if (activeTab === PROJECT_TABS.performance) {
loadAnalyticsPerf(true)
return
@@ -2405,7 +2392,7 @@ const ViewProject = ({
}
const onForecastOpen = () => {
- if (isLoading || dataLoading || isSelfhosted) {
+ if (authLoading || dataLoading || isSelfhosted) {
return
}
@@ -2430,7 +2417,13 @@ const ViewProject = ({
try {
const result = await getChartPrediction(chartData, periodToForecast, timeBucket)
const transformed = transformAIChartData(result)
- setProjectForcastCache(id, transformed, key)
+ dispatch(
+ UIActions.setProjectForecastCache({
+ pid: id,
+ data: transformed,
+ key,
+ }),
+ )
setForecasedChartData(transformed)
} catch (reason) {
console.error(`[forecastChart] Error: ${reason}`)
@@ -2439,7 +2432,7 @@ const ViewProject = ({
const forecastDetails = async () => {
try {
- const data = await getDetailsPrediction(project.id, projectPassword)
+ const data = await getDetailsPrediction(id, projectPassword)
if (_isEmpty(data)) {
throw new Error('getDetailsPrediction returned an empty object')
@@ -2516,7 +2509,7 @@ const ViewProject = ({
useEffect(() => {
if (activeTab === PROJECT_TABS.traffic) {
if (
- (!isLoading && !_isEmpty(chartData) && !_isEmpty(mainChart)) ||
+ (!authLoading && !_isEmpty(chartData) && !_isEmpty(mainChart)) ||
(isActiveCompare && !_isEmpty(dataChartCompare) && !_isEmpty(mainChart))
) {
if (
@@ -2577,7 +2570,7 @@ const ViewProject = ({
})
}
}
- } else if (!isLoading && !_isEmpty(chartDataPerf) && !_isEmpty(mainChart)) {
+ } else if (!authLoading && !_isEmpty(chartDataPerf) && !_isEmpty(mainChart)) {
const bbSettings = getSettingsPerf(
chartDataPerf,
timeBucket,
@@ -2594,7 +2587,7 @@ const ViewProject = ({
return generate
})
}
- }, [isLoading, activeChartMetrics, chartData, chartDataPerf, activeChartMetricsPerf, dataChartCompare]) // eslint-disable-line
+ }, [authLoading, activeChartMetrics, chartData, chartDataPerf, activeChartMetricsPerf, dataChartCompare]) // eslint-disable-line
useEffect(() => {
let sdk: any | null = null
@@ -2697,7 +2690,7 @@ const ViewProject = ({
return
}
- const { active: isActive, created, public: isPublic } = project
+ const { active: isActive, created, public: isPublic, name } = project
sdkInstance?._emitEvent('projectinfo', {
id,
@@ -2706,7 +2699,7 @@ const ViewProject = ({
created,
isPublic,
})
- }, [sdkInstance, name]) // eslint-disable-line
+ }, [sdkInstance, project]) // eslint-disable-line
useEffect(() => {
setPeriodPairs(tbPeriodPairs(t, undefined, undefined, language))
@@ -2747,7 +2740,15 @@ const ViewProject = ({
setPeriodPairs(tbPeriodPairs(t, timeBucketToDays[index].tb, dates, language))
setPeriod('custom')
- setProjectViewPrefs(id, 'custom', timeBucketToDays[index].tb[0], dates)
+
+ dispatch(
+ UIActions.setProjectViewPrefs({
+ pid: id,
+ period: 'custom',
+ timeBucket: timeBucketToDays[index].tb[0],
+ rangeDate: dates,
+ }),
+ )
setCanLoadMoreSessions(false)
resetSessions()
@@ -2881,36 +2882,38 @@ const ViewProject = ({
}, [dateRange, t, arePeriodParsed]) // eslint-disable-line
useEffect(() => {
+ if (!project || project.isLocked) {
+ return
+ }
+
const updateLiveVisitors = async () => {
const { id: pid } = project
const result = await getLiveVisitors([pid], projectPassword)
- setLiveStatsForProject(pid, result[pid])
+ setLiveVisitors(result[pid])
}
- let interval: any = null
- if (project.uiHidden) {
- updateLiveVisitors()
- interval = setInterval(async () => {
- await updateLiveVisitors()
- }, LIVE_VISITORS_UPDATE_INTERVAL)
- }
+ updateLiveVisitors()
+
+ const interval = setInterval(async () => {
+ await updateLiveVisitors()
+ }, LIVE_VISITORS_UPDATE_INTERVAL)
return () => clearInterval(interval)
- }, [project.id, setLiveStatsForProject]) // eslint-disable-line react-hooks/exhaustive-deps
+ }, [project, projectPassword])
useEffect(() => {
- if (isLoading || !_isEmpty(project)) {
+ if (authLoading || !_isEmpty(project)) {
return
}
getProject(id, projectPassword)
- .then((projectRes) => {
- if (_isEmpty(projectRes)) {
+ .then((result) => {
+ if (_isEmpty(result)) {
onErrorLoading()
}
- if (projectRes.isPasswordProtected && !projectRes.role && _isEmpty(projectPassword)) {
+ if (result.isPasswordProtected && !result.role && _isEmpty(projectPassword)) {
navigate({
pathname: _replace(routes.project_protected_password, ':id', id),
search: `?theme=${ssrTheme}&embedded=${embedded}`,
@@ -2918,31 +2921,13 @@ const ViewProject = ({
return
}
- if ((projectRes.isPublic || projectRes?.isPasswordProtected) && !projectRes.role) {
- setPublicProject(projectRes)
- } else {
- // TODO: Check, do we really need to add this project to the projects list?
- setProjects([...(projects as any[]), projectRes])
-
- if (projectRes.isLocked) {
- return
- }
-
- getLiveVisitors([id], projectPassword)
- .then((res) => {
- setLiveStatsForProject(id, res[id])
- })
- .catch((e) => {
- console.error('[ERROR] (getProject -> getLiveVisitors)', e)
- onErrorLoading()
- })
- }
+ setProject(result)
})
.catch((reason) => {
console.error('[ERROR] (getProject)', reason)
onErrorLoading()
})
- }, [isLoading, project, id, setPublicProject]) // eslint-disable-line
+ }, [authLoading, project, id]) // eslint-disable-line
const updatePeriod = (newPeriod: { period: string; label?: string }) => {
if (period === newPeriod.period) {
@@ -2963,7 +2948,13 @@ const ViewProject = ({
searchParams.delete('from')
searchParams.delete('to')
searchParams.set('period', newPeriod.period)
- setProjectViewPrefs(id, newPeriod.period, tb)
+ dispatch(
+ UIActions.setProjectViewPrefs({
+ pid: id,
+ period: newPeriod.period,
+ timeBucket: tb,
+ }),
+ )
setPeriod(newPeriod.period)
setCanLoadMoreSessions(false)
@@ -2986,7 +2977,14 @@ const ViewProject = ({
searchParams.set('timeBucket', newTimebucket)
setSearchParams(searchParams)
setTimebucket(newTimebucket)
- setProjectViewPrefs(id, period, newTimebucket, dateRange as Date[])
+ dispatch(
+ UIActions.setProjectViewPrefs({
+ pid: id,
+ period,
+ timeBucket: newTimebucket,
+ rangeDate: dateRange as Date[],
+ }),
+ )
sdkInstance?._emitEvent('timeupdate', {
period,
timeBucket: newTimebucket,
@@ -3008,16 +3006,12 @@ const ViewProject = ({
navigate(_replace(routes.project_settings, ':id', id))
}
+ // TODO: What the fuck is this?
useEffect(() => {
try {
const intialPeriod = projectViewPrefs
? searchParams.get('period') || projectViewPrefs[id]?.period
: searchParams.get('period') || '7d'
- const tab = searchParams.get('tab')
-
- if (tab === PROJECT_TABS.performance) {
- setProjectTab(PROJECT_TABS.performance)
- }
if (!_includes(validPeriods, intialPeriod)) {
return
@@ -3183,7 +3177,6 @@ const ViewProject = ({
return
}
- setProjectTab(tab)
setActiveTab(tab)
})
@@ -3240,8 +3233,7 @@ const ViewProject = ({
return
}
- setProjectTab(item?.id)
- setActiveTab(item?.id)
+ setActiveTab(item?.id as keyof typeof PROJECT_TABS)
}}
title={activeTabLabel}
capitalise
@@ -3251,21 +3243,19 @@ const ViewProject = ({
<nav className='-mb-px flex space-x-4 overflow-x-auto' aria-label='Tabs'>
{_map(tabs, (tab) => {
const isCurrent = tab.id === activeTab
- const isSettings = tab.id === 'settings'
const handleClick = (e: React.MouseEvent) => {
- if (isSettings) {
+ if (tab.id === 'settings') {
return
}
e.preventDefault()
- setProjectTab(tab.id)
setActiveTab(tab.id)
}
const currentUrl = new URL(window.location.href)
currentUrl.searchParams.set('tab', tab.id)
- const tabUrl = isSettings ? _replace(routes.project_settings, ':id', id) : currentUrl.toString()
+ const tabUrl = tab.id === 'settings' ? _replace(routes.project_settings, ':id', id) : currentUrl.toString()
return (
<Link
@@ -3328,7 +3318,7 @@ const ViewProject = ({
</div>
)
- if (isLoading) {
+ if (authLoading || !project) {
return (
<>
{!embedded && <Header ssrTheme={ssrTheme} authenticated={authenticated} />}
@@ -3340,7 +3330,7 @@ const ViewProject = ({
>
<Loader />
</div>
- {!embedded && <Footer authenticated={authenticated} minimal />}
+ {!embedded && <Footer authenticated={authenticated} />}
</>
)
}
@@ -3357,11 +3347,11 @@ const ViewProject = ({
>
<TabsSelector />
<h2 className='mt-2 break-words break-all text-center text-xl font-bold text-gray-900 dark:text-gray-50 sm:text-left'>
- {name}
+ {project.name}
</h2>
<LockedDashboard user={user} project={project} />
</div>
- {!embedded && <Footer authenticated={authenticated} minimal />}
+ {!embedded && <Footer authenticated={authenticated} />}
</>
)
}
@@ -3378,11 +3368,11 @@ const ViewProject = ({
>
<TabsSelector />
<h2 className='mt-2 break-words break-all text-center text-xl font-bold text-gray-900 dark:text-gray-50 sm:text-left'>
- {name}
+ {project.name}
</h2>
<WaitingForAnEvent project={project} />
</div>
- {!embedded && <Footer authenticated={authenticated} minimal />}
+ {!embedded && <Footer authenticated={authenticated} />}
</>
)
}
@@ -3403,11 +3393,11 @@ const ViewProject = ({
>
<TabsSelector />
<h2 className='mt-2 break-words break-all text-center text-xl font-bold text-gray-900 dark:text-gray-50 sm:text-left'>
- {name}
+ {project.name}
</h2>
<WaitingForAnError />
</div>
- {!embedded && <Footer authenticated={authenticated} minimal />}
+ {!embedded && <Footer authenticated={authenticated} />}
</>
)
}
@@ -3422,7 +3412,7 @@ const ViewProject = ({
projectPassword,
timezone,
dateRange,
- isLoading,
+ isLoading: authLoading,
timeBucket,
period,
activePeriod,
@@ -3486,7 +3476,7 @@ const ViewProject = ({
<div className='flex flex-wrap items-center space-x-5'>
<h2 className='break-words break-all text-xl font-bold text-gray-900 dark:text-gray-50'>
{/* If tab is funnels - then display a funnel name, otherwise a project name */}
- {activeTab === PROJECT_TABS.funnels ? activeFunnel?.name : name}
+ {activeTab === PROJECT_TABS.funnels ? activeFunnel?.name : project.name}
</h2>
{activeTab !== PROJECT_TABS.funnels && (
<LiveVisitorsDropdown
@@ -3494,7 +3484,7 @@ const ViewProject = ({
setActiveTab(PROJECT_TABS.sessions)
setActivePSID(psid)
}}
- live={liveStats[id]}
+ live={liveVisitors}
/>
)}
</div>
@@ -3509,7 +3499,7 @@ const ViewProject = ({
className={cx(
'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',
{
- 'cursor-not-allowed opacity-50': isLoading || dataLoading,
+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,
},
)}
>
@@ -3530,7 +3520,8 @@ const ViewProject = ({
className={cx(
'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',
{
- 'cursor-not-allowed opacity-50': isLoading || dataLoading || !_isEmpty(filters),
+ 'cursor-not-allowed opacity-50':
+ authLoading || dataLoading || !_isEmpty(filters),
'!border !border-gray-300 !bg-gray-200 dark:!border-gray-500 dark:!bg-gray-600':
!_isEmpty(forecasedChartData),
},
@@ -3546,6 +3537,7 @@ const ViewProject = ({
)}
<div
className={cx('border-gray-200 dark:border-gray-600', {
+ // @ts-expect-error
'lg:border-r': activeTab === PROJECT_TABS.funnels,
hidden: activeTab === PROJECT_TABS.errors && activeError,
})}
@@ -3557,7 +3549,7 @@ const ViewProject = ({
className={cx(
'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',
{
- 'cursor-not-allowed opacity-50': isLoading || dataLoading,
+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,
},
)}
>
@@ -3836,7 +3828,7 @@ const ViewProject = ({
disabled={errorStatusUpdating}
onClick={markErrorAsResolved}
className={cx('p-2 text-sm font-medium text-gray-700 dark:text-gray-50', {
- 'cursor-not-allowed': isLoading || errorLoading,
+ 'cursor-not-allowed': authLoading || errorLoading,
'opacity-50': errorLoading && !errorStatusUpdating,
'animate-pulse cursor-not-allowed': errorStatusUpdating,
})}
@@ -3853,7 +3845,7 @@ const ViewProject = ({
disabled={errorStatusUpdating}
onClick={markErrorAsActive}
className={cx('p-2 text-sm font-medium text-gray-700 dark:text-gray-50', {
- 'cursor-not-allowed': isLoading || errorLoading,
+ 'cursor-not-allowed': authLoading || errorLoading,
'opacity-50': errorLoading && !errorStatusUpdating,
'animate-pulse cursor-not-allowed': errorStatusUpdating,
})}
@@ -3895,7 +3887,7 @@ const ViewProject = ({
className={cx(
'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',
{
- 'cursor-not-allowed opacity-50': isLoading || dataLoading,
+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,
},
)}
>
@@ -3955,6 +3947,7 @@ const ViewProject = ({
title={activePeriod?.label}
onSelect={(pair) => {
if (pair.period === PERIOD_PAIRS_COMPARE.COMPARE) {
+ // @ts-expect-error
if (activeTab === PROJECT_TABS.alerts) {
return
}
@@ -5077,7 +5070,7 @@ const ViewProject = ({
pid={id}
tnMapping={tnMapping}
/>
- {!embedded && <Footer authenticated={authenticated} minimal showDBIPMessage />}
+ {!embedded && <Footer authenticated={authenticated} showDBIPMessage />}
</>
</ViewProjectContext.Provider>
)}
@@ -5085,4 +5078,4 @@ const ViewProject = ({
)
}
-export default memo(withProjectProtected(ViewProject))
+export default ViewProject
diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsx
index e48dd48f4..29e44eef0 100644
--- a/web/app/pages/Project/View/components/InteractiveMap.tsx
+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx
@@ -5,12 +5,11 @@ import _reduce from 'lodash/reduce'
import { useTranslation } from 'react-i18next'
import countries from 'utils/isoCountries'
import { PROJECT_TABS } from 'redux/constants'
-import { StateType } from 'redux/store'
import { getTimeFromSeconds, getStringFromTime, nFormatter } from 'utils/generic'
import { IEntry } from 'redux/models/IEntry'
import countriesList from 'utils/countries'
-import { useSelector } from 'react-redux'
+import { useSearchParams } from '@remix-run/react'
interface IInteractiveMap {
data: IEntry[]
@@ -37,6 +36,7 @@ const InteractiveMap = ({ data, onClickCountry, total }: IInteractiveMap) => {
t,
i18n: { language },
} = useTranslation('common')
+ const [searchParams] = useSearchParams()
const [hoverShow, setHoverShow] = useState(false)
const [dataHover, setDataHover] = useState<IDataHover>({} as IDataHover)
const [cursorPosition, setCursorPosition] = useState<ICursorPosition>({} as ICursorPosition)
@@ -45,8 +45,7 @@ const InteractiveMap = ({ data, onClickCountry, total }: IInteractiveMap) => {
[data],
)
- const projectTab = useSelector((state: StateType) => state.ui.projects.projectTab)
- const isTrafficTab = projectTab === PROJECT_TABS.traffic
+ const isTrafficTab = searchParams.get('tab') === PROJECT_TABS.traffic
const onMouseMove = (e: React.MouseEvent<SVGSVGElement, MouseEvent>) => {
const rect = e.currentTarget.getBoundingClientRect()
diff --git a/web/app/pages/Project/View/index.tsx b/web/app/pages/Project/View/index.tsx
index 9bb6ff2df..9a05d0255 100644
--- a/web/app/pages/Project/View/index.tsx
+++ b/web/app/pages/Project/View/index.tsx
@@ -1,3 +1,3 @@
-import ViewProject from './ViewProject.container'
+import ViewProject from './ViewProject'
export default ViewProject
diff --git a/web/app/pages/UserSettings/components/ProjectList.tsx b/web/app/pages/UserSettings/components/ProjectList.tsx
index f85807583..0f63bbec3 100644
--- a/web/app/pages/UserSettings/components/ProjectList.tsx
+++ b/web/app/pages/UserSettings/components/ProjectList.tsx
@@ -11,7 +11,6 @@ import { rejectProjectShare, acceptProjectShare } from 'api'
import { ISharedProject } from 'redux/models/ISharedProject'
import { StateType, useAppDispatch } from 'redux/store'
import { authActions } from 'redux/reducers/auth'
-import UIActions from 'redux/reducers/ui'
import { useSelector } from 'react-redux'
interface ProjectListProps {
@@ -37,11 +36,6 @@ const ProjectList = ({ item }: ProjectListProps) => {
sharedProjects: _filter(user.sharedProjects, (share) => share.id !== item.id),
}),
)
- dispatch(
- UIActions.removeProject({
- pid: project.id,
- }),
- )
toast.success(t('apiNotifications.quitProject'))
} catch (reason) {
console.error(`[ERROR] Error while quitting project: ${reason}`)
@@ -53,13 +47,6 @@ const ProjectList = ({ item }: ProjectListProps) => {
try {
await acceptProjectShare(id)
- dispatch(
- UIActions.setProjectsShareData({
- data: { isAccessConfirmed: true },
- id: project.id,
- }),
- )
-
dispatch(
authActions.mergeUser({
sharedProjects: _map(user.sharedProjects, (item) => {
diff --git a/web/app/redux/reducers/ui/alerts.ts b/web/app/redux/reducers/ui/alerts.ts
deleted file mode 100644
index 42318f9c0..000000000
--- a/web/app/redux/reducers/ui/alerts.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { IAlerts } from 'redux/models/IAlerts'
-
-interface IInitialState {
- alerts: IAlerts[]
- total: number
- pageTotal: number
- loading: boolean
-}
-
-const initialState: IInitialState = {
- alerts: [],
- total: 0,
- pageTotal: 0,
- loading: false,
-}
-
-const alertsSlice = createSlice({
- name: 'alerts',
- initialState,
- reducers: {
- setProjectAlerts(state, action: PayloadAction<IAlerts[]>) {
- state.alerts = action.payload
- },
- setProjectAlertsTotal(state, { payload }: PayloadAction<{ total: number; pageTotal?: number }>) {
- state.total = payload.total
- state.pageTotal = payload.pageTotal || state.pageTotal
- },
- setProjectAlertsLoading(state, { payload }: PayloadAction<boolean>) {
- state.loading = payload
- },
- },
-})
-
-export const alertsActions = alertsSlice.actions
-
-export default alertsSlice.reducer
diff --git a/web/app/redux/reducers/ui/index.ts b/web/app/redux/reducers/ui/index.ts
index 864113fd8..f57cdbe04 100644
--- a/web/app/redux/reducers/ui/index.ts
+++ b/web/app/redux/reducers/ui/index.ts
@@ -1,4 +1,3 @@
-import { alertsActions } from './alerts'
import { cacheActions } from './cache'
import { miscActions } from './misc'
import { projectsActions } from './projects'
@@ -6,7 +5,6 @@ import { themeActions } from './theme'
import { monitorActions } from './monitors'
const UIActions = {
- ...alertsActions,
...cacheActions,
...miscActions,
...projectsActions,
diff --git a/web/app/redux/reducers/ui/projects.ts b/web/app/redux/reducers/ui/projects.ts
index d3fe71860..5770e833a 100644
--- a/web/app/redux/reducers/ui/projects.ts
+++ b/web/app/redux/reducers/ui/projects.ts
@@ -1,43 +1,16 @@
-import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'
-import _filter from 'lodash/filter'
-import _findIndex from 'lodash/findIndex'
-import _map from 'lodash/map'
-import { PROJECT_TABS, PROJECTS_PROTECTED } from 'redux/constants'
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { PROJECTS_PROTECTED } from 'redux/constants'
import { setItem, getItem } from 'utils/localstorage'
-import { IProject, ILiveStats, IOverall, IOverallObject } from 'redux/models/IProject'
-import { IAlerts } from 'redux/models/IAlerts'
-interface IInitialState {
- projects: IProject[]
- birdseye: {
- [key: string]: IOverallObject
- }
- isLoading: boolean
- error: null | string
+interface InitialState {
totalMonthlyEvents: number | null
- total: number
- dashboardPaginationPage: number
- projectTab: string
- alerts: IAlerts[]
- subscribers: any[]
- liveStats: ILiveStats
password: {
[key: string]: string
}
}
-const initialState: IInitialState = {
- projects: [],
- birdseye: {},
- isLoading: true,
- error: null,
+const initialState: InitialState = {
totalMonthlyEvents: null,
- total: 0,
- dashboardPaginationPage: 1,
- projectTab: PROJECT_TABS.traffic,
- alerts: [],
- subscribers: [],
- liveStats: {},
password: getItem(PROJECTS_PROTECTED) || {},
}
@@ -45,99 +18,10 @@ const projectsSlice = createSlice({
name: 'projects',
initialState,
reducers: {
- setProjects(
- state,
- {
- payload,
- }: PayloadAction<{
- projects: Partial<IProject>[]
- }>,
- ) {
- state.isLoading = false
- state.projects = payload.projects as IProject[]
- },
- updateProject(state, { payload }: PayloadAction<{ project: Partial<IProject>; pid: string }>) {
- const { pid, project } = payload
-
- state.projects = _map(current(state.projects), (res) => {
- if (res.id === pid) {
- return {
- ...res,
- ...project,
- }
- }
- return res
- })
- },
- setDashboardPaginationPage(state, { payload }: PayloadAction<number>) {
- state.dashboardPaginationPage = payload
- },
setTotalMonthlyEvents(state, { payload }: PayloadAction<number>) {
state.totalMonthlyEvents = payload
},
- setTotal(state, { payload }: PayloadAction<{ total: number }>) {
- state.total = payload.total
- },
- setLiveStats(state, { payload }: PayloadAction<{ data: any }>) {
- const { data } = payload
-
- state.liveStats = {
- ...state.liveStats,
- ...data,
- }
- },
- setLiveStatsProject(state, { payload }: PayloadAction<{ id: string; count: number }>) {
- const { id, count } = payload
-
- state.liveStats = {
- ...state.liveStats,
- [id]: count,
- }
- },
- setPublicProject(state, { payload }: PayloadAction<{ project: Partial<IProject> }>) {
- const { project } = payload
-
- state.projects =
- _findIndex(current(state.projects), (el) => el.id === project.id) >= 0
- ? state.projects
- : [
- ...state.projects,
- {
- ...(project as IProject),
- uiHidden: true,
- },
- ]
- },
- setProjectsShareData(state, { payload }: PayloadAction<{ data: Partial<IProject>; id: string }>) {
- const { data, id } = payload
-
- state.projects = _map(current(state.projects), (res) => {
- if (res.id === id) {
- return {
- ...res,
- ...data,
- }
- }
- return res
- })
- },
- setProjectsError(state, { payload }: PayloadAction<string>) {
- state.error = payload
- },
- removeProject(state, { payload }: PayloadAction<{ pid: string }>) {
- const { pid } = payload
-
- state.projects = _filter(state.projects, (project) => project.id !== pid)
- state.total -= 1
- },
- setProjectsLoading(state, { payload }: PayloadAction<{ isLoading: boolean }>) {
- const { isLoading } = payload
- state.isLoading = isLoading
- },
- setProjectTab(state, { payload }: PayloadAction<string>) {
- state.projectTab = payload
- },
- setProjectProtectedPassword: (state, { payload }: PayloadAction<{ id: string; password: string }>) => {
+ setProjectPassword: (state, { payload }: PayloadAction<{ id: string; password: string }>) => {
const { id, password } = payload
state.password = {
@@ -146,19 +30,6 @@ const projectsSlice = createSlice({
}
setItem(PROJECTS_PROTECTED, JSON.stringify(state.password))
},
- reset(state) {
- state.projects = []
- state.total = 0
- state.alerts = []
- state.subscribers = []
- state.error = null
- },
- setBirdsEyeBulk(state, { payload }: PayloadAction<IOverall>) {
- state.birdseye = {
- ...state.birdseye,
- ...payload,
- }
- },
},
})
diff --git a/web/app/redux/sagas/actions/index.ts b/web/app/redux/sagas/actions/index.ts
index 97f0d4b22..cc3c65871 100644
--- a/web/app/redux/sagas/actions/index.ts
+++ b/web/app/redux/sagas/actions/index.ts
@@ -6,11 +6,6 @@ import { removeItem } from 'utils/localstorage'
import { LS_VIEW_PREFS_SETTING, LS_CAPTCHA_VIEW_PREFS_SETTING } from 'redux/constants'
import { IUser } from '../../models/IUser'
-const loadProjects = (take?: number, skip?: number, search?: string) => ({
- type: types.LOAD_PROJECTS,
- payload: { take, skip, search },
-})
-
const loadMetainfo = () => ({
type: types.LOAD_METAINFO,
})
@@ -23,11 +18,6 @@ const loadExtensions = () => ({
type: types.LOAD_EXTENSIONS,
})
-const loadProjectAlerts = (take?: number, skip?: number) => ({
- type: types.LOAD_PROJECT_ALERTS,
- payload: { take, skip },
-})
-
const loadMonitors = (take?: number, skip?: number) => ({
type: types.LOAD_MONITORS,
payload: { take, skip },
@@ -168,9 +158,7 @@ const updateShowLiveVisitorsInTitle = (show: boolean, callback: (isSuccess: bool
})
const sagaActions = {
- loadProjects,
loadExtensions,
- loadProjectAlerts,
loginAsync,
authSSO,
signupAsync,
diff --git a/web/app/redux/sagas/actions/types.ts b/web/app/redux/sagas/actions/types.ts
index 88745efb6..44cb33b33 100644
--- a/web/app/redux/sagas/actions/types.ts
+++ b/web/app/redux/sagas/actions/types.ts
@@ -1,9 +1,7 @@
const sagaTypes = Object.freeze({
LOAD_EXTENSIONS: 'LOAD_EXTENSIONS',
- LOAD_PROJECTS: 'LOAD_PROJECTS',
LOAD_METAINFO: 'LOAD_METAINFO',
LOAD_USAGEINFO: 'LOAD_USAGEINFO',
- LOAD_PROJECT_ALERTS: 'LOAD_PROJECT_ALERTS',
LOAD_MONITORS: 'LOAD_MONITORS',
LOGIN_ASYNC: 'LOGIN_ASYNC',
SIGNUP_ASYNC: 'SIGNUP_ASYNC',
diff --git a/web/app/redux/sagas/auth/workers/signin.ts b/web/app/redux/sagas/auth/workers/signin.ts
index 0e7f5e4f5..397b1f1c0 100644
--- a/web/app/redux/sagas/auth/workers/signin.ts
+++ b/web/app/redux/sagas/auth/workers/signin.ts
@@ -40,8 +40,6 @@ export default function* singinWorker({ payload: { credentials, callback } }: IS
yield call(setAccessToken, accessToken, dontRemember)
yield call(setRefreshToken, refreshToken)
yield put(UIActions.setThemeType(user.theme))
- yield put(sagaActions.loadProjects())
- yield put(sagaActions.loadProjectAlerts())
yield put(sagaActions.loadMonitors())
callback(true, false)
} catch (reason: any) {
diff --git a/web/app/redux/sagas/auth/workers/signup.ts b/web/app/redux/sagas/auth/workers/signup.ts
index fa656b269..2a655f8f1 100644
--- a/web/app/redux/sagas/auth/workers/signup.ts
+++ b/web/app/redux/sagas/auth/workers/signup.ts
@@ -46,9 +46,6 @@ export default function* signupWorder({
yield call(setAccessToken, accessToken, dontRemember)
yield call(setRefreshToken, refreshToken)
yield put(authActions.setDontRemember(dontRemember))
- // yield put(UIActions.setThemeType(response.theme))
- yield put(sagaActions.loadProjects())
- yield put(sagaActions.loadProjectAlerts())
yield put(sagaActions.loadMonitors())
callback(true)
} catch (reason: any) {
diff --git a/web/app/redux/sagas/auth/workers/sso_auth.ts b/web/app/redux/sagas/auth/workers/sso_auth.ts
index 04c90af80..448be71f7 100644
--- a/web/app/redux/sagas/auth/workers/sso_auth.ts
+++ b/web/app/redux/sagas/auth/workers/sso_auth.ts
@@ -69,9 +69,6 @@ export default function* ssoAuth({ payload: { callback, dontRemember, t, provide
yield put(authActions.authSuccessful(user))
yield call(setAccessToken, accessToken, dontRemember)
yield call(setRefreshToken, refreshToken)
- // yield put(UIActions.setThemeType(user.theme))
- yield put(sagaActions.loadProjects())
- yield put(sagaActions.loadProjectAlerts())
yield put(sagaActions.loadMonitors())
yield put(authActions.finishLoading())
callback(true, false)
diff --git a/web/app/redux/sagas/ui/index.ts b/web/app/redux/sagas/ui/index.ts
index 974ee2b8a..c91977700 100644
--- a/web/app/redux/sagas/ui/index.ts
+++ b/web/app/redux/sagas/ui/index.ts
@@ -1,34 +1,24 @@
import { takeEvery, fork, takeLatest } from 'redux-saga/effects'
import sagaTypes from '../actions/types'
-import loadProjects from './load_projects'
import initialise from './initialise'
-import liveVisitors from './worker_live_visitors'
import generalStats from './worker_general_stats'
import isEventsAvailable from './worker_is_events_available'
import shareVerify from './share_verify'
import loadExtensions from './load_extensions'
import loadMetainfo from './load_metainfo'
import loadUsageinfo from './load_usageinfo'
-import logout from './logout'
-import loadProjectAlerts from './load_alerts'
import loadMonitors from './load_monitors'
function* mainUISaga() {
yield fork(initialise)
- yield fork(liveVisitors)
yield fork(isEventsAvailable)
yield fork(generalStats)
- // @ts-expect-error
- yield takeEvery(sagaTypes.LOAD_PROJECTS, loadProjects)
yield takeEvery(sagaTypes.LOAD_METAINFO, loadMetainfo)
yield takeEvery(sagaTypes.LOAD_USAGEINFO, loadUsageinfo)
yield takeEvery(sagaTypes.LOAD_EXTENSIONS, loadExtensions)
- yield takeEvery(sagaTypes.LOGOUT, logout)
// @ts-expect-error
yield takeLatest(sagaTypes.SHARE_VERIFY_ASYNC, shareVerify)
// @ts-expect-error
- yield takeLatest(sagaTypes.LOAD_PROJECT_ALERTS, loadProjectAlerts)
- // @ts-expect-error
yield takeLatest(sagaTypes.LOAD_MONITORS, loadMonitors)
}
diff --git a/web/app/redux/sagas/ui/initialise.ts b/web/app/redux/sagas/ui/initialise.ts
index dee5ee94c..eb4505780 100644
--- a/web/app/redux/sagas/ui/initialise.ts
+++ b/web/app/redux/sagas/ui/initialise.ts
@@ -13,9 +13,7 @@ export default function* initialise() {
const refreshToken: string = yield call(getRefreshToken)
if (token && refreshToken) {
- yield put(sagaActions.loadProjects())
yield put(sagaActions.loadExtensions())
- yield put(sagaActions.loadProjectAlerts())
yield put(sagaActions.loadMonitors())
}
diff --git a/web/app/redux/sagas/ui/load_alerts.ts b/web/app/redux/sagas/ui/load_alerts.ts
deleted file mode 100644
index b7a2b70ee..000000000
--- a/web/app/redux/sagas/ui/load_alerts.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { put, call } from 'redux-saga/effects'
-import { toast } from 'sonner'
-import _isString from 'lodash/isString'
-import UIActions from 'redux/reducers/ui'
-import { DEFAULT_ALERTS_TAKE, isSelfhosted } from 'redux/constants'
-const { getAlerts } = require('api')
-
-export default function* loadProjectAlerts({ payload: { take = DEFAULT_ALERTS_TAKE, skip = 0 } }) {
- if (isSelfhosted) {
- yield put(UIActions.setProjectAlertsLoading(false))
- return
- }
-
- try {
- yield put(UIActions.setProjectAlertsLoading(true))
- const { results, total, page_total: pageTotal } = yield call(getAlerts, take, skip)
-
- yield put(UIActions.setProjectAlerts(results))
- yield put(
- UIActions.setProjectAlertsTotal({
- total,
- pageTotal,
- }),
- )
- } catch (reason: unknown) {
- const { message } = reason as { message: string }
- if (_isString(message)) {
- toast.error(message)
- }
- console.error('failed to load extensions:', message)
- } finally {
- yield put(UIActions.setProjectAlertsLoading(false))
- }
-}
diff --git a/web/app/redux/sagas/ui/load_extensions.ts b/web/app/redux/sagas/ui/load_extensions.ts
index 43fe95b66..384c8b7ae 100644
--- a/web/app/redux/sagas/ui/load_extensions.ts
+++ b/web/app/redux/sagas/ui/load_extensions.ts
@@ -15,9 +15,6 @@ export default function* loadExtensions() {
yield put(UIActions.setExtensions(extensions))
} catch (reason: unknown) {
const { message } = reason as { message: string }
- // if (_isString(message)) {
- // yield put(UIActions.setProjectsError(message))
- // }
console.error('failed to load extensions:', message)
}
}
diff --git a/web/app/redux/sagas/ui/load_metainfo.ts b/web/app/redux/sagas/ui/load_metainfo.ts
index f0d9a5936..4c51bb2cd 100644
--- a/web/app/redux/sagas/ui/load_metainfo.ts
+++ b/web/app/redux/sagas/ui/load_metainfo.ts
@@ -16,9 +16,6 @@ export default function* loadMetainfo() {
yield put(UIActions.setMetainfo(metainfo))
} catch (reason: unknown) {
const { message } = reason as { message: string }
- // if (_isString(message)) {
- // yield put(UIActions.setProjectsError(message))
- // }
console.error('failed to load metainfo:', message)
}
}
diff --git a/web/app/redux/sagas/ui/load_projects.ts b/web/app/redux/sagas/ui/load_projects.ts
deleted file mode 100644
index 188e6f221..000000000
--- a/web/app/redux/sagas/ui/load_projects.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { put, call } from 'redux-saga/effects'
-import _map from 'lodash/map'
-import _isString from 'lodash/isString'
-import { getAccessToken } from 'utils/accessToken'
-
-import UIActions from 'redux/reducers/ui'
-
-import { ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
-import { IOverall } from 'redux/models/IProject'
-const { getProjects, getOverallStats, getLiveVisitors } = require('../../../api')
-
-export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, search = '' } }) {
- const token = getAccessToken()
-
- if (!token) {
- return
- }
-
- try {
- yield put(
- UIActions.setProjectsLoading({
- isLoading: true,
- }),
- )
-
- let {
- // eslint-disable-next-line prefer-const, camelcase
- results,
- totalMonthlyEvents,
- total,
- } = yield call(getProjects, take, skip, search)
-
- const pids = _map(results, (result) => result.id)
-
- let overall: IOverall = {}
-
- try {
- overall = yield call(getOverallStats, pids, '7d')
- } catch (reason) {
- console.error('failed to overall stats:', reason)
- }
-
- yield put(UIActions.setBirdsEyeBulk(overall))
-
- yield put(
- UIActions.setProjects({
- projects: results,
- }),
- )
- yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))
- yield put(
- UIActions.setTotal({
- total,
- }),
- )
-
- const liveStats: any[] = yield call(getLiveVisitors, pids)
- yield put(
- UIActions.setLiveStats({
- data: liveStats,
- }),
- )
- } catch (reason: unknown) {
- const { message } = reason as { message: string }
- if (_isString(message)) {
- yield put(UIActions.setProjectsError(message))
- }
- console.error('failed to load projects:', message)
- }
-}
diff --git a/web/app/redux/sagas/ui/load_usageinfo.ts b/web/app/redux/sagas/ui/load_usageinfo.ts
index e9bfb8425..11a45d4ec 100644
--- a/web/app/redux/sagas/ui/load_usageinfo.ts
+++ b/web/app/redux/sagas/ui/load_usageinfo.ts
@@ -22,9 +22,6 @@ export default function* loadUsageinfo() {
yield put(UIActions.setUsageinfo(info))
} catch (reason: unknown) {
const { message } = reason as { message: string }
- // if (_isString(message)) {
- // yield put(UIActions.setProjectsError(message))
- // }
console.error('failed to load usageinfo:', message)
}
}
diff --git a/web/app/redux/sagas/ui/logout.ts b/web/app/redux/sagas/ui/logout.ts
deleted file mode 100644
index f5f108179..000000000
--- a/web/app/redux/sagas/ui/logout.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { put } from 'redux-saga/effects'
-
-import UIActions from 'redux/reducers/ui'
-
-export default function* logout() {
- yield put(UIActions.reset())
-}
diff --git a/web/app/redux/sagas/ui/share_verify.ts b/web/app/redux/sagas/ui/share_verify.ts
index 12f4fa802..3acb67ddb 100644
--- a/web/app/redux/sagas/ui/share_verify.ts
+++ b/web/app/redux/sagas/ui/share_verify.ts
@@ -1,5 +1,4 @@
-import { call, put } from 'redux-saga/effects'
-import sagaActions from '../actions'
+import { call } from 'redux-saga/effects'
const { verifyShare } = require('api')
export default function* shareVerify({
@@ -15,9 +14,7 @@ export default function* shareVerify({
}
}) {
try {
- // @ts-ignore
yield call(verifyShare, data)
- yield put(sagaActions.loadProjects())
successfulCallback()
} catch (reason) {
errorCallback(reason)
diff --git a/web/app/redux/sagas/ui/worker_live_visitors.ts b/web/app/redux/sagas/ui/worker_live_visitors.ts
deleted file mode 100644
index e79a21e2a..000000000
--- a/web/app/redux/sagas/ui/worker_live_visitors.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { put, call, delay, select } from 'redux-saga/effects'
-import _map from 'lodash/map'
-import _filter from 'lodash/filter'
-import _isEmpty from 'lodash/isEmpty'
-
-import UIActions from 'redux/reducers/ui'
-import { LIVE_VISITORS_UPDATE_INTERVAL } from 'redux/constants'
-import { IProject } from '../../models/IProject'
-const { getLiveVisitors } = require('api')
-
-export default function* liveVisitors() {
- while (true) {
- yield delay(LIVE_VISITORS_UPDATE_INTERVAL)
-
- const projects: IProject[] = yield select((state) => state.ui.projects.projects)
-
- if (_isEmpty(projects)) {
- continue
- }
-
- const pids = _map(
- _filter(projects, ({ uiHidden }) => !uiHidden),
- (project) => project.id,
- )
-
- if (_isEmpty(pids)) {
- continue
- }
-
- const liveStats: any[] = yield call(getLiveVisitors, pids)
-
- yield put(
- UIActions.setLiveStats({
- data: liveStats,
- }),
- )
- }
-}
diff --git a/web/app/redux/store/index.ts b/web/app/redux/store/index.ts
index 4bfe28cc3..f32cbb05a 100644
--- a/web/app/redux/store/index.ts
+++ b/web/app/redux/store/index.ts
@@ -6,7 +6,6 @@ import rootSaga from '../sagas'
import authSlice from '../reducers/auth'
import miscSlice from '../reducers/ui/misc'
import projectsSlice from '../reducers/ui/projects'
-import alertsProjectsSlice from '../reducers/ui/alerts'
import themeSlice from '../reducers/ui/theme'
import cacheSlice from '../reducers/ui/cache'
import monitorsSlice from '../reducers/ui/monitors'
@@ -16,7 +15,6 @@ const rootReducer = combineReducers({
ui: combineReducers({
misc: miscSlice,
projects: projectsSlice,
- alerts: alertsProjectsSlice,
theme: themeSlice,
cache: cacheSlice,
monitors: monitorsSlice,
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index 2a8730921..843afb8be 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -1,6 +1,5 @@
import ViewProject from 'pages/Project/View'
import type { LinksFunction, LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
-import { useLoaderData } from '@remix-run/react'
import { json } from '@remix-run/node'
import _split from 'lodash/split'
@@ -38,15 +37,5 @@ export async function loader({ request }: LoaderFunctionArgs) {
}
export default function Index() {
- const { theme, embedded, isAuth, queryPassword, tabs } = useLoaderData<typeof loader>()
-
- return (
- <ViewProject
- ssrTheme={theme}
- ssrAuthenticated={isAuth}
- embedded={embedded}
- queryPassword={queryPassword}
- projectQueryTabs={tabs}
- />
- )
+ return <ViewProject />
}
diff --git a/web/app/routes/projects.$pid.alerts.settings.$id.tsx b/web/app/routes/projects.$pid.alerts.settings.$id.tsx
index 952e17bdb..04155cc02 100644
--- a/web/app/routes/projects.$pid.alerts.settings.$id.tsx
+++ b/web/app/routes/projects.$pid.alerts.settings.$id.tsx
@@ -1,5 +1,5 @@
import ProjectAlertsSettings from 'pages/Project/Alerts/Settings'
export default function Index() {
- return <ProjectAlertsSettings />
+ return <ProjectAlertsSettings isSettings />
}