@vizzly/dashboard 0.14.4 → 0.15.0-dev-4c548c2a9cdc29d779838ea3325029fe7e640235

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

@@ -0,0 +1,53 @@
+import { BarChartRepresentation } from '../BarChartV2/types';
+import { LineChartRepresentation } from '../LineChartV2/types';
+import { Result as ResultType } from '../../../shared-logic/src/Result/types';
+export declare function buildComboChartRepresentation(xKeyField: ResultType.Field | undefined, barChartRepresentation: BarChartRepresentation, lineChartRepresentation: LineChartRepresentation): {
+    x: {
+        scale: {
+            min: number;
+            max: number;
+            dataType: import("../Field/types").DataType;
+            key: string | null;
+            ordering: "asc" | "desc" | null;
+        } | {
+            min: null;
+            max: null;
+            dataType: import("../Field/types").DataType;
+            key: string | null;
+            ordering: "asc" | "desc" | null;
+        };
+        ticks: import("../ChartsV2/types").Tick<string | number | Date>[];
+        postfix: string;
+        prefix: string;
+        title: string | null;
+        key: string;
+    };
+    keys: {};
+    y: {
+        scale: {
+            max: number;
+            min: number;
+            dataType: import("../Field/types").DataType;
+            key: string | null;
+            ordering: "asc" | "desc" | null;
+        };
+        ticks: import("../ChartsV2/types").Tick<number>[];
+        barKeys: string[];
+        lineKeys: string[];
+        postfix: string;
+        prefix: string;
+        title: string | null;
+        keys: string[];
+    };
+    lines: {
+        definitions: import("../ChartsV2/types").ShapeDefinition<import("../LineChartV2/types").LineStyles>[];
+        data: import("../ChartsV2/types").Datum[];
+        conditionalFormattingRules: import("../ChartsV2/types").ConditionalFormattingRule[];
+    };
+    bars: {
+        definitions: import("../ChartsV2/types").ShapeDefinition<import("../BarChartV2/types").BarStyles>[];
+        data: import("../ChartsV2/types").Datum[];
+        conditionalFormattingRules: import("../ChartsV2/types").ConditionalFormattingRule[];
+    };
+    goalLines: import("../ChartsV2/types").GoalLine[];
+};

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

@@ -0,0 +1,3 @@
+import { ViewConstants } from '../ComponentInterface/types/namespaces.types';
+declare const CONSTANTS: ViewConstants;
+export default CONSTANTS;

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

@@ -0,0 +1,4 @@
+import { Component } from '../Component/types';
+import { LoadComponentInterface } from '../ComponentInterface/types';
+declare const ComboChartV2: LoadComponentInterface<Component.ComboChartV2Attributes, Component.ComboChartV2Attributes>;
+export default ComboChartV2;

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

@@ -0,0 +1,4 @@
+import { Component } from '../Component/types';
+import { ComponentInterfaceConfig } from '../ComponentInterface/types';
+declare const _default: (config: ComponentInterfaceConfig) => (chart: Component.ComboChartV2Attributes, partial: Partial<Component.ComboChartV2Attributes>) => Component.ComboChartV2Attributes;
+export default _default;

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

@@ -0,0 +1,21 @@
+import { BarStyles } from '../BarChartV2/types';
+import { ShapeDefinition, ConditionalFormattingRule, GoalLine, BaseChartRepresentation, KeyId, Axis, Datum } from '../ChartsV2/types';
+import { LineStyles } from '../LineChartV2/types';
+export declare type ComboYAxis = Axis<number, {
+    lineKeys: KeyId[];
+    barKeys: KeyId[];
+}>;
+export interface ComboChartRepresentation extends Omit<BaseChartRepresentation, 'y' | 'data'> {
+    goalLines: GoalLine[];
+    bars: {
+        definitions: ShapeDefinition<BarStyles>[];
+        data: Datum[];
+        conditionalFormattingRules: ConditionalFormattingRule[];
+    };
+    lines: {
+        definitions: ShapeDefinition<LineStyles>[];
+        data: Datum[];
+        conditionalFormattingRules: ConditionalFormattingRule[];
+    };
+    y: ComboYAxis;
+}

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.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes>, partialAttributes: Partial<Component.AreaChartAttributes> | Partial<Component.BarChartAttributes> | Partial<Component.BasicTableAttributes> | Partial<Component.ComboChartAttributes> | Partial<Component.CustomViewAttributes> | Partial<Component.DataTableAttributes> | Partial<Component.FunnelChartAttributes> | Partial<Component.HorizontalBarChartAttributes> | Partial<Component.LineChartAttributes> | Partial<Component.LineChartV2Attributes> | Partial<Component.MercatorMapAttributes> | Partial<Component.PieChartAttributes> | Partial<Component.ProgressAttributes> | Partial<Component.RichTextAttributes> | Partial<Component.ScatterChartAttributes> | Partial<Component.SingleStatAttributes>, 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

