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 with sharedProjects

kruzhambus4f916c4638ca
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
index 724b2303b..d18990f10 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -237,41 +237,43 @@ const Dashboard = ({
}) => (
<div key={confirmed ? `${id}-confirmed` : id}>
{
- (_isUndefined(confirmed) || confirmed) ? (
- <Link to={_replace(routes.project, ':id', id)}>
+ !(dashboardPaginationPage > 1 && shared) && (
+ (_isUndefined(confirmed) || confirmed) ? (
+ <Link to={_replace(routes.project, ':id', id)}>
+ <ProjectCart
+ t={t}
+ language={language}
+ name={name}
+ created={created}
+ shared={shared}
+ active={active}
+ isPublic={isPublic}
+ confirmed={confirmed}
+ overall={overall}
+ live={_isNumber(live) ? live : 'N/A'}
+ />
+ </Link>
+ ) : (
<ProjectCart
t={t}
+ id={id}
language={language}
name={name}
created={created}
shared={shared}
active={active}
isPublic={isPublic}
- confirmed={confirmed}
overall={overall}
+ confirmed={confirmed}
+ sharedProjects={user.sharedProjects}
+ setProjectsShareData={setProjectsShareData}
+ setUserShareData={setUserShareData}
live={_isNumber(live) ? live : 'N/A'}
+ userSharedUpdate={userSharedUpdate}
+ sharedProjectError={sharedProjectError}
+ deleteProjectFailed={deleteProjectFailed}
/>
- </Link>
- ) : (
- <ProjectCart
- t={t}
- id={id}
- language={language}
- name={name}
- created={created}
- shared={shared}
- active={active}
- isPublic={isPublic}
- overall={overall}
- confirmed={confirmed}
- sharedProjects={user.sharedProjects}
- setProjectsShareData={setProjectsShareData}
- setUserShareData={setUserShareData}
- live={_isNumber(live) ? live : 'N/A'}
- userSharedUpdate={userSharedUpdate}
- sharedProjectError={sharedProjectError}
- deleteProjectFailed={deleteProjectFailed}
- />
+ )
)
}
</div>
diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.js
index e0455eb75..0321b3289 100644
--- a/src/redux/actions/ui/index.js
+++ b/src/redux/actions/ui/index.js
@@ -12,6 +12,13 @@ const setProjects = (projects) => ({
},
})
+const setShareProjects = (projects) => ({
+ type: types.SET_SHARE_PROJECTS,
+ payload: {
+ projects,
+ },
+})
+
const setTotalMonthlyEvents = (totalMonthlyEvents) => ({
type: types.SET_TOTAL_MONTHLY_EVENTS,
payload: {
@@ -158,6 +165,7 @@ const UIActions = {
setShowNoEventsLeftBanner,
setProjectsShareData,
shareVerifyAsync,
+ setShareProjects,
}
export default UIActions
diff --git a/src/redux/actions/ui/types.js b/src/redux/actions/ui/types.js
index fb4943e18..0ab6fc370 100644
--- a/src/redux/actions/ui/types.js
+++ b/src/redux/actions/ui/types.js
@@ -16,6 +16,7 @@ export const types = {
SET_TOTAL_MONTHLY_EVENTS: 'UI_SET_TOTAL_MONTHLY_EVENTS',
SET_TOTAL: 'UI_SET_TOTAL',
SET_DASHBOARD_PAGINATION_PAGE: 'UI_SET_DASHBOARD_PAGINATION_PAGE',
+ SET_SHARE_PROJECTS: 'UI_SET_SHARE_PROJECTS',
SET_SHOW_NO_EVENTS_LEFT: 'UI_SET_SHOW_NO_EVENTS_LEFT',
SET_PROJECTS_SHARE_DATA: 'UI_SET_PROJECTS_SHARE_DATA',
SHARE_VERIFY_ASYNC: 'UI_SHARE_VERIFY_ASYNC',
diff --git a/src/redux/reducers/ui/projects.js b/src/redux/reducers/ui/projects.js
index b52603387..83af48416 100644
--- a/src/redux/reducers/ui/projects.js
+++ b/src/redux/reducers/ui/projects.js
@@ -26,6 +26,15 @@ const projectsReducer = (state = getInitialState(), { type, payload }) => {
}
}
+ case types.SET_SHARE_PROJECTS: {
+ const { projects } = payload
+ return {
+ ...state,
+ sharedProjects: projects,
+ isLoading: false,
+ }
+ }
+
case types.SET_DASHBOARD_PAGINATION_PAGE: {
const { page } = payload
return {