📈 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
fix seo gsc pagination and compare freshness
Blue Mouse522a632e5eaa
diff --git a/backend/apps/cloud/src/project/gsc.service.ts b/backend/apps/cloud/src/project/gsc.service.tsindex 65f012bea..c01dcdb9f 100644--- a/backend/apps/cloud/src/project/gsc.service.ts+++ b/backend/apps/cloud/src/project/gsc.service.ts@@ -977,11 +977,23 @@ export class GSCService {const dimensionFilterGroups = this.getDimensionFilterGroups(filtersStr)try {- const rows = await this.queryGSC(gsc, from, to, {- dimensions: ['date', 'query'],- rowLimit: MAX_ROW_LIMIT,- dimensionFilterGroups,- })+ const rows: GSCRow[] = []+ let startRow = 0++ while (true) {+ const page = await this.queryGSC(gsc, from, to, {+ dimensions: ['date', 'query'],+ rowLimit: MAX_ROW_LIMIT,+ startRow,+ dimensionFilterGroups,+ })++ rows.push(...page)++ if (page.length < MAX_ROW_LIMIT) break++ startRow += MAX_ROW_LIMIT+ }const impressionBuckets = initialImpressionPositionBuckets()const organicPositionsByDate = new Map<diff --git a/backend/apps/community/src/project/gsc.service.ts b/backend/apps/community/src/project/gsc.service.tsindex 271724c50..d525ba03e 100644--- a/backend/apps/community/src/project/gsc.service.ts+++ b/backend/apps/community/src/project/gsc.service.ts@@ -1038,11 +1038,23 @@ export class GSCService {const dimensionFilterGroups = this.getDimensionFilterGroups(filtersStr)try {- const rows = await this.queryGSC(gsc, from, to, {- dimensions: ['date', 'query'],- rowLimit: MAX_ROW_LIMIT,- dimensionFilterGroups,- })+ const rows: GSCRow[] = []+ let startRow = 0++ while (true) {+ const page = await this.queryGSC(gsc, from, to, {+ dimensions: ['date', 'query'],+ rowLimit: MAX_ROW_LIMIT,+ startRow,+ dimensionFilterGroups,+ })++ rows.push(...page)++ if (page.length < MAX_ROW_LIMIT) break++ startRow += MAX_ROW_LIMIT+ }const impressionBuckets = initialImpressionPositionBuckets()const organicPositionsByDate = new Map<diff --git a/web/app/pages/Project/tabs/SEO/SEOView.tsx b/web/app/pages/Project/tabs/SEO/SEOView.tsxindex 50af489b3..5d0ee4ee6 100644--- a/web/app/pages/Project/tabs/SEO/SEOView.tsx+++ b/web/app/pages/Project/tabs/SEO/SEOView.tsx@@ -260,6 +260,7 @@ const SEOViewInner = ({ projectId, tnMapping }: SEOViewProps) => {const currentPromise = fetchDashboard(projectId, params)if (isActiveCompare && compareEnabled && compareFrom && compareTo) {+ resetCompareData()await Promise.all([currentPromise,fetchCompareDashboard(projectId, {diff --git a/web/app/pages/Project/tabs/SEO/seo-chart-options.ts b/web/app/pages/Project/tabs/SEO/seo-chart-options.tsindex 403c8b710..b118c31f5 100644--- a/web/app/pages/Project/tabs/SEO/seo-chart-options.ts+++ b/web/app/pages/Project/tabs/SEO/seo-chart-options.ts@@ -128,11 +128,12 @@ export function buildMainChartOptions(year: '%Y',}const tickFormat = tickFormatMap[timeBucket] || '%b %d'+ const xFormat = timeBucket === 'hour' ? '%Y-%m-%d %H:%M:%S' : '%Y-%m-%d'return {data: {x: 'x',- xFormat: timeBucket === 'hour' ? '%Y-%m-%d %H:%M:%S' : '%Y-%m-%d',+ xFormat,columns,types,axes,@@ -219,7 +220,7 @@ export function buildMainChartOptions(? compareSeries?.[firstIndex]?.date: nullconst parsedCompareDate = compareDate- ? d3.timeParse('%Y-%m-%d')(compareDate)+ ? d3.timeParse(xFormat)(compareDate): nullconst compareHeaderLabel = parsedCompareDate? d3.timeFormat(tooltipFmt)(parsedCompareDate)