@vizzly/dashboard 0.15.0-dev-3d764e5c2346be462bbcf7327369903e64b96b40 → 0.15.1-dev-7c85efb9d70a7b5e5367d265c0b48faf46ecac6e

package/dist/shared-logic/src/BubbleChartV2/getScaleAndTicks.d.ts

@@ -3,7 +3,6 @@ import { QueryAttributes } from '../QueryAttributes/types';
 import { DataType } from '../Field/types';
 import { FormattedResult } from '../Result/types';
 import { Tick } from '../ChartsV2/types';
-import { ApproxAxisLabelCount } from '../../../shared-logic/src/Component/types';
 declare type FormattingFunction = (value: any, nullValueAlias?: string) => string;
 interface getScaleAndTicksArgs {
     data: FormattedResult['contentMapped'];
@@ -11,7 +10,7 @@ interface getScaleAndTicksArgs {
     xScaleDataType: DataType;
     yKeys: string[];
     nullValue: string | undefined;
-    approxYAxisLabelCount: ApproxAxisLabelCount;
+    tickCountYAxis: number;
     formattingFunctionX: FormattingFunction;
     formattingFunctionY: FormattingFunction;
     order: QueryAttributes.Order[];
@@ -33,11 +32,11 @@ interface getScaleAndTicksReturn {
         scale: {
             max: number;
             min: number;
-            key: string | null;
+            key: null;
             ordering: 'asc' | 'desc';
             dataType: 'number';
         };
     };
 }
-export declare const getScaleAndTicks: ({ data, xKey, yKeys, xScaleDataType, nullValue, approxYAxisLabelCount, formattingFunctionX, formattingFunctionY, order, goalLines, }: getScaleAndTicksArgs) => getScaleAndTicksReturn;
+export declare const getScaleAndTicks: ({ data, xKey, yKeys, xScaleDataType, nullValue, tickCountYAxis, formattingFunctionX, formattingFunctionY, order, goalLines, }: getScaleAndTicksArgs) => getScaleAndTicksReturn;
 export {};

package/dist/shared-logic/src/BubbleChartV2/types.d.ts

@@ -1,4 +1,3 @@
-import { Component } from '../../../shared-logic/src/Component/types';
 import { Tick } from '../ChartsV2/types';
 import { DataType } from '../Field/types';
 export declare type KeyId = string;
@@ -37,12 +36,6 @@ export declare type Key = {
     keyFormatted: string;
     dataType: DataType;
 };
-export declare type Legend = {
-    keys: {
-        [key: KeyId]: Key;
-    };
-    items: LegendItem[];
-};
 export declare type BubbleChartRepresentation = {
     keys: {
         [key: KeyId]: Key;
@@ -54,15 +47,12 @@ export declare type BubbleChartRepresentation = {
         keys: KeyId[];
     }>;
     z: string;
-    quadrants: Component.Quadrant.Rule;
     conditionalFormattingRules: ConditionalFormattingRule[];
     goalLines: GoalLine[];
     data: {
         [keyId: string]: DataItem;
     }[];
     lines: LegendItem[];
-    groupByKey: string;
-    legend: Legend;
 };
 export declare type DataItem = {
     value: number | string | null;

package/dist/shared-logic/src/Callbacks/cell.funcs.d.ts

@@ -65,7 +65,7 @@ export declare function getCellAttributes(result: Result, rowIndex: number, cell
         aggregate?: undefined;
     } | {
         fieldId: string;
-        value: import("react").ReactText;
+        value: string | number;
         function: string;
         aggregate: string;
         grouping?: undefined;

package/dist/shared-logic/src/ChartsV2/adjustTicks.d.ts

@@ -1,12 +1,9 @@
-import { HorizontalBarChartRepresentation } from '../HorizontalBarChartV2/types';
 import { Result } from '../Result/types';
 import { BaseChartRepresentation, Tick } from './types';
-export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 7.1;
-export declare const ASSUMED_AVERAGE_CHAR_HEIGHT = 24;
-export declare function howManyTicksFitInWidth(ticks: Tick<string | number | Date>[], maxWidth: number, avgCharWidth?: number): number;
-export declare function howManyTicksFitInHeight(ticks: Tick<string | number | Date>[], maxHeight: number, avgCharHeight?: number): number;
+export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 4;
+export declare function howManyTicksFitInWidth(ticks: Tick<string | Number | Date>[], maxWidth: number, avgCharWidth?: number): number;
+export declare function howManyTicksFitInHeight(ticks: Tick<string | number | Date>[], height: number): number | undefined;
 export declare function determineYTicks(ticks: Tick<number>[], height: number): Tick<number>[];
 export declare function pickEquallySpaced<T>(arr: Tick<T>[], numPicks: number): Tick<T>[];
 export declare function adjustTicks<T extends BaseChartRepresentation>(representation: T, width: number, height: number, xKeyField?: Result.Field): T;
-export declare function adjustTicksForHorizontalChart(representation: HorizontalBarChartRepresentation, width: number, height: number, yKeyField?: Result.Field): HorizontalBarChartRepresentation;
-export declare function getEvenlySpacedTicks<DataType extends string | number | Date>(ticks: Tick<DataType>[], count: number, xKeyField: Result.Field | undefined): Tick<DataType>[];
+export declare function getEvenlySpacedTicks<DataType extends string | number | Date>(ticks: Tick<DataType>[], count: number | undefined, xKeyField: Result.Field | undefined): Tick<DataType>[];

package/dist/shared-logic/src/ChartsV2/types.d.ts

@@ -54,8 +54,6 @@ export declare type GoalLine = {
 export declare type DataItem = {
     value: number | string | null;
     formattedValue: string | null;
-    originalValue?: number | string | null;
-    displayValue?: number;
 };
 export declare type DateTimeFormatter = {
     formatter: (date: Date) => string;

package/dist/shared-logic/src/ComboChartV2/buildComboChartRepresentation.d.ts

@@ -8,13 +8,13 @@ export declare function buildComboChartRepresentation(xKeyField: ResultType.Fiel
             max: number;
             dataType: import("../Field/types").DataType;
             key: string | null;
-            ordering: "desc" | "asc" | null;
+            ordering: "asc" | "desc" | null;
         } | {
             min: null;
             max: null;
             dataType: import("../Field/types").DataType;
             key: string | null;
-            ordering: "desc" | "asc" | null;
+            ordering: "asc" | "desc" | null;
         };
         ticks: import("../ChartsV2/types").Tick<string | number | Date>[];
         postfix: string;
@@ -29,7 +29,7 @@ export declare function buildComboChartRepresentation(xKeyField: ResultType.Fiel
             min: number;
             dataType: import("../Field/types").DataType;
             key: string | null;
-            ordering: "desc" | "asc" | null;
+            ordering: "asc" | "desc" | null;
         };
         ticks: import("../ChartsV2/types").Tick<number>[];
         barKeys: string[];

package/dist/shared-logic/src/Component/setAttributes.d.ts

@@ -7,5 +7,5 @@ export declare const removeUnusedOrderFieldsFromTimeSeriesComponent: <T extends
     timeDimension?: QueryAttributes.TimeDimension | null | undefined;
     dimension: Array<QueryAttributes.Dimension>;
 }>(attributes: T) => T;
-declare const setAttributes: <Attributes extends Component.Attributes>(attributes: Partial<Component.AreaChartAttributes> | Partial<Component.BarChartAttributes> | Partial<Component.BasicTableAttributes> | Partial<Component.BubbleChartAttributes> | Partial<Component.BubbleChartV2Attributes> | Partial<Component.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.BarChartV2Attributes> | Partial<Component.AreaChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.SunburstChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes> | Partial<Component.WaterfallChartAttributes> | Partial<Component.RadarChartAttributes> | Partial<Component.ComboChartV2Attributes> | Partial<Component.HorizontalBarChartV2Attributes>, partialAttributes: Partial<Component.AreaChartAttributes> | Partial<Component.BarChartAttributes> | Partial<Component.BasicTableAttributes> | Partial<Component.BubbleChartAttributes> | Partial<Component.BubbleChartV2Attributes> | Partial<Component.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.BarChartV2Attributes> | Partial<Component.AreaChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.SunburstChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes> | Partial<Component.WaterfallChartAttributes> | Partial<Component.RadarChartAttributes> | Partial<Component.ComboChartV2Attributes> | Partial<Component.HorizontalBarChartV2Attributes>, schema: Joi.ObjectSchema<any>) => Attributes;
+declare const setAttributes: <Attributes extends Component.Attributes>(attributes: Partial<Component.AreaChartAttributes> | Partial<Component.BarChartAttributes> | Partial<Component.BasicTableAttributes> | Partial<Component.BubbleChartAttributes> | Partial<Component.BubbleChartV2Attributes> | Partial<Component.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.BarChartV2Attributes> | Partial<Component.AreaChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.SunburstChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes> | Partial<Component.WaterfallChartAttributes> | Partial<Component.RadarChartAttributes> | Partial<Component.ComboChartV2Attributes>, partialAttributes: Partial<Component.AreaChartAttributes> | Partial<Component.BarChartAttributes> | Partial<Component.BasicTableAttributes> | Partial<Component.BubbleChartAttributes> | Partial<Component.BubbleChartV2Attributes> | Partial<Component.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.BarChartV2Attributes> | Partial<Component.AreaChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.SunburstChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes> | Partial<Component.WaterfallChartAttributes> | Partial<Component.RadarChartAttributes> | Partial<Component.ComboChartV2Attributes>, schema: Joi.ObjectSchema<any>) => Attributes;
 export default setAttributes;

package/dist/shared-logic/src/Component/sharedSchemas.d.ts

@@ -8,7 +8,6 @@ export declare const measureSchema: (supportedAggregates: SupportedAggregates, a
 export declare const orderSchema: (queryEngineConfig: QueryEngineConfig) => Joi.ObjectSchema<any>;
 export declare const timeDimensionSchema: (supportedTimeTruncFunctions: SupportedTimeTruncFunctions) => Joi.ObjectSchema<any>;
 export declare const dimensionSchema: (supportedTimeTruncFunctions: SupportedTimeTruncFunctions, attributeSchemaOptions: ComponentInterfaceConfig['attributesSchemaOptions']) => Joi.ArraySchema<any[]>;
-export declare const queryFilterSchema: (queryEngineConfig: QueryEngineConfig, maxDepth?: number) => Joi.Schema;
 export declare const filterSchema: (queryEngineConfig: QueryEngineConfig) => Joi.ObjectSchema<any>;
 export declare const queryAttributesFilter: (queryEngineConfig: QueryEngineConfig) => Joi.ArraySchema<any[]>;
 export declare const queryAttributesLimit: () => Joi.NumberSchema<number>;
@@ -52,7 +51,6 @@ export declare const protectedFieldsDimension: (queryEngineConfig: QueryEngineCo
 export declare const parametersSchema: (queryEngineConfig: QueryEngineConfig, attributeSchemaOptions: ComponentInterfaceConfig['attributesSchemaOptions']) => Joi.ObjectSchema<any>;
 export declare const goalLineSchema: () => Joi.ObjectSchema<any>;
 export declare const goalLinesSchema: () => Joi.ArraySchema<any[]>;
-export declare const quadrantsSchema: () => Joi.ObjectSchema<any>;
 export declare const headlineSchema: () => Joi.ObjectSchema<any>;
 export declare const axisTitleSchema: () => Joi.ObjectSchema<any>;
 export declare const sizingSchema: Joi.ObjectSchema<any>;

package/dist/shared-logic/src/Component/types.d.ts

@@ -8,11 +8,10 @@ import { TableFieldsV2 } from '../DataTable/types';
 import { Dictionary } from 'lodash';
 import { MovingAverage, TrendType } from '../Trends/types';
 import { DataSet } from '../DataSet/types';
-import { RulesField } from '../CustomField/types';
 export declare type getNumberFormatter = (formatterId: string | undefined | null) => (number: number) => string;
 export declare type FormatType = string | null;
 export declare type ApproxAxisLabelCount = 'auto' | number;
-export declare type ComponentType = 'areaChart' | 'areaChartV2' | 'barChart' | 'barChartV2' | 'basicTable' | 'bubbleChart' | 'bubbleChartV2' | 'comboChart' | 'comboChartV2' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'horizontalBarChartV2' | 'lineChart' | 'lineChartV2' | 'mercatorMap' | 'pieChart' | 'progress' | 'radarChart' | 'richText' | 'scatterChart' | 'singleStat' | 'sunburstChart' | 'waterfallChart';
+export declare type ComponentType = 'areaChart' | 'areaChartV2' | 'barChart' | 'barChartV2' | 'basicTable' | 'bubbleChart' | 'bubbleChartV2' | 'comboChart' | 'comboChartV2' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'lineChart' | 'lineChartV2' | 'mercatorMap' | 'pieChart' | 'progress' | 'radarChart' | 'richText' | 'scatterChart' | 'singleStat' | 'sunburstChart' | 'waterfallChart';
 export declare const componentTypes: string[];
 export declare namespace Component {
     export type LineCurve = 'natural' | 'straight' | 'step' | 'stepBefore' | 'stepAfter' | 'dotted';
@@ -88,7 +87,6 @@ export declare namespace Component {
         approxXAxisLabelCount: ApproxAxisLabelCount;
         approxYAxisLabelCount: ApproxAxisLabelCount;
         legend: boolean;
-        labels?: boolean;
         protectedFields?: ProtectedFields;
         parameters?: Parameters;
         goalLines?: Array<Component.GoalLine.Rule>;
@@ -164,7 +162,6 @@ export declare namespace Component {
         approxXAxisLabelCount: ApproxAxisLabelCount;
         approxYAxisLabelCount: ApproxAxisLabelCount;
         legend: boolean;
-        labels?: boolean;
         goalLines?: Array<Component.GoalLine.Rule>;
         conditionalFormattingRules?: {
             bar?: Array<ConditionalFormatting.Rule>;
@@ -208,7 +205,6 @@ export declare namespace Component {
         conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
         drilldown: QueryAttributes.Dimension[];
         legend: boolean;
-        labels?: boolean;
         parameters?: Parameters;
         goalLines?: Array<Component.GoalLine.Rule>;
         axisTitles?: AxisTitles;
@@ -229,7 +225,6 @@ export declare namespace Component {
         conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
         drilldown: QueryAttributes.Dimension[];
         legend: boolean;
-        labels?: boolean;
         parameters?: Parameters;
         goalLines?: Array<Component.GoalLine.Rule>;
         axisTitles?: AxisTitles;
@@ -239,7 +234,7 @@ export declare namespace Component {
     };
     export type BarChartV2Attributes = BaseAttributes & BaseQueryAttributes & {
         type: 'barChartV2';
-        stacked?: boolean | '100%';
+        stacked?: boolean;
         xAxisPrefix: string;
         yAxisPrefix: string;
         xAxisPostfix: string;
@@ -249,12 +244,13 @@ export declare namespace Component {
         approxXAxisLabelCount: ApproxAxisLabelCount;
         approxYAxisLabelCount: ApproxAxisLabelCount;
         conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
+        drilldown: QueryAttributes.Dimension[];
         legend: boolean;
-        labels?: boolean;
         parameters?: Parameters;
         goalLines?: Array<Component.GoalLine.Rule>;
         axisTitles?: AxisTitles;
         headline?: Headline;
+        drilldownOptions: Array<DrilldownOptions> | undefined;
     };
     export type PieChartAttributes = BaseAttributes & BaseQueryAttributes & {
         type: 'pieChart';
@@ -295,25 +291,6 @@ export declare namespace Component {
         axisTitles?: AxisTitles;
         headline?: Headline;
     };
-    export type HorizontalBarChartV2Attributes = BaseAttributes & BaseQueryAttributes & {
-        type: 'horizontalBarChartV2';
-        stacked?: boolean | '100%';
-        xAxisPrefix: string;
-        yAxisPrefix: string;
-        xAxisPostfix: string;
-        yAxisPostfix: string;
-        xAxisFormat: FormatType;
-        yAxisFormat: FormatType;
-        approxXAxisLabelCount: ApproxAxisLabelCount;
-        approxYAxisLabelCount: ApproxAxisLabelCount;
-        conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
-        legend: boolean;
-        labels?: boolean;
-        parameters?: Parameters;
-        goalLines?: Array<Component.GoalLine.Rule>;
-        axisTitles?: AxisTitles;
-        headline?: Headline;
-    };
     export namespace ConditionalFormatting {
         type Rule = {
             filters: QueryAttributes['filter'];
@@ -335,17 +312,6 @@ export declare namespace Component {
             label?: boolean;
         };
     }
-    export namespace Quadrant {
-        type Rule = {
-            enabled: boolean;
-            labels: {
-                quadrantOne?: string;
-                quadrantTwo?: string;
-                quadrantThree?: string;
-                quadrantFour?: string;
-            };
-        };
-    }
     export type ExportNames = {
         [resultFieldId: string]: string | undefined;
     };
@@ -438,7 +404,6 @@ export declare namespace Component {
         approxXAxisLabelCount: ApproxAxisLabelCount;
         approxYAxisLabelCount: ApproxAxisLabelCount;
         goalLines?: Array<Component.GoalLine.Rule>;
-        quadrants?: Component.Quadrant.Rule;
         axisTitles?: AxisTitles;
     };
     export type BubbleChartAttributes = BaseAttributes & Omit<BaseQueryAttributes, 'measure'> & {
@@ -480,7 +445,6 @@ export declare namespace Component {
         axisTitles?: AxisTitles;
         headline?: Headline;
         trends?: Array<Trends>;
-        quadrants?: Component.Quadrant.Rule;
     };
     export type RadarChartAttributes = BaseAttributes & BaseQueryAttributes & {
         type: 'radarChart';
@@ -505,16 +469,14 @@ export declare namespace Component {
         approxXAxisLabelCount: ApproxAxisLabelCount;
         approxYAxisLabelCount: ApproxAxisLabelCount;
         legend: boolean;
-        labels?: boolean;
         parameters?: Parameters;
         axisTitles?: AxisTitles;
         headline?: Headline;
         increaseColor: string;
         decreaseColor: string;
-        comparison: RulesField | null;
     };
-    export type ViewType = 'areaChart' | 'barChart' | 'basicTable' | 'bubbleChart' | 'bubbleChartV2' | 'comboChart' | 'comboChartV2' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'lineChart' | 'lineChartV2' | 'areaChartV2' | 'barChartV2' | 'mercatorMap' | 'pieChart' | 'sunburstChart' | 'progress' | 'richText' | 'scatterChart' | 'singleStat' | 'waterfallChart' | 'radarChart' | 'horizontalBarChartV2';
-    export type Attributes = AreaChartAttributes | BarChartAttributes | BasicTableAttributes | BubbleChartAttributes | BubbleChartV2Attributes | ComboChartAttributes | CustomViewAttributes | DataTableAttributes | FunnelChartAttributes | HorizontalBarChartAttributes | LineChartAttributes | LineChartV2Attributes | BarChartV2Attributes | AreaChartV2Attributes | MercatorMapAttributes | PieChartAttributes | SunburstChartAttributes | ProgressAttributes | RichTextAttributes | ScatterChartAttributes | SingleStatAttributes | WaterfallChartAttributes | RadarChartAttributes | ComboChartV2Attributes | HorizontalBarChartV2Attributes;
+    export type ViewType = 'areaChart' | 'barChart' | 'basicTable' | 'bubbleChart' | 'bubbleChartV2' | 'comboChart' | 'comboChartV2' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'lineChart' | 'lineChartV2' | 'areaChartV2' | 'barChartV2' | 'mercatorMap' | 'pieChart' | 'sunburstChart' | 'progress' | 'richText' | 'scatterChart' | 'singleStat' | 'waterfallChart' | 'radarChart';
+    export type Attributes = AreaChartAttributes | BarChartAttributes | BasicTableAttributes | BubbleChartAttributes | BubbleChartV2Attributes | ComboChartAttributes | CustomViewAttributes | DataTableAttributes | FunnelChartAttributes | HorizontalBarChartAttributes | LineChartAttributes | LineChartV2Attributes | BarChartV2Attributes | AreaChartV2Attributes | MercatorMapAttributes | PieChartAttributes | SunburstChartAttributes | ProgressAttributes | RichTextAttributes | ScatterChartAttributes | SingleStatAttributes | WaterfallChartAttributes | RadarChartAttributes | ComboChartV2Attributes;
     export interface RenderTableCell {
         viewId: string;
         type: 'basicTable' | 'dataTable';
@@ -624,6 +586,7 @@ export declare type MaybeOldComponent<Attrs = Component.Attributes> = Omit<Compo
 export declare type Component<Attrs = Component.Attributes> = {
     attributes: Attrs;
     localFilters: Array<AdditionalFilter>;
+    results: (Result | null)[];
     colSpan: number;
     /** @deprecated Moved to dashboard level. */
     reports: Array<Report>;

package/dist/shared-logic/src/ComponentInterface/types/namespaces.types.d.ts

@@ -25,30 +25,29 @@ export declare type Pagination = {
     options: number[];
 };
 export interface DataPanelNamespaces {
-    combo_chart_dimension?: Section<'comboChartDimension'>;
-    comparison?: Section<'comparison'>;
-    custom_metrics?: Section<'customMetrics'>;
     data_set: Section<'dataSet'>;
-    dateComparison?: Section<'dateComparison'>;
-    drilldown?: Section<'drilldown'>;
+    views: Section<'views'>;
+    fields?: Section<'fields'>;
+    field_y_axis?: Section<'fieldCollector'>;
+    field_z_axis?: Section<'fieldCollector'>;
+    field_rows?: Section<'fieldCollector'>;
     field_columns?: Section<'fieldCollector'>;
-    field_country?: Section<'fieldCollector'>;
-    field_grouping?: Section<'fieldCollector'>;
     field_metrics?: Section<'fieldCollector'>;
-    field_rows?: Section<'fieldCollector'>;
+    field_grouping?: Section<'fieldCollector'>;
+    progress_goals?: Section<'progressGoals'>;
+    drilldown?: Section<'drilldown'>;
     field_x_axis?: Section<'fieldCollector'>;
-    field_y_axis?: Section<'fieldCollector'>;
-    field_z_axis?: Section<'fieldCollector'>;
-    fields?: Section<'fields'>;
+    field_country?: Section<'fieldCollector'>;
+    sort?: Section<'sort'>;
     filter?: Section<'filter'>;
+    custom_metrics?: Section<'customMetrics'>;
+    limit?: Section<'limit'>;
+    pagination?: Section<'pagination'>;
+    combo_chart_dimension?: Section<'comboChartDimension'>;
+    comparison?: Section<'comparison'>;
     labelled_metrics?: Section<'labelledMetrics'> & {
         subSectionDefinition: SubSectionDef;
     };
-    limit?: Section<'limit'>;
-    pagination?: Section<'pagination'>;
-    progress_goals?: Section<'progressGoals'>;
-    sort?: Section<'sort'>;
-    views: Section<'views'>;
 }
 export declare type Namespace = keyof FormatPanelNamespaces | keyof DataPanelNamespaces;
 export interface FormatPanelNamespaces {
@@ -118,7 +117,6 @@ export interface FormatPanelNamespaces {
             line: SubSection<'stacked'>;
         };
     };
-    quadrants?: Section<'quadrants'>;
 }
 export declare type ComponentNamespace = 'area_chart' | 'bar_chart' | 'basic_table' | 'bubble_chart' | 'combo_chart' | 'custom' | 'fields' | 'funnel_chart' | 'headline' | 'horizontal_bar_chart' | 'line_chart' | 'mercator_map' | 'pie_chart' | 'sunburst_chart' | 'pivot_table' | 'progress' | 'rich_text' | 'scatter_chart' | 'single_stat' | 'waterfall_chart' | 'radar_chart';
 export {};

package/dist/shared-logic/src/CustomField/AggregateMath/index.d.ts

@@ -1,7 +1,6 @@
 import { AggregateMathField, AggregateNested } from '../../CustomField/types';
 import { Query } from '../../Query/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
-import { VariableList } from '../../Variables/types';
 import { MathOperator } from '../types';
 export declare const init: (publicName: string, leftFieldId: string, leftFunction: string, operator: MathOperator, rightFieldId: string, rightFunction: string, queryEngineConfig: QueryEngineConfig, leftNested: AggregateNested | undefined, rightNested: AggregateNested | undefined) => AggregateMathField;
-export declare const build: (customField: AggregateMathField, variables: VariableList) => Query['measure'][number];
+export declare const build: (customField: AggregateMathField) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Conditional/index.d.ts

@@ -1,9 +1,9 @@
-import { Params } from '../../../../results-driver/src/types';
 import { DataSet } from '../../DataSet/types';
-import * as Filter from '../../Filter';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
 import { ConditionalField } from '../types';
+import * as Filter from '../../Filter';
+import { Params } from '../../../../results-driver/src/types';
 export declare const init: (publicName: string, fieldId: string, func: string, rule: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig) => ConditionalField;
 export declare const build: (field: ConditionalField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/CustomField.d.ts

@@ -1,5 +1,5 @@
 import { DataSet as DataSetType } from '../DataSet/types';
-import { AggregateMathField, AliasFieldType, ConditionalField, CustomField, DateCalculationField, MetricField, PercentageField, RoundedNumberField, RulesField, SimpleMathField } from '../CustomField/types';
+import { AggregateMathField, ConditionalField, CustomField, DateCalculationField, MetricField, PercentageField, RoundedNumberField, RulesField, SimpleMathField } from '../CustomField/types';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { Query } from '../Query/types';
@@ -12,7 +12,6 @@ export declare const isPercentageField: (field: DataSetType.Field) => field is P
 export declare const isRules: (field: DataSetType.Field) => field is RulesField;
 export declare const isConditional: (field: DataSetType.Field) => field is ConditionalField;
 export declare const isCustomBuildMetric: (field: DataSetType.Field) => field is MetricField;
-export declare const isAliasField: (field: DataSetType.Field) => field is AliasFieldType;
 export declare const isDateCalculation: (field: DataSetType.Field) => field is DateCalculationField;
 export declare const getCustomFieldCategory: (field: CustomField) => CustomFieldCategory;
 export declare const isCustomField: (field: DataSetType.Field) => field is CustomField;

package/dist/shared-logic/src/CustomField/CustomMetric/build.d.ts

@@ -1,7 +1,7 @@
-import { Params } from '../../../../results-driver/src/types';
 import { DataSet } from '../../DataSet/types';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
+import { Params } from '../../../../results-driver/src/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
 import { MetricField } from '../types';
 export declare const build: (measureAttribute: QueryAttributes.Measure, customField: MetricField, dataSet: DataSet, queryEngineConfig: QueryEngineConfig, params: Params) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/CustomMetric/combineFilters.d.ts

@@ -0,0 +1,2 @@
+import { QueryAttributes } from '../../QueryAttributes/types';
+export declare function combineFilters(filters: QueryAttributes.Filter[][] | undefined, customFilters: QueryAttributes.Filter[][] | undefined): QueryAttributes.Filter[][];

package/dist/shared-logic/src/CustomField/DateCalculation/index.d.ts

@@ -1,7 +1,6 @@
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
-import { VariableList } from '../../Variables/types';
 import { DateCalculationField } from '../types';
 export declare const init: (publicName: string, leftFieldId: string, dateCalculationFunction: DateCalculationField['dateCalculationFunction'], rightFieldId: string, queryEngineConfig: QueryEngineConfig) => DateCalculationField;
-export declare const build: (measureAttribute: QueryAttributes.Measure, customField: DateCalculationField, variables: VariableList) => Query['measure'][number];
+export declare const build: (measureAttribute: QueryAttributes.Measure, customField: DateCalculationField) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Percentage/index.d.ts

@@ -1,16 +1,15 @@
-import { Params } from '../../../../results-driver/src/types';
 import { DataSet } from '../../DataSet/types';
+import { PercentageField } from '../types';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
-import { VariableList } from '../../Variables/types';
-import { PercentageField } from '../types';
+import { Params } from '../../../../results-driver/src/types';
 /**
  * Creates a new custom percentage field.
  */
 export declare const init: (publicName: string, denominatorFieldId: string, denominatorAggregate: string, numeratorFieldId: string | null, numeratorAggregate: string | null, numeratorFilter: QueryAttributes['filter'], denominatorFilter: QueryAttributes['filter'], queryEngineConfig: QueryEngineConfig, denominatorScope?: PercentageField['denominatorScope']) => PercentageField;
 export declare const build: (customField: PercentageField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, _queryHasDimension: boolean, params: Params) => Query['measure'][number];
-export declare function buildPercentageFilters(customField: PercentageField, variables: VariableList): {
-    queryFilterFromNumeratorFilter: import("@vizzly/sqlbuilder-public").RecursiveFilter;
-    queryFilterFromDenominatorFilter: import("@vizzly/sqlbuilder-public").RecursiveFilter;
+export declare function buildPercentageFilters(filters: QueryAttributes.Filter[][] | undefined, customField: PercentageField): {
+    combinedNominatorFilters: QueryAttributes.Filter[][];
+    combinedDenominatorFilters: QueryAttributes.Filter[][];
 };

package/dist/shared-logic/src/CustomField/RoundedNumber/index.d.ts

@@ -2,6 +2,5 @@ import { RoundedNumberField } from '../../CustomField/types';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
-import { VariableList } from '../../Variables/types';
 export declare const init: (publicName: string, fieldId: string, roundToDecimalPlaces: 0 | 2, queryEngineConfig: QueryEngineConfig) => RoundedNumberField;
-export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RoundedNumberField, variables: VariableList) => Query['measure'][number];
+export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RoundedNumberField) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Rules/index.d.ts

@@ -1,10 +1,10 @@
-import { Params } from '../../../../results-driver/src/types';
-import { RulesField } from '../../CustomField/types';
 import { DataSet } from '../../DataSet/types';
+import { RulesField } from '../../CustomField/types';
 import { Query, QueryNameSpace } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
 import { Rules } from './types';
+import { Params } from '../../../../results-driver/src/types';
 export declare const init: (publicName: string, rules: Rules[], queryEngineConfig: QueryEngineConfig) => RulesField;
 export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RulesField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['measure'][number];
 export declare const convertToCases: (rules: Rules[], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => QueryNameSpace.Cases[];

package/dist/shared-logic/src/CustomField/SimpleMath/index.d.ts

@@ -8,4 +8,4 @@ import { Params } from '../../../../results-driver/src/types';
 import { VariableList } from '../../Variables/types';
 export declare const init: (publicName: string, leftFieldId: string, operator: MathOperator, rightFieldId: string, queryEngineConfig: QueryEngineConfig) => SimpleMathField;
 export declare const build: (measureAttribute: QueryAttributes.Measure, customField: SimpleMathField, dataSet: DataSet, params: Params) => Query['measure'][number];
-export declare const buildSide: (value: string, dataSet: DataSet, variables: VariableList) => QueryNameSpace.FieldDefinition;
+export declare const buildSide: (value: string, dataSet: DataSet, variables: VariableList) => QueryNameSpace.FieldDefinition<string, string, string>;

package/dist/shared-logic/src/CustomField/types.d.ts

@@ -58,11 +58,6 @@ export declare type RoundedNumberField = BaseCustomField & RoundedNumber;
 export declare type DateCalculationField = BaseCustomField & DateCalculation;
 export declare type AggregateMathField = BaseCustomField & AggregateMath;
 export declare type ConditionalField = BaseCustomField & Conditional;
-export declare type AliasFieldType = BaseCustomField & {
-    allowedFields: Array<{
-        id: string;
-    }>;
-};
 export declare type MetricField = BaseCustomField & {
     metric: Metric;
 };
@@ -77,7 +72,7 @@ export declare type CustomBuildMetricField = BaseField & {
     metricAttributes: Metric;
     dataType: 'number';
 };
-export declare type CustomField = PercentageField | SimpleMathField | AggregateMathField | RulesField | RoundedNumberField | DateCalculationField | ConditionalField | MetricField | CustomBuildMetricField | AliasFieldType;
+export declare type CustomField = PercentageField | SimpleMathField | AggregateMathField | RulesField | RoundedNumberField | DateCalculationField | ConditionalField | MetricField | CustomBuildMetricField;
 export declare type MathOperator = '*' | '-' | '/' | '+';
 export declare type CustomFieldCategory = 'percentage' | 'math' | 'rules' | 'roundedNumber' | 'dateCalculation' | 'conditional' | 'customBuildMetric';
 export declare enum AcceptedTypes {

package/dist/shared-logic/src/DataPanelConfig/types.d.ts

@@ -40,6 +40,6 @@ export interface ProgressGoalSection<T> extends Omit<Section<T>, 'type'> {
 }
 export declare type ProgressGoalsSection = Section<'progressGoals'> & ProgressGoalSection<'progressGoals'>;
 export declare type PaginationSection = Section<'pagination'> & Pagination;
-export declare type DataPanelSection = DimensionSection | FieldCollectorSection | LabelledMetricSection | MetricsSection | PaginationSection | ProgressGoalsSection | Section<'comboChartDimension'> | Section<'comparison'> | Section<'country'> | Section<'customMetrics'> | Section<'dataSet'> | Section<'dateComparison'> | Section<'drilldown'> | Section<'fields'> | Section<'filter'> | Section<'limit'> | Section<'sort'> | Section<'timeDimension'> | Section<'views'> | Section<'xAxis'>;
+export declare type DataPanelSection = Section<'dataSet'> | MetricsSection | FieldCollectorSection | LabelledMetricSection | Section<'customMetrics'> | DimensionSection | Section<'drilldown'> | Section<'comparison'> | Section<'comboChartDimension'> | Section<'timeDimension'> | Section<'xAxis'> | Section<'views'> | Section<'sort'> | Section<'filter'> | Section<'limit'> | PaginationSection | Section<'fields'> | Section<'country'> | ProgressGoalsSection;
 export declare type DataPanelConfig = Array<DataPanelSection>;
 export {};

package/dist/shared-logic/src/DataSet/DataSet.d.ts

@@ -28,7 +28,7 @@ export declare const takeFieldsForMeasure: (dataSet: DataSet, componentType: Com
  * provide the componentType to ensure the custom fields which are returned
  * are also supported by the componentType.
  */
-export declare const takeCustomFields: (dataSet: DataSet, componentType?: "progress" | "areaChart" | "areaChartV2" | "barChart" | "barChartV2" | "basicTable" | "bubbleChart" | "bubbleChartV2" | "comboChart" | "comboChartV2" | "custom" | "dataTable" | "funnelChart" | "horizontalBarChart" | "horizontalBarChartV2" | "lineChart" | "lineChartV2" | "mercatorMap" | "pieChart" | "radarChart" | "richText" | "scatterChart" | "singleStat" | "sunburstChart" | "waterfallChart" | undefined) => CustomField[];
+export declare const takeCustomFields: (dataSet: DataSet, componentType?: "progress" | "areaChart" | "areaChartV2" | "barChart" | "barChartV2" | "basicTable" | "bubbleChart" | "bubbleChartV2" | "comboChart" | "comboChartV2" | "custom" | "dataTable" | "funnelChart" | "horizontalBarChart" | "lineChart" | "lineChartV2" | "mercatorMap" | "pieChart" | "radarChart" | "richText" | "scatterChart" | "singleStat" | "sunburstChart" | "waterfallChart" | undefined) => CustomField[];
 export declare const takeNonCustomFields: (dataSet: DataSet) => Array<NonDateTimeField | DateTimeField | SimpleMathField>;
 export declare const takeNonPercentageCustomFields: (dataSet: DataSet) => Array<NonDateTimeField | DateTimeField | SimpleMathField>;
 export declare const removeCustomFields: (dataSet: DataSet) => DataSet;

package/dist/shared-logic/src/DataTable/resultToPivotTableRepresentation.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 import { TextOverride } from '../../../shared-logic/src/Translations/types';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { Result as ResultType } from '../Result/types';
 import { TableRepresentation } from './types';
 export declare const resultToPivotTableRepresentation: (result: ResultType, dimension: QueryAttributes['dimension'], measure: QueryAttributes['measure'], dataSetId: string, textOverride?: TextOverride | undefined, hiddenFields?: string[] | undefined, valueAlias?: {
-    [id: string]: import("react").ReactText;
+    [id: string]: string | number;
 } | import("../ValueAlias/types").ValueAliasFunction | undefined) => TableRepresentation;

package/dist/shared-logic/src/Field/Field.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSet } from '../DataSet/types';
 import { DateTimeField, NonDateTimeField, SupportedAggregateOption } from '../Field/types';
 import { DataType } from './types';
@@ -36,7 +35,7 @@ export declare const isValidDataType: (type: string) => boolean;
 export declare const toHumanReadable: (fieldTitle: string) => string;
 export declare const dataTypeToHumanReadable: (dataType: DataType) => string;
 export declare const toString: (value: null | string | number | Date | boolean | string[], formatDate?: ((date: Date) => string) | undefined, nullReplacement?: string) => string | null;
-export declare const toStringShort: (value: null | string | number | Date, nullReplacement?: string) => import("react").ReactText;
+export declare const toStringShort: (value: null | string | number | Date, nullReplacement?: string) => string | number;
 export declare const removeFields: <T extends {
     id: string;
 }>(originalFields: {
@@ -96,8 +95,8 @@ export declare const upcastStringDimensionsToObject: (dimensions: QueryAttribute
 export declare const isArrayDataType: (field: {
     dataType: DataType;
 }) => boolean;
-export declare const supportedTransformationFunctions: (keys?: import("react").ReactText[] | undefined) => SupportedTransformationFunctions;
+export declare const supportedTransformationFunctions: (keys?: (string | number)[] | undefined) => SupportedTransformationFunctions;
 export declare const supportedAggregatesFunction: (queryEngineConfig: QueryEngineConfig, dataType: DataType, supportedAggregateOptions?: string[] | undefined) => SupportedAggregateOption[];
 export declare const checkForNullValue: (dataSetId: string, dimensions: QueryAttributes.Dimension[] | null, timeDimension: QueryAttributes.TimeDimension | null, textOverride?: TextOverride | undefined, valueAlias?: {
-    [id: string]: import("react").ReactText;
+    [id: string]: string | number;
 } | import("../ValueAlias/types").ValueAliasFunction | undefined, textOverrideKey?: string | undefined) => string | undefined;

package/dist/shared-logic/src/Filter/Filter.d.ts

@@ -0,0 +1,10 @@
+import { Query } from '../Query/types';
+import { QueryAttributes } from '../QueryAttributes/types';
+import { QueryEngineConfig } from '../QueryEngineConfig/types';
+import { DataSet } from '../DataSet/types';
+import { Params } from '../../../results-driver/src/types';
+export declare const addAndFilters: (filter: QueryAttributes['filter'], filterToAddToAll: QueryAttributes.Filter[]) => QueryAttributes['filter'];
+export declare const filterAttributeToQueryFilter: (filters: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['filter'];
+export declare const takeUsedFields: (filter: QueryAttributes['filter']) => string[];
+export declare const isAvailable: (filter?: QueryAttributes.Filter[][] | undefined) => boolean | undefined;
+export declare const isAdditionalFilter: (value: any) => boolean;

package/dist/shared-logic/src/Filter/Where.d.ts

@@ -0,0 +1,6 @@
+import { DataSet } from '../DataSet/types';
+import { WhereClause } from './types';
+import { QueryEngineConfig } from '../QueryEngineConfig/types';
+import { Params } from '../../../results-driver/src/types';
+export declare const filterConfigToWhere: (dataSet: DataSet, queryEngineConfig: QueryEngineConfig, params: Params) => WhereClause | undefined;
+export declare const isWhereClause: (thing: any) => thing is WhereClause;

package/dist/shared-logic/src/Filter/combineFilters.d.ts

@@ -1,2 +1,3 @@
 import { QueryAttributes } from '../QueryAttributes/types';
 export declare const combineFilters: (array1: QueryAttributes.Filter[][], array2: QueryAttributes.Filter[][]) => QueryAttributes.Filter[][];
+export declare function combineForCustomMetricFilters(filters: QueryAttributes.Filter[][] | undefined, customFilters: QueryAttributes.Filter[][] | undefined): QueryAttributes.Filter[][];

package/dist/shared-logic/src/Filter/types.d.ts

@@ -1,7 +1,9 @@
-import type { Query } from '@vizzly/sqlbuilder-public';
 export declare enum Clause {
     AND_WHERE = "andWhere",
     OR_WHERE = "orWhere",
     WHERE = "where"
 }
-export declare type WhereClause = Query['filter'];
+export declare type WhereClause = {
+    type: Clause;
+    value: any;
+};