@vizzly/dashboard 0.14.4-dev-452014891c726bda8e71210563e32bb225b30c86 → 0.14.4-dev-5d1abd7a6424f860eb93453f0fe71ca68b0e9b0d

package/dist/dashboard.cjs.development.js

@@ -2187,6 +2187,7 @@ var PropertyType = /*#__PURE__*/function (PropertyType) {
   PropertyType["NumberInput"] = "number";
   PropertyType["Variable"] = "variable";
   PropertyType["Field"] = "field";
+  PropertyType["Aggregate"] = "aggregate";
   return PropertyType;
 }({});
 var OperatorType = /*#__PURE__*/function (OperatorType) {
@@ -2356,7 +2357,313 @@ var validate$1 = function validate(field) {
   return true;
 };
 
-var init$8 = function init(publicName, fieldId, roundToDecimalPlaces, queryEngineConfig) {
+var tagSchema = function tagSchema() {
+  return Joi.object({
+    key: Joi.string().required()
+  });
+};
+var tagsSchema = function tagsSchema() {
+  return Joi.array().items(tagSchema()).min(0);
+};
+
+var measureSchema = function measureSchema(supportedAggregates, attributeSchemaOptions) {
+  var buildMeasureJoi = function buildMeasureJoi(fieldJoi, functionJoi) {
+    return Joi.object({
+      field: fieldJoi.required(),
+      "function": functionJoi.required().description('Which if any, aggregate function should be applied to the field?')
+    });
+  };
+
+  // Return an enum using the restriction fields
+  if (attributeSchemaOptions != null && attributeSchemaOptions.restrictFields) {
+    return Joi.alternatives.apply(Joi, attributeSchemaOptions.restrictFields.filter(function (f) {
+      return f.canBeMeasure;
+    }).map(function (restrictedField) {
+      var _Joi$string;
+      var supportedFunctionsForField = listValidFunctionsForDataType(restrictedField, supportedAggregates);
+      return buildMeasureJoi(Joi.string().valid(restrictedField.id).description(restrictedField.publicName + ", " + (restrictedField.description || '') + "."), (_Joi$string = Joi.string()).valid.apply(_Joi$string, supportedFunctionsForField.concat(['none'])));
+    }));
+  }
+  return buildMeasureJoi(Joi.string().description('The ID of the field from the data set to reference.'), Joi.valid.apply(Joi, Object.keys(supportedAggregates).concat(['none'])));
+};
+var orderSchema = function orderSchema(queryEngineConfig) {
+  var _Joi$string2;
+  return Joi.object({
+    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
+    direction: Joi.string().valid('asc', 'desc').required().description('In which direction should the results be ordered?'),
+    "function": (_Joi$string2 = Joi.string()).valid.apply(_Joi$string2, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])).description('Which if any, function should be applied to the field?')
+  });
+};
+var timeDimensionSchema = function timeDimensionSchema(supportedTimeTruncFunctions) {
+  return Joi.object({
+    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
+    truncate: Joi.valid.apply(Joi, Object.keys(supportedTimeTruncFunctions).concat(['none'])),
+    bucketFill: Joi["boolean"]()
+  });
+};
+var dimensionSchema = function dimensionSchema(supportedTimeTruncFunctions, attributeSchemaOptions) {
+  var buildDimensionJoi = function buildDimensionJoi(fieldJoi, isDate) {
+    return Joi.object({
+      field: fieldJoi.required(),
+      pivot: Joi.string().valid('x', 'y').optional(),
+      "function": isDate ? Joi.valid.apply(Joi, Object.keys(supportedTimeTruncFunctions).concat(['none'])).required() : Joi.valid('none').required()
+    });
+  };
+
+  // Return an enum using the restriction fields
+  if (attributeSchemaOptions != null && attributeSchemaOptions.restrictFields) {
+    return Joi.array().items(Joi.alternatives.apply(Joi, attributeSchemaOptions.restrictFields.filter(function (f) {
+      return f.canBeDimension;
+    }).map(function (restrictedField) {
+      return buildDimensionJoi(Joi.string().valid(restrictedField.id).description(restrictedField.publicName + ", " + (restrictedField.description || '') + "."), restrictedField.dataType === 'date_time');
+    }))).description('Fields to group the data by');
+  }
+  return Joi.array().items(buildDimensionJoi(Joi.string().description('The ID of the field from the data set to reference.'), true)).description('Fields to group the data by');
+};
+var filterSchema = function filterSchema(queryEngineConfig) {
+  var _Joi$string3, _Joi$string4;
+  return Joi.object({
+    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
+    op: (_Joi$string3 = Joi.string()).valid.apply(_Joi$string3, Object.keys(queryEngineConfig.supportedOperators)).required(),
+    value: Joi.alternatives()["try"](joiDate, Joi.string().allow(null), Joi.number(), Joi["boolean"](), Joi.array().items(Joi.string(), Joi.number(), Joi.allow(null)), relativeSchema).required(),
+    "function": (_Joi$string4 = Joi.string()).valid.apply(_Joi$string4, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])).description('Which function should be applied to the field?')
+  });
+};
+var queryAttributesFilter = function queryAttributesFilter(queryEngineConfig) {
+  return Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig)));
+};
+var queryAttributesLimit = function queryAttributesLimit() {
+  return Joi.number().description('Limit the number of results returned after the query has been ran.');
+};
+var baseAttributesSchema = function baseAttributesSchema(attributeSchemaOptions) {
+  var _Joi$string5;
+  var dataSetIdSchema = attributeSchemaOptions != null && attributeSchemaOptions.restrictDataSetIds ? (_Joi$string5 = Joi.string()).valid.apply(_Joi$string5, attributeSchemaOptions.restrictDataSetIds) : Joi.string();
+  return {
+    viewId: Joi.string().allow('').optional().description('__vizzly_hide_from_docs'),
+    displayTitle: Joi.string().allow('').description('A title that explains what is being displayed.'),
+    displaySubject: Joi.string().allow('').description('A chance to add a more detailed description of what is being shown.'),
+    dataSetId: dataSetIdSchema.description('The ID of the data set that is being used by the view.'),
+    protectedByOrganisation: Joi["boolean"]().optional().description('Has the view been created by your organisation, and therefore cannot be modified by your users?')
+  };
+};
+var approxAxisLabelCountSchema = /*#__PURE__*/Joi.valid('auto', 2, 0).description('Determine how many axis labels should be shown on the axis');
+var querySchema = function querySchema(queryEngineConfig, attributeSchemaOptions) {
+  return {
+    measure: Joi.array().items(measureSchema(queryEngineConfig.supportedAggregates, attributeSchemaOptions)).required().description('A list of metrics that are to be shown. For example the `count` of a specific field in your data set.'),
+    dimension: dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions).required(),
+    order: Joi.array().items(orderSchema(queryEngineConfig)),
+    limit: queryAttributesLimit(),
+    offset: Joi.number().min(0).description('Paginate results by using this property with limit.')
+  };
+};
+var timeDimensionQuerySchema = function timeDimensionQuerySchema(queryEngineConfig, attributeSchemaOptions) {
+  return _extends({}, querySchema(queryEngineConfig, attributeSchemaOptions), {
+    filter: Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))),
+    timeDimension: Joi.alternatives(timeDimensionSchema(queryEngineConfig.supportedTimeTruncFunctions), Joi.valid(null)).required(),
+    drilldown: Joi.alternatives(dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions).required(), Joi.string()),
+    xAxisPrefix: Joi.string().allow('').description('Add a prefix to the X Axis'),
+    yAxisPrefix: Joi.string().allow('').description('Add a prefix to the Y Axis'),
+    xAxisPostfix: Joi.string().allow('').description('Add a postfix to the X Axis'),
+    yAxisPostfix: Joi.string().allow('').description('Add a postfix to the Y Axis'),
+    yAxisFormat: Joi.alternatives(Joi.string(), Joi.valid(null)).description('ID of the formatting function to apply to the Y Axis values'),
+    xAxisFormat: Joi.alternatives(Joi.string(), Joi.valid(null)).description('ID of the formatting function to apply to the X Axis values'),
+    approxYAxisLabelCount: approxAxisLabelCountSchema,
+    approxXAxisLabelCount: approxAxisLabelCountSchema
+  });
+};
+var lineCurveSchema = /*#__PURE__*/Joi.string().valid('natural', 'straight', 'step', 'stepBefore', 'stepAfter', 'dotted');
+var areaCurveSchema = /*#__PURE__*/Joi.string().valid('natural', 'straight', 'step');
+var protectedFieldsMeasure = function protectedFieldsMeasure(queryEngineConfig) {
+  var _Joi$string6;
+  return Joi.array().items(Joi.object({
+    "function": (_Joi$string6 = Joi.string()).valid.apply(_Joi$string6, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])),
+    field: Joi.string().required().description('The ID of the field from the data set to reference.')
+  }));
+};
+var protectedFieldsDimension = function protectedFieldsDimension(queryEngineConfig) {
+  var _Joi$string7;
+  return Joi.array().items(Joi.object({
+    "function": (_Joi$string7 = Joi.string()).valid.apply(_Joi$string7, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])),
+    truncate: Joi.string(),
+    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
+    bucketFill: Joi["boolean"]().optional(),
+    pivot: Joi.string().valid('x', 'y').optional()
+  }));
+};
+var parameterGroupSchema = function parameterGroupSchema(queryEngineConfig, attributeSchemaOptions) {
+  return Joi.object().pattern(Joi.string(), Joi.alternatives()["try"](Joi.array().items(timeDimensionSchema(queryEngineConfig.supportedTimeTruncFunctions)).min(1), dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions))).unknown(true);
+};
+var parameterMeasureSchema = function parameterMeasureSchema(queryEngineConfig, attributeSchemaOptions) {
+  return Joi.object().pattern(Joi.string(), Joi.array().items(measureSchema(queryEngineConfig.supportedAggregates, attributeSchemaOptions)).min(1)).unknown(true);
+};
+var parametersSchema = function parametersSchema(queryEngineConfig, attributeSchemaOptions) {
+  return Joi.object({
+    measure: parameterMeasureSchema(queryEngineConfig, attributeSchemaOptions),
+    group: parameterGroupSchema(queryEngineConfig, attributeSchemaOptions)
+  });
+};
+var goalLineValueSchema = /*#__PURE__*/Joi.alternatives()["try"]( /*#__PURE__*/Joi.number().required(), /*#__PURE__*/Joi.string().pattern(/^\{\{.*\}\}$/).required());
+var goalLineSchema = function goalLineSchema() {
+  return Joi.object({
+    color: Joi.string().required(),
+    value: goalLineValueSchema,
+    strokeWidth: Joi.number().required(),
+    strokeStyle: Joi.string().valid('dashed', 'solid').required(),
+    label: Joi["boolean"]().optional()
+  });
+};
+var goalLinesSchema = function goalLinesSchema() {
+  return Joi.array().items(goalLineSchema());
+};
+var headlineSchema = function headlineSchema() {
+  return Joi.object({
+    func: Joi.string().valid('mean', 'sum', 'current').allow(null).optional()
+  });
+};
+var axisTitleSchema = function axisTitleSchema() {
+  return Joi.object({
+    x: Joi.string().allow(''),
+    y: Joi.string().allow('')
+  });
+};
+var sizingSchema = /*#__PURE__*/Joi.object().pattern( /*#__PURE__*/Joi.string(), /*#__PURE__*/Joi.object({
+  width: /*#__PURE__*/Joi.number().min(0),
+  height: /*#__PURE__*/Joi.number().min(0)
+}));
+var joiDate = /*#__PURE__*/Joi.custom(function (value, helpers) {
+  if (Object.prototype.toString.call(value) === '[object Date]') {
+    return value;
+  }
+  return helpers.error('any.invalid');
+}, 'Date object validation');
+
+// Aggregate schema
+var aggregateSchema = /*#__PURE__*/Joi.object({
+  type: /*#__PURE__*/Joi.string().valid('aggregate').required(),
+  fieldId: /*#__PURE__*/Joi.string().required(),
+  "function": /*#__PURE__*/Joi.string().required()
+});
+
+// Field schema
+var fieldSchema = /*#__PURE__*/Joi.object({
+  type: /*#__PURE__*/Joi.string().valid('field').required(),
+  fieldId: /*#__PURE__*/Joi.string().required(),
+  "function": /*#__PURE__*/Joi.string().valid('none').required()
+});
+
+// Variable schema
+var variableSchema = /*#__PURE__*/Joi.object({
+  type: /*#__PURE__*/Joi.string().valid('variable').required(),
+  value: /*#__PURE__*/Joi.string().required()
+});
+
+// Number schema
+var numberSchema = /*#__PURE__*/Joi.object({
+  type: /*#__PURE__*/Joi.string().valid('number').required(),
+  value: /*#__PURE__*/Joi.number().required()
+});
+
+// Recursive operator schema (prevents empty values)
+var operatorSchema = /*#__PURE__*/Joi.object({
+  type: Joi.string().valid('operator').required(),
+  op: Joi.string().valid('+', '-', '*', '/').required(),
+  values: Joi.array().items(Joi.when('type', {
+    is: 'operator',
+    then: Joi.link('#operatorSchema'),
+    otherwise: Joi.alternatives()["try"](aggregateSchema, fieldSchema, variableSchema, numberSchema)
+  })).min(2).custom(function (values, helpers) {
+    var hasAggregate = values.some(function (v) {
+      return v.type === 'aggregate';
+    });
+    var hasField = values.some(function (v) {
+      return v.type === 'field';
+    });
+    var hasEmptyOperator = values.some(function (v) {
+      return v.type === 'operator' && (!v.values || v.values.length === 0);
+    });
+    if (hasAggregate && hasField) {
+      return helpers.error('any.invalid', {
+        message: 'Field type cannot be mixed with Aggregate type in the same array'
+      });
+    }
+    if (hasEmptyOperator) {
+      return helpers.error('any.invalid', {
+        message: 'Nested operators must have at least two values'
+      });
+    }
+    return values;
+  })
+}).meta({
+  id: 'operatorSchema'
+});
+var ifLogicSchema = function ifLogicSchema(queryEngineConfig) {
+  return Joi.object({
+    type: Joi.string().valid('ifLogic').required(),
+    cases: Joi.array().items(Joi.object({
+      filter: Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig)).min(1)).min(1).required(),
+      returns: Joi.alternatives()["try"](fieldSchema, variableSchema, numberSchema, aggregateSchema, operatorSchema).required()
+    })).min(1).required(),
+    "else": Joi.alternatives()["try"](fieldSchema, variableSchema, numberSchema, aggregateSchema, operatorSchema).optional()
+  });
+};
+
+var validate$2 = function validate(queryEngineConfig, metric) {
+  if (!metric) return {
+    isValid: false
+  };
+  var schema = null;
+
+  // Determine which schema to use based on the metric type
+  if (metric.type === 'operator') {
+    schema = operatorSchema;
+  } else if (metric.type === 'ifLogic') {
+    schema = ifLogicSchema(queryEngineConfig);
+  } else {
+    return {
+      isValid: false,
+      errors: ['Unsupported metric type']
+    };
+  }
+
+  // Perform validation
+  var _schema$validate = schema.validate(metric, {
+      abortEarly: false
+    }),
+    error = _schema$validate.error;
+  if (error) {
+    return {
+      isValid: false,
+      errors: error.details.map(function (detail) {
+        return detail.message;
+      })
+    };
+  }
+  return {
+    isValid: true
+  };
+};
+
+var init$8 = function init(publicName, metric, queryEngineConfig) {
+  return {
+    id: generateId(),
+    publicName: publicName,
+    metricAtrributes: metric,
+    canBeDimension: false,
+    canBeMeasure: true,
+    allowedOperators: validOperatorsForField({
+      dataType: 'number'
+    }, queryEngineConfig),
+    dataType: 'number'
+  };
+};
+var build$9 = function build() {
+  return {
+    type: 'number',
+    value: 0
+  };
+};
+
+var init$9 = function init(publicName, fieldId, roundToDecimalPlaces, queryEngineConfig) {
   return {
     id: generateId(),
     publicName: publicName,
@@ -2370,7 +2677,7 @@ var init$8 = function init(publicName, fieldId, roundToDecimalPlaces, queryEngin
     }, queryEngineConfig)
   };
 };
-var build$9 = function build(measureAttribute, customField) {
+var build$a = function build(measureAttribute, customField) {
   var builtRoundedNumber = {
     type: 'field',
     "function": "round_to_" + customField.roundToDecimalPlaces + "_dp",
@@ -2405,6 +2712,9 @@ var isConditional = function isConditional(field) {
 var isMetric = function isMetric(field) {
   return 'metric' in field;
 };
+var isCustomBuildMetric = function isCustomBuildMetric(field) {
+  return 'metricAtrributes' in field;
+};
 var isDateCalculation = function isDateCalculation(field) {
   return 'dateCalculationFunction' in field;
 };
@@ -2417,10 +2727,11 @@ var getCustomFieldCategory = function getCustomFieldCategory(field) {
   if (isDateCalculation(field)) return 'dateCalculation';
   if (isConditional(field)) return 'conditional';
   if (isMetric(field)) return 'calculatedField';
+  if (isCustomBuildMetric(field)) return 'customBuildMetric';
   throw "Unrecognised custom field type for custom field; " + JSON.stringify(field);
 };
 var isCustomField = function isCustomField(field) {
-  return isPercentageField(field) || isSimpleMathField(field) || isAggregateMathField(field) || isRules(field) || isRoundedNumberField(field) || isDateCalculation(field) || isConditional(field) || isMetric(field);
+  return isPercentageField(field) || isSimpleMathField(field) || isAggregateMathField(field) || isRules(field) || isRoundedNumberField(field) || isDateCalculation(field) || isConditional(field) || isMetric(field) || isCustomBuildMetric(field);
 };
 
 /**
@@ -2441,7 +2752,7 @@ var toQueryMeasure = function toQueryMeasure(measureAttribute, customField, quer
     return build$3(measureAttribute, customField, dataSet, params);
   }
   if (isRoundedNumberField(customField)) {
-    return build$9(measureAttribute, customField);
+    return build$a(measureAttribute, customField);
   }
   if (isConditional(customField)) {
     return build$5(customField, queryEngineConfig, dataSet, params);
@@ -2452,6 +2763,9 @@ var toQueryMeasure = function toQueryMeasure(measureAttribute, customField, quer
   if (isMetric(customField)) {
     return build$8(measureAttribute, customField, dataSet, queryEngineConfig, params);
   }
+  if (isCustomBuildMetric(customField)) {
+    return build$9();
+  }
   throw "Unsupported custom field type; " + JSON.stringify(customField);
 };
 
@@ -2616,187 +2930,7 @@ var fromDashboardRequiredFilterGroups = function fromDashboardRequiredFilterGrou
   });
 };
 
-var tagSchema = function tagSchema() {
-  return Joi.object({
-    key: Joi.string().required()
-  });
-};
-var tagsSchema = function tagsSchema() {
-  return Joi.array().items(tagSchema()).min(0);
-};
-
-var measureSchema = function measureSchema(supportedAggregates, attributeSchemaOptions) {
-  var buildMeasureJoi = function buildMeasureJoi(fieldJoi, functionJoi) {
-    return Joi.object({
-      field: fieldJoi.required(),
-      "function": functionJoi.required().description('Which if any, aggregate function should be applied to the field?')
-    });
-  };
-
-  // Return an enum using the restriction fields
-  if (attributeSchemaOptions != null && attributeSchemaOptions.restrictFields) {
-    return Joi.alternatives.apply(Joi, attributeSchemaOptions.restrictFields.filter(function (f) {
-      return f.canBeMeasure;
-    }).map(function (restrictedField) {
-      var _Joi$string;
-      var supportedFunctionsForField = listValidFunctionsForDataType(restrictedField, supportedAggregates);
-      return buildMeasureJoi(Joi.string().valid(restrictedField.id).description(restrictedField.publicName + ", " + (restrictedField.description || '') + "."), (_Joi$string = Joi.string()).valid.apply(_Joi$string, supportedFunctionsForField.concat(['none'])));
-    }));
-  }
-  return buildMeasureJoi(Joi.string().description('The ID of the field from the data set to reference.'), Joi.valid.apply(Joi, Object.keys(supportedAggregates).concat(['none'])));
-};
-var orderSchema = function orderSchema(queryEngineConfig) {
-  var _Joi$string2;
-  return Joi.object({
-    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
-    direction: Joi.string().valid('asc', 'desc').required().description('In which direction should the results be ordered?'),
-    "function": (_Joi$string2 = Joi.string()).valid.apply(_Joi$string2, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])).description('Which if any, function should be applied to the field?')
-  });
-};
-var timeDimensionSchema = function timeDimensionSchema(supportedTimeTruncFunctions) {
-  return Joi.object({
-    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
-    truncate: Joi.valid.apply(Joi, Object.keys(supportedTimeTruncFunctions).concat(['none'])),
-    bucketFill: Joi["boolean"]()
-  });
-};
-var dimensionSchema = function dimensionSchema(supportedTimeTruncFunctions, attributeSchemaOptions) {
-  var buildDimensionJoi = function buildDimensionJoi(fieldJoi, isDate) {
-    return Joi.object({
-      field: fieldJoi.required(),
-      pivot: Joi.string().valid('x', 'y').optional(),
-      "function": isDate ? Joi.valid.apply(Joi, Object.keys(supportedTimeTruncFunctions).concat(['none'])).required() : Joi.valid('none').required()
-    });
-  };
-
-  // Return an enum using the restriction fields
-  if (attributeSchemaOptions != null && attributeSchemaOptions.restrictFields) {
-    return Joi.array().items(Joi.alternatives.apply(Joi, attributeSchemaOptions.restrictFields.filter(function (f) {
-      return f.canBeDimension;
-    }).map(function (restrictedField) {
-      return buildDimensionJoi(Joi.string().valid(restrictedField.id).description(restrictedField.publicName + ", " + (restrictedField.description || '') + "."), restrictedField.dataType === 'date_time');
-    }))).description('Fields to group the data by');
-  }
-  return Joi.array().items(buildDimensionJoi(Joi.string().description('The ID of the field from the data set to reference.'), true)).description('Fields to group the data by');
-};
-var filterSchema = function filterSchema(queryEngineConfig) {
-  var _Joi$string3, _Joi$string4;
-  return Joi.object({
-    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
-    op: (_Joi$string3 = Joi.string()).valid.apply(_Joi$string3, Object.keys(queryEngineConfig.supportedOperators)).required(),
-    value: Joi.alternatives()["try"](joiDate, Joi.string().allow(null), Joi.number(), Joi["boolean"](), Joi.array().items(Joi.string(), Joi.number(), Joi.allow(null)), relativeSchema).required(),
-    "function": (_Joi$string4 = Joi.string()).valid.apply(_Joi$string4, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])).description('Which function should be applied to the field?')
-  });
-};
-var queryAttributesFilter = function queryAttributesFilter(queryEngineConfig) {
-  return Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig)));
-};
-var queryAttributesLimit = function queryAttributesLimit() {
-  return Joi.number().description('Limit the number of results returned after the query has been ran.');
-};
-var baseAttributesSchema = function baseAttributesSchema(attributeSchemaOptions) {
-  var _Joi$string5;
-  var dataSetIdSchema = attributeSchemaOptions != null && attributeSchemaOptions.restrictDataSetIds ? (_Joi$string5 = Joi.string()).valid.apply(_Joi$string5, attributeSchemaOptions.restrictDataSetIds) : Joi.string();
-  return {
-    viewId: Joi.string().allow('').optional().description('__vizzly_hide_from_docs'),
-    displayTitle: Joi.string().allow('').description('A title that explains what is being displayed.'),
-    displaySubject: Joi.string().allow('').description('A chance to add a more detailed description of what is being shown.'),
-    dataSetId: dataSetIdSchema.description('The ID of the data set that is being used by the view.'),
-    protectedByOrganisation: Joi["boolean"]().optional().description('Has the view been created by your organisation, and therefore cannot be modified by your users?')
-  };
-};
-var approxAxisLabelCountSchema = /*#__PURE__*/Joi.valid('auto', 2, 0).description('Determine how many axis labels should be shown on the axis');
-var querySchema = function querySchema(queryEngineConfig, attributeSchemaOptions) {
-  return {
-    measure: Joi.array().items(measureSchema(queryEngineConfig.supportedAggregates, attributeSchemaOptions)).required().description('A list of metrics that are to be shown. For example the `count` of a specific field in your data set.'),
-    dimension: dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions).required(),
-    order: Joi.array().items(orderSchema(queryEngineConfig)),
-    limit: queryAttributesLimit(),
-    offset: Joi.number().min(0).description('Paginate results by using this property with limit.')
-  };
-};
-var timeDimensionQuerySchema = function timeDimensionQuerySchema(queryEngineConfig, attributeSchemaOptions) {
-  return _extends({}, querySchema(queryEngineConfig, attributeSchemaOptions), {
-    filter: Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))),
-    timeDimension: Joi.alternatives(timeDimensionSchema(queryEngineConfig.supportedTimeTruncFunctions), Joi.valid(null)).required(),
-    drilldown: Joi.alternatives(dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions).required(), Joi.string()),
-    xAxisPrefix: Joi.string().allow('').description('Add a prefix to the X Axis'),
-    yAxisPrefix: Joi.string().allow('').description('Add a prefix to the Y Axis'),
-    xAxisPostfix: Joi.string().allow('').description('Add a postfix to the X Axis'),
-    yAxisPostfix: Joi.string().allow('').description('Add a postfix to the Y Axis'),
-    yAxisFormat: Joi.alternatives(Joi.string(), Joi.valid(null)).description('ID of the formatting function to apply to the Y Axis values'),
-    xAxisFormat: Joi.alternatives(Joi.string(), Joi.valid(null)).description('ID of the formatting function to apply to the X Axis values'),
-    approxYAxisLabelCount: approxAxisLabelCountSchema,
-    approxXAxisLabelCount: approxAxisLabelCountSchema
-  });
-};
-var lineCurveSchema = /*#__PURE__*/Joi.string().valid('natural', 'straight', 'step', 'stepBefore', 'stepAfter', 'dotted');
-var areaCurveSchema = /*#__PURE__*/Joi.string().valid('natural', 'straight', 'step');
-var protectedFieldsMeasure = function protectedFieldsMeasure(queryEngineConfig) {
-  var _Joi$string6;
-  return Joi.array().items(Joi.object({
-    "function": (_Joi$string6 = Joi.string()).valid.apply(_Joi$string6, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])),
-    field: Joi.string().required().description('The ID of the field from the data set to reference.')
-  }));
-};
-var protectedFieldsDimension = function protectedFieldsDimension(queryEngineConfig) {
-  var _Joi$string7;
-  return Joi.array().items(Joi.object({
-    "function": (_Joi$string7 = Joi.string()).valid.apply(_Joi$string7, Object.keys(queryEngineConfig.supportedAggregates).concat(Object.keys(queryEngineConfig.supportedTimeTruncFunctions), ['none'])),
-    truncate: Joi.string(),
-    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
-    bucketFill: Joi["boolean"]().optional(),
-    pivot: Joi.string().valid('x', 'y').optional()
-  }));
-};
-var parameterGroupSchema = function parameterGroupSchema(queryEngineConfig, attributeSchemaOptions) {
-  return Joi.object().pattern(Joi.string(), Joi.alternatives()["try"](Joi.array().items(timeDimensionSchema(queryEngineConfig.supportedTimeTruncFunctions)).min(1), dimensionSchema(queryEngineConfig.supportedTimeTruncFunctions, attributeSchemaOptions))).unknown(true);
-};
-var parameterMeasureSchema = function parameterMeasureSchema(queryEngineConfig, attributeSchemaOptions) {
-  return Joi.object().pattern(Joi.string(), Joi.array().items(measureSchema(queryEngineConfig.supportedAggregates, attributeSchemaOptions)).min(1)).unknown(true);
-};
-var parametersSchema = function parametersSchema(queryEngineConfig, attributeSchemaOptions) {
-  return Joi.object({
-    measure: parameterMeasureSchema(queryEngineConfig, attributeSchemaOptions),
-    group: parameterGroupSchema(queryEngineConfig, attributeSchemaOptions)
-  });
-};
-var goalLineValueSchema = /*#__PURE__*/Joi.alternatives()["try"]( /*#__PURE__*/Joi.number().required(), /*#__PURE__*/Joi.string().pattern(/^\{\{.*\}\}$/).required());
-var goalLineSchema = function goalLineSchema() {
-  return Joi.object({
-    color: Joi.string().required(),
-    value: goalLineValueSchema,
-    strokeWidth: Joi.number().required(),
-    strokeStyle: Joi.string().valid('dashed', 'solid').required(),
-    label: Joi["boolean"]().optional()
-  });
-};
-var goalLinesSchema = function goalLinesSchema() {
-  return Joi.array().items(goalLineSchema());
-};
-var headlineSchema = function headlineSchema() {
-  return Joi.object({
-    func: Joi.string().valid('mean', 'sum', 'current').allow(null).optional()
-  });
-};
-var axisTitleSchema = function axisTitleSchema() {
-  return Joi.object({
-    x: Joi.string().allow(''),
-    y: Joi.string().allow('')
-  });
-};
-var sizingSchema = /*#__PURE__*/Joi.object().pattern( /*#__PURE__*/Joi.string(), /*#__PURE__*/Joi.object({
-  width: /*#__PURE__*/Joi.number().min(0),
-  height: /*#__PURE__*/Joi.number().min(0)
-}));
-var joiDate = /*#__PURE__*/Joi.custom(function (value, helpers) {
-  if (Object.prototype.toString.call(value) === '[object Date]') {
-    return value;
-  }
-  return helpers.error('any.invalid');
-}, 'Date object validation');
-
-var fieldSchema = /*#__PURE__*/Joi.object({
+var fieldSchema$1 = /*#__PURE__*/Joi.object({
   fieldId: /*#__PURE__*/Joi.string().required(),
   dataSetId: /*#__PURE__*/Joi.string().required()
 });
@@ -2811,8 +2945,8 @@ var sharedAdditionalFilterSchema = function sharedAdditionalFilterSchema(queryEn
     managedByConfiguration: Joi["boolean"]().optional(),
     requiresValue: Joi["boolean"]().optional(),
     optionsFilters: optionsFiltersSchema(queryEngineConfig).optional(),
-    appliesToFields: Joi.array().items(fieldSchema).required(),
-    optionsPulledFrom: Joi.array().items(fieldSchema).optional(),
+    appliesToFields: Joi.array().items(fieldSchema$1).required(),
+    optionsPulledFrom: Joi.array().items(fieldSchema$1).optional(),
     hidden: Joi["boolean"](),
     options: Joi.array().items(Joi.object({
       value: Joi.allow(Joi.number(), Joi.string()),
@@ -3171,7 +3305,7 @@ var buildFilters = function buildFilters(dataSet, queryEngineConfig, params, pre
   return [];
 };
 
-var build$a = buildFromQueryAttributes;
+var build$b = buildFromQueryAttributes;
 var hasDimensions = function hasDimensions(query) {
   return query.group.length > 0;
 };
@@ -4042,6 +4176,7 @@ var upcastHeadline = function upcastHeadline(headline, timeDimension) {
 var AcceptedTypes = /*#__PURE__*/function (AcceptedTypes) {
   AcceptedTypes["Maths"] = "maths";
   AcceptedTypes["IfStatement"] = "ifStatement";
+  AcceptedTypes["Aggregates"] = "aggregates";
   return AcceptedTypes;
 }({});
 
@@ -4175,7 +4310,8 @@ var BarChart = function BarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -4570,7 +4706,8 @@ var LineChart = function LineChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -4938,7 +5075,8 @@ var LineChart$1 = function LineChart(config) {
       rules: true,
       aggregateMaths: true,
       roundedNumbers: true,
-      conditional: true
+      conditional: true,
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -5212,7 +5350,8 @@ var PieChart = function PieChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -5566,7 +5705,8 @@ var ScatterChart = function ScatterChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -5938,7 +6078,8 @@ var ComboChart = function ComboChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -6273,7 +6414,8 @@ var DataTable = function DataTable(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -6518,7 +6660,8 @@ var BasicTable = function BasicTable(config) {
       roundedNumbers: true,
       dateCalculations: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths]
+      calculatedField: [AcceptedTypes.Maths],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -6830,7 +6973,8 @@ var HorizontalBarChart = function HorizontalBarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -7191,7 +7335,8 @@ var AreaChart = function AreaChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -7481,7 +7626,8 @@ var SingleStat = function SingleStat(config) {
       rules: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
     },
     supportedFeatures: {
       parameters: true,
@@ -7616,7 +7762,8 @@ var CustomChart = function CustomChart(config) {
       roundedNumbers: false,
       dateCalculations: false,
       conditional: false,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       colorGradient: false,
@@ -7852,7 +7999,8 @@ var MercatorMap = function MercatorMap(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -8163,7 +8311,8 @@ var RichText = function RichText(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -8472,7 +8621,8 @@ var RadarChart = function RadarChart(config) {
       rules: true,
       aggregateMaths: true,
       roundedNumbers: true,
-      conditional: true
+      conditional: true,
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -8690,7 +8840,8 @@ var Progress = function Progress(config) {
       rules: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
     },
     supportedFeatures: {
       parameters: false,
@@ -8993,7 +9144,8 @@ var FunnelChart = function FunnelChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -9640,7 +9792,8 @@ var BubbleChart = function BubbleChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: false,
@@ -9999,7 +10152,8 @@ var BarChart$1 = function BarChart(config) {
       rules: true,
       aggregateMaths: true,
       roundedNumbers: true,
-      conditional: true
+      conditional: true,
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -10330,7 +10484,8 @@ var WaterfallChart = function WaterfallChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
+      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -10703,7 +10858,8 @@ var AreaChart$1 = function AreaChart(config) {
       rules: true,
       aggregateMaths: true,
       roundedNumbers: true,
-      conditional: true
+      conditional: true,
+      customBuild: false
     },
     supportedFeatures: {
       parameters: true,
@@ -10813,6 +10969,11 @@ function filterFields(originalFields, options) {
       return !isDateCalculation(field);
     });
   }
+  if (options != null && options.removeCustomBuildMetric) {
+    fields = fields.filter(function (field) {
+      return !isCustomBuildMetric(field);
+    });
+  }
   if (options != null && options.removeConditional) {
     fields = fields.filter(function (field) {
       return !isConditional(field);
@@ -12023,7 +12184,7 @@ function linearForecast(data, forecastUnits, key, timeUnit, includeForecast // N
   return trendlineWithForecast;
 }
 
-var init$9 = function init(_ref) {
+var init$a = function init(_ref) {
   var pivotConfig = _ref.pivotConfig,
     measures = _ref.measures,
     resultSet = _ref.resultSet,
@@ -13773,6 +13934,7 @@ var ADMIN_FEATURE_TOGGLES = {
   allowAggregateMathsCustomField: true,
   allowRoundedNumberCustomField: true,
   allowRulesCustomField: true,
+  allowCustomBuildField: false,
   showDateAndTimeFilter: true,
   showDateFilter: true,
   canSeeEmptyState: false,
@@ -13810,6 +13972,7 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   allowRoundedNumberCustomField: true,
   allowCalculatedField: false,
   allowRulesCustomField: true,
+  allowCustomBuildField: false,
   showDateAndTimeFilter: true,
   showDateFilter: true,
   canSeeEmptyState: false,
@@ -13822,7 +13985,7 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   showSavingIndicator: true,
   disablePersistingGlobalFiltersLocally: false
 };
-var build$b = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
+var build$c = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
   var featureToggles = {};
   featureToggles = _extends({}, featureToggles, END_USER_DEFAULT_FEATURE_TOGGLES, partialFeatureToggles);
   if (mode == 'admin') {
@@ -13916,7 +14079,7 @@ var removeField$3 = function removeField(component, fieldId) {
   return newComponent;
 };
 
-var init$a = function init(displayTitle) {
+var init$b = function init(displayTitle) {
   return {
     displayTitle: displayTitle,
     colSpan: 12
@@ -13928,7 +14091,7 @@ var isComponent = function isComponent(component) {
 var HEADER_ROW_HEIGHT$1 = 52;
 var add = function add(display, rowIndex, initialTitle) {
   var updatedDisplay = [].concat(display);
-  var newHeader = init$a(initialTitle);
+  var newHeader = init$b(initialTitle);
   var newRow = initRow([newHeader], HEADER_ROW_HEIGHT$1);
   updatedDisplay.splice(rowIndex, 0, newRow);
   return updatedDisplay;
@@ -14394,7 +14557,7 @@ var defaultDateFilterOptions = function defaultDateFilterOptions() {
   }
   return defaultDateFilterOptions;
 };
-var build$c = function build(textOverride, overrides) {
+var build$d = function build(textOverride, overrides) {
   var timeRangeMapping = defaultTimeRangeMapping(textOverride);
   var orderedKeys = Object.keys(DEFAULT_DATETIME_FILTER_OPTIONS).map(function (key) {
     return key in timeRangeMapping ? "_vizzly_" + key : key;
@@ -14688,7 +14851,7 @@ var base = {
     return undefined;
   }
 };
-var init$b = function init(overrides, includeComponentTypes, excludeComponentTypes, textOverride, featureToggles) {
+var init$c = function init(overrides, includeComponentTypes, excludeComponentTypes, textOverride, featureToggles) {
   var _overrides$developerT;
   var onlyViewTypes = function onlyViewTypes(dataSet) {
     var allowedView = filterIncludedAndExcludedViews(ALL_VIZZLY_COMPONENT_TYPES, includeComponentTypes,
@@ -14726,7 +14889,7 @@ var init$b = function init(overrides, includeComponentTypes, excludeComponentTyp
       return _extends({}, defaultFormatMapping, overrides.defaultFormats ? overrides.defaultFormats() : {});
     },
     onEditorUpdate: overrides.onEditorUpdate ? overrides.onEditorUpdate : base.onEditorUpdate,
-    dateFilterOptions: build$c(textOverride, overrides.dateFilterOptions),
+    dateFilterOptions: build$d(textOverride, overrides.dateFilterOptions),
     onSave: overrides.onSave ? overrides.onSave : base.onSave,
     onScheduledReportChange: overrides.onScheduledReportChange || base.onScheduledReportChange,
     dashboardFilters: overrides.dashboardFilters ? overrides.dashboardFilters : base.dashboardFilters,
@@ -14780,7 +14943,7 @@ function useSubscription(callback, idOverride) {
 var useFeatureTogglesSetup = function useFeatureTogglesSetup(mode, overrideFeatureToggles, queryEngineConfig, scope, id) {
   var base$1 = base;
   var buildInitialFeatureToggles = function () {
-    var updatedFeatureToggles = build$b(___default.merge({}, base$1.featureToggles, overrideFeatureToggles), queryEngineConfig != null ? queryEngineConfig : base$1.queryEngineConfig, mode || base$1.mode, scope || base$1.scope);
+    var updatedFeatureToggles = build$c(___default.merge({}, base$1.featureToggles, overrideFeatureToggles), queryEngineConfig != null ? queryEngineConfig : base$1.queryEngineConfig, mode || base$1.mode, scope || base$1.scope);
     return updatedFeatureToggles;
   }();
   var _useState = React.useState(buildInitialFeatureToggles),
@@ -14810,7 +14973,7 @@ var DashboardBehaviourContextProvider = function DashboardBehaviourContextProvid
   var _useState = React.useState(null),
     overrideDeveloperInfo = _useState[0],
     setOverrideDeveloperInfo = _useState[1];
-  var dashboardBehaviour = init$b(_extends({}, props.dashboardBehaviour || {}, {
+  var dashboardBehaviour = init$c(_extends({}, props.dashboardBehaviour || {}, {
     mode: props.mode
   }), props.includeComponentTypes, props.excludeComponentTypes, textOverride, featureToggles);
   return jsxRuntime.jsx(DashboardBehaviourContext.Provider, {
@@ -33429,7 +33592,7 @@ var AreaChart$3 = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
 });
 
-var init$c = function init(attributes) {
+var init$d = function init(attributes) {
   var dimension = [];
   if ('dimension' in attributes) {
     dimension = [].concat(dimension, attributes.dimension || []);
@@ -34321,7 +34484,7 @@ var AreaChartView = function AreaChartView(props) {
   if (isLoading(props.result)) return jsxRuntime.jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var series$1 = series(pivotConfig, props.measure, props.result);
   var resultSet$1 = resultSet(props.result, props.measure, pivotConfig, props.stacked == '100%', checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
   var showHeadline = headlineAvailable(props.order, props.headline, props.timeDimension);
@@ -35608,7 +35771,7 @@ var BarChartView = function BarChartView(props) {
   if (isLoading(props.result)) return jsxRuntime.jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var series$1 = series(pivotConfig, props.measure, props.result);
   var resultSet$1 = resultSet(props.result, props.measure, pivotConfig, props.stacked == '100%', checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
   var showHeadline = headlineAvailable(props.order, props.headline, props.timeDimension);
@@ -36013,12 +36176,12 @@ var LineChartView = function LineChartView(props) {
   if (isLoading(props.result)) return jsxRuntime.jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var series$1 = series(pivotConfig, props.measure, props.result);
   var resultSet$1 = resultSet(props.result, props.measure, pivotConfig, props.stacked == '100%', checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
   var buildTrends = function buildTrends() {
     if (props.order.length > 0 && props.trends && props.trends.length > 0 && acceptedTimeDimensions(props.timeDimension)) {
-      var trends = init$9({
+      var trends = init$a({
         pivotConfig: pivotConfig,
         measures: props.measure,
         resultSet: resultSet$1,
@@ -36258,7 +36421,7 @@ var ScatterChartView = function ScatterChartView(props) {
   var measure = [];
   if (props.xMeasure) measure.push(props.xMeasure);
   if (props.yMeasure) measure.push(props.yMeasure);
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var scatterData = props.result ? resultSet(props.result, measure, pivotConfig) : [];
   var xField = key([], [], props.xMeasure.field, props.xMeasure["function"]);
   scatterData.map(function (d) {
@@ -37624,7 +37787,7 @@ var PieChartView = function PieChartView(props) {
   }
   if (hasFailed(props.result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$c({
+  var pivotConfig = init$d({
     dimension: props.dimension
   });
   var rS = resultSet$1(props.result, pivotConfig, fakeQuery, false, checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
@@ -41782,7 +41945,7 @@ var BubbleChartView = function BubbleChartView(props) {
   var measure = [];
   measure.push(props.xMeasure);
   measure.push(props.yMeasure);
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var bubbleData = props.result ? resultSet(props.result, measure, pivotConfig) : [];
   var xField = key([], [], props.xMeasure.field, props.xMeasure["function"]);
   var zField = props.zMeasure ? key([], [], props.zMeasure.field, props.zMeasure["function"]) : '';
@@ -45272,7 +45435,7 @@ var LineChartV2View = function LineChartV2View(props) {
   var showHeadline = headlineAvailable(props.attributes.order, props.attributes.headline, null);
   var theme = useTheme();
   var LineChartV2Component = getComponentInterface(props.attributes.type);
-  var pivotConfig = init$c(props.attributes);
+  var pivotConfig = init$d(props.attributes);
   var chartRepresentation = null;
   if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && LineChartV2Component.isRunnable(props.attributes)) {
     var _theme$charts$colors, _theme$charts, _props$attributes$goa;
@@ -45439,13 +45602,13 @@ var ComboChartView = function ComboChartView(props) {
   }
   if (isLoading(props.lineResult) || isLoading(props.barResult)) return jsxRuntime.jsx(LoadingComponent, {});
   if (hasFailed(props.lineResult) && hasFailed(props.barResult)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
-  var barPivotConfig = init$c({
+  var barPivotConfig = init$d({
     dimension: props.barDimension,
     timeDimension: props.timeDimension
   });
   var barSeries = props.barResult ? series(barPivotConfig, props.barMeasure, props.barResult) : [];
   var barTimeseriesResultSet = props.barResult ? resultSet(props.barResult, props.barMeasure, barPivotConfig, props.stacked == '100%', checkForNullValue(props.dataSetId, props.barDimension, props.timeDimension, textOverride, valueAlias)) : [];
-  var linePivotConfig = init$c({
+  var linePivotConfig = init$d({
     dimension: props.lineDimension,
     timeDimension: props.timeDimension
   });
@@ -45736,7 +45899,7 @@ var FunnelChartView = function FunnelChartView(props) {
   if (isLoading(props.result)) return jsxRuntime.jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var series$1 = series(pivotConfig, props.measure, props.result);
   var resultSet$1 = resultSet(props.result, props.measure, pivotConfig, false, checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
   var showHeadline = headlineAvailable(props.order, props.headline, props.timeDimension);
@@ -48389,7 +48552,7 @@ var DataTable$2 = function DataTable(props) {
   }));
 };
 
-var validate$2 = function validate(component, dataSets, dashboardBehaviour) {
+var validate$3 = function validate(component, dataSets, dashboardBehaviour) {
   try {
     var dataSet = find(dataSets, component.attributes.dataSetId);
     if (!dataSet) throw new DataSetNotFound(dataSets, component.attributes.dataSetId);
@@ -48915,7 +49078,7 @@ var BarChartV2View = function BarChartV2View(props) {
   var showHeadline = headlineAvailable(props.attributes.order, props.attributes.headline, null);
   var theme = useTheme();
   var BarChartV2Component = getComponentInterface(props.attributes.type);
-  var pivotConfig = init$c(props.attributes);
+  var pivotConfig = init$d(props.attributes);
   var chartRepresentation = React.useMemo(function () {
     if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && BarChartV2Component.isRunnable(props.attributes)) {
       var _theme$charts$colors, _theme$charts, _props$attributes$goa;
@@ -49965,7 +50128,7 @@ var WaterfallChartView = function WaterfallChartView(props) {
   if (hasFailed(result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
   var showHeadline = headlineAvailable(order, headline, timeDimension);
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var _buildWaterfallChartR = buildWaterfallChartRepresentation({
       approxYAxisLabelCount: approxYAxisLabelCount === 'auto' ? 10 : approxYAxisLabelCount,
       axisTitles: axisTitles,
@@ -50293,7 +50456,7 @@ var AreaChartV2View = function AreaChartV2View(props) {
   var showHeadline = headlineAvailable(props.attributes.order, props.attributes.headline, null);
   var theme = useTheme();
   var AreaChartV2Component = getComponentInterface(props.attributes.type);
-  var pivotConfig = init$c(props.attributes);
+  var pivotConfig = init$d(props.attributes);
   var chartRepresentation = null;
   if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && AreaChartV2Component.isRunnable(props.attributes)) {
     var _theme$charts$colors, _theme$charts, _props$attributes$goa;
@@ -50786,7 +50949,7 @@ var RadarChartView = function RadarChartView(props) {
   if (hasFailed(result)) return jsxRuntime.jsx(FailedToLoadDataNotice, {});
   if (isEmpty(result)) return jsxRuntime.jsx(NoResultContentToShowNotice, _extends({}, headerProps));
   var showHeadline = headlineAvailable(order, headline, timeDimension);
-  var pivotConfig = init$c(props);
+  var pivotConfig = init$d(props);
   var chartRepresentation = buildRadarChartRepresentation({
     result: result,
     xAxisFormat: xAxisFormat,
@@ -50944,7 +51107,7 @@ var Component = function Component(props) {
   var setPartialAttributes = function setPartialAttributes(changes) {
     return props.updateComponentAttributes(componentInterface.setAttributes(props.component.attributes, changes));
   };
-  var validationError = validate$2(props.component, dashboard.dataSets, dashboardBehaviour);
+  var validationError = validate$3(props.component, dashboard.dataSets, dashboardBehaviour);
   if (validationError) {
     if (validationError instanceof DataSetNotFound) {
       return jsxRuntime.jsx(Empty, {
@@ -51710,7 +51873,7 @@ var PopulatedComponentOptions = function PopulatedComponentOptions(props) {
   var theme = useTheme();
   var dashboardBehaviour = useDashboardBehaviourContext();
   var componentInterface = getComponentInterface(props.component.attributes.type);
-  var validationError = validate$2(props.component, dashboard.dataSets, dashboardBehaviour);
+  var validationError = validate$3(props.component, dashboard.dataSets, dashboardBehaviour);
   var dataSet = find(dashboard.dataSets, props.component.attributes.dataSetId);
   var populatedCellOptions = [];
   var isCustomComponent = props.component.attributes.type === 'custom';
@@ -53719,7 +53882,7 @@ var wrap$1 = function wrap(metric) {
   return metric ? [metric] : [];
 };
 var MeasuresInput = function MeasuresInput(inputProps) {
-  var _inputProps$label, _inputProps$testId;
+  var _inputProps$onDeleteI, _inputProps$label, _inputProps$testId;
   var _useState = React.useState(false),
     cannotRemove = _useState[0],
     showCannotRemove = _useState[1];
@@ -53784,7 +53947,7 @@ var MeasuresInput = function MeasuresInput(inputProps) {
     children: [jsxRuntime.jsx(ListView, {
       mode: mode,
       onOrderChange: inputProps.allowsMultiple ? onOrderChange : undefined,
-      onDeleteItem: inputProps.disableRemove || inputProps.dataSet.preAggregated ? undefined : onDeleteItem,
+      onDeleteItem: (_inputProps$onDeleteI = inputProps.onDeleteItem) != null ? _inputProps$onDeleteI : inputProps.disableRemove || inputProps.dataSet.preAggregated ? undefined : onDeleteItem,
       items: inputProps.filterOptions ? inputProps.filterOptions(items) : items,
       newItem: {
         callToAction: (_inputProps$label = inputProps == null ? void 0 : inputProps.label) != null ? _inputProps$label : textOverride('add_metric', 'Add metric'),
@@ -54113,6 +54276,10 @@ function customMetricText(key, textOverride) {
     calculatedField: {
       title: textOverride('custom_metric_title.caclulated_field', 'Calculated Field'),
       subtext: textOverride('custom_metric_description.caclulated_field', 'Create a calculated field')
+    },
+    customBuildMetric: {
+      title: textOverride('custom_metric_title.caclulated_field', 'Custom Metric Builder'),
+      subtext: textOverride('custom_metric_description.caclulated_field', 'Create a custom build field')
     }
   };
   return values[key];
@@ -54139,6 +54306,11 @@ var buildInitOptions = function buildInitOptions(featureToggles, componentType,
       logDebug("Simple math custom field not made available, because it is not supported for the view " + componentInterface.title + ".");
     }
   }
+  if (featureToggles.allowCustomBuildField && componentInterface.supportedCustomFields.customBuild) {
+    initValues.push(_extends({}, customMetricText('customBuildMetric', textOverride), {
+      value: 'customBuildMetric'
+    }));
+  }
   if (featureToggles.allowRoundedNumberCustomField && componentInterface.supportedCustomFields.roundedNumbers) {
     initValues.push(_extends({}, customMetricText('roundedNumber', textOverride), {
       value: 'roundedNumber'
@@ -54235,6 +54407,7 @@ var ModalType = /*#__PURE__*/function (ModalType) {
   ModalType["GoalLines"] = "goalLines";
   ModalType["CalculatedField"] = "calculatedField";
   ModalType["ItemPicker"] = "itemPicker";
+  ModalType["CustomMetricBuilder"] = "customMetricBuilder";
   return ModalType;
 }({});
 
@@ -54511,6 +54684,9 @@ function getSubtext(customField, textOverride) {
   if (isMetric(customField)) {
     return customMetricText('calculatedField', textOverride).title;
   }
+  if (isCustomBuildMetric(customField)) {
+    return customMetricText('customBuildMetric', textOverride).title;
+  }
   return '';
 }
 var mapCategoryToModalType = function mapCategoryToModalType(category) {
@@ -54529,6 +54705,8 @@ var mapCategoryToModalType = function mapCategoryToModalType(category) {
       return ModalType.DateCalculationCustomMetric;
     case 'calculatedField':
       return ModalType.CalculatedField;
+    case 'customBuildMetric':
+      return ModalType.CustomMetricBuilder;
     default:
       return undefined;
   }
@@ -62228,7 +62406,8 @@ var ConditionalModal = function ConditionalModal(props) {
     removeRuleGrouping: true,
     removeAggregateMaths: true,
     removeDateCalculations: true,
-    removeConditional: true
+    removeConditional: true,
+    removeCustomBuildMetric: true
   };
   return jsxRuntime.jsxs(Modal, {
     width: "4xl",
@@ -62781,7 +62960,8 @@ var PercentageModal = function PercentageModal(props) {
     removeRuleGrouping: true,
     removeAggregateMaths: true,
     removeDateCalculations: true,
-    removeConditional: true
+    removeConditional: true,
+    removeCustomBuildMetric: true
   };
   return jsxRuntime.jsxs(Modal, {
     width: "4xl",
@@ -63190,7 +63370,8 @@ var MathModal = function MathModal(props) {
     removeSimpleMaths: true,
     removeAggregateMaths: true,
     removeDateCalculations: true,
-    removeConditional: true
+    removeConditional: true,
+    removeCustomBuildMetric: true
   };
   var numberFields = filterFields(props.dataSet.fields, numberFieldsOptions);
   var options = getMathRadioButtonOptions(props.componentType);
@@ -63808,7 +63989,7 @@ var useRoundedNumberBuilder = function useRoundedNumberBuilder(initialValue, que
   var onCreateNewRoundedNumber = function onCreateNewRoundedNumber() {
     if (selected && selected.dataSetField) {
       var _selected$dataSetFiel;
-      var newCustomField = init$8(metricName, (_selected$dataSetFiel = selected.dataSetField) == null ? void 0 : _selected$dataSetFiel.id, selected.transformationFunctionKey == 'round_to_0_dp' ? 0 : 2, queryEngineConfig);
+      var newCustomField = init$9(metricName, (_selected$dataSetFiel = selected.dataSetField) == null ? void 0 : _selected$dataSetFiel.id, selected.transformationFunctionKey == 'round_to_0_dp' ? 0 : 2, queryEngineConfig);
       onNewCustomField(_extends({}, newCustomField, {
         id: isEditing ? initialValue.id : newCustomField.id
       }));
@@ -64935,6 +65116,12 @@ function createNewValueFromSelected(selected) {
           fieldId: selected.id,
           "function": 'none'
         };
+      case PropertyType.Aggregate:
+        return {
+          type: PropertyType.Aggregate,
+          fieldId: selected.id,
+          "function": undefined
+        };
       case PropertyType.Operator:
         return initOperator(selected.id);
       case PropertyType.IfLogic:
@@ -64974,35 +65161,6 @@ var buildVariableItems = function buildVariableItems(variables, accepts) {
   };
 };
 
-var buildFieldItems = function buildFieldItems(dataSet) {
-  var numberFieldsOptions = {
-    onlyFieldTypes: ['number'],
-    removePercentage: true,
-    removeSimpleMaths: true,
-    removeAggregateMaths: true,
-    removeDateCalculations: true,
-    removeConditional: true
-  };
-  var numberFields = filterFields(dataSet.fields, numberFieldsOptions);
-  var things = numberFields.map(function (field) {
-    return {
-      type: PropertyType.Field,
-      id: field.id,
-      title: field.publicName,
-      subtext: field.description,
-      editIcon: false,
-      icon: jsxRuntime.jsx(DataTypeIcon, {
-        icon: "number"
-      })
-    };
-  });
-  return {
-    id: PropertyType.Field,
-    title: 'Fields',
-    things: things
-  };
-};
-
 var DeleteAction = function DeleteAction(props) {
   var _useDashboardBehaviou = useDashboardBehaviourContext();
   var theme = useTheme();
@@ -65048,7 +65206,7 @@ var CustomMetricNumberInput = function CustomMetricNumberInput(props) {
   });
 };
 
-var _formatFormula = function formatFormula(obj, isNested, textOverride) {
+var _formatFormula = function formatFormula(obj, isNested, textOverride, dataSet) {
   if (isNested === void 0) {
     isNested = false;
   }
@@ -65059,6 +65217,8 @@ var _formatFormula = function formatFormula(obj, isNested, textOverride) {
       return obj.value !== undefined ? obj.value.toString() : toBeDefined;
     case PropertyType.Variable:
       return "{{ " + obj.value + " }}";
+    case PropertyType.Aggregate:
+      return findField(dataSet, obj.fieldId).publicName + " " + (obj["function"] ? "(" + obj["function"] + ")" : '');
     case PropertyType.Field:
       return obj.fieldId;
     case PropertyType.Operator:
@@ -65071,27 +65231,27 @@ var _formatFormula = function formatFormula(obj, isNested, textOverride) {
         if (op === OperatorType.Divide && values.length > 2) {
           var grouped = values.reduce(function (acc, val, index) {
             if (index === 0) {
-              return _formatFormula(val, true, textOverride);
+              return _formatFormula(val, true, textOverride, dataSet);
             }
-            return "(" + acc + " / " + _formatFormula(val, true, textOverride) + ")";
+            return "(" + acc + " / " + _formatFormula(val, true, textOverride, dataSet) + ")";
           }, '');
           return isNested ? "(" + grouped + ")" : grouped;
         }
         var formattedValues = values.map(function (val) {
-          return _formatFormula(val, true, textOverride);
+          return _formatFormula(val, true, textOverride, dataSet);
         }).join(" " + op + " ");
         return isNested ? "(" + formattedValues + ")" : formattedValues;
       }
     case PropertyType.IfLogic:
       {
         var formattedCases = obj.cases.map(function (c) {
-          var then = c.returns ? "then " + _formatFormula(c.returns, true, textOverride) : '';
+          var then = c.returns ? "then " + _formatFormula(c.returns, true, textOverride, dataSet) : '';
           if (c.filter.length === 0) return toBeDefined;
           return "if (" + c.filter.map(function (f) {
             return filterCondition(f, c.filter.length > 1, textOverride);
           }).join(' || ') + ") " + then;
         }).join(' else ');
-        var elsePart = obj["else"] ? " else " + _formatFormula(obj["else"], true, textOverride) : '';
+        var elsePart = obj["else"] ? " else " + _formatFormula(obj["else"], true, textOverride, dataSet) : '';
         return formattedCases + elsePart;
       }
     default:
@@ -65124,7 +65284,8 @@ var filterCondition = function filterCondition(filter, nested, textOverride) {
 };
 
 var MetricOverview = function MetricOverview(_ref) {
-  var metric = _ref.metric;
+  var metric = _ref.metric,
+    dataSet = _ref.dataSet;
   var _useDashboardBehaviou = useDashboardBehaviourContext(),
     textOverride = _useDashboardBehaviou.textOverride;
   if (!metric) {
@@ -65137,7 +65298,7 @@ var MetricOverview = function MetricOverview(_ref) {
   return jsxRuntime.jsx("code", {
     className: "" + code$1,
     "data-testid": "metric-overview",
-    children: _formatFormula(metric, false, textOverride)
+    children: _formatFormula(metric, false, textOverride, dataSet)
   });
 };
 var code$1 = /*#__PURE__*/styles({
@@ -65254,6 +65415,152 @@ var availableItems = function availableItems() {
   }];
 };
 
+var CustomMetricAggregate = function CustomMetricAggregate(props) {
+  var dashboardBehaviour = useDashboardBehaviourContext();
+  var numberFieldsOptions = {
+    onlyFieldTypes: ['number'],
+    removePercentage: true,
+    removeSimpleMaths: true,
+    removeAggregateMaths: true,
+    removeDateCalculations: true,
+    removeConditional: true,
+    removeCustomBuildMetric: true
+  };
+  return jsxRuntime.jsx(MeasuresInput, {
+    id: props.id,
+    testId: props.id,
+    componentType: props.componentType,
+    maxAllowed: 1,
+    allowsMultiple: false,
+    setPartialAttributes: function setPartialAttributes(_ref) {
+      var measure = _ref.measure;
+      return props.onChange(_extends({}, props.measure, {
+        fieldId: measure.field,
+        "function": measure["function"]
+      }));
+    },
+    supportedAggregates: dashboardBehaviour.queryEngineConfig.supportedAggregates,
+    attributes: {
+      measure: {
+        field: props.measure.fieldId,
+        "function": props.measure["function"] || undefined
+      }
+    },
+    dataSet: props.dataSet,
+    fieldFilterOptions: numberFieldsOptions,
+    onDeleteItem: props.onDeleteItem
+  });
+};
+
+var buildAggregateItems = function buildAggregateItems(dataSet) {
+  var fieldsOptions = {
+    onlyFieldTypes: ['number', 'string', 'boolean'],
+    removePercentage: true,
+    removeSimpleMaths: true,
+    removeAggregateMaths: true,
+    removeDateCalculations: true,
+    removeConditional: true,
+    removeRuleGrouping: true,
+    removeCustomBuildMetric: true
+  };
+  var fields = filterFields(dataSet.fields, fieldsOptions);
+  var things = fields.map(function (field) {
+    return {
+      type: PropertyType.Aggregate,
+      id: field.id,
+      title: field.publicName,
+      subtext: field.description,
+      editIcon: false,
+      icon: field.dataType
+    };
+  });
+  return {
+    id: PropertyType.Aggregate,
+    title: 'Aggregates',
+    things: things
+  };
+};
+
+var buildFieldItems = function buildFieldItems(dataSet) {
+  var numberFieldsOptions = {
+    onlyFieldTypes: ['number'],
+    removePercentage: true,
+    removeSimpleMaths: true,
+    removeAggregateMaths: true,
+    removeDateCalculations: true,
+    removeConditional: true,
+    removeCustomBuildMetric: true
+  };
+  var numberFields = filterFields(dataSet.fields, numberFieldsOptions);
+  var things = numberFields.map(function (field) {
+    return {
+      type: PropertyType.Field,
+      id: field.id,
+      title: field.publicName,
+      subtext: field.description,
+      editIcon: false,
+      icon: field.dataType
+    };
+  });
+  return {
+    id: PropertyType.Field,
+    title: 'Fields',
+    things: things
+  };
+};
+
+function buildFieldsAndAggregates(value, dataSet, parentHasAggregate, parentHasField) {
+  var isOperator = value.type === PropertyType.Operator;
+  var isIfLogic = value.type === PropertyType.IfLogic;
+  var hasAggregate = isOperator && value.values.some(function (v) {
+    return v.type === PropertyType.Aggregate;
+  });
+  var hasField = isOperator && value.values.some(function (v) {
+    return v.type === PropertyType.Field;
+  });
+  var hasAggregateCase = isIfLogic && value.cases.some(function (c) {
+    var _c$returns;
+    return ((_c$returns = c.returns) == null ? void 0 : _c$returns.type) === 'aggregate';
+  });
+  var hasFieldCase = isIfLogic && value.cases.some(function (c) {
+    var _c$returns2;
+    return ((_c$returns2 = c.returns) == null ? void 0 : _c$returns2.type) === 'field';
+  });
+  var hasNoReturns = isIfLogic && value.cases.every(function (c) {
+    return !c.returns;
+  });
+  var updatedItems = [];
+  var updatedParentHasAggregate = parentHasAggregate != null ? parentHasAggregate : false;
+  var updatedParentHasField = parentHasField != null ? parentHasField : false;
+  if (hasAggregate) {
+    updatedParentHasAggregate = true;
+  }
+  if (hasField) {
+    updatedParentHasField = true;
+  }
+  if (isOperator) {
+    if (!updatedParentHasField) updatedItems.push(buildAggregateItems(dataSet));
+    if (!updatedParentHasAggregate) updatedItems.push(buildFieldItems(dataSet));
+  }
+  if (isIfLogic) {
+    if (!updatedParentHasField && hasAggregateCase) {
+      updatedItems.push(buildAggregateItems(dataSet));
+    }
+    if (!updatedParentHasAggregate && hasFieldCase) {
+      updatedItems.push(buildFieldItems(dataSet));
+    }
+    if (hasNoReturns) {
+      updatedItems.push(buildAggregateItems(dataSet));
+      updatedItems.push(buildFieldItems(dataSet));
+    }
+  }
+  return {
+    updatedItems: updatedItems,
+    updatedParentHasAggregate: updatedParentHasAggregate,
+    updatedParentHasField: updatedParentHasField
+  };
+}
+
 var operatorMap = function operatorMap(operator) {
   switch (operator) {
     case OperatorType.Divide:
@@ -65341,13 +65648,25 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
     index = _ref.index,
     onDeleteItem = _ref.onDeleteItem,
     parentIsIfLogic = _ref.parentIsIfLogic,
-    isEditing = _ref.isEditing;
+    isEditing = _ref.isEditing,
+    parentHasAggregate = _ref.parentHasAggregate,
+    parentHasField = _ref.parentHasField;
   var _useDashboardBehaviou2 = useDashboardBehaviourContext(),
     variables = _useDashboardBehaviou2.variables,
     textOverride = _useDashboardBehaviou2.textOverride;
   var handleBuildMetric = function handleBuildMetric(selected) {
     _updateValue(addToOperator(value, selected));
   };
+  if (value.type === PropertyType.Aggregate) {
+    return jsxRuntime.jsx(CustomMetricAggregate, {
+      measure: value,
+      onChange: _updateValue,
+      dataSet: dataSet,
+      id: level + "-measure-" + index,
+      onDeleteItem: onDeleteItem,
+      componentType: "progress"
+    });
+  }
   if (value.type === PropertyType.NumberInput) {
     var handleUpdatingValue = function handleUpdatingValue(event) {
       var itemToUpdate = _extends({}, value);
@@ -65380,8 +65699,14 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
     operator: [OperatorType.Add, OperatorType.Divide, OperatorType.Subtract, OperatorType.Multiply],
     logic: [PropertyType.NumberInput]
   }));
-  if (value.type !== PropertyType.IfLogic && !parentIsIfLogic) {
-    items.push(buildFieldItems(dataSet));
+  if (!parentIsIfLogic) {
+    var _buildFieldsAndAggreg = buildFieldsAndAggregates(value, dataSet, parentHasAggregate, parentHasField),
+      updatedItems = _buildFieldsAndAggreg.updatedItems,
+      updatedParentHasAggregate = _buildFieldsAndAggreg.updatedParentHasAggregate,
+      updatedParentHasField = _buildFieldsAndAggreg.updatedParentHasField;
+    items.push.apply(items, updatedItems);
+    parentHasAggregate = updatedParentHasAggregate;
+    parentHasField = updatedParentHasField;
   }
   if (variables != null && variables.variables) {
     var builtVariables = buildVariableItems(variables.variables, 'numbers');
@@ -65450,7 +65775,9 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
                   ifCase.returns = undefined;
                   _updateValue(_extends({}, value));
                 },
-                parentIsIfLogic: parentIsIfLogic
+                parentIsIfLogic: parentIsIfLogic,
+                parentHasAggregate: parentHasAggregate,
+                parentHasField: parentHasField
               }), !ifCase.returns && jsxRuntime.jsx(AddItem, {
                 items: items,
                 onSelect: handleUpdateCase,
@@ -65473,7 +65800,9 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
               value["else"] = undefined;
               _updateValue(_extends({}, value));
             },
-            parentIsIfLogic: parentIsIfLogic
+            parentIsIfLogic: parentIsIfLogic,
+            parentHasAggregate: parentHasAggregate,
+            parentHasField: parentHasField
           }), !value["else"] && jsxRuntime.jsx(AddItem, {
             items: items,
             onSelect: function onSelect(selected) {
@@ -65516,7 +65845,9 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
                   var newValue = deleteOperatorValue(value, index);
                   _updateValue(newValue);
                 },
-                parentIsIfLogic: parentIsIfLogic
+                parentIsIfLogic: parentIsIfLogic,
+                parentHasAggregate: parentHasAggregate,
+                parentHasField: parentHasField
               })
             }), value.values.length - 1 !== index && jsxRuntime.jsx("div", {
               className: styles({
@@ -65603,7 +65934,8 @@ var CustomMetric = function CustomMetric(props) {
       }), jsxRuntime.jsx(View, {
         marginTop: 20,
         children: jsxRuntime.jsx(MetricOverview, {
-          metric: state.wipCustomMetric
+          metric: state.wipCustomMetric,
+          dataSet: props.dataSet
         })
       })]
     })
@@ -65855,6 +66187,117 @@ var ItemPicker = function ItemPicker(props) {
   });
 };
 
+var emptyConditional$1 = {
+  publicName: '',
+  metric: undefined
+};
+var useCustomMetricBuilderModal = function useCustomMetricBuilderModal(queryEngineConfig, customField, onUpdateField) {
+  var isEditing = !!customField;
+  var _useState = React.useState(emptyConditional$1),
+    state = _useState[0],
+    setState = _useState[1];
+  React.useEffect(function () {
+    if (customField) {
+      setState({
+        publicName: customField.publicName,
+        metric: customField.metricAtrributes
+      });
+    } else {
+      setState(emptyConditional$1);
+    }
+  }, [JSON.stringify(customField)]);
+  var handleUpsertField = function handleUpsertField() {
+    if (state.metric) {
+      var _customField$id;
+      var newCustomField = init$8(state.publicName, state.metric, queryEngineConfig);
+      onUpdateField(_extends({}, newCustomField, {
+        id: (_customField$id = customField == null ? void 0 : customField.id) != null ? _customField$id : newCustomField.id
+      }));
+    }
+  };
+  React.useEffect(function () {
+    return logDebug(state.metric);
+  }, [JSON.stringify(state.metric)]);
+  var onChange = function onChange(partial) {
+    setState(_extends({}, state, partial));
+  };
+  return {
+    state: state,
+    handleUpsertField: handleUpsertField,
+    onChange: onChange,
+    isEditing: isEditing,
+    isValid: validate$2(queryEngineConfig, state.metric).isValid && state.publicName.length > 0
+  };
+};
+
+var CustomMetricBuilderModal = function CustomMetricBuilderModal(props) {
+  var dataSet = props.dataSet;
+  var _useDashboardBehaviou = useDashboardBehaviourContext(),
+    textOverride = _useDashboardBehaviou.textOverride,
+    queryEngineConfig = _useDashboardBehaviou.queryEngineConfig;
+  var _useCustomMetricBuild = useCustomMetricBuilderModal(queryEngineConfig, props.initialValue, props.onNewCustomField),
+    handleUpsertField = _useCustomMetricBuild.handleUpsertField,
+    state = _useCustomMetricBuild.state,
+    _onChange = _useCustomMetricBuild.onChange,
+    isEditing = _useCustomMetricBuild.isEditing,
+    isValid = _useCustomMetricBuild.isValid;
+  var supportedTypes = function () {
+    var supportedLogicTypes = getComponentInterface(props.componentType).supportedCustomFields.customBuild;
+    if (typeof supportedLogicTypes !== 'boolean') return supportedLogicTypes;
+    return undefined;
+  }();
+  return jsxRuntime.jsxs(Modal, {
+    width: "4xl",
+    isOpen: props.show,
+    onClose: props.onClose,
+    disableDnD: true,
+    children: [jsxRuntime.jsx(Modal.Header, {
+      title: customMetricText('customBuildMetric', textOverride).title
+    }), jsxRuntime.jsxs(Modal.Content, {
+      children: [jsxRuntime.jsx(PanelProperty, {
+        children: jsxRuntime.jsx(Input, {
+          id: "custom-metric-name",
+          placeholder: textOverride('metric_name', 'Metric name'),
+          label: textOverride('metric_name', 'Metric name'),
+          value: state.publicName,
+          onChange: function onChange(event) {
+            return _onChange({
+              publicName: event.target.value
+            });
+          }
+        })
+      }), supportedTypes && jsxRuntime.jsx(CustomMetric, {
+        dataSet: dataSet,
+        metric: state.metric,
+        onChange: function onChange(metric) {
+          return _onChange({
+            metric: metric
+          });
+        },
+        supportedTypes: supportedTypes
+      }, isEditing + "-" + state.publicName)]
+    }), jsxRuntime.jsx(Modal.Footer, {
+      buttons: "end",
+      children: jsxRuntime.jsxs(ButtonGroup, {
+        children: [jsxRuntime.jsx(Button$2, {
+          onClick: function onClick() {
+            return props.onClose();
+          },
+          secondary: true,
+          children: textOverride('cancel', 'Cancel')
+        }), jsxRuntime.jsx(Button$2, {
+          onClick: function onClick() {
+            return handleUpsertField();
+          },
+          disabled: !isValid,
+          testId: (isEditing ? 'update' : 'create') + "-custom-metric-builder",
+          children: isEditing ? textOverride('update', 'Update') : textOverride('create', 'Create')
+        })]
+      })
+    })]
+  });
+};
+
 var ModalToShow = /*#__PURE__*/function (ModalToShow) {
   ModalToShow[ModalToShow["Neither"] = 0] = "Neither";
   ModalToShow[ModalToShow["Library"] = 1] = "Library";
@@ -65928,6 +66371,8 @@ var ModalRouting = function ModalRouting() {
           }), modalType);
         case ModalType.ConditionalCustomMetric:
           return jsxRuntime.jsx(ConditionalModal, _extends({}, attributes), modalType);
+        case ModalType.CustomMetricBuilder:
+          return jsxRuntime.jsx(CustomMetricBuilderModal, _extends({}, attributes), modalType);
         case ModalType.PercentageCustomMetric:
           return jsxRuntime.jsx(PercentageModal, _extends({}, attributes), modalType);
         case ModalType.MathCustomMetric:
@@ -66629,7 +67074,7 @@ var fromToken = function fromToken(token) {
   });
 };
 
-var init$d = function init(dashboardSessionToken, dataAccessToken, queryEngineAccessToken, dashboardAdminOverrideToken) {
+var init$e = function init(dashboardSessionToken, dataAccessToken, queryEngineAccessToken, dashboardAdminOverrideToken) {
   var dashboardAccessContent = fromToken(dashboardSessionToken);
   if (!('scope' in dashboardAccessContent)) {
     dashboardAccessContent.scope = 'read_write';
@@ -66695,7 +67140,7 @@ var fetchIdentityConfig = /*#__PURE__*/function () {
           throw new FailedToLoadIdentity('Failed to fetch identity config.');
         case 6:
           dashboardAdminOverride = isClientSide() ? getDashboardAdminOverride(window.location.href) : null;
-          identityConfig = init$d(tokens.dashboardAccessToken, tokens.dataAccessToken, tokens.queryEngineAccessToken, dashboardAdminOverride);
+          identityConfig = init$e(tokens.dashboardAccessToken, tokens.dataAccessToken, tokens.queryEngineAccessToken, dashboardAdminOverride);
           return _context.abrupt("return", {
             identityConfig: identityConfig,
             tokens: tokens
@@ -67322,7 +67767,7 @@ var Header = /*#__PURE__*/function () {
   function Header(title) {
     /** The header component. */
     this.component = undefined;
-    var newHeader = init$a('New Header');
+    var newHeader = init$b('New Header');
     if (title) {
       newHeader = _extends({}, newHeader, {
         displayTitle: title
@@ -68032,7 +68477,7 @@ function getOptionsOrders(dataSetField) {
 }
 
 var commonToQueries = function commonToQueries(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$a(dataSet, attributes.measure, attributes.order, attributes.dimension,
+  var _Query$build = build$b(dataSet, attributes.measure, attributes.order, attributes.dimension,
     // @ts-ignore
     attributes.timeDimension || null, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
@@ -68065,8 +68510,8 @@ var toQueries$a = commonToQueries;
 var toQueries$b = commonToQueries;
 
 var buildMainQueries = function buildMainQueries(attributes, dataSet, queryEngineConfig, params) {
-  var line = build$a(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
-  var bar = build$a(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var line = build$b(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var bar = build$b(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
   return {
     bar: bar,
     line: line
@@ -68085,7 +68530,7 @@ var toQueries$c = function toQueries(attributes, dataSet, queryEngineConfig, par
 };
 
 var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$a(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$b(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
 
@@ -68113,7 +68558,7 @@ var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineCon
 };
 var buildDeltaQuery = function buildDeltaQuery(dataSet, attributes, queryEngineConfig, params) {
   if (!attributes.deltaTimeDimension) return null;
-  return build$a(dataSet, attributes.measure, [{
+  return build$b(dataSet, attributes.measure, [{
     field: attributes.deltaTimeDimension.field,
     direction: 'asc',
     "function": attributes.deltaTimeDimension.truncate
@@ -68145,7 +68590,7 @@ var toQueries$e = function toQueries(attributes, dataSet, queryEngineConfig, par
   var measures = [];
   attributes.xMeasure && measures.push(attributes.xMeasure);
   attributes.yMeasure && measures.push(attributes.yMeasure);
-  var _Query$build = build$a(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$b(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
   var resultFields = toResultFields([measureDescription], queryEngineConfig);
@@ -68159,7 +68604,7 @@ var toQueries$f = function toQueries(attributes, dataSet, queryEngineConfig, par
   var measures = [];
   attributes.xMeasure && measures.push(attributes.xMeasure);
   attributes.yMeasure && measures.push(attributes.yMeasure);
-  var _Query$build = build$a(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$b(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
   var resultFields = toResultFields([measureDescription], queryEngineConfig);
@@ -69529,7 +69974,7 @@ var VizzlyServices = /*#__PURE__*/function () {
               }
               return undefined;
             }();
-            runQueriesCallback = getRunQueriesCallback(service.identityConfig, service.queryEngineConfig, build$c(defaultText, params == null ? void 0 : params.dateFilterOptions), (params == null ? void 0 : params.variables) || {}, params == null ? void 0 : params.runQueries, params == null ? void 0 : params.data, queryEngineEndpoint);
+            runQueriesCallback = getRunQueriesCallback(service.identityConfig, service.queryEngineConfig, build$d(defaultText, params == null ? void 0 : params.dateFilterOptions), (params == null ? void 0 : params.variables) || {}, params == null ? void 0 : params.runQueries, params == null ? void 0 : params.data, queryEngineEndpoint);
             fetch = /*#__PURE__*/function () {
               var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
                 var _params$abortControll;
@@ -72473,7 +72918,7 @@ var GlobalProviderContents = function GlobalProviderContents(props) {
     }
   };
   var resolvedDateFilterOptions = (_props$dateFilterOpti = props.dateFilterOptions) != null ? _props$dateFilterOpti : props.dateTimeFilterOptions;
-  var runQueriesCallback = getRunQueriesCallback(session.identityConfig, session.queryEngineConfig, build$c(textOverride, resolvedDateFilterOptions), variables.variables, props.runQueries, props.data, props.queryEngineEndpoint, props.timeZone);
+  var runQueriesCallback = getRunQueriesCallback(session.identityConfig, session.queryEngineConfig, build$d(textOverride, resolvedDateFilterOptions), variables.variables, props.runQueries, props.data, props.queryEngineEndpoint, props.timeZone);
   var aiOnAction = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(conversationId, messageId, actionOptions) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {