📈 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
some fix and test
kruzhambus051cb69da1dd
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex 179c3bba7..8f11e1e53 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -183,7 +183,7 @@ const Dashboard = ({const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)const history = useHistory()const [tabProjects, setTabProjects] = useState(dashboardTabs)- const pageAmount = useMemo(() => _ceil(total / ENTRIES_PER_PAGE_DASHBOARD), [total])+ const pageAmount = useMemo(() => (dashboardTabs === tabForSharedProject ? _ceil(sharedTotal / ENTRIES_PER_PAGE_DASHBOARD) : _ceil(total / ENTRIES_PER_PAGE_DASHBOARD)), [total, sharedTotal, dashboardTabs])const onNewProject = () => {if (user.isActive || isSelfhosted) {@@ -194,8 +194,17 @@ const Dashboard = ({}useEffect(() => {+ if (sharedTotal <= 0) {+ setDashboardTabs(tabForOwnedProject)+ setTabProjects(tabForOwnedProject)+ }+setDashboardTabs(tabProjects)- }, [tabProjects, setDashboardTabs])+ }, [tabProjects, setDashboardTabs, sharedTotal])++ useEffect(() => {+ setDashboardPaginationPage(1)+ }, [tabProjects, setDashboardPaginationPage])useEffect(() => {if (tabProjects === tabForOwnedProject) {@@ -345,7 +354,7 @@ const Dashboard = ({{pageAmount > 1 && (- <Pagination page={dashboardPaginationPage} setPage={(page) => setDashboardPaginationPage(page)} pageAmount={pageAmount || 0} total={total} />+ <Pagination page={dashboardPaginationPage} setPage={(page) => setDashboardPaginationPage(page)} pageAmount={pageAmount || 0} total={tabProjects === tabForSharedProject ? sharedTotal : total} />)}</div>diff --git a/src/pages/Project/Settings/ProjectSettings.container.jsx b/src/pages/Project/Settings/ProjectSettings.container.jsxindex 4c5f2f012..f61a48b25 100644--- a/src/pages/Project/Settings/ProjectSettings.container.jsx+++ b/src/pages/Project/Settings/ProjectSettings.container.jsx@@ -3,6 +3,7 @@ import UIActions from 'redux/actions/ui'import { alertsActions } from 'redux/actions/alerts'import { errorsActions } from 'redux/actions/errors'+import { tabForSharedProject } from 'redux/constants'import ProjectSettings from './ProjectSettings'const mapStateToProps = (state) => ({@@ -10,7 +11,7 @@ const mapStateToProps = (state) => ({sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,user: state.auth.user,- isSharedProject: false,+ isSharedProject: state.ui.projects.dashboardTabs === tabForSharedProject,})const mapDispatchToProps = (dispatch) => ({diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsxindex 3327fc417..8cdfe1790 100644--- a/src/pages/UserSettings/UserSettings.container.jsx+++ b/src/pages/UserSettings/UserSettings.container.jsx@@ -123,7 +123,7 @@ const UserSettingsContainer = () => {}const removeProject = (projectId) => {- dispatch(UIActions.removeProject(projectId))+ dispatch(UIActions.removeProject(projectId, true))}const removeShareProject = (id) => {@@ -131,7 +131,7 @@ const UserSettingsContainer = () => {}const setProjectsShareData = (data, id) => {- dispatch(UIActions.setProjectsShareData(data, id))+ dispatch(UIActions.setProjectsShareData(data, id, true))}const setUserShareData = (data, id) => {diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.jsindex 4ca3e09e0..6bd08cb10 100644--- a/src/redux/reducers/ui/projects.js+++ b/src/redux/reducers/ui/projects.js@@ -209,13 +209,15 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {if (shared) {return {...state,- sharedProjects: _filter(state.sharedProjects, (project) => project.id !== pid),+ sharedProjects: _filter(state.sharedProjects, (item) => item.project.id !== pid),+ sharedTotal: state.sharedTotal - 1,}}return {...state,projects: _filter(state.projects, (project) => project.id !== pid),+ total: state.total - 1,}}