@@ -45,6 +45,7 @@ export declare const timeDimensionQuerySchema: (queryEngineConfig: QueryEngineCo
     offset: Joi.NumberSchema<number>;
 };
 export declare const lineCurveSchema: Joi.StringSchema<string>;
+export declare const areaCurveSchema: Joi.StringSchema<string>;
 export declare const protectedFieldsMeasure: (queryEngineConfig: QueryEngineConfig) => Joi.ArraySchema<any[]>;
 export declare const protectedFieldsDimension: (queryEngineConfig: QueryEngineConfig) => Joi.ArraySchema<any[]>;
 export declare const parametersSchema: (queryEngineConfig: QueryEngineConfig, attributeSchemaOptions: ComponentInterfaceConfig['attributesSchemaOptions']) => Joi.ObjectSchema<any>;

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

@@ -11,10 +11,11 @@ import { DataSet } from '../DataSet/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' | 'barChart' | 'basicTable' | 'comboChart' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'lineChart' | 'lineChartV2' | 'mercatorMap' | 'pieChart' | 'progress' | 'richText' | 'scatterChart' | 'singleStat';
+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';
+    export type AreaCurve = 'natural' | 'straight' | 'step';
     export type RawComponent = Omit<Component, 'queries' | 'results' | 'span'> & {
         colSpan?: number;
     };
@@ -145,6 +146,29 @@ export declare namespace Component {
         };
         axisTitles?: AxisTitles;
     };
