Skip to content

Commit

Permalink
Merge branch 'master' into fix/js-lite-usage-reports
Browse files Browse the repository at this point in the history
  • Loading branch information
@marandaneto
marandaneto authored Dec 3, 2024
2 parents 57ac5fc + e43803b commit fbd099e
Show file tree
Hide file tree
Showing 14 changed files with 111 additions and 776 deletions.
2 changes: 0 additions & 2 deletions frontend/src/queries/nodes/DataTable/queryFeatures.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
isWebGoalsQuery,
isWebOverviewQuery,
isWebStatsTableQuery,
isWebTopClicksQuery,
} from '~/queries/utils'

export enum QueryFeature {
Expand Down Expand Up @@ -62,7 +61,6 @@ export function getQueryFeatures(query: Node): Set<QueryFeature> {

if (
isWebOverviewQuery(query) ||
isWebTopClicksQuery(query) ||
isWebExternalClicksQuery(query) ||
isWebStatsTableQuery(query) ||
isWebGoalsQuery(query)
Expand Down
320 changes: 0 additions & 320 deletions frontend/src/queries/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,6 @@
{
"$ref": "#/definitions/WebExternalClicksTableQuery"
},
{
"$ref": "#/definitions/WebTopClicksQuery"
},
{
"$ref": "#/definitions/WebGoalsQuery"
},
Expand Down Expand Up @@ -3620,83 +3617,6 @@
],
"type": "object"
},
"CachedWebTopClicksQueryResponse": {
"additionalProperties": false,
"properties": {
"cache_key": {
"type": "string"
},
"cache_target_age": {
"format": "date-time",
"type": "string"
},
"calculation_trigger": {
"description": "What triggered the calculation of the query, leave empty if user/immediate",
"type": "string"
},
"columns": {
"items": {},
"type": "array"
},
"error": {
"description": "Query error. Returned only if 'explain' or `modifiers.debug` is true. Throws an error otherwise.",
"type": "string"
},
"hogql": {
"description": "Generated HogQL query.",
"type": "string"
},
"is_cached": {
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"results": {
"items": {},
"type": "array"
},
"samplingRate": {
"$ref": "#/definitions/SamplingRate"
},
"timezone": {
"type": "string"
},
"timings": {
"description": "Measured timings for different parts of the query generation process",
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
},
"types": {
"items": {},
"type": "array"
}
},
"required": [
"cache_key",
"is_cached",
"last_refresh",
"next_allowed_client_refresh",
"results",
"timezone"
],
"type": "object"
},
"ChartAxis": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -4397,51 +4317,6 @@
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"columns": {
"items": {},
"type": "array"
},
"error": {
"description": "Query error. Returned only if 'explain' or `modifiers.debug` is true. Throws an error otherwise.",
"type": "string"
},
"hogql": {
"description": "Generated HogQL query.",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"results": {
"items": {},
"type": "array"
},
"samplingRate": {
"$ref": "#/definitions/SamplingRate"
},
"timings": {
"description": "Measured timings for different parts of the query generation process",
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
},
"types": {
"items": {},
"type": "array"
}
},
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -4825,9 +4700,6 @@
{
"$ref": "#/definitions/WebExternalClicksTableQuery"
},
{
"$ref": "#/definitions/WebTopClicksQuery"
},
{
"$ref": "#/definitions/WebGoalsQuery"
},
Expand Down Expand Up @@ -8622,7 +8494,6 @@
"InsightActorsQueryOptions",
"FunnelCorrelationQuery",
"WebOverviewQuery",
"WebTopClicksQuery",
"WebStatsTableQuery",
"WebExternalClicksTableQuery",
"WebGoalsQuery",
Expand Down Expand Up @@ -9713,51 +9584,6 @@
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"columns": {
"items": {},
"type": "array"
},
"error": {
"description": "Query error. Returned only if 'explain' or `modifiers.debug` is true. Throws an error otherwise.",
"type": "string"
},
"hogql": {
"description": "Generated HogQL query.",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"results": {
"items": {},
"type": "array"
},
"samplingRate": {
"$ref": "#/definitions/SamplingRate"
},
"timings": {
"description": "Measured timings for different parts of the query generation process",
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
},
"types": {
"items": {},
"type": "array"
}
},
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -10386,51 +10212,6 @@
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
"columns": {
"items": {},
"type": "array"
},
"error": {
"description": "Query error. Returned only if 'explain' or `modifiers.debug` is true. Throws an error otherwise.",
"type": "string"
},
"hogql": {
"description": "Generated HogQL query.",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"results": {
"items": {},
"type": "array"
},
"samplingRate": {
"$ref": "#/definitions/SamplingRate"
},
"timings": {
"description": "Measured timings for different parts of the query generation process",
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
},
"types": {
"items": {},
"type": "array"
}
},
"required": ["results"],
"type": "object"
},
{
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -11175,9 +10956,6 @@
{
"$ref": "#/definitions/WebExternalClicksTableQuery"
},
{
"$ref": "#/definitions/WebTopClicksQuery"
},
{
"$ref": "#/definitions/WebGoalsQuery"
},
Expand Down Expand Up @@ -13568,104 +13346,6 @@
"required": ["results"],
"type": "object"
},
"WebTopClicksQuery": {
"additionalProperties": false,
"properties": {
"conversionGoal": {
"anyOf": [
{
"$ref": "#/definitions/WebAnalyticsConversionGoal"
},
{
"type": "null"
}
]
},
"dateRange": {
"$ref": "#/definitions/DateRange"
},
"filterTestAccounts": {
"type": "boolean"
},
"kind": {
"const": "WebTopClicksQuery",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"properties": {
"$ref": "#/definitions/WebAnalyticsPropertyFilters"
},
"response": {
"$ref": "#/definitions/WebTopClicksQueryResponse"
},
"sampling": {
"additionalProperties": false,
"properties": {
"enabled": {
"type": "boolean"
},
"forceSamplingRate": {
"$ref": "#/definitions/SamplingRate"
}
},
"type": "object"
},
"useSessionsTable": {
"deprecated": "ignored, always treated as enabled *",
"type": "boolean"
}
},
"required": ["kind", "properties"],
"type": "object"
},
"WebTopClicksQueryResponse": {
"additionalProperties": false,
"properties": {
"columns": {
"items": {},
"type": "array"
},
"error": {
"description": "Query error. Returned only if 'explain' or `modifiers.debug` is true. Throws an error otherwise.",
"type": "string"
},
"hogql": {
"description": "Generated HogQL query.",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"results": {
"items": {},
"type": "array"
},
"samplingRate": {
"$ref": "#/definitions/SamplingRate"
},
"timings": {
"description": "Measured timings for different parts of the query generation process",
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
},
"types": {
"items": {},
"type": "array"
}
},
"required": ["results"],
"type": "object"
},
"YAxisSettings": {
"additionalProperties": false,
"properties": {
Expand Down
Loading

0 comments on commit fbd099e

Please sign in to comment.