diff --git a/apps/api/src/controllers/insights.controller.ts b/apps/api/src/controllers/insights.controller.ts index e1f0a913..b8051ae3 100644 --- a/apps/api/src/controllers/insights.controller.ts +++ b/apps/api/src/controllers/insights.controller.ts @@ -96,8 +96,6 @@ export async function getPages( startDate: startDate, endDate: endDate, timezone, - cursor: parsed.data.cursor, - limit: Math.min(parsed.data.limit, 50), }); } @@ -170,8 +168,6 @@ export function getOverviewGeneric( startDate: startDate, endDate: endDate, timezone, - cursor: parsed.data.cursor, - limit: Math.min(parsed.data.limit, 50), }), ); }; diff --git a/package.json b/package.json index c2985585..526de4ed 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "lint": "biome check .", "lint:fix": "biome check --write .", "lint:workspace": "pnpm dlx sherif@latest", - "typecheck": "pnpm -r typecheck", + "typecheck": "pnpm -r --no-bail typecheck", "update-simple-git-hooks": "npx simple-git-hooks" }, "simple-git-hooks": { diff --git a/packages/db/src/engine/index.ts b/packages/db/src/engine/index.ts index 4b0bd3d2..4769db9e 100644 --- a/packages/db/src/engine/index.ts +++ b/packages/db/src/engine/index.ts @@ -127,6 +127,8 @@ export async function executeAggregateChart( endDate: normalized.endDate, breakdowns: normalized.breakdowns, limit: normalized.limit, + metric: normalized.metric, + previous: normalized.previous, timezone, }; @@ -251,6 +253,8 @@ export async function executeAggregateChart( endDate: previousPeriod.endDate, breakdowns: normalized.breakdowns, limit: normalized.limit, + metric: normalized.metric, + previous: normalized.previous, timezone, }; diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.ts index 735e6a09..7ce69f81 100644 --- a/packages/db/src/services/chart.service.ts +++ b/packages/db/src/services/chart.service.ts @@ -1,4 +1,3 @@ -import { uniq } from 'ramda'; import sqlstring from 'sqlstring'; import { DateTime, stripLeadingAndTrailingSlashes } from '@openpanel/common'; @@ -355,23 +354,10 @@ export function getAggregateChartSql({ endDate, projectId, limit, - timezone, }: Omit & { timezone: string; }) { - const { - sb, - join, - getWhere, - getFrom, - getJoins, - getSelect, - getOrderBy, - getGroupBy, - getWith, - with: addCte, - getSql, - } = createSqlBuilder(); + const { sb, join, getJoins, with: addCte, getSql } = createSqlBuilder(); sb.where = getEventFiltersWhereClause(event.filters); sb.where.projectId = `project_id = ${sqlstring.escape(projectId)}`; diff --git a/packages/db/src/services/pages.service.ts b/packages/db/src/services/pages.service.ts index 70f3ab58..8e2fdd97 100644 --- a/packages/db/src/services/pages.service.ts +++ b/packages/db/src/services/pages.service.ts @@ -1,7 +1,7 @@ import { TABLE_NAMES, ch } from '../clickhouse/client'; import { clix } from '../clickhouse/query-builder'; -export interface IGetTopPagesInput { +export interface IGetPagesInput { projectId: string; startDate: string; endDate: string; @@ -28,7 +28,7 @@ export class PagesService { endDate, timezone, search, - }: IGetTopPagesInput): Promise { + }: IGetPagesInput): Promise { // CTE: Get titles from the last 30 days for faster retrieval const titlesCte = clix(this.client, timezone) .select([ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5eb3ddbd..0d300ac3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1419,7 +1419,7 @@ importers: packages/sdks/astro: dependencies: '@openpanel/web': - specifier: workspace:1.0.6-local + specifier: workspace:1.0.7-local version: link:../web devDependencies: astro: @@ -1432,7 +1432,7 @@ importers: specifier: workspace:* version: link:../../common '@openpanel/sdk': - specifier: workspace:1.0.3-local + specifier: workspace:1.0.4-local version: link:../sdk express: specifier: ^4.17.0 || ^5.0.0 @@ -1457,7 +1457,7 @@ importers: packages/sdks/nextjs: dependencies: '@openpanel/web': - specifier: workspace:1.0.6-local + specifier: workspace:1.0.7-local version: link:../web next: specifier: ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 @@ -1485,7 +1485,7 @@ importers: packages/sdks/nuxt: dependencies: '@openpanel/web': - specifier: workspace:1.0.6-local + specifier: workspace:1.0.7-local version: link:../web h3: specifier: ^1.0.0 @@ -1522,7 +1522,7 @@ importers: packages/sdks/react-native: dependencies: '@openpanel/sdk': - specifier: workspace:1.0.3-local + specifier: workspace:1.0.4-local version: link:../sdk expo-application: specifier: 5 - 6 @@ -1568,7 +1568,7 @@ importers: packages/sdks/web: dependencies: '@openpanel/sdk': - specifier: workspace:1.0.3-local + specifier: workspace:1.0.4-local version: link:../sdk devDependencies: '@openpanel/tsconfig':