+    export type ComboChartV2Attributes = BaseAttributes & Omit<BaseQueryAttributes, 'measure' | 'dimension'> & {
+        type: 'comboChartV2';
+        barMeasure: QueryAttributes.Measure[];
+        lineMeasure: QueryAttributes.Measure[];
+        barDimension: QueryAttributes.Dimension[];
+        lineDimension: QueryAttributes.Dimension[];
+        stacked?: false;
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        legend: boolean;
+        goalLines?: Array<Component.GoalLine.Rule>;
+        conditionalFormattingRules?: {
+            bar?: Array<ConditionalFormatting.Rule>;
+            line?: Array<ConditionalFormatting.Rule>;
+        };
+        axisTitles?: AxisTitles;
+    };
     export type LineChartAttributes = BaseAttributes & BaseQueryAttributes & {
         type: 'lineChart';
         stacked?: boolean | '100%';
@@ -187,6 +211,47 @@ export declare namespace Component {
         headline?: Headline;
         trends?: Array<Trends>;
     };
+    export type AreaChartV2Attributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'areaChartV2';
+        stacked: boolean;
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
+        drilldown: QueryAttributes.Dimension[];
+        legend: boolean;
+        parameters?: Parameters;
+        goalLines?: Array<Component.GoalLine.Rule>;
+        axisTitles?: AxisTitles;
+        headline?: Headline;
+        trends?: Array<Trends>;
+        lineCurve: AreaCurve;
+    };
+    export type BarChartV2Attributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'barChartV2';
+        stacked?: boolean;
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
+        drilldown: QueryAttributes.Dimension[];
+        legend: boolean;
+        parameters?: Parameters;
+        goalLines?: Array<Component.GoalLine.Rule>;
+        axisTitles?: AxisTitles;
+        headline?: Headline;
+        drilldownOptions: Array<DrilldownOptions> | undefined;
+    };
     export type PieChartAttributes = BaseAttributes & BaseQueryAttributes & {
         type: 'pieChart';
         conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
@@ -197,6 +262,15 @@ export declare namespace Component {
         parameters?: Parameters;
         drilldownOptions: Array<DrilldownOptions> | undefined;
     };
+    export type SunburstChartAttributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'sunburstChart';
+        conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
+        labelsAsPercentage: boolean;
+        legend: boolean;
+        labels?: boolean;
+        labelFormat: FormatType;
+        parameters?: Parameters;
+    };
     export type AreaChartAttributes = BaseAttributes & BaseQueryAttributes & {
         type: 'areaChart';
         stacked?: boolean | '100%';
@@ -332,8 +406,77 @@ export declare namespace Component {
         goalLines?: Array<Component.GoalLine.Rule>;
         axisTitles?: AxisTitles;
     };
-    export type ViewType = 'areaChart' | 'barChart' | 'basicTable' | 'comboChart' | 'custom' | 'dataTable' | 'funnelChart' | 'horizontalBarChart' | 'lineChart' | 'lineChartV2' | 'mercatorMap' | 'pieChart' | 'progress' | 'richText' | 'scatterChart' | 'singleStat';
-    export type Attributes = AreaChartAttributes | BarChartAttributes | BasicTableAttributes | ComboChartAttributes | CustomViewAttributes | DataTableAttributes | FunnelChartAttributes | HorizontalBarChartAttributes | LineChartAttributes | LineChartV2Attributes | MercatorMapAttributes | PieChartAttributes | ProgressAttributes | RichTextAttributes | ScatterChartAttributes | SingleStatAttributes;
+    export type BubbleChartAttributes = BaseAttributes & Omit<BaseQueryAttributes, 'measure'> & {
+        type: 'bubbleChart';
+        xMeasure: QueryAttributes.Measure | null;
+        yMeasure: QueryAttributes.Measure | null;
+        zMeasure?: QueryAttributes.Measure | null;
+        legend: boolean;
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        goalLines?: Array<Component.GoalLine.Rule>;
+        axisTitles?: AxisTitles;
+    };
+    export type BubbleChartV2Attributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'bubbleChartV2';
+        stacked?: boolean | '100%';
+        zMeasure: QueryAttributes.Measure[];
+        xMeasure: QueryAttributes.Measure[];
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        lineCurve: LineCurve;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        conditionalFormattingRules: Array<ConditionalFormatting.Rule>;
+        drilldown: QueryAttributes.Dimension[];
+        legend: boolean;
+        parameters?: Parameters;
+        goalLines?: Array<Component.GoalLine.Rule>;
+        axisTitles?: AxisTitles;
+        headline?: Headline;
+        trends?: Array<Trends>;
+    };
+    export type RadarChartAttributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'radarChart';
+        legend: boolean;
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+    };
+    export type WaterfallChartAttributes = BaseAttributes & BaseQueryAttributes & {
+        type: 'waterfallChart';
+        xAxisPrefix: string;
+        yAxisPrefix: string;
+        xAxisPostfix: string;
+        yAxisPostfix: string;
+        xAxisFormat: FormatType;
+        yAxisFormat: FormatType;
+        approxXAxisLabelCount: ApproxAxisLabelCount;
+        approxYAxisLabelCount: ApproxAxisLabelCount;
+        legend: boolean;
+        parameters?: Parameters;
+        axisTitles?: AxisTitles;
+        headline?: Headline;
+        increaseColor: string;
+        decreaseColor: string;
+    };
+    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';
@@ -371,7 +514,7 @@ export declare namespace Component {
         };
     }
     export interface ChartOnViewClick extends BaseOnViewClick {
-        type: 'barChart' | 'horizontalBarChart' | 'pieChart';
+        type: 'barChart' | 'horizontalBarChart' | 'pieChart' | 'sunburstChart';
         clicked: {
             grouping?: Array<ReturnedField>;
             value?: ReturnedField;
@@ -393,8 +536,9 @@ export declare namespace Component {
     };
     export type ValueAliasOptions = {
         fieldId?: string;
-        value: string | number;
+        value: string | number | null;
         filter?: AdditionalFilter;
+        dataSetId?: string;
     };
     export type Parameters = {
         measure?: ParameterMeasure;

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

@@ -2,5 +2,9 @@ import { QueryAttributes } from '../QueryAttributes/types';
 import { Component } from './types';
 export declare const usedMeasures: (attrs: Partial<Component.Attributes | QueryAttributes>) => QueryAttributes['measure'];
 export declare const usedDimensions: (attrs: Partial<Component.Attributes | QueryAttributes>) => QueryAttributes['dimension'];
-declare const usedFields: (attrs: Partial<Component.Attributes | QueryAttributes>) => string[];
+declare const usedFields: (attrs: Partial<Component.Attributes | QueryAttributes>) => Array<{
+    dataSetId: string;
+    fieldId: string;
+    function: string;
+}>;
 export default usedFields;

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

@@ -19,6 +19,7 @@ declare type SubSectionDef = {
     bar?: SubSection<'metrics'>;
     xAxis?: SubSection<'metrics'>;
     yAxis?: SubSection<'metrics'>;
+    zAxis?: SubSection<'metrics'>;
 };
 export declare type Pagination = {
     options: number[];
@@ -28,6 +29,7 @@ export interface DataPanelNamespaces {
     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_metrics?: Section<'fieldCollector'>;
@@ -56,13 +58,19 @@ export interface FormatPanelNamespaces {
             'x.postfix': SubSection<'axisLabels'>;
             'x.format': SubSection<'axisLabels'>;
             'x.count': SubSection<'axisLabels'>;
-            'x.axis_title': SubSection<'axisLabels'>;
+            'x.axis_title'?: SubSection<'axisLabels'>;
             y: SubSection<'axisLabels'>;
             'y.prefix': SubSection<'axisLabels'>;
             'y.postfix': SubSection<'axisLabels'>;
             'y.format': SubSection<'axisLabels'>;
             'y.count': SubSection<'axisLabels'>;
-            'y.axis_title': SubSection<'axisLabels'>;
+            'y.axis_title'?: SubSection<'axisLabels'>;
+            z?: SubSection<'axisLabels'>;
+            'z.prefix'?: SubSection<'axisLabels'>;
+            'z.postfix'?: SubSection<'axisLabels'>;
+            'z.format'?: SubSection<'axisLabels'>;
+            'z.count'?: SubSection<'axisLabels'>;
+            'z.axis_title'?: SubSection<'axisLabels'>;
         };
     };
     stats_labels?: Section<'statsLabels'> & {
@@ -99,6 +107,7 @@ export interface FormatPanelNamespaces {
     };
     goal_line?: Section<'goalLine'>;
     map_colors?: Section<'mapColors'>;
+    waterfall_colors?: Section<'waterfallColors'>;
     headline?: Section<'headline'>;
     trends?: Section<'trends'>;
     prefixes?: Section<'prefixes'>;
@@ -109,5 +118,5 @@ export interface FormatPanelNamespaces {
         };
     };
 }
-export declare type ComponentNamespace = 'area_chart' | 'bar_chart' | 'basic_table' | 'combo_chart' | 'custom' | 'fields' | 'funnel_chart' | 'headline' | 'horizontal_bar_chart' | 'line_chart' | 'mercator_map' | 'pie_chart' | 'pivot_table' | 'progress' | 'rich_text' | 'scatter_chart' | 'single_stat';
+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/ComponentInterface/types.d.ts

@@ -34,11 +34,12 @@ export interface ComponentInterface<Hydrated = any, Dumped = any> extends Dumpab
         roundedNumbers: boolean;
         dateCalculations: boolean;
         conditional: boolean;
-        calculatedField: Array<AcceptedTypes> | false;
+        customBuild: Array<AcceptedTypes> | false;
     };
     supportedFeatures: {
         parameters: boolean;
         colorGradient: boolean;
     };
+    supportedAggregations?: Array<string>;
 }
 export declare type LoadComponentInterface<Hydrated, Dumped> = (config: ComponentInterfaceConfig) => ComponentInterface<Hydrated, Dumped>;

package/dist/shared-logic/src/ConditionalFormatting/utils.d.ts

@@ -0,0 +1,7 @@
+import { QueryAttributes } from '../QueryAttributes/types';
+export declare type ComparisonFilter = {
+    op: QueryAttributes.Operator;
+    value: QueryAttributes.Filter['value'];
+};
+export declare const compare: (filter: ComparisonFilter, recordValue: unknown) => any;
+export declare const conditionIsMet: (filter: ComparisonFilter, value: number | string | boolean) => boolean;

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

@@ -11,7 +11,7 @@ export declare const isAggregateMathField: (field: DataSetType.Field) => field i
 export declare const isPercentageField: (field: DataSetType.Field) => field is PercentageField;
 export declare const isRules: (field: DataSetType.Field) => field is RulesField;
 export declare const isConditional: (field: DataSetType.Field) => field is ConditionalField;
-export declare const isMetric: (field: DataSetType.Field) => field is MetricField;
+export declare const isCustomBuildMetric: (field: DataSetType.Field) => field is MetricField;
 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/__mocks__/mockDataSet.d.ts

@@ -0,0 +1,2 @@
+import { DataSet } from '../../../DataSet/types';
+export declare const mockDataSets: DataSet[];

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

@@ -1,11 +1,7 @@
 import { DataSet } from '../../DataSet/types';
-import { Query, QueryNameSpace } from '../../Query/types';
-import * as Filter from '../../Filter';
-import * as Types from './types';
+import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { Params } from '../../../../results-driver/src/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
-export declare const buildOperator: (operator: Types.Operator, dataSet: DataSet, params: Params, measureAttribute?: QueryAttributes.Measure | undefined) => Query['measure'][number];
-export declare const buildIfLogic: (ifLogic: Types.IfLogic, dataSet: DataSet, localAndDashboardFilters: QueryAttributes.Filter[], queryEngineConfig: QueryEngineConfig, params: Params, measureAttribute?: QueryAttributes.Measure | undefined) => QueryNameSpace.FieldDefinition<string, string, string>;
-export declare const buildNumber: (numberInput: Types.NumberInput) => QueryNameSpace.FieldDefinition<string, string, string>;
-export declare const buildField: (field: Types.Field) => QueryNameSpace.FieldDefinition<string, string, string>;
+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/index.d.ts

@@ -1,10 +1,3 @@
-import { DataSet } from '../../DataSet/types';
-import { Query } from '../../Query/types';
-import * as Types from './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 init: (publicName: string, metric: Types.Metric, queryEngineConfig: QueryEngineConfig) => MetricField;
-export declare const build: (measureAttribute: QueryAttributes.Measure, customField: MetricField, dataSet: DataSet, queryEngineConfig: QueryEngineConfig, params: Params) => Query['measure'][number];
-export declare const validate: (field: MetricField) => boolean;
+export * from './init';
+export * from './build';
+export * from './validate';

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

@@ -0,0 +1,4 @@
+import * as Types from './types';
+import { QueryEngineConfig } from '../../QueryEngineConfig/types';
+import { MetricField } from '../types';
+export declare const init: (publicName: string, metric: Types.Metric, queryEngineConfig: QueryEngineConfig) => MetricField;

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

@@ -4,13 +4,15 @@ export declare enum PropertyType {
     IfLogic = "ifLogic",
     NumberInput = "number",
     Variable = "variable",
-    Field = "field"
+    Field = "field",
+    Aggregate = "aggregate"
+}
+export declare enum OperatorType {
+    Divide = "/",
+    Multiply = "*",
+    Subtract = "-",
+    Add = "+"
 }
-export declare type Operator = {
-    type: PropertyType.Operator;
-    op: OperatorType;
-    values: Array<Operator | NumberInput | Field | Variable | IfLogic>;
-};
 export declare type NumberInput = {
     type: PropertyType.NumberInput;
     value: number | undefined;
@@ -24,18 +26,22 @@ export declare type Field = {
     fieldId: string;
     function: string;
 };
+export declare type Aggregate = {
+    type: PropertyType.Aggregate;
+    fieldId: string;
+    function?: string;
+};
 export declare type IfLogic = {
     type: PropertyType.IfLogic;
     cases: Array<{
         filter: Array<QueryAttributes.Filter[]>;
-        returns: Operator | NumberInput | Field | Variable | IfLogic | undefined;
+        returns: Operator | NumberInput | Field | Variable | IfLogic | Aggregate | undefined;
     }>;
-    else: Operator | NumberInput | Field | Variable | IfLogic | undefined;
+    else: Operator | NumberInput | Field | Variable | IfLogic | undefined | Aggregate;
 };
-export declare type Metric = Operator | IfLogic;
-export declare enum OperatorType {
-    Divide = "/",
-    Multiply = "*",
-    Subtract = "-",
-    Add = "+"
-}
+export declare type Operator = {
+    type: PropertyType.Operator;
+    op: OperatorType;
+    values: Array<Operator | NumberInput | Field | Variable | IfLogic | Aggregate>;
+};
+export declare type Metric = Operator | IfLogic | Aggregate | NumberInput | Field;

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

@@ -0,0 +1,2 @@
+import { MetricField } from '../types';
+export declare const validate: (field: MetricField) => boolean;

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

@@ -6,4 +6,5 @@ export * as Rules from './Rules';
 export * as RoundedNumber from './RoundedNumber';
 export * as DateCalculation from './DateCalculation';
 export * as Conditional from './Conditional';
+export * as CustomMetric from './CustomMetric';
 export * from './upcast';

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

@@ -0,0 +1,2 @@
+import { Aggregate, IfLogic, NumberInput, Operator, Field as FieldMetric, Variable } from './CustomMetric/types';
+export declare function metricValuesHaveAggregates(values: (Operator | IfLogic | Aggregate | NumberInput | FieldMetric | Variable)[] | undefined): boolean;

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

@@ -3,22 +3,15 @@ import { BaseField, DataType, NonDateTimeField } from '../Field/types';
 import { Rules } from './Rules/types';
 import { Metric } from './CustomMetric/types';
 declare type BaseCustomField = Omit<NonDateTimeField, 'dashboardFilterGroups'>;
-export declare type PercentageField = BaseCustomField & Percentage;
-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 MetricField = BaseCustomField & {
-    metric: Metric;
+declare type SimpleMath = {
+    leftFieldId: string;
+    operator: MathOperator;
+    rightFieldId: string;
 };
-export declare type SimpleMathField = BaseCustomField & SimpleMath & {
-    dataType: 'number';
+declare type RoundedNumber = {
+    roundToDecimalPlaces: 0 | 2;
+    fieldId: string;
 };
-export interface RulesField extends BaseField {
-    rules: Rules[];
-    dataType: 'string';
-}
-export declare type CustomField = PercentageField | SimpleMathField | AggregateMathField | RulesField | RoundedNumberField | DateCalculationField | ConditionalField | MetricField;
 export declare type Conditional = {
     fieldId: string;
     function: string;
@@ -55,25 +48,36 @@ export declare type AggregateMath = {
     /** @deprecated ignore this outside of upcasting */
     rightAggregate?: string;
 };
-export declare type SimpleMath = {
-    leftFieldId: string;
-    operator: MathOperator;
-    rightFieldId: string;
-};
-export declare type RoundedNumber = {
-    roundToDecimalPlaces: 0 | 2;
-    fieldId: string;
-};
 export declare type DateCalculation = {
     leftFieldId: string;
     rightFieldId: string;
     dateCalculationFunction: 'seconds_between' | 'minutes_between' | 'hours_between' | 'days_between';
 };
+export declare type PercentageField = BaseCustomField & Percentage;
+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 MetricField = BaseCustomField & {
+    metric: Metric;
+};
+export declare type SimpleMathField = BaseCustomField & SimpleMath & {
+    dataType: 'number';
+};
+export declare type RulesField = BaseField & {
+    rules: Rules[];
+    dataType: 'string';
+};
+export declare type CustomBuildMetricField = BaseField & {
+    metricAttributes: Metric;
+    dataType: 'number';
+};
+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' | 'calculatedField';
+export declare type CustomFieldCategory = 'percentage' | 'math' | 'rules' | 'roundedNumber' | 'dateCalculation' | 'conditional' | 'customBuildMetric';
 export declare enum AcceptedTypes {
     Maths = "maths",
-    IfStatement = "ifStatement"
+    IfStatement = "ifStatement",
+    Aggregates = "aggregates"
 }
-export declare type MaybeOldCustomField = CustomField;
 export {};

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

@@ -1,13 +1,10 @@
 /// <reference types="react" />
+import { FilterConfig } from '../AdditionalFilter/types';
 import { Component } from '../Component/types';
-import { QueryAttributes } from '../QueryAttributes/types';
 export declare type CustomView = StaticCustomView | SelectableCustomView;
-export declare type DataSetDashboardFilters = {
-    [dataSetId: string]: QueryAttributes.Filter[][];
-};
 export declare type CustomViewCallbackParams = {
-    dashboardFilters: DataSetDashboardFilters;
     attributes?: Component.CustomViewAttributes;
+    filterConfig: FilterConfig;
 };
 export declare type BaseCustomView = {
     id: string;