📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Combine shared, owned & captcha projects
Blue Mousefdf7a5fb7bec
diff --git a/web/app/api/index.ts b/web/app/api/index.tsindex f73dca5de..791fdffd7 100644--- a/web/app/api/index.ts+++ b/web/app/api/index.ts@@ -16,7 +16,6 @@ import { IUser } from 'redux/models/IUser'import { IAuth } from 'redux/models/IAuth'import { IProject, IOverall } from 'redux/models/IProject'import { IAlerts } from 'redux/models/IAlerts'-import { ISharedProject } from 'redux/models/ISharedProject'import { ISubscribers } from 'redux/models/ISubscribers'import { IFilter, IProjectViewCustomEvent } from 'pages/Project/View/interfaces/traffic'import { AIResponse } from 'pages/Project/View/interfaces/ai'@@ -262,9 +261,9 @@ export const verifyShare = ({ path, id }: { path: string; id: string }) =>throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message})-export const getProjects = (take: number = 0, skip: number = 0, isCaptcha: boolean = false, search?: string) =>+export const getProjects = (take: number = 0, skip: number = 0, search?: string) =>api- .get(`/project?take=${take}&skip=${skip}&isCaptcha=${isCaptcha}&search=${search}`)+ .get(`/project?take=${take}&skip=${skip}&search=${search}`).then((response,@@ -325,23 +324,6 @@ export const removeProjectFromOrganisation = (organisationId: string, projectId:throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message})-export const getSharedProjects = (take: number = 0, skip: number = 0, search?: string) =>- api- .get(`/project/shared?take=${take}&skip=${skip}&search=${search}`)- .then(- (- response,- ): {- results: ISharedProject[]- total: number- page_total: number- } => response.data,- )- .catch((error) => {- debug('%s', error)- throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message- })-// eslint-disable-next-line default-param-lastexport const getProject = (pid: string, isCaptcha: boolean = false, password?: string) =>apidiff --git a/web/app/pages/Auth/Signin/Signin.container.tsx b/web/app/pages/Auth/Signin/Signin.container.tsxindex 7c98cbade..d2485eb47 100644--- a/web/app/pages/Auth/Signin/Signin.container.tsx+++ b/web/app/pages/Auth/Signin/Signin.container.tsx@@ -20,7 +20,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({loginSuccess: (user: IUser) => {dispatch(authActions.loginSuccessful(user))dispatch(sagaActions.loadProjects())- dispatch(sagaActions.loadSharedProjects())},authSSO: (provider: string, dontRemember: boolean, t: typeof i18next.t, callback: (res: any) => void) => {dispatch(sagaActions.authSSO(provider, dontRemember, t, callback))diff --git a/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx b/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsxindex 898860d22..0f7981169 100644--- a/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx+++ b/web/app/pages/Captcha/Settings/CaptchaSettings.container.tsx@@ -5,23 +5,23 @@ import { StateType, AppDispatch } from 'redux/store'import CaptchaSettings from './CaptchaSettings'const mapStateToProps = (state: StateType) => ({- projects: state.ui.projects.captchaProjects,+ projects: state.ui.projects.projects,analyticsProjects: state.ui.projects.projects,- isLoading: state.ui.projects.isLoadingCaptcha,+ isLoading: state.ui.projects.isLoading,loading: state.auth.loading,user: state.auth.user,})const mapDispatchToProps = (dispatch: AppDispatch) => ({loadProjects: () => {- sagaActions.loadProjectsCaptcha()+ sagaActions.loadProjects()},removeProject: (pid: string) => {- dispatch(UIActions.removeCaptchaProject(pid))+ dispatch(UIActions.removeProject({ pid }))},- deleteProjectCache: (pid: string, filters: any) => {+ deleteProjectCache: (pid: string) => {dispatch(- UIActions.deleteCaptchaProjectCache({+ UIActions.deleteProjectCache({pid,}),)diff --git a/web/app/pages/Captcha/View/ViewCaptcha.container.tsx b/web/app/pages/Captcha/View/ViewCaptcha.container.tsxindex 104cf3403..4aa90e041 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.container.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.container.tsx@@ -2,12 +2,12 @@ import { connect } from 'react-redux'import UIActions from 'redux/reducers/ui'import { StateType, AppDispatch } from 'redux/store'-import { ICaptchaProject } from 'redux/models/IProject'+import { IProject } from 'redux/models/IProject'import ViewCaptcha from './ViewCaptcha'const mapStateToProps = (state: StateType) => ({- projects: state.ui.projects.captchaProjects,- isLoading: state.ui.projects.isLoadingCaptcha,+ projects: state.ui.projects.projects,+ isLoading: state.ui.projects.isLoading,cache: state.ui.cache.captchaAnalytics,projectViewPrefs: state.ui.cache.captchaProjectsViewPrefs,authenticated: state.auth.authenticated,@@ -26,8 +26,8 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({}),)},- setProjects: (project: ICaptchaProject[]) => {- dispatch(UIActions.setCaptchaProjects(project))+ setProjects: (projects: IProject[]) => {+ dispatch(UIActions.setProjects({ projects }))},setProjectViewPrefs: (pid: string, period: string, timeBucket: string, rangeDate?: Date[] | null) => {dispatch(diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsxindex 15d09f305..ec9b8e5cd 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx@@ -76,7 +76,7 @@ const PageLoader = () => ()interface IViewCaptcha {- projects: ICaptchaProject[]+ projects: IProject[]isLoading: booleancache: anysetProjectCache: (pid: string, data: any, key: string) => void@@ -85,7 +85,7 @@ interface IViewCaptcha {authenticated: booleanuser: IUser// eslint-disable-next-line no-unused-vars, no-shadow- setProjects: (projects: ICaptchaProject[]) => void+ setProjects: (projects: IProject[]) => voidtheme: ThemeTypessrTheme: ThemeType}diff --git a/web/app/pages/Dashboard/Dashboard.container.tsx b/web/app/pages/Dashboard/Dashboard.container.tsxindex 062fdc75b..74c9cf4de 100644--- a/web/app/pages/Dashboard/Dashboard.container.tsx+++ b/web/app/pages/Dashboard/Dashboard.container.tsx@@ -9,18 +9,11 @@ import Dashboard from './Dashboard'const mapStateToProps = (state: StateType) => ({projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,- captchaProjects: state.ui.projects.captchaProjects,user: state.auth.user,isLoading: state.ui.projects.isLoading,total: state.ui.projects.total,- sharedTotal: state.ui.projects.sharedTotal,- captchaTotal: state.ui.projects.captchaTotal,error: state.ui.projects.error,dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,- dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,- dashboardPaginationPageCaptcha: state.ui.projects.dashboardPaginationPageCaptcha,- dashboardTabs: state.ui.projects.dashboardTabs,liveStats: state.ui.projects.liveStats,birdseye: state.ui.projects.birdseye,})@@ -31,7 +24,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({UIActions.setProjectsShareData({data,id,- shared,}),)},@@ -46,24 +38,9 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({loadProjects: (take: number, skip: number, search: string) => {dispatch(sagaActions.loadProjects(take, skip, search))},- loadSharedProjects: (take: number, skip: number, search: string) => {- dispatch(sagaActions.loadSharedProjects(take, skip, search))- },setDashboardPaginationPage: (page: number) => {dispatch(UIActions.setDashboardPaginationPage(page))},- setDashboardPaginationPageShared: (page: number) => {- dispatch(UIActions.setDashboardPaginationPageShared(page))- },- setDashboardTabs: (tab: string) => {- dispatch(UIActions.setDashboardTabs(tab))- },- loadProjectsCaptcha: (take: number, skip: number, search: string) => {- dispatch(sagaActions.loadProjectsCaptcha(take, skip, search))- },- setDashboardPaginationPageCaptcha: (page: number) => {- dispatch(UIActions.setDashboardPaginationPageCaptcha(page))- },})export default connect(mapStateToProps, mapDispatchToProps)(Dashboard)diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsxindex 172944239..27c23b3d6 100644--- a/web/app/pages/Dashboard/Dashboard.tsx+++ b/web/app/pages/Dashboard/Dashboard.tsx@@ -8,7 +8,6 @@ import _size from 'lodash/size'import _isNumber from 'lodash/isNumber'import _replace from 'lodash/replace'import _map from 'lodash/map'-import _isUndefined from 'lodash/isUndefined'import _filter from 'lodash/filter'import _find from 'lodash/find'import { useTranslation } from 'react-i18next'@@ -23,22 +22,12 @@ import { XCircleIcon } from '@heroicons/react/24/solid'import { ChevronUpIcon, ChevronDownIcon } from '@heroicons/react/20/solid'import Modal from 'ui/Modal'-import Select from 'ui/Select'import { withAuthentication, auth } from 'hoc/protected'import Loader from 'ui/Loader'import { Badge, BadgeProps } from 'ui/Badge'import routes from 'utils/routes'import { nFormatter, calculateRelativePercentage } from 'utils/generic'-import {- isSelfhosted,- ENTRIES_PER_PAGE_DASHBOARD,- tabForOwnedProject,- tabForSharedProject,- tabForCaptchaProject,- DASHBOARD_TABS,- tabsForDashboard,- roleViewer,-} from 'redux/constants'+import { isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD, roleViewer } from 'redux/constants'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import DashboardLockedBanner from 'components/DashboardLockedBanner'import useDebounce from 'hooks/useDebounce'@@ -47,19 +36,15 @@ import { acceptShareProject } from 'api'import Pagination from 'ui/Pagination'import { ISharedProject } from 'redux/models/ISharedProject'-import { IProject, ICaptchaProject, ILiveStats, IOverall } from 'redux/models/IProject'+import { IProject, ILiveStats, IOverall } from 'redux/models/IProject'import { IUser } from 'redux/models/IUser'interface ProjectCardProps {birdseye: IOverall- type: 'analytics' | 'captcha'live?: string | number- confirmed?: booleansharedProjects: ISharedProject[]- setProjectsShareData: (data: Partial<ISharedProject>, id: string, shared?: boolean) => void- setUserShareData: (data: Partial<ISharedProject>, id: string) => void- shared?: boolean- captcha?: boolean+ setProjectsShareData: (data: Partial<IProject>, id: string) => void+ setUserShareData: (data: Partial<IProject>, id: string) => voidgetRole?: (id: string) => string | nullproject: IProject}@@ -109,13 +94,9 @@ const MiniCard = ({ labelTKey, total = 0, percChange }: MiniCardProps) => {const ProjectCard = ({birdseye,live = 'N/A',- confirmed,sharedProjects,setProjectsShareData,setUserShareData,- shared,- captcha,- type,getRole,project,}: ProjectCardProps) => {@@ -132,14 +113,18 @@ const ProjectCard = ({list.push({ colour: 'red', label: t('dashboard.disabled') })}- if (shared) {- if (confirmed) {- list.push({ colour: 'green', label: t('dashboard.shared') })+ if (!project.isOwner) {+ if (project.isShareConfirmed) {+ list.push({ colour: 'indigo', label: t('dashboard.shared') })} else {list.push({ colour: 'yellow', label: t('common.pending') })}}+ if (project.isCaptchaProject) {+ list.push({ colour: 'indigo', label: t('dashboard.captcha') })+ }+if (isTransferring) {list.push({ colour: 'indigo', label: t('common.transferring') })}@@ -159,7 +144,17 @@ const ProjectCard = ({}return list- }, [t, active, shared, isTransferring, isPublic, organisation, confirmed, share])+ }, [+ t,+ active,+ isTransferring,+ isPublic,+ organisation,+ share,+ project.isShareConfirmed,+ project.isOwner,+ project.isCaptchaProject,+ ])const onAccept = async () => {// @ts-expect-error@@ -170,8 +165,8 @@ const ProjectCard = ({throw new Error('Project not found')}await acceptShareProject(pid)- setProjectsShareData({ confirmed: true }, id, true)- setUserShareData({ confirmed: true }, pid)+ setProjectsShareData({ isShareConfirmed: true }, id)+ setUserShareData({ isShareConfirmed: true }, pid)toast.success(t('apiNotifications.acceptInvitation'))} catch (reason: any) {toast.error(t('apiNotifications.acceptInvitationError'))@@ -179,7 +174,7 @@ const ProjectCard = ({}const onElementClick = (e: React.MouseEvent<HTMLAnchorElement>) => {- if (confirmed) {+ if (project.isOwner || project.isShareConfirmed) {return}@@ -189,7 +184,7 @@ const ProjectCard = ({return (<Link- to={_replace(type === 'analytics' ? routes.project : routes.captcha, ':id', id)}+ to={_replace(project.isCaptchaProject ? routes.captcha : routes.project, ':id', id)}onClick={onElementClick}className='min-h-[153.1px] cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-slate-800 dark:hover:bg-slate-700'>@@ -200,14 +195,14 @@ const ProjectCard = ({<div className='flex items-center gap-2' onClick={(e) => e.stopPropagation()}>{role !== roleViewer.role && (<Link- to={_replace(type === 'analytics' ? routes.project_settings : routes.captcha_settings, ':id', id)}+ to={_replace(project.isCaptchaProject ? routes.captcha_settings : routes.project_settings, ':id', id)}aria-label={`${t('project.settings.settings')} ${name}`}><AdjustmentsVerticalIcon className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500' /></Link>)}<a- href={_replace(type === 'analytics' ? routes.project : routes.captcha, ':id', id)}+ href={_replace(project.isCaptchaProject ? routes.captcha : routes.project, ':id', id)}aria-label='name (opens in a new tab)'target='_blank'rel='noopener noreferrer'@@ -224,15 +219,15 @@ const ProjectCard = ({<div className='mt-4 flex flex-shrink-0 gap-5'>{birdseye[id] && (<MiniCard- labelTKey={captcha ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}+ labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}total={birdseye[id].current.all}percChange={calculateRelativePercentage(birdseye[id].previous.all, birdseye[id].current.all)}/>)}- {!captcha && <MiniCard labelTKey='dashboard.liveVisitors' total={live} />}+ {project.isCaptchaProject && <MiniCard labelTKey='dashboard.liveVisitors' total={live} />}</div></div>- {!confirmed && (+ {!project.isOwner && !project.isShareConfirmed && (<ModalonClose={() => {setShowInviteModal(false)@@ -254,22 +249,20 @@ const ProjectCard = ({}interface NoProjectsProps {- newProjectLink: stringonClick: (e: React.MouseEvent<HTMLAnchorElement>) => void}interface AddProjectProps {- newProjectLink: stringonClick: (e: React.MouseEvent<HTMLAnchorElement>) => voidsitesCount: number}-const NoProjects = ({ newProjectLink, onClick }: NoProjectsProps) => {+const NoProjects = ({ onClick }: NoProjectsProps) => {const { t } = useTranslation('common')return (<Link- to={newProjectLink}+ to={routes.new_project}onClick={onClick}className='relative mx-auto block max-w-lg rounded-lg border-2 border-dashed border-gray-300 p-12 text-center hover:border-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2'>@@ -281,12 +274,12 @@ const NoProjects = ({ newProjectLink, onClick }: NoProjectsProps) => {)}-const AddProject = ({ newProjectLink, onClick, sitesCount }: AddProjectProps) => {+const AddProject = ({ onClick, sitesCount }: AddProjectProps) => {const { t } = useTranslation('common')return (<Link- to={newProjectLink}+ to={routes.new_project}onClick={onClick}className={cx('group flex h-auto min-h-[153.1px] cursor-pointer items-center justify-center rounded-lg border-2 border-dashed border-gray-300 hover:border-gray-400',@@ -313,21 +306,9 @@ interface DashboardProps {setProjectsShareData: (data: Partial<ISharedProject>) => voidsetUserShareData: (data: Partial<ISharedProject>) => voidloadProjects: (take: number, skip: number, search: string) => void- loadSharedProjects: (take: number, skip: number, search: string) => voidtotal: numbersetDashboardPaginationPage: (page: number) => voiddashboardPaginationPage: number- sharedProjects: ISharedProject[]- dashboardTabs: string- setDashboardTabs: (tab: string) => void- sharedTotal: number- setDashboardPaginationPageShared: (page: number) => void- dashboardPaginationPageShared: number- captchaProjects: ICaptchaProject[]- captchaTotal: number- dashboardPaginationPageCaptcha: number- setDashboardPaginationPageCaptcha: (page: number) => void- loadProjectsCaptcha: (take: number, skip: number, search: string) => voidliveStats: ILiveStatsbirdseye: IOverall}@@ -340,34 +321,19 @@ const Dashboard = ({setProjectsShareData,setUserShareData,loadProjects,- loadSharedProjects,total,setDashboardPaginationPage,dashboardPaginationPage,- sharedProjects,- dashboardTabs,- setDashboardTabs,- sharedTotal,- setDashboardPaginationPageShared,- dashboardPaginationPageShared,- captchaProjects,- captchaTotal,- dashboardPaginationPageCaptcha,- setDashboardPaginationPageCaptcha,- loadProjectsCaptcha,liveStats,birdseye,}: DashboardProps): JSX.Element => {const { t } = useTranslation('common')const [isSearchActive, setIsSearchActive] = useState<boolean>(false)const [showActivateEmailModal, setShowActivateEmailModal] = useState<boolean>(false)- const [activeTab, setActiveTab] = useState(dashboardTabs)- const pageAmountShared: number = Math.ceil(sharedTotal / ENTRIES_PER_PAGE_DASHBOARD)const pageAmount: number = Math.ceil(total / ENTRIES_PER_PAGE_DASHBOARD)- const pageAmountCaptcha: number = Math.ceil(captchaTotal / ENTRIES_PER_PAGE_DASHBOARD)- const getRole = (pid: string): string | null =>- _find([..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))], (p) => p.id === pid)?.role ||- null+ // const getRole = (pid: string): string | null =>+ // _find([..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))], (p) => p.id === pid)?.role ||+ // null// This search represents what's inside the search inputconst [search, setSearch] = useState('')const debouncedSearch = useDebounce(search, 500)@@ -381,90 +347,14 @@ const Dashboard = ({setShowActivateEmailModal(true)}- const newProjectLink = useMemo(() => {- if (isSelfhosted) {- return routes.new_project- }-- return dashboardTabs === tabForCaptchaProject ? routes.new_captcha : routes.new_project- }, [dashboardTabs])-- useEffect(() => {- if (sharedTotal <= 0 && activeTab === tabForSharedProject) {- setDashboardTabs(tabForOwnedProject)- setActiveTab(tabForOwnedProject)- }-- setDashboardTabs(activeTab)- }, [activeTab, setDashboardTabs, sharedTotal])-useEffect(() => {- setSearch('')- }, [activeTab])-- useEffect(() => {- if (activeTab === tabForOwnedProject) {- loadProjects(- ENTRIES_PER_PAGE_DASHBOARD,- (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD,- debouncedSearch,- )- }- if (activeTab === tabForSharedProject) {- loadSharedProjects(- ENTRIES_PER_PAGE_DASHBOARD,- (dashboardPaginationPageShared - 1) * ENTRIES_PER_PAGE_DASHBOARD,- debouncedSearch,- )- }- if (activeTab === tabForCaptchaProject) {- loadProjectsCaptcha(- ENTRIES_PER_PAGE_DASHBOARD,- (dashboardPaginationPageCaptcha - 1) * ENTRIES_PER_PAGE_DASHBOARD,- debouncedSearch,- )- }+ loadProjects(+ ENTRIES_PER_PAGE_DASHBOARD,+ (dashboardPaginationPage - 1) * ENTRIES_PER_PAGE_DASHBOARD,+ debouncedSearch,+ )// eslint-disable-next-line react-hooks/exhaustive-deps- }, [dashboardPaginationPage, dashboardPaginationPageShared, debouncedSearch])-- const dashboardLocTabs = useMemo(() => {- if (sharedTotal <= 0) {- return [- {- id: DASHBOARD_TABS.owned,- name: tabForOwnedProject,- label: t('profileSettings.owned'),- },- {- id: DASHBOARD_TABS.captcha,- name: tabForCaptchaProject,- label: t('profileSettings.captcha'),- },- ]- }-- return [- {- id: DASHBOARD_TABS.owned,- name: tabForOwnedProject,- label: t('profileSettings.owned'),- },- {- id: DASHBOARD_TABS.shared,- name: tabForSharedProject,- label: t('profileSettings.shared'),- },- {- id: DASHBOARD_TABS.captcha,- name: tabForCaptchaProject,- label: t('profileSettings.captcha'),- },- ]- }, [t, sharedTotal])-- const activeTabLabel = useMemo(() => {- return _find(dashboardLocTabs, (tab) => tab.name === activeTab)?.label- }, [dashboardLocTabs, activeTab])+ }, [dashboardPaginationPage, debouncedSearch])if (error && !isLoading) {return (@@ -556,12 +446,12 @@ const Dashboard = ({)}</div><Link- to={newProjectLink}+ to={routes.new_project}onClick={onNewProject}className='inline-flex cursor-pointer items-center justify-center rounded-md border border-transparent bg-slate-900 px-3 py-2 !pl-2 text-center text-sm font-medium leading-4 text-white shadow-sm hover:bg-slate-700 focus:outline-none focus:ring-2 focus:ring-slate-500 focus:ring-offset-2 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'><FolderPlusIcon className='mr-1 h-5 w-5' />- {activeTab === tabForCaptchaProject ? t('dashboard.newCaptchaProject') : t('dashboard.newProject')}+ {t('dashboard.newProject')}</Link></div>{isSearchActive && (@@ -583,51 +473,6 @@ const Dashboard = ({</div></div>)}- {!isSelfhosted && (- <div className='mb-2'>- {/* Dashboard tabs selector */}- <div>- <div className='mb-2 sm:hidden'>- <Select- items={dashboardLocTabs}- keyExtractor={(item) => item.id}- labelExtractor={(item) => item.label}- onSelect={(item) => {- setActiveTab(item.name)- }}- title={activeTabLabel}- capitalise- />- </div>- <div className='hidden sm:block'>- <nav className='-mb-px flex space-x-8'>- {_map(tabsForDashboard, (tab) => {- if (tab.name === tabForSharedProject && sharedTotal <= 0) {- return null- }-- return (- <button- key={tab.name}- type='button'- onClick={() => setActiveTab(tab.name)}- className={cx('text-md whitespace-nowrap border-b-2 px-1 pb-4 font-medium', {- 'border-slate-900 text-slate-900 dark:border-gray-50 dark:text-gray-50':- activeTab === tab.name,- 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 dark:text-gray-400 dark:hover:border-gray-300 dark:hover:text-gray-300':- activeTab !== tab.name,- })}- aria-current={tab.name === activeTab ? 'page' : undefined}- >- {t(tab.label)}- </button>- )- })}- </nav>- </div>- </div>- </div>- )}{isLoading ? (<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'><Loader />@@ -642,124 +487,35 @@ const Dashboard = ({>{() => (<>- {activeTab === tabForOwnedProject && (- <>- {_isEmpty(_filter(projects, ({ uiHidden }) => !uiHidden)) ? (- <NoProjects newProjectLink={newProjectLink} 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}- type='analytics'- birdseye={birdseye}- live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}- setUserShareData={() => {}}- sharedProjects={[]}- setProjectsShareData={() => {}}- confirmed- />- ),- )}- <AddProject- newProjectLink={newProjectLink}- sitesCount={_size(_filter(projects, ({ uiHidden }) => !uiHidden))}- onClick={onNewProject}- />- </div>- )}- </>- )}-- {activeTab === tabForCaptchaProject && (- <>- {_isEmpty(_filter(captchaProjects, ({ uiHidden }) => !uiHidden)) ? (- <NoProjects newProjectLink={newProjectLink} onClick={onNewProject} />- ) : (- <div className='grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>- {_map(- _filter(captchaProjects, ({ uiHidden }) => !uiHidden),- (project) => (- <ProjectCard- key={project.id}- project={project as IProject}- type='captcha'- birdseye={birdseye}- live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}- sharedProjects={[]}- setProjectsShareData={() => {}}- setUserShareData={() => {}}- captcha- confirmed- />- ),- )}- <AddProject- newProjectLink={newProjectLink}- sitesCount={_size(_filter(captchaProjects, ({ uiHidden }) => !uiHidden))}- onClick={onNewProject}+ {_isEmpty(_filter(projects, ({ uiHidden }) => !uiHidden)) ? (+ <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}+ birdseye={birdseye}+ live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}+ setUserShareData={() => {}}+ sharedProjects={[]}+ setProjectsShareData={() => {}}/>- </div>- )}- </>- )}-- {activeTab === tabForSharedProject && (- <>- {_isEmpty(_filter(sharedProjects, ({ uiHidden }) => !uiHidden)) ? (- <NoProjects newProjectLink={newProjectLink} onClick={onNewProject} />- ) : (- <div className='grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>- {_map(- _filter(sharedProjects, ({ uiHidden }) => !uiHidden),- ({ project, confirmed }) => {- if (_isUndefined(confirmed) || confirmed) {- return (- <ProjectCard- key={project.id}- project={project}- type='analytics'- getRole={getRole}- confirmed={confirmed}- birdseye={birdseye}- live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}- setUserShareData={() => {}}- sharedProjects={[]}- setProjectsShareData={() => {}}- shared- />- )- }-- return (- <ProjectCard- key={project?.id}- type='analytics'- shared- getRole={getRole}- birdseye={birdseye}- confirmed={confirmed}- sharedProjects={user.sharedProjects}- setProjectsShareData={setProjectsShareData}- setUserShareData={setUserShareData}- live={_isNumber(liveStats[project.id]) ? liveStats[project.id] : 'N/A'}- project={project}- />- )- },- )}- </div>+ ),)}- </>+ <AddProject+ sitesCount={_size(_filter(projects, ({ uiHidden }) => !uiHidden))}+ onClick={onNewProject}+ />+ </div>)}</>)}</ClientOnly>)}- {activeTab === tabForOwnedProject && pageAmount > 1 && (+ {pageAmount > 1 ? (<PaginationclassName='mt-2'page={dashboardPaginationPage}@@ -767,25 +523,7 @@ const Dashboard = ({setPage={setDashboardPaginationPage}total={total}/>- )}- {activeTab === tabForSharedProject && pageAmountShared > 1 && (- <Pagination- className='mt-2'- page={dashboardPaginationPageShared}- pageAmount={pageAmountShared}- setPage={setDashboardPaginationPageShared}- total={sharedTotal}- />- )}- {activeTab === tabForCaptchaProject && pageAmountCaptcha > 1 && (- <Pagination- className='mt-2'- page={dashboardPaginationPageCaptcha}- pageAmount={pageAmountCaptcha}- setPage={setDashboardPaginationPageCaptcha}- total={captchaTotal}- />- )}+ ) : null}</div></div></div>diff --git a/web/app/pages/Organisations/index.tsx b/web/app/pages/Organisations/index.tsxindex 5d4f004dc..130e024c5 100644--- a/web/app/pages/Organisations/index.tsx+++ b/web/app/pages/Organisations/index.tsx@@ -31,6 +31,7 @@ import { acceptShareProject, createOrganisation, getOrganisations } from 'api'import Pagination from 'ui/Pagination'import { ISharedProject } from 'redux/models/ISharedProject'+import { IProject } from 'redux/models/IProject'import { Organisation } from 'redux/models/Organisation'import Input from 'ui/Input'@@ -41,8 +42,8 @@ interface OrganisationCardProps {confirmed?: booleanid: stringsharedProjects: ISharedProject[]- setProjectsShareData: (data: Partial<ISharedProject>, id: string, shared?: boolean) => void- setUserShareData: (data: Partial<ISharedProject>, id: string) => void+ setProjectsShareData: (data: Partial<IProject>, id: string) => void+ setUserShareData: (data: Partial<IProject>, id: string) => voidshared?: booleanisTransferring?: booleangetRole?: (id: string) => string | null@@ -96,8 +97,8 @@ const OrganisationCard = ({throw new Error('Project not found')}await acceptShareProject(pid)- setProjectsShareData({ confirmed: true }, id, true)- setUserShareData({ confirmed: true }, pid)+ setProjectsShareData({ isShareConfirmed: true }, id)+ setUserShareData({ isShareConfirmed: true }, pid)toast.success(t('apiNotifications.acceptInvitation'))} catch (reason: any) {toast.error(t('apiNotifications.acceptInvitationError'))diff --git a/web/app/pages/Project/Settings/People/People.container.tsx b/web/app/pages/Project/Settings/People/People.container.tsxindex 12b2e721a..f7bf92b47 100644--- a/web/app/pages/Project/Settings/People/People.container.tsx+++ b/web/app/pages/Project/Settings/People/People.container.tsx@@ -11,12 +11,11 @@ const mapStateToProps = (state: StateType) => ({})const mapDispatchToProps = (dispatch: AppDispatch) => ({- setProjectShareData: (data: Partial<IProject>, projectId: string, shared = false) => {+ setProjectShareData: (data: Partial<IProject>, projectId: string) => {dispatch(UIActions.setProjectsShareData({data,id: projectId,- shared,}),)},diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex 9b7585c94..ef1000480 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -38,23 +38,13 @@ interface IUsersList {data: IShareOwnerProjectonRemove: (id: string) => voidshare?: IShareOwnerProject[]- setProjectShareData: (item: Partial<IProject>, id: string, shared: boolean) => void+ setProjectShareData: (item: Partial<IProject>, id: string) => voidpid: stringlanguage: stringauthedUserEmail: string | undefined- isSharedProject: boolean}-const UsersList = ({- data,- onRemove,- share,- setProjectShareData,- pid,- language,- authedUserEmail,- isSharedProject,-}: IUsersList) => {+const UsersList = ({ data, onRemove, share, setProjectShareData, pid, language, authedUserEmail }: IUsersList) => {const { t } = useTranslation('common')const [open, setOpen] = useState(false)const [showDeleteModal, setShowDeleteModal] = useState(false)@@ -71,7 +61,7 @@ const UsersList = ({}return itShare})- setProjectShareData({ share: newShared }, pid, isSharedProject)+ setProjectShareData({ share: newShared }, pid)toast.success(t('apiNotifications.roleUpdated'))} catch (reason) {console.error(`[ERROR] Error while updating user's role: ${reason}`)@@ -180,10 +170,9 @@ const UsersList = ({interface IPeopleProps {project: IProject- setProjectShareData: (data: Partial<IProject>, projectId: string, share?: boolean) => void+ setProjectShareData: (data: Partial<IProject>, projectId: string) => voidisPaidTierUsed: booleanuser: IUser- isSharedProject: boolean}const People: React.FunctionComponent<IPeopleProps> = ({@@ -191,8 +180,7 @@ const People: React.FunctionComponent<IPeopleProps> = ({setProjectShareData,isPaidTierUsed,user: currentUser,- isSharedProject,-}: IPeopleProps): JSX.Element => {+}: IPeopleProps) => {const [showModal, setShowModal] = useState<boolean>(false)const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState<boolean>(false)const {@@ -357,7 +345,6 @@ const People: React.FunctionComponent<IPeopleProps> = ({setProjectShareData={setProjectShareData}pid={id}authedUserEmail={currentUser?.email}- isSharedProject={isSharedProject}/>))}</tbody>diff --git a/web/app/pages/Project/Settings/ProjectSettings.container.tsx b/web/app/pages/Project/Settings/ProjectSettings.container.tsxindex d5d50dfed..c96fa2ac7 100644--- a/web/app/pages/Project/Settings/ProjectSettings.container.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.container.tsx@@ -3,34 +3,24 @@ import UIActions from 'redux/reducers/ui'import sagaActions from 'redux/sagas/actions'import { StateType, AppDispatch } from 'redux/store'-import { tabForSharedProject } from 'redux/constants'import ProjectSettings from './ProjectSettings'const mapStateToProps = (state: StateType) => ({projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,- isLoadingShared: state.ui.projects.isLoadingShared,authLoading: state.auth.loading,dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,- dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,user: state.auth.user,- isSharedProject: state.ui.projects.dashboardTabs === tabForSharedProject,})const mapDispatchToProps = (dispatch: AppDispatch) => ({- loadProjects: (shared: boolean, skip: number) => {- if (shared) {- dispatch(sagaActions.loadSharedProjects(skip))- } else {- dispatch(sagaActions.loadProjects(skip))- }+ loadProjects: (skip: number) => {+ dispatch(sagaActions.loadProjects(skip))},- removeProject: (pid: string, shared: boolean) => {+ removeProject: (pid: string) => {dispatch(UIActions.removeProject({pid,- shared,}),)},diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 1f5534e2f..4acac707a 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -28,7 +28,7 @@ import {} from 'redux/constants'import { IProject } from 'redux/models/IProject'import { IUser } from 'redux/models/IUser'-import { IProjectForShared, ISharedProject } from 'redux/models/ISharedProject'+import { IProjectForShared } from 'redux/models/ISharedProject'import {updateProject,deleteProject,@@ -259,34 +259,26 @@ interface IForm extends Partial<IProject> {const DEFAULT_PROJECT_NAME = 'Untitled Project'interface IProjectSettings {- loadProjects: (shared: boolean, skip: number) => void+ loadProjects: (skip: number) => voidisLoading: boolean- isLoadingShared: booleanprojects: IProject[]- removeProject: (pid: string, shared: boolean) => void+ removeProject: (pid: string) => voiduser: IUser- isSharedProject: boolean- sharedProjects: ISharedProject[]deleteProjectCache: (pid: string) => voidsetProjectProtectedPassword: (pid: string, password: string) => voiddashboardPaginationPage: number- dashboardPaginationPageShared: numberauthLoading: boolean}const ProjectSettings = ({loadProjects,isLoading,- isLoadingShared,projects,removeProject,user,- isSharedProject,- sharedProjects,deleteProjectCache,setProjectProtectedPassword,dashboardPaginationPage,- dashboardPaginationPageShared,authLoading,}: IProjectSettings) => {const {@@ -295,10 +287,8 @@ const ProjectSettings = ({} = useTranslation('common')const { id } = useRequiredParams<{ id: string }>()const project: IProjectForShared = useMemo(- () =>- _find([...projects, ..._map(sharedProjects, (item) => item.project)], (p) => p.id === id) ||- ({} as IProjectForShared),- [projects, id, sharedProjects],+ () => _find(projects, (p) => p.id === id) || ({} as IProjectForShared),+ [projects, id],)const navigate = useNavigate()const { requestOrigin } = useLoaderData<{ requestOrigin: string | null }>()@@ -336,9 +326,7 @@ const ProjectSettings = ({const [activeFilter, setActiveFilter] = useState<string[]>([])const [filterType, setFilterType] = useState<string>('')- const paginationSkip: number = isSharedProject- ? dashboardPaginationPageShared * ENTRIES_PER_PAGE_DASHBOARD- : dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARD+ const paginationSkip = dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARDconst botsProtectionLevels = useMemo(() => {return [@@ -380,7 +368,7 @@ const ProjectSettings = ({navigate(routes.dashboard)}- if (!isLoading && !isLoadingShared && !projectDeleting) {+ if (!isLoading && !projectDeleting) {if (_isEmpty(project) || project?.uiHidden) {toast.error(t('project.noExist'))navigate(routes.dashboard)@@ -393,7 +381,7 @@ const ProjectSettings = ({setInitialised(true)}}- }, [user, project, initialised, isLoading, navigate, projectDeleting, t, authLoading, isLoadingShared])+ }, [user, project, initialised, isLoading, navigate, projectDeleting, t, authLoading])const onSubmit = async (data: IForm) => {if (!projectSaving) {@@ -418,7 +406,7 @@ const ProjectSettings = ({await updateProject(id, formalisedData as Partial<IProject>)toast.success(t('project.settings.updated'))- loadProjects(isSharedProject, paginationSkip)+ loadProjects(paginationSkip)} catch (reason: any) {toast.error(reason)} finally {@@ -433,7 +421,7 @@ const ProjectSettings = ({setProjectDeleting(true)try {await deleteProject(id)- removeProject(id, isSharedProject)+ removeProject(id)toast.success(t('project.settings.deleted'))navigate(routes.dashboard)} catch (reason: any) {@@ -791,7 +779,7 @@ const ProjectSettings = ({{!isSelfhosted && (<><hr className='mt-2 border-gray-200 dark:border-gray-600 sm:mt-5' />- <People project={project} isSharedProject={isSharedProject} />+ <People project={project} /></>)}</form>diff --git a/web/app/pages/Project/View/ViewProject.container.tsx b/web/app/pages/Project/View/ViewProject.container.tsxindex 26305cec5..c7845f4a6 100644--- a/web/app/pages/Project/View/ViewProject.container.tsx+++ b/web/app/pages/Project/View/ViewProject.container.tsx@@ -1,6 +1,5 @@import { connect } from 'react-redux'import UIActions from 'redux/reducers/ui'-import { tabForSharedProject } from 'redux/constants'import { StateType, AppDispatch } from 'redux/store'import { IProject } from 'redux/models/IProject'import { ISharedProject } from 'redux/models/ISharedProject'@@ -8,31 +7,8 @@ import { ISharedProject } from 'redux/models/ISharedProject'import ViewProject from './ViewProject'const mapStateToProps = (state: StateType) => {- if (state.ui.projects.dashboardTabs === tabForSharedProject) {- return {- projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,- isLoading: state.ui.projects.isLoadingShared,- cache: state.ui.cache.analytics,- cachePerf: state.ui.cache.analyticsPerf,- cacheFunnels: state.ui.cache.funnels,- projectViewPrefs: state.ui.cache.projectViewPrefs,- authenticated: state.auth.authenticated,- authLoading: state.auth.loading,- 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,- }- }-return {projects: state.ui.projects.projects,- sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,authLoading: state.auth.loading,cache: state.ui.cache.analytics,@@ -96,11 +72,10 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({}),)},- setProjects: (project: Partial<IProject | ISharedProject>[], shared?: boolean) => {+ setProjects: (project: Partial<IProject | ISharedProject>[]) => {dispatch(UIActions.setProjects({projects: project,- shared,}),)},diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex b633edc3e..26011b68c 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -298,7 +298,6 @@ interface IViewProject {authenticated: booleanuser: IUsertimezone: string- sharedProjects: ISharedProject[]projectTab: stringsetProjectTab: (tab: string) => void// eslint-disable-next-line no-unused-vars, no-shadow@@ -334,7 +333,6 @@ const ViewProject = ({authenticated: csrAuthenticated,timezone = DEFAULT_TIMEZONE,user,- sharedProjects,extensions,setProjectCachePerf,projectTab,@@ -388,14 +386,9 @@ const ViewProject = ({// searchParams is a search params from react-router-domconst [searchParams, setSearchParams] = useSearchParams()- // find project by id from url from state in redux projects and sharedProjects. projects and sharedProjects loading from api in Saga on page loadconst project: IProjectForShared = useMemo(- () =>- _find(- [...projects, ..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))],- (p) => p.id === id,- ) || ({} as IProjectForShared),- [projects, id, sharedProjects],+ () => _find(projects, (p) => p.id === id) || ({} as IProjectForShared),+ [projects, id],)const projectPassword = useMemo(@@ -403,13 +396,8 @@ const ViewProject = ({[id, password, queryPassword],)- /* isSharedProject is a boolean check if project is shared. If isSharedProject is true,- we used role and other colummn from sharedProjects.- And it is used for remove settings button when user have role viewer or logic with Alert tabs */- const isSharedProject = useMemo(() => {- const foundProject = _find([..._map(sharedProjects, (item) => item.project)], (p) => p.id === id)- return !_isEmpty(foundProject)- }, [id, sharedProjects])+ // TODO: TEST+ const isSharedProject = project.isOwner// areFiltersParsed used for check filters is parsed from url. If we have query params in url, we parse it and set to state// when areFiltersParsed and areFiltersPerfParsed changed we call loadAnalytics or loadAnalyticsPerf and other func for load datadiff --git a/web/app/pages/UserSettings/UserSettings.container.tsx b/web/app/pages/UserSettings/UserSettings.container.tsxindex 959a2dae5..10b6163e7 100644--- a/web/app/pages/UserSettings/UserSettings.container.tsx+++ b/web/app/pages/UserSettings/UserSettings.container.tsx@@ -60,11 +60,10 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({}),)},- removeProject: (projectId: string) => {+ removeProject: (pid: string) => {dispatch(UIActions.removeProject({- pid: projectId,- shared: true,+ pid,}),)},@@ -76,7 +75,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({UIActions.setProjectsShareData({data,id,- shared: true,}),)},diff --git a/web/app/pages/UserSettings/components/ProjectList.tsx b/web/app/pages/UserSettings/components/ProjectList.tsxindex d462512e3..0678eb0b8 100644--- a/web/app/pages/UserSettings/components/ProjectList.tsx+++ b/web/app/pages/UserSettings/components/ProjectList.tsx@@ -7,6 +7,15 @@ import Button from 'ui/Button'import Modal from 'ui/Modal'import { deleteShareProject, acceptShareProject } from 'api'import { ISharedProject } from 'redux/models/ISharedProject'+import { IProject } from 'redux/models/IProject'++interface ProjectListProps {+ item: ISharedProject+ removeShareProject: (id: string) => void+ removeProject: (id: string) => void+ setProjectsShareData: (data: Partial<IProject>, id: string) => void+ setUserShareData: (data: Partial<IProject>, id: string) => void+}const ProjectList = ({item,@@ -14,13 +23,7 @@ const ProjectList = ({removeProject,setProjectsShareData,setUserShareData,-}: {- item: ISharedProject- removeShareProject: (id: string) => void- removeProject: (id: string) => void- setProjectsShareData: (data: Partial<ISharedProject>, id: string, shared?: boolean) => void- setUserShareData: (data: Partial<ISharedProject>, id: string) => void-}): JSX.Element => {+}: ProjectListProps) => {const {t,i18n: { language },@@ -44,8 +47,8 @@ const ProjectList = ({const onAccept = async () => {try {await acceptShareProject(id)- setProjectsShareData({ confirmed: true }, project.id)- setUserShareData({ confirmed: true }, id)+ setProjectsShareData({ isShareConfirmed: true }, project.id)+ setUserShareData({ isShareConfirmed: true }, id)toast.success(t('apiNotifications.acceptInvitation'))} catch (e) {console.error(`[ERROR] Error while accepting project invitation: ${e}`)diff --git a/web/app/redux/constants/index.ts b/web/app/redux/constants/index.tsindex 54f7b2a38..bc874a474 100644--- a/web/app/redux/constants/index.ts+++ b/web/app/redux/constants/index.ts@@ -510,30 +510,6 @@ export const roleAdmin: {description: 'Can manage the project',}-export const tabForOwnedProject: string = 'owned'-export const tabForSharedProject: string = 'shared'-export const tabForCaptchaProject: string = 'captcha'--interface IDashboardTabs {- name: string- label: string-}--export const tabsForDashboard: IDashboardTabs[] = [- {- name: tabForOwnedProject,- label: 'profileSettings.owned',- },- {- name: tabForSharedProject,- label: 'profileSettings.shared',- },- {- name: tabForCaptchaProject,- label: 'profileSettings.captcha',- },-]-const SELFHOSTED_PROJECT_TABS = {traffic: 'traffic',performance: 'performance',@@ -556,12 +532,6 @@ export const PROJECT_TABS = (isSelfhosted ? SELFHOSTED_PROJECT_TABS : PRODUCTION_PROJECT_TABS) as typeof PRODUCTION_PROJECT_TABS-export const DASHBOARD_TABS: IStringObject = {- owned: 'owned',- shared: 'shared',- captcha: 'captcha',-}-export const QUERY_METRIC: IStringObject = {PAGE_VIEWS: 'page_views',UNIQUE_PAGE_VIEWS: 'unique_page_views',diff --git a/web/app/redux/models/IProject.ts b/web/app/redux/models/IProject.tsindex dbc786c6c..7db643e69 100644--- a/web/app/redux/models/IProject.ts+++ b/web/app/redux/models/IProject.ts@@ -90,6 +90,7 @@ export interface IProject {isPublic?: booleanisTransferring?: booleanisPasswordProtected?: boolean+ isShareConfirmed?: booleanorganisationId?: stringorganisation?: Organisationpassword?: stringdiff --git a/web/app/redux/reducers/ui/projects.ts b/web/app/redux/reducers/ui/projects.tsindex e1f08b091..d3fe71860 100644--- a/web/app/redux/reducers/ui/projects.ts+++ b/web/app/redux/reducers/ui/projects.ts@@ -2,31 +2,21 @@ import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'import _filter from 'lodash/filter'import _findIndex from 'lodash/findIndex'import _map from 'lodash/map'-import { tabForOwnedProject, PROJECT_TABS, PROJECTS_PROTECTED, isSelfhosted } from 'redux/constants'+import { PROJECT_TABS, PROJECTS_PROTECTED } from 'redux/constants'import { setItem, getItem } from 'utils/localstorage'-import { IProject, ICaptchaProject, ILiveStats, IOverall, IOverallObject } from 'redux/models/IProject'-import { ISharedProject } from 'redux/models/ISharedProject'+import { IProject, ILiveStats, IOverall, IOverallObject } from 'redux/models/IProject'import { IAlerts } from 'redux/models/IAlerts'interface IInitialState {projects: IProject[]- sharedProjects: ISharedProject[]- captchaProjects: ICaptchaProject[]birdseye: {[key: string]: IOverallObject}isLoading: boolean- isLoadingShared: boolean- isLoadingCaptcha: booleanerror: null | stringtotalMonthlyEvents: number | nulltotal: number- sharedTotal: number- captchaTotal: numberdashboardPaginationPage: number- dashboardPaginationPageShared: number- dashboardPaginationPageCaptcha: number- dashboardTabs: stringprojectTab: stringalerts: IAlerts[]subscribers: any[]@@ -38,21 +28,12 @@ interface IInitialState {const initialState: IInitialState = {projects: [],- sharedProjects: [],- captchaProjects: [],birdseye: {},isLoading: true,- isLoadingShared: true,- isLoadingCaptcha: true,error: null,totalMonthlyEvents: null,total: 0,- sharedTotal: 0,- captchaTotal: 0,dashboardPaginationPage: 1,- dashboardPaginationPageShared: 1,- dashboardPaginationPageCaptcha: 1,- dashboardTabs: isSelfhosted ? tabForOwnedProject : (getItem('dashboardTabs') as string) || tabForOwnedProject,projectTab: PROJECT_TABS.traffic,alerts: [],subscribers: [],@@ -69,19 +50,13 @@ const projectsSlice = createSlice({{payload,}: PayloadAction<{- projects: Partial<IProject | ISharedProject>[]- shared?: boolean+ projects: Partial<IProject>[]}>,) {- if (payload.shared) {- state.isLoadingShared = false- state.sharedProjects = payload.projects as ISharedProject[]- } else {- state.isLoading = false- state.projects = payload.projects as IProject[]- }+ state.isLoading = false+ state.projects = payload.projects as IProject[]},- updateProject(state, { payload }: PayloadAction<{ project: Partial<IProject | ISharedProject>; pid: string }>) {+ updateProject(state, { payload }: PayloadAction<{ project: Partial<IProject>; pid: string }>) {const { pid, project } = payloadstate.projects = _map(current(state.projects), (res) => {@@ -94,37 +69,14 @@ const projectsSlice = createSlice({return res})},- setCaptchaProjects(state, { payload }: PayloadAction<ICaptchaProject[]>) {- state.isLoadingCaptcha = false- state.captchaProjects = payload- },setDashboardPaginationPage(state, { payload }: PayloadAction<number>) {state.dashboardPaginationPage = payload},- setDashboardPaginationPageShared(state, { payload }: PayloadAction<number>) {- state.dashboardPaginationPageShared = payload- },- setDashboardPaginationPageCaptcha(state, { payload }: PayloadAction<number>) {- state.dashboardPaginationPageCaptcha = payload- },setTotalMonthlyEvents(state, { payload }: PayloadAction<number>) {state.totalMonthlyEvents = payload},- setTotal(state, { payload }: PayloadAction<{ total: number; shared?: boolean }>) {- if (payload.shared) {- state.sharedTotal = payload.total- } else {- state.total = payload.total- }- },- setCaptchaTotal(state, { payload }: PayloadAction<number>) {- state.captchaTotal = payload- },- setCaptchaLoading(state, { payload }: PayloadAction<boolean>) {- state.isLoadingCaptcha = payload- },- removeCaptchaProject(state, { payload }: PayloadAction<string>) {- state.captchaProjects = _filter(state.captchaProjects, (project) => project.id !== payload)+ setTotal(state, { payload }: PayloadAction<{ total: number }>) {+ state.total = payload.total},setLiveStats(state, { payload }: PayloadAction<{ data: any }>) {const { data } = payload@@ -142,90 +94,45 @@ const projectsSlice = createSlice({[id]: count,}},- setPublicProject(- state,- { payload }: PayloadAction<{ project: Partial<IProject | ISharedProject>; shared?: boolean }>,- ) {- const { project, shared = false } = payload+ setPublicProject(state, { payload }: PayloadAction<{ project: Partial<IProject> }>) {+ const { project } = payload- if (shared) {- state.sharedProjects =- _findIndex(current(state.sharedProjects), (el) => el.id === project.id) >= 0- ? state.sharedProjects- : [- ...state.sharedProjects,- {- ...(project as ISharedProject),- uiHidden: true,- },- ]- } else {- 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> | Partial<ISharedProject>; id: string; shared?: boolean }>,- ) {- const { data, id, shared = false } = 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- if (shared) {- state.sharedProjects = _map(current(state.sharedProjects), (res) => {- if (res.project && res.project.id === id) {- return {- ...res,- ...data,- }- }- return res- })- } else {- state.projects = _map(current(state.projects), (res) => {- if (res.id === id) {- return {- ...res,- ...data,- }+ state.projects = _map(current(state.projects), (res) => {+ if (res.id === id) {+ return {+ ...res,+ ...data,}- return res- })- }+ }+ return res+ })},setProjectsError(state, { payload }: PayloadAction<string>) {state.error = payload},- removeProject(state, { payload }: PayloadAction<{ pid: string; shared: boolean }>) {- const { pid, shared = false } = payload-- if (shared) {- state.sharedProjects = _filter(state.sharedProjects, (project) => project.id !== pid)- state.sharedTotal -= 1- } else {- state.projects = _filter(state.projects, (project) => project.id !== pid)- state.total -= 1- }- },- setProjectsLoading(state, { payload }: PayloadAction<{ isLoading: boolean; shared?: boolean }>) {- const { isLoading, shared = false } = payload+ removeProject(state, { payload }: PayloadAction<{ pid: string }>) {+ const { pid } = payload- if (shared) {- state.isLoadingShared = isLoading- } else {- state.isLoading = isLoading- }+ state.projects = _filter(state.projects, (project) => project.id !== pid)+ state.total -= 1},- setDashboardTabs(state, { payload }: PayloadAction<string>) {- state.dashboardTabs = payload- setItem('dashboardTabs', payload)+ setProjectsLoading(state, { payload }: PayloadAction<{ isLoading: boolean }>) {+ const { isLoading } = payload+ state.isLoading = isLoading},setProjectTab(state, { payload }: PayloadAction<string>) {state.projectTab = payload@@ -241,11 +148,7 @@ const projectsSlice = createSlice({},reset(state) {state.projects = []- state.sharedProjects = []- state.captchaProjects = []state.total = 0- state.sharedTotal = 0- state.captchaTotal = 0state.alerts = []state.subscribers = []state.error = nulldiff --git a/web/app/redux/sagas/actions/index.ts b/web/app/redux/sagas/actions/index.tsindex fbfb3f3d0..5d0a7ee1f 100644--- a/web/app/redux/sagas/actions/index.ts+++ b/web/app/redux/sagas/actions/index.ts@@ -19,16 +19,6 @@ const loadUsageinfo = () => ({type: types.LOAD_USAGEINFO,})-const loadSharedProjects = (take?: number, skip?: number, search?: string) => ({- type: types.LOAD_SHARED_PROJECTS,- payload: { take, skip, search },-})--const loadProjectsCaptcha = (take?: number, skip?: number, search?: string) => ({- type: types.LOAD_PROJECTS,- payload: { take, skip, isCaptcha: true, search },-})-const loadExtensions = () => ({type: types.LOAD_EXTENSIONS,})@@ -179,8 +169,6 @@ const updateShowLiveVisitorsInTitle = (show: boolean, callback: (isSuccess: boolconst sagaActions = {loadProjects,- loadSharedProjects,- loadProjectsCaptcha,loadExtensions,loadProjectAlerts,loginAsync,diff --git a/web/app/redux/sagas/actions/types.ts b/web/app/redux/sagas/actions/types.tsindex e88526d3d..88745efb6 100644--- a/web/app/redux/sagas/actions/types.ts+++ b/web/app/redux/sagas/actions/types.ts@@ -3,7 +3,6 @@ const sagaTypes = Object.freeze({LOAD_PROJECTS: 'LOAD_PROJECTS',LOAD_METAINFO: 'LOAD_METAINFO',LOAD_USAGEINFO: 'LOAD_USAGEINFO',- LOAD_SHARED_PROJECTS: 'LOAD_SHARED_PROJECTS',LOAD_PROJECT_ALERTS: 'LOAD_PROJECT_ALERTS',LOAD_MONITORS: 'LOAD_MONITORS',LOGIN_ASYNC: 'LOGIN_ASYNC',diff --git a/web/app/redux/sagas/auth/workers/signin.ts b/web/app/redux/sagas/auth/workers/signin.tsindex fe8c63041..81fcfa2e9 100644--- a/web/app/redux/sagas/auth/workers/signin.ts+++ b/web/app/redux/sagas/auth/workers/signin.ts@@ -41,8 +41,6 @@ export default function* singinWorker({ payload: { credentials, callback } }: ISyield call(setRefreshToken, refreshToken)yield put(UIActions.setThemeType(user.theme))yield put(sagaActions.loadProjects())- yield put(sagaActions.loadSharedProjects())- yield put(sagaActions.loadProjectsCaptcha())yield put(sagaActions.loadProjectAlerts())yield put(sagaActions.loadMonitors())callback(true, false)diff --git a/web/app/redux/sagas/auth/workers/signup.ts b/web/app/redux/sagas/auth/workers/signup.tsindex f5cfc8f50..1cd270a64 100644--- a/web/app/redux/sagas/auth/workers/signup.ts+++ b/web/app/redux/sagas/auth/workers/signup.ts@@ -48,7 +48,6 @@ export default function* signupWorder({yield put(authActions.setDontRemember(dontRemember))// yield put(UIActions.setThemeType(response.theme))yield put(sagaActions.loadProjects())- yield put(sagaActions.loadSharedProjects())yield put(sagaActions.loadProjectAlerts())yield put(sagaActions.loadMonitors())callback(true)diff --git a/web/app/redux/sagas/auth/workers/sso_auth.ts b/web/app/redux/sagas/auth/workers/sso_auth.tsindex d4627c8ff..893501909 100644--- a/web/app/redux/sagas/auth/workers/sso_auth.ts+++ b/web/app/redux/sagas/auth/workers/sso_auth.ts@@ -71,8 +71,6 @@ export default function* ssoAuth({ payload: { callback, dontRemember, t, provideyield call(setRefreshToken, refreshToken)// yield put(UIActions.setThemeType(user.theme))yield put(sagaActions.loadProjects())- yield put(sagaActions.loadSharedProjects())- yield put(sagaActions.loadProjectsCaptcha())yield put(sagaActions.loadProjectAlerts())yield put(sagaActions.loadMonitors())yield put(authActions.finishLoading())diff --git a/web/app/redux/sagas/ui/index.ts b/web/app/redux/sagas/ui/index.tsindex f36a2e4e7..974ee2b8a 100644--- a/web/app/redux/sagas/ui/index.ts+++ b/web/app/redux/sagas/ui/index.ts@@ -10,7 +10,6 @@ import loadExtensions from './load_extensions'import loadMetainfo from './load_metainfo'import loadUsageinfo from './load_usageinfo'import logout from './logout'-import loadSharedProjects from './load_shared_projects'import loadProjectAlerts from './load_alerts'import loadMonitors from './load_monitors'@@ -23,8 +22,6 @@ function* mainUISaga() {yield takeEvery(sagaTypes.LOAD_PROJECTS, loadProjects)yield takeEvery(sagaTypes.LOAD_METAINFO, loadMetainfo)yield takeEvery(sagaTypes.LOAD_USAGEINFO, loadUsageinfo)- // @ts-expect-error- yield takeEvery(sagaTypes.LOAD_SHARED_PROJECTS, loadSharedProjects)yield takeEvery(sagaTypes.LOAD_EXTENSIONS, loadExtensions)yield takeEvery(sagaTypes.LOGOUT, logout)// @ts-expect-errordiff --git a/web/app/redux/sagas/ui/initialise.ts b/web/app/redux/sagas/ui/initialise.tsindex 34dbba4b0..b1ccec7e7 100644--- a/web/app/redux/sagas/ui/initialise.ts+++ b/web/app/redux/sagas/ui/initialise.ts@@ -17,8 +17,6 @@ export default function* initialise() {if (token && refreshToken) {yield put(sagaActions.loadProjects())- yield put(sagaActions.loadSharedProjects())- yield put(sagaActions.loadProjectsCaptcha())yield put(sagaActions.loadExtensions())yield put(sagaActions.loadProjectAlerts())yield put(sagaActions.loadMonitors())diff --git a/web/app/redux/sagas/ui/load_projects.ts b/web/app/redux/sagas/ui/load_projects.tsindex 111c961a7..164094388 100644--- a/web/app/redux/sagas/ui/load_projects.ts+++ b/web/app/redux/sagas/ui/load_projects.ts@@ -6,20 +6,13 @@ import { getAccessToken } from 'utils/accessToken'import UIActions from 'redux/reducers/ui'-import { ENTRIES_PER_PAGE_DASHBOARD, isSelfhosted } from 'redux/constants'+import { ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'import { IOverall } from 'redux/models/IProject'-const { getProjects, getOverallStats, getLiveVisitors, getOverallStatsCaptcha } = require('../../../api')+const { getProjects, getOverallStats, getLiveVisitors } = require('../../../api')const debug = Debug('swetrix:rx:s:load-projects')-export default function* loadProjects({- payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, isCaptcha = false, search = '' },-}) {- if (isCaptcha && isSelfhosted) {- yield put(UIActions.setCaptchaLoading(false))- return- }-+export default function* loadProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, search = '' } }) {const token = getAccessToken()if (!token) {@@ -27,60 +20,42 @@ export default function* loadProjects({}try {- if (isCaptcha) {- yield put(UIActions.setCaptchaLoading(true))- } else {- yield put(- UIActions.setProjectsLoading({- isLoading: true,- shared: false,- }),- )- }+ yield put(+ UIActions.setProjectsLoading({+ isLoading: true,+ }),+ )let {// eslint-disable-next-line prefer-const, camelcaseresults,totalMonthlyEvents,total,- } = yield call(getProjects, take, skip, isCaptcha, search)+ } = yield call(getProjects, take, skip, search)const pids = _map(results, (result) => result.id)let overall: IOverall = {}- if (isCaptcha) {- try {- overall = yield call(getOverallStatsCaptcha, pids, '7d')- } catch (e) {- debug('failed to overall stats: %s', e)- }- } else {- try {- overall = yield call(getOverallStats, pids, '7d')- } catch (e) {- debug('failed to overall stats: %s', e)- }+ try {+ overall = yield call(getOverallStats, pids, '7d')+ } catch (e) {+ debug('failed to overall stats: %s', e)}yield put(UIActions.setBirdsEyeBulk(overall))- if (isCaptcha) {- yield put(UIActions.setCaptchaProjects(results))- yield put(UIActions.setCaptchaTotal(total))- } else {- yield put(- UIActions.setProjects({- projects: results,- }),- )- yield put(UIActions.setTotalMonthlyEvents(totalMonthlyEvents))- yield put(- UIActions.setTotal({- total,- }),- )- }+ 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(diff --git a/web/app/redux/sagas/ui/load_shared_projects.ts b/web/app/redux/sagas/ui/load_shared_projects.tsdeleted file mode 100644index 990b2378e..000000000--- a/web/app/redux/sagas/ui/load_shared_projects.ts+++ /dev/null@@ -1,95 +0,0 @@-import { put, call } from 'redux-saga/effects'-import _map from 'lodash/map'-import _isString from 'lodash/isString'-import Debug from 'debug'--import UIActions from 'redux/reducers/ui'--import { ENTRIES_PER_PAGE_DASHBOARD, isSelfhosted } from 'redux/constants'-import { IOverall } from 'redux/models/IProject'-const { getSharedProjects, getOverallStats, getLiveVisitors } = require('api')--const debug = Debug('swetrix:rx:s:load-projects')--export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE_DASHBOARD, skip = 0, search = '' } }) {- if (isSelfhosted) {- yield put(- UIActions.setProjectsLoading({- isLoading: false,- shared: true,- }),- )- return- }-- try {- yield put(- UIActions.setProjectsLoading({- isLoading: true,- shared: true,- }),- )-- let {- // eslint-disable-next-line prefer-const- results,- total,- } = yield call(getSharedProjects, take, skip, search)-- if (total === 0) {- yield put(- UIActions.setProjectsLoading({- isLoading: false,- shared: true,- }),- )- return- }-- const projectsWithShared = _map(results, (result) => {- return {- ...result,- project: {- ...result.project,- shared: true,- },- }- })- const pids = _map(projectsWithShared, ({ project }) => project.id)-- let overall: IOverall-- try {- overall = yield call(getOverallStats, pids, '7d')- yield put(UIActions.setBirdsEyeBulk(overall))- } catch (e) {- debug('failed to overall stats: %s', e)- }-- yield put(- UIActions.setProjects({- projects: projectsWithShared,- shared: true,- }),- )- yield put(- UIActions.setTotal({- total,- shared: true,- }),- )-- const liveStats: any[] = yield call(getLiveVisitors, pids)- yield put(- UIActions.setLiveStats({- data: liveStats,- }),- )- } catch (e: unknown) {- const { message } = e as { message: string }- if (_isString(message)) {- yield put(UIActions.setProjectsError(message))- }- debug('failed to load shared projects: %s', message)- }-}diff --git a/web/app/redux/sagas/ui/share_verify.ts b/web/app/redux/sagas/ui/share_verify.tsindex 2bbadefdb..f23cce05a 100644--- a/web/app/redux/sagas/ui/share_verify.ts+++ b/web/app/redux/sagas/ui/share_verify.ts@@ -18,7 +18,6 @@ export default function* shareVerify({// @ts-ignoreyield call(verifyShare, data)yield put(sagaActions.loadProjects())- yield put(sagaActions.loadSharedProjects())successfulCallback()} catch (error) {errorCallback(error)diff --git a/web/app/redux/sagas/ui/worker_live_visitors.ts b/web/app/redux/sagas/ui/worker_live_visitors.tsindex 8c6cd5b8f..e79a21e2a 100644--- a/web/app/redux/sagas/ui/worker_live_visitors.ts+++ b/web/app/redux/sagas/ui/worker_live_visitors.ts@@ -4,61 +4,35 @@ import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import UIActions from 'redux/reducers/ui'-import { LIVE_VISITORS_UPDATE_INTERVAL, tabForSharedProject } from 'redux/constants'-import { ISharedProject } from '../../models/ISharedProject'+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 tab: string = yield select((state) => state.ui.projects.dashboardTabs)- if (tabForSharedProject === tab) {- const sharedProjects: ISharedProject[] = yield select((state) => state.ui.projects.sharedProjects)+ const projects: IProject[] = yield select((state) => state.ui.projects.projects)- if (_isEmpty(sharedProjects)) {- continue- }-- const pids = _map(- _filter(sharedProjects, ({ project }) => !project?.uiHidden),- (item) => (item?.project?.id ? item.project.id : ''),- )-- if (_isEmpty(pids)) {- continue- }-- const liveStats: any[] = yield call(getLiveVisitors, pids)-- yield put(- UIActions.setLiveStats({- data: liveStats,- }),- )- } else {- const projects: IProject[] = yield select((state) => state.ui.projects.projects)- if (_isEmpty(projects)) {- continue- }+ if (_isEmpty(projects)) {+ continue+ }- const pids = _map(- _filter(projects, ({ uiHidden }) => !uiHidden),- (project) => project.id,- )+ const pids = _map(+ _filter(projects, ({ uiHidden }) => !uiHidden),+ (project) => project.id,+ )- if (_isEmpty(pids)) {- continue- }+ if (_isEmpty(pids)) {+ continue+ }- const liveStats: any[] = yield call(getLiveVisitors, pids)+ const liveStats: any[] = yield call(getLiveVisitors, pids)- yield put(- UIActions.setLiveStats({- data: liveStats,- }),- )- }+ yield put(+ UIActions.setLiveStats({+ data: liveStats,+ }),+ )}}diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 1ad8aa30a..c34194dd2 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -505,7 +505,6 @@"quitProjectTitle": "Quit {{project}}?","shared": "Shared projects","receiveLoginNotifications": "Receive login notifications",- "owned": "Owned projects","sharedTable": {"project": "Project","role": "Role",@@ -640,6 +639,7 @@},"dashboard": {"uptime": "Uptime",+ "captcha": "CAPTCHA","newProject": "New project","newFunnel": "New funnel","reloadPage": "Reload page",