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!

fix loadProjects with pagination in user settings

Maksim Mrug8f06b27969be
diff --git a/app/pages/Project/Settings/ProjectSettings.container.tsx b/app/pages/Project/Settings/ProjectSettings.container.tsx
index 330ffd3a1..fa06c8e6b 100644
--- a/app/pages/Project/Settings/ProjectSettings.container.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.container.tsx
@@ -12,6 +12,8 @@ const mapStateToProps = (state: StateType) => ({
projects: state.ui.projects.projects,
sharedProjects: state.ui.projects.sharedProjects,
isLoading: state.ui.projects.isLoading,
+ dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,
+ dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,
user: state.auth.user,
isSharedProject: state.ui.projects.dashboardTabs === tabForSharedProject,
})
@@ -44,11 +46,15 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
message,
}))
},
- loadProjects: (shared: boolean) => {
+ loadProjects: (shared: boolean, skip: number) => {
if (shared) {
- dispatch(sagaActions.loadSharedProjects())
+ dispatch(sagaActions.loadSharedProjects(
+ skip,
+ ))
} else {
- dispatch(sagaActions.loadProjects())
+ dispatch(sagaActions.loadProjects(
+ skip,
+ ))
}
},
removeProject: (pid: string, shared: boolean) => {
diff --git a/app/pages/Project/Settings/ProjectSettings.tsx b/app/pages/Project/Settings/ProjectSettings.tsx
index 2ef1af3ba..c44334bf1 100644
--- a/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.tsx
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types'
import { ExclamationTriangleIcon, TrashIcon, RocketLaunchIcon } from '@heroicons/react/24/outline'
import { withAuthentication, auth } from 'hoc/protected'
-import { isSelfhosted, TITLE_SUFFIX } from 'redux/constants'
+import { isSelfhosted, TITLE_SUFFIX, ENTRIES_PER_PAGE_DASHBOARD } from 'redux/constants'
import { IProject } from 'redux/models/IProject'
import { IUser } from 'redux/models/IUser'
import { IProjectForShared, ISharedProject } from 'redux/models/ISharedProject'
@@ -121,14 +121,14 @@ const DEFAULT_PROJECT_NAME = 'Untitled Project'
const ProjectSettings = ({
updateProjectFailed, createNewProjectFailed, generateAlerts, projectDeleted, deleteProjectFailed,
loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,
- deleteProjectCache, setProjectProtectedPassword,
+ deleteProjectCache, setProjectProtectedPassword, dashboardPaginationPage, dashboardPaginationPageShared,
}: {
updateProjectFailed: (message: string) => void,
createNewProjectFailed: (message: string) => void,
generateAlerts: (message: string) => void,
projectDeleted: (message: string) => void,
deleteProjectFailed: (message: string) => void,
- loadProjects: (shared: boolean) => void,
+ loadProjects: (shared: boolean, skip: number) => void,
isLoading: boolean,
projects: IProject[],
showError: (message: string) => void,
@@ -138,6 +138,8 @@ const ProjectSettings = ({
sharedProjects: ISharedProject[],
deleteProjectCache: (pid: string) => void,
setProjectProtectedPassword: (pid: string, password: string) => void,
+ dashboardPaginationPage: number,
+ dashboardPaginationPageShared: number,
}) => {
const { t }: {
t: (key: string, options?: {
@@ -179,6 +181,8 @@ const ProjectSettings = ({
const [tab, setTab] = useState<string>(tabDeleteDataModal[0].name)
const [showProtected, setShowProtected] = useState<boolean>(false)
+ const paginationSkip: number = isSharedProject ? dashboardPaginationPageShared * ENTRIES_PER_PAGE_DASHBOARD : dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARD
+
useEffect(() => {
if (!user.isActive && !isSelfhosted) {
showError(t('project.settings.verify'))
@@ -228,7 +232,7 @@ const ProjectSettings = ({
generateAlerts(t('project.settings.created'))
}
- loadProjects(isSharedProject)
+ loadProjects(isSharedProject, paginationSkip)
} catch (e) {
if (isSettings) {
updateProjectFailed(e as string)