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 panels order after Promise.all related changes on the backend

Blue Mouse4d009839a83d
diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsx
index 6e5c6a66b..7aa232778 100644
--- a/src/pages/Project/View/ViewProject.jsx
+++ b/src/pages/Project/View/ViewProject.jsx
@@ -35,7 +35,8 @@ import Title from 'components/Title'
import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import {
tbPeriodPairs, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE, CDN_URL, isDevelopment,
- timeBucketToDays, getProjectCacheCustomKey, roleViewer, MAX_MONTHS_IN_PAST, MAX_MONTHS_IN_PAST_FREE, PROJECT_TABS, TimeFormat, getProjectForcastCacheKey, chartTypes, roleAdmin,
+ timeBucketToDays, getProjectCacheCustomKey, roleViewer, MAX_MONTHS_IN_PAST, MAX_MONTHS_IN_PAST_FREE, PROJECT_TABS,
+ TimeFormat, getProjectForcastCacheKey, chartTypes, roleAdmin, TRAFFIC_PANELS_ORDER, PERFORMANCE_PANELS_ORDER,
} from 'redux/constants'
import Button from 'ui/Button'
import Loader from 'ui/Loader'
@@ -1585,7 +1586,7 @@ const ViewProject = ({
projectId={id}
/>
)}
- {_map(panelsData.types, (type) => {
+ {_map(TRAFFIC_PANELS_ORDER, (type) => {
const panelName = tnMapping[type]
const panelIcon = panelIconMapping[type]
const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
@@ -1690,7 +1691,7 @@ const ViewProject = ({
</div>
)}
<div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>
- {_map(panelsDataPerf.types, (type) => {
+ {_map(PERFORMANCE_PANELS_ORDER, (type) => {
const panelName = tnMapping[type]
const panelIcon = panelIconMapping[type]
const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
diff --git a/src/redux/constants/index.js b/src/redux/constants/index.js
index 126904666..f35bb3aa1 100644
--- a/src/redux/constants/index.js
+++ b/src/redux/constants/index.js
@@ -69,6 +69,10 @@ export const tbPeriodPairs = (t, tbs, dates) => [{
access: 'free',
}]
+// the order of panels in the project view
+export const TRAFFIC_PANELS_ORDER = ['cc', 'pg', 'lc', 'br', 'os', 'dv', 'ref', 'so', 'me', 'ca']
+export const PERFORMANCE_PANELS_ORDER = ['cc', 'pg', 'br', 'dv']
+
// the maximum amount of months user can go back when picking a date in flat picker (project view)
export const MAX_MONTHS_IN_PAST = 24
export const MAX_MONTHS_IN_PAST_FREE = 3