Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
benjackwhite committed Sep 26, 2023
2 parents 4693936 + 705d877 commit da93015
Show file tree
Hide file tree
Showing 106 changed files with 3,865 additions and 611 deletions.
1 change: 1 addition & 0 deletions bin/copy-posthog-js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ cp node_modules/posthog-js/dist/array.js* frontend/dist/
cp node_modules/posthog-js/dist/array.full.js* frontend/dist/
cp node_modules/posthog-js/dist/recorder.js* frontend/dist/
cp node_modules/posthog-js/dist/recorder-v2.js* frontend/dist/
cp node_modules/posthog-js/dist/surveys.js* frontend/dist/
Binary file modified frontend/__snapshots__/lemon-ui-icons--shelf-b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/__snapshots__/lemon-ui-icons--shelf-i.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/lib/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ export const FEATURE_FLAGS = {
SESSION_REPLAY_CORS_PROXY: 'session-replay-cors-proxy', // owner: #team-monitoring
HOGQL_INSIGHTS: 'hogql-insights', // owner: @mariusandra
WEBHOOKS_DENYLIST: 'webhooks-denylist', // owner: #team-pipeline
SURVEYS_SITE_APP_DEPRECATION: 'surveys-site-app-deprecation', // owner: @neilkakkar
} as const
export type FeatureFlagKey = (typeof FEATURE_FLAGS)[keyof typeof FEATURE_FLAGS]

Expand Down
21 changes: 21 additions & 0 deletions frontend/src/lib/lemon-ui/icons/icons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1927,6 +1927,27 @@ export function IconMonitor(props: LemonIconProps): JSX.Element {
)
}

/** Material Bold icon. */
export function IconBold(props: LemonIconProps): JSX.Element {
return (
<LemonIconBase {...props}>
<path
fill="currentColor"
d="M15.6 10.79c.97-.67 1.65-1.77 1.65-2.79 0-2.26-1.75-4-4-4H7v14h7.04c2.09 0 3.71-1.7 3.71-3.79 0-1.52-.86-2.82-2.15-3.42zM10 6.5h3c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5h-3v-3zm3.5 9H10v-3h3.5c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5z"
/>
</LemonIconBase>
)
}

/** Material Italic icon. */
export function IconItalic(props: LemonIconProps): JSX.Element {
return (
<LemonIconBase {...props}>
<path fill="currentColor" d="M10 4v3h2.21l-3.42 8H6v3h8v-3h-2.21l3.42-8H18V4h-8z" />
</LemonIconBase>
)
}

/** Material CellPhone icon. */
export function IconPhone(props: LemonIconProps): JSX.Element {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ describe('filtersToQueryNode', () => {
funnel_correlation_person_entity: { a: 1 },
funnel_correlation_person_converted: 'true',
funnel_custom_steps: [1, 2, 3],
funnel_advanced: true,
layout: FunnelLayout.horizontal,
funnel_step: 1,
entrance_period_start: 'abc',
Expand All @@ -371,7 +370,6 @@ describe('filtersToQueryNode', () => {
funnel_from_step: 1,
funnel_to_step: 2,
funnel_step_reference: FunnelStepReference.total,
funnel_step_breakdown: 1,
breakdown_attribution_type: BreakdownAttributionType.AllSteps,
breakdown_attribution_value: 1,
bin_count: 'auto',
Expand All @@ -384,14 +382,7 @@ describe('filtersToQueryNode', () => {
funnel_to_step: 1,
},
],
funnel_correlation_person_entity: { a: 1 },
funnel_correlation_person_converted: 'true',
funnel_custom_steps: [1, 2, 3],
funnel_advanced: true,
layout: FunnelLayout.horizontal,
funnel_step: 1,
entrance_period_start: 'abc',
drop_off: true,
hidden_legend_breakdowns: ['Chrome', 'Safari'],
},
}
Expand Down Expand Up @@ -465,9 +456,6 @@ describe('filtersToQueryNode', () => {
funnel_filter: { a: 1 },
exclude_events: ['e', 'f'],
step_limit: 1,
path_start_key: 'g',
path_end_key: 'h',
path_dropoff_key: 'i',
path_replacements: true,
local_path_cleaning_filters: [{ alias: 'home' }],
edge_limit: 1,
Expand All @@ -486,7 +474,6 @@ describe('filtersToQueryNode', () => {
compare: true,
show_legend: true,
hidden_legend_keys: { 0: true, 10: true },
stickiness_days: 2,
shown_as: ShownAsValue.STICKINESS,
display: ChartDisplayType.ActionsLineGraph,
}
Expand All @@ -499,7 +486,6 @@ describe('filtersToQueryNode', () => {
compare: true,
show_legend: true,
hidden_legend_indexes: [0, 10],
stickiness_days: 2,
shown_as: ShownAsValue.STICKINESS,
display: ChartDisplayType.ActionsLineGraph,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,14 @@ export const filtersToQueryNode = (filters: Partial<FilterType>): InsightQueryNo
funnel_from_step: filters.funnel_from_step,
funnel_to_step: filters.funnel_to_step,
funnel_step_reference: filters.funnel_step_reference,
funnel_step_breakdown: filters.funnel_step_breakdown,
breakdown_attribution_type: filters.breakdown_attribution_type,
breakdown_attribution_value: filters.breakdown_attribution_value,
bin_count: filters.bin_count,
funnel_window_interval_unit: filters.funnel_window_interval_unit,
funnel_window_interval: filters.funnel_window_interval,
funnel_order_type: filters.funnel_order_type,
exclusions: filters.exclusions,
funnel_correlation_person_entity: filters.funnel_correlation_person_entity,
funnel_correlation_person_converted: filters.funnel_correlation_person_converted,
funnel_custom_steps: filters.funnel_custom_steps,
funnel_advanced: filters.funnel_advanced,
layout: filters.layout,
funnel_step: filters.funnel_step,
entrance_period_start: filters.entrance_period_start,
drop_off: filters.drop_off,
hidden_legend_breakdowns: cleanHiddenLegendSeries(filters.hidden_legend_keys),
funnel_aggregate_by_hogql: filters.funnel_aggregate_by_hogql,
})
Expand Down Expand Up @@ -238,9 +230,6 @@ export const filtersToQueryNode = (filters: Partial<FilterType>): InsightQueryNo
funnel_filter: filters.funnel_filter,
exclude_events: filters.exclude_events,
step_limit: filters.step_limit,
path_start_key: filters.path_start_key,
path_end_key: filters.path_end_key,
path_dropoff_key: filters.path_dropoff_key,
path_replacements: filters.path_replacements,
local_path_cleaning_filters: filters.local_path_cleaning_filters,
edge_limit: filters.edge_limit,
Expand All @@ -256,7 +245,6 @@ export const filtersToQueryNode = (filters: Partial<FilterType>): InsightQueryNo
compare: filters.compare,
show_legend: filters.show_legend,
hidden_legend_indexes: cleanHiddenLegendIndexes(filters.hidden_legend_keys),
stickiness_days: filters.stickiness_days,
shown_as: filters.shown_as,
show_values_on_series: filters.show_values_on_series,
})
Expand Down
127 changes: 44 additions & 83 deletions frontend/src/queries/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,20 +528,6 @@
},
"EmptyPropertyFilter": {
"additionalProperties": false,
"properties": {
"key": {
"not": {}
},
"operator": {
"not": {}
},
"type": {
"not": {}
},
"value": {
"not": {}
}
},
"type": "object"
},
"EntityType": {
Expand Down Expand Up @@ -860,15 +846,7 @@
"enum": ["second", "minute", "hour", "day", "week", "month"],
"type": "string"
},
"FunnelLayout": {
"enum": ["horizontal", "vertical"],
"type": "string"
},
"FunnelPathType": {
"enum": ["funnel_path_before_step", "funnel_path_between_steps", "funnel_path_after_step"],
"type": "string"
},
"FunnelStepRangeEntityFilter": {
"FunnelExclusion": {
"additionalProperties": false,
"properties": {
"custom_name": {
Expand Down Expand Up @@ -898,6 +876,14 @@
},
"type": "object"
},
"FunnelLayout": {
"enum": ["horizontal", "vertical"],
"type": "string"
},
"FunnelPathType": {
"enum": ["funnel_path_before_step", "funnel_path_between_steps", "funnel_path_after_step"],
"type": "string"
},
"FunnelStepReference": {
"enum": ["total", "previous"],
"type": "string"
Expand All @@ -908,7 +894,7 @@
},
"FunnelsFilter": {
"additionalProperties": false,
"description": "`FunnelsFilterType` minus everything inherited from `FilterType` and `hidden_legend_keys` replaced by `hidden_legend_breakdowns`",
"description": "`FunnelsFilterType` minus everything inherited from `FilterType` and persons modal related params and `hidden_legend_keys` replaced by `hidden_legend_breakdowns`",
"properties": {
"bin_count": {
"$ref": "#/definitions/BinCountValue"
Expand All @@ -919,65 +905,21 @@
"breakdown_attribution_value": {
"type": "number"
},
"drop_off": {
"type": "boolean"
},
"entrance_period_start": {
"type": "string"
},
"exclusions": {
"items": {
"$ref": "#/definitions/FunnelStepRangeEntityFilter"
"$ref": "#/definitions/FunnelExclusion"
},
"type": "array"
},
"funnel_advanced": {
"type": "boolean"
},
"funnel_aggregate_by_hogql": {
"type": "string"
},
"funnel_correlation_person_converted": {
"enum": ["true", "false"],
"type": "string"
},
"funnel_correlation_person_entity": {
"type": "object"
},
"funnel_custom_steps": {
"items": {
"type": "number"
},
"type": "array"
},
"funnel_from_step": {
"type": "number"
},
"funnel_order_type": {
"$ref": "#/definitions/StepOrderValue"
},
"funnel_step": {
"type": "number"
},
"funnel_step_breakdown": {
"anyOf": [
{
"type": "string"
},
{
"items": {
"type": "number"
},
"type": "array"
},
{
"type": "number"
},
{
"type": "null"
}
]
},
"funnel_step_reference": {
"$ref": "#/definitions/FunnelStepReference"
},
Expand Down Expand Up @@ -1486,7 +1428,7 @@
},
"PathsFilter": {
"additionalProperties": false,
"description": "`PathsFilterType` minus everything inherited from `FilterType`",
"description": "`PathsFilterType` minus everything inherited from `FilterType` and persons modal related params",
"properties": {
"edge_limit": {
"type": "number"
Expand Down Expand Up @@ -1524,12 +1466,6 @@
"min_edge_weight": {
"type": "number"
},
"path_dropoff_key": {
"type": "string"
},
"path_end_key": {
"type": "string"
},
"path_groupings": {
"items": {
"type": "string"
Expand All @@ -1539,9 +1475,6 @@
"path_replacements": {
"type": "boolean"
},
"path_start_key": {
"type": "string"
},
"path_type": {
"$ref": "#/definitions/PathType"
},
Expand Down Expand Up @@ -2065,7 +1998,7 @@
},
"StickinessFilter": {
"additionalProperties": false,
"description": "`StickinessFilterType` minus everything inherited from `FilterType` and `hidden_legend_keys` replaced by `hidden_legend_indexes`",
"description": "`StickinessFilterType` minus everything inherited from `FilterType` and persons modal related params and `hidden_legend_keys` replaced by `hidden_legend_indexes`",
"properties": {
"compare": {
"type": "boolean"
Expand All @@ -2087,9 +2020,6 @@
},
"shown_as": {
"$ref": "#/definitions/ShownAsValue"
},
"stickiness_days": {
"type": "number"
}
},
"type": "object"
Expand Down Expand Up @@ -2283,6 +2213,9 @@
],
"description": "Property filters for all series"
},
"response": {
"$ref": "#/definitions/TrendsQueryResponse"
},
"samplingFactor": {
"description": "Sampling rate",
"type": ["number", "null"]
Expand All @@ -2308,6 +2241,34 @@
},
"required": ["kind", "series"],
"type": "object"
},
"TrendsQueryResponse": {
"additionalProperties": false,
"properties": {
"is_cached": {
"type": "boolean"
},
"last_refresh": {
"type": "string"
},
"next_allowed_client_refresh": {
"type": "string"
},
"result": {
"items": {
"type": "object"
},
"type": "array"
},
"timings": {
"items": {
"$ref": "#/definitions/QueryTiming"
},
"type": "array"
}
},
"required": ["result"],
"type": "object"
}
}
}
Loading

0 comments on commit da93015

Please sign in to comment.