diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46b9bb6e6..69011fb8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ name: Main on: push: - branches: [main] + branches: [main, v2] pull_request: - branches: [main] + branches: [main, v2] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/packages/app/src/DBDashboardPage.tsx b/packages/app/src/DBDashboardPage.tsx index 0a54ea1df..f23aa16d2 100644 --- a/packages/app/src/DBDashboardPage.tsx +++ b/packages/app/src/DBDashboardPage.tsx @@ -63,7 +63,11 @@ import GranularityPicker, { import HDXMarkdownChart from './HDXMarkdownChart'; import { withAppNav } from './layout'; import SearchInputV2 from './SearchInputV2'; -import { getFirstTimestampValueExpression, useSource, useSources } from './source'; +import { + getFirstTimestampValueExpression, + useSource, + useSources, +} from './source'; import { SearchCondition, SearchConditionLanguage, diff --git a/packages/app/src/renderChartConfig.tsx b/packages/app/src/renderChartConfig.tsx index 5b56c51d5..04e88e440 100644 --- a/packages/app/src/renderChartConfig.tsx +++ b/packages/app/src/renderChartConfig.tsx @@ -6,6 +6,7 @@ import { ChSql, chSql, concatChSql, wrapChSqlIfNotEmpty } from '@/clickhouse'; import { DisplayType } from '@/DisplayType'; import { Metadata, metadata } from '@/metadata'; import { CustomSchemaSQLSerializerV2, SearchQueryBuilder } from '@/queryParser'; +import { getFirstTimestampValueExpression } from '@/source'; import { AggregateFunction, AggregateFunctionWithCombinators, @@ -16,7 +17,6 @@ import { SortSpecificationList, SQLInterval, } from '@/sqlTypes'; -import { getFirstTimestampValueExpression } from './source'; // FIXME: SQLParser.ColumnRef is incomplete type ColumnRef = SQLParser.ColumnRef & { @@ -461,7 +461,6 @@ function timeFilterExpr( ); } - async function renderSelect( chartConfig: ChartConfigWithOptDateRange, metadata: Metadata,