@vizzly/dashboard 0.14.4-dev-d0e2dcb72115609967eac641863436c4976d6900 → 0.14.4-dev-ed852f0025b4384a82981186f7a42ccbad0c2691

package/dist/dashboard.esm.js

@@ -2178,6 +2178,20 @@ var build$7 = function build(measureAttribute, customField) {
   }
 };
 
+var init$7 = function init(publicName, metric, queryEngineConfig) {
+  return {
+    id: generateId(),
+    publicName: publicName,
+    metric: metric,
+    dataType: 'number',
+    canBeDimension: false,
+    canBeMeasure: true,
+    allowedOperators: validOperatorsForField({
+      dataType: 'number'
+    }, queryEngineConfig)
+  };
+};
+
 var PropertyType = /*#__PURE__*/function (PropertyType) {
   PropertyType["Operator"] = "operator";
   PropertyType["IfLogic"] = "ifLogic";
@@ -2195,41 +2209,20 @@ var OperatorType = /*#__PURE__*/function (OperatorType) {
   return OperatorType;
 }({});
 
-var buildOperator = function buildOperator(operator, dataSet, params, measureAttribute) {
-  var _operator$values = operator.values,
-    firstMetric = _operator$values[0],
-    secondMetric = _operator$values[1],
-    restMetrics = _operator$values.slice(2);
-  var left = buildMetric(firstMetric, dataSet, params);
-  var right = buildMetric(secondMetric, dataSet, params);
-  if (restMetrics.length > 0) {
-    right = restMetrics.reduce(function (acc, currMetric) {
-      return {
-        type: 'maths',
-        op: operator.op,
-        left: acc,
-        right: buildMetric(currMetric, dataSet, params)
-      };
-    }, right);
+var build$8 = function build(measureAttribute, customField, dataSet, queryEngineConfig, params) {
+  if (customField.metric.type === PropertyType.IfLogic) {
+    return buildIfLogic(customField.metric, dataSet, fromFilterConfig(params.filterConfig, dataSet, params.timeRangeOptions), queryEngineConfig, params, measureAttribute);
   }
-  if (measureAttribute && measureAttribute["function"] != 'none') {
-    return {
-      type: 'function',
-      "function": measureAttribute["function"],
-      value: {
-        type: 'maths',
-        op: operator.op,
-        left: left,
-        right: right
-      }
-    };
+  if (customField.metric.type === PropertyType.Aggregate) {
+    return buildAggregate(customField.metric);
   }
-  return {
-    type: 'maths',
-    op: operator.op,
-    left: left,
-    right: right
-  };
+  if (customField.metric.type === PropertyType.Field) {
+    return buildField(customField.metric, measureAttribute);
+  }
+  if (customField.metric.type === PropertyType.NumberInput) {
+    return buildNumber(customField.metric);
+  }
+  return buildOperator(customField.metric, dataSet, params, measureAttribute, false);
 };
 var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilters, queryEngineConfig, params, measureAttribute) {
   var alwaysTrueFilter = [[{
@@ -2245,7 +2238,7 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilt
       var _params$filterConfig$, _params$filterConfig;
       var customMetricFilter = combineForCustomMetricFilters(addAndFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.advancedFilter) != null ? _params$filterConfig$ : [], localAndDashboardFilters), c.filter);
       return {
-        returns: buildMetric(c.returns, dataSet, params),
+        returns: buildMetric(c.returns, dataSet, params, measureAttribute),
         filter: filterAttributeToQueryFilter(customMetricFilter, queryEngineConfig, dataSet, params)
       };
     });
@@ -2253,11 +2246,11 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilt
       returns: {
         type: 'null'
       },
-      filter: alwaysTrueFilter
+      filter: alwaysTrueFilter // Do not remove
     }]);
     var elseCase = {
-      returns: buildMetric(ifLogic["else"], dataSet, params),
-      filter: alwaysTrueFilter
+      returns: buildMetric(ifLogic["else"], dataSet, params, measureAttribute),
+      filter: alwaysTrueFilter // Do not remove
     };
     return [].concat(thenCases, [elseCase]);
   }();
@@ -2266,7 +2259,7 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilt
   }
   return {
     type: 'function',
-    "function": measureAttribute == null ? void 0 : measureAttribute["function"],
+    "function": measureAttribute["function"],
     value: {
       type: 'switchField',
       value: {
@@ -2275,7 +2268,56 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilt
     }
   };
 };
-var buildMetric = function buildMetric(metric, dataSet, params) {
+var buildAggregate = function buildAggregate(aggregate) {
+  var _aggregate$function;
+  return {
+    type: 'field',
+    value: aggregate.fieldId,
+    "function": (_aggregate$function = aggregate["function"]) != null ? _aggregate$function : ''
+  };
+};
+var buildOperator = function buildOperator(operator, dataSet, params, measureAttribute, internal) {
+  var _operator$values = operator.values,
+    firstMetric = _operator$values[0],
+    secondMetric = _operator$values[1],
+    restMetrics = _operator$values.slice(2);
+  var left = buildMetric(firstMetric, dataSet, params, measureAttribute);
+  var right = buildMetric(secondMetric, dataSet, params, measureAttribute);
+  if (restMetrics.length > 0) {
+    right = restMetrics.reduce(function (acc, currMetric) {
+      return {
+        type: 'maths',
+        op: operator.op,
+        left: acc,
+        right: buildMetric(currMetric, dataSet, params, measureAttribute)
+      };
+    }, right);
+  }
+  if (!internal) {
+    var hasFieldValue = operator.values.some(function (value) {
+      return value.type === PropertyType.Field;
+    });
+    if (hasFieldValue) {
+      return {
+        type: 'function',
+        "function": measureAttribute["function"],
+        value: {
+          type: 'maths',
+          op: operator.op,
+          left: left,
+          right: right
+        }
+      };
+    }
+  }
+  return {
+    type: 'maths',
+    op: operator.op,
+    left: left,
+    right: right
+  };
+};
+var buildMetric = function buildMetric(metric, dataSet, params, measureAttribute) {
   if (!metric) {
     throw new Error('Invalid metric: undefined metric received');
   }
@@ -2285,9 +2327,11 @@ var buildMetric = function buildMetric(metric, dataSet, params) {
     case PropertyType.Variable:
       return buildVariable(metric, params.variables);
     case PropertyType.Operator:
-      return buildOperator(metric, dataSet, params);
+      return buildOperator(metric, dataSet, params, measureAttribute, true);
     case PropertyType.Field:
       return buildField(metric);
+    case PropertyType.Aggregate:
+      return buildAggregate(metric);
     default:
       throw new Error("Unsupported metric type: " + metric.type);
   }
@@ -2317,350 +2361,39 @@ var buildNumber = function buildNumber(numberInput) {
     value: valueAsNumber
   };
 };
-var buildField = function buildField(field) {
+var buildField = function buildField(field, measureAttribute) {
   return {
     type: 'field',
     value: field.fieldId,
-    "function": 'none'
+    "function": measureAttribute ? measureAttribute["function"] : 'none'
   };
 };
 
-var init$7 = function init(publicName, metric, queryEngineConfig) {
-  return {
-    id: generateId(),
-    publicName: publicName,
-    metric: metric,
-    dataType: 'number',
-    canBeDimension: false,
-    canBeMeasure: true,
-    allowedOperators: validOperatorsForField({
-      dataType: 'number'
-    }, queryEngineConfig)
-  };
-};
-var build$8 = function build(measureAttribute, customField, dataSet, queryEngineConfig, params) {
-  if (customField.metric.type === PropertyType.IfLogic) {
-    return buildIfLogic(customField.metric, dataSet, fromFilterConfig(params.filterConfig, dataSet, params.timeRangeOptions), queryEngineConfig, params, measureAttribute);
-  }
-  return buildOperator(customField.metric, dataSet, params, measureAttribute);
-};
 var validate$1 = function validate(field) {
   if (field.publicName.length === 0) return false;
-  if (field.publicName === undefined) return false;
-  if (field.metric === undefined) return false;
-  if (field.metric.type === undefined) return false;
+  if (!field.metric) return false;
   if (field.metric.type === PropertyType.Operator && 'values' in field.metric && field.metric.values.length === 0) return false;
   if (field.metric.type === PropertyType.IfLogic && 'cases' in field.metric && field.metric.cases.length === 0) return false;
-  return true;
-};
-
-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'])));
-    }));
+  if (field.metric.type === PropertyType.Aggregate && (!field.metric["function"] || field.metric["function"] === 'none')) return false;
+  if (field.metric.type === PropertyType.NumberInput && field.metric.value === undefined) return false;
+  if ('values' in field.metric) {
+    return !_hasAggregatesWithEmptyFunctions(field.metric.values);
   }
-  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('')
-  });
+  return true;
 };
-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'
-      });
+var _hasAggregatesWithEmptyFunctions = function hasAggregatesWithEmptyFunctions(values) {
+  return values.some(function (value) {
+    if (value.type === PropertyType.Aggregate) {
+      return !value["function"] || value["function"] === 'none';
     }
-    if (hasEmptyOperator) {
-      return helpers.error('any.invalid', {
-        message: 'Nested operators must have at least two values'
-      });
+    if ('values' in value) {
+      return _hasAggregatesWithEmptyFunctions(value.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()
+    return false;
   });
 };
 
-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) {
+var init$8 = function init(publicName, fieldId, roundToDecimalPlaces, queryEngineConfig) {
   return {
     id: generateId(),
     publicName: publicName,
@@ -2674,7 +2407,7 @@ var init$9 = function init(publicName, fieldId, roundToDecimalPlaces, queryEngin
     }, queryEngineConfig)
   };
 };
-var build$a = function build(measureAttribute, customField) {
+var build$9 = function build(measureAttribute, customField) {
   var builtRoundedNumber = {
     type: 'field',
     "function": "round_to_" + customField.roundToDecimalPlaces + "_dp",
@@ -2706,11 +2439,8 @@ var isRules = function isRules(field) {
 var isConditional = function isConditional(field) {
   return 'rule' in field;
 };
-var isMetric = function isMetric(field) {
-  return 'metric' in field;
-};
 var isCustomBuildMetric = function isCustomBuildMetric(field) {
-  return 'metricAtrributes' in field;
+  return 'metric' in field;
 };
 var isDateCalculation = function isDateCalculation(field) {
   return 'dateCalculationFunction' in field;
@@ -2723,12 +2453,11 @@ var getCustomFieldCategory = function getCustomFieldCategory(field) {
   if (isRoundedNumberField(field)) return 'roundedNumber';
   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) || isCustomBuildMetric(field);
+  return isPercentageField(field) || isSimpleMathField(field) || isAggregateMathField(field) || isRules(field) || isRoundedNumberField(field) || isDateCalculation(field) || isConditional(field) || isCustomBuildMetric(field);
 };
 
 /**
@@ -2749,7 +2478,7 @@ var toQueryMeasure = function toQueryMeasure(measureAttribute, customField, quer
     return build$3(measureAttribute, customField, dataSet, params);
   }
   if (isRoundedNumberField(customField)) {
-    return build$a(measureAttribute, customField);
+    return build$9(measureAttribute, customField);
   }
   if (isConditional(customField)) {
     return build$5(customField, queryEngineConfig, dataSet, params);
@@ -2757,11 +2486,8 @@ var toQueryMeasure = function toQueryMeasure(measureAttribute, customField, quer
   if (isDateCalculation(customField)) {
     return build$7(measureAttribute, customField);
   }
-  if (isMetric(customField)) {
-    return build$8(measureAttribute, customField, dataSet, queryEngineConfig, params);
-  }
   if (isCustomBuildMetric(customField)) {
-    return build$9();
+    return build$8(measureAttribute, customField, dataSet, queryEngineConfig, params);
   }
   throw "Unsupported custom field type; " + JSON.stringify(customField);
 };
@@ -2927,7 +2653,187 @@ var fromDashboardRequiredFilterGroups = function fromDashboardRequiredFilterGrou
   });
 };
 
-var fieldSchema$1 = /*#__PURE__*/Joi.object({
+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({
   fieldId: /*#__PURE__*/Joi.string().required(),
   dataSetId: /*#__PURE__*/Joi.string().required()
 });
@@ -2942,8 +2848,8 @@ var sharedAdditionalFilterSchema = function sharedAdditionalFilterSchema(queryEn
     managedByConfiguration: Joi["boolean"]().optional(),
     requiresValue: Joi["boolean"]().optional(),
     optionsFilters: optionsFiltersSchema(queryEngineConfig).optional(),
-    appliesToFields: Joi.array().items(fieldSchema$1).required(),
-    optionsPulledFrom: Joi.array().items(fieldSchema$1).optional(),
+    appliesToFields: Joi.array().items(fieldSchema).required(),
+    optionsPulledFrom: Joi.array().items(fieldSchema).optional(),
     hidden: Joi["boolean"](),
     options: Joi.array().items(Joi.object({
       value: Joi.allow(Joi.number(), Joi.string()),
@@ -3302,7 +3208,7 @@ var buildFilters = function buildFilters(dataSet, queryEngineConfig, params, pre
   return [];
 };
 
-var build$b = buildFromQueryAttributes;
+var build$a = buildFromQueryAttributes;
 var hasDimensions = function hasDimensions(query) {
   return query.group.length > 0;
 };
@@ -4190,10 +4096,6 @@ var upcastHeadline = function upcastHeadline(headline, timeDimension) {
   return undefined;
 };
 
-/** @deprecated */
-
-/** @deprecated */
-
 var AcceptedTypes = /*#__PURE__*/function (AcceptedTypes) {
   AcceptedTypes["Maths"] = "maths";
   AcceptedTypes["IfStatement"] = "ifStatement";
@@ -4331,8 +4233,7 @@ var BarChart = function BarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -4727,8 +4628,7 @@ var LineChart = function LineChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -5089,7 +4989,6 @@ var LineChart$1 = function LineChart(config) {
       ];
     },
     supportedCustomFields: {
-      calculatedField: false,
       percentages: true,
       dateCalculations: true,
       simpleMaths: true,
@@ -5097,7 +4996,7 @@ var LineChart$1 = function LineChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -5371,8 +5270,7 @@ var PieChart = function PieChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -5643,8 +5541,7 @@ var SunburstChart = function SunburstChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -5998,8 +5895,7 @@ var ScatterChart = function ScatterChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -6371,8 +6267,7 @@ var ComboChart = function ComboChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -6707,8 +6602,7 @@ var DataTable = function DataTable(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -6953,8 +6847,7 @@ var BasicTable = function BasicTable(config) {
       roundedNumbers: true,
       dateCalculations: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths],
-      customBuild: [AcceptedTypes.Maths]
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement]
     },
     supportedFeatures: {
       parameters: false,
@@ -7266,8 +7159,7 @@ var HorizontalBarChart = function HorizontalBarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -7628,8 +7520,7 @@ var AreaChart = function AreaChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -7919,7 +7810,6 @@ var SingleStat = function SingleStat(config) {
       rules: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
       customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
@@ -8055,8 +7945,7 @@ var CustomChart = function CustomChart(config) {
       roundedNumbers: false,
       dateCalculations: false,
       conditional: false,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       colorGradient: false,
@@ -8292,8 +8181,7 @@ var MercatorMap = function MercatorMap(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -8604,8 +8492,7 @@ var RichText = function RichText(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -8906,7 +8793,6 @@ var RadarChart = function RadarChart(config) {
       return [headingConstant(CONSTANTS$f), chartStylesConstant(CONSTANTS$f, false, false), axisLabelsConstants(CONSTANTS$f)];
     },
     supportedCustomFields: {
-      calculatedField: false,
       percentages: true,
       dateCalculations: true,
       simpleMaths: true,
@@ -8914,7 +8800,7 @@ var RadarChart = function RadarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -9132,7 +9018,6 @@ var Progress = function Progress(config) {
       rules: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
       customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
@@ -9436,8 +9321,7 @@ var FunnelChart = function FunnelChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -10084,8 +9968,7 @@ var BubbleChart = function BubbleChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -10500,7 +10383,6 @@ var BubbleChartV2 = function BubbleChartV2(config) {
       ];
     },
     supportedCustomFields: {
-      calculatedField: false,
       percentages: true,
       dateCalculations: true,
       simpleMaths: true,
@@ -10508,7 +10390,7 @@ var BubbleChartV2 = function BubbleChartV2(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -10863,7 +10745,6 @@ var BarChart$1 = function BarChart(config) {
       }), namespace(CONSTANTS$k, 'goal_line')];
     },
     supportedCustomFields: {
-      calculatedField: false,
       percentages: true,
       dateCalculations: true,
       simpleMaths: true,
@@ -10871,7 +10752,7 @@ var BarChart$1 = function BarChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -11202,8 +11083,7 @@ var WaterfallChart = function WaterfallChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -11569,7 +11449,6 @@ var AreaChart$1 = function AreaChart(config) {
       }), namespace(CONSTANTS$m, 'goal_line')];
     },
     supportedCustomFields: {
-      calculatedField: false,
       percentages: true,
       dateCalculations: true,
       simpleMaths: true,
@@ -11577,7 +11456,7 @@ var AreaChart$1 = function AreaChart(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: true,
@@ -11932,8 +11811,7 @@ var ComboChartV2 = function ComboChartV2(config) {
       aggregateMaths: true,
       roundedNumbers: true,
       conditional: true,
-      calculatedField: [AcceptedTypes.Maths, AcceptedTypes.IfStatement],
-      customBuild: false
+      customBuild: [AcceptedTypes.Maths, AcceptedTypes.IfStatement, AcceptedTypes.Aggregates]
     },
     supportedFeatures: {
       parameters: false,
@@ -13268,7 +13146,7 @@ function linearForecast(data, forecastUnits, key, timeUnit, includeForecast // N
   return trendlineWithForecast;
 }
 
-var init$a = function init(_ref) {
+var init$9 = function init(_ref) {
   var pivotConfig = _ref.pivotConfig,
     measures = _ref.measures,
     resultSet = _ref.resultSet,
@@ -15018,13 +14896,12 @@ var ADMIN_FEATURE_TOGGLES = {
   canEditCustomMetrics: true,
   allowPercentagesCustomField: true,
   allowDateCalculationsCustomField: true,
-  allowCalculatedField: false,
   allowConditionalCustomField: true,
   allowSimpleMathsCustomField: true,
   allowAggregateMathsCustomField: true,
   allowRoundedNumberCustomField: true,
   allowRulesCustomField: true,
-  allowCustomBuildField: false,
+  allowCustomBuildField: true,
   showDateAndTimeFilter: true,
   showDateFilter: true,
   canSeeEmptyState: false,
@@ -15060,9 +14937,8 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   allowSimpleMathsCustomField: true,
   allowAggregateMathsCustomField: true,
   allowRoundedNumberCustomField: true,
-  allowCalculatedField: false,
   allowRulesCustomField: true,
-  allowCustomBuildField: false,
+  allowCustomBuildField: true,
   showDateAndTimeFilter: true,
   showDateFilter: true,
   canSeeEmptyState: false,
@@ -15075,7 +14951,7 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   showSavingIndicator: true,
   disablePersistingGlobalFiltersLocally: false
 };
-var build$c = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
+var build$b = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
   var featureToggles = {};
   featureToggles = _extends({}, featureToggles, END_USER_DEFAULT_FEATURE_TOGGLES, partialFeatureToggles);
   if (mode == 'admin') {
@@ -15141,7 +15017,7 @@ var buildDefaults = function buildDefaults(partialFeatureToggles) {
     canDownloadViewAsPNG: partialFeatureToggles.canDownloadViewAsPNG !== undefined ? partialFeatureToggles.canDownloadViewAsPNG : true,
     forceMobile: partialFeatureToggles.forceMobile !== undefined ? partialFeatureToggles.forceMobile : false,
     unloadOffScreenViews: partialFeatureToggles.unloadOffScreenViews !== undefined ? partialFeatureToggles.unloadOffScreenViews : false,
-    allowCalculatedField: (_partialFeatureToggle2 = partialFeatureToggles.allowCalculatedField) != null ? _partialFeatureToggle2 : false
+    allowCustomBuildField: (_partialFeatureToggle2 = partialFeatureToggles.allowCustomBuildField) != null ? _partialFeatureToggle2 : true
   };
 };
 
@@ -15169,7 +15045,7 @@ var removeField$3 = function removeField(component, fieldId) {
   return newComponent;
 };
 
-var init$b = function init(displayTitle) {
+var init$a = function init(displayTitle) {
   return {
     displayTitle: displayTitle,
     colSpan: 12
@@ -15181,7 +15057,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$b(initialTitle);
+  var newHeader = init$a(initialTitle);
   var newRow = initRow([newHeader], HEADER_ROW_HEIGHT$1);
   updatedDisplay.splice(rowIndex, 0, newRow);
   return updatedDisplay;
@@ -15656,7 +15532,7 @@ var defaultDateFilterOptions = function defaultDateFilterOptions() {
   }
   return defaultDateFilterOptions;
 };
-var build$d = function build(textOverride, overrides) {
+var build$c = 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;
@@ -15950,7 +15826,7 @@ var base = {
     return undefined;
   }
 };
-var init$c = function init(overrides, includeComponentTypes, excludeComponentTypes, textOverride, featureToggles) {
+var init$b = function init(overrides, includeComponentTypes, excludeComponentTypes, textOverride, featureToggles) {
   var _overrides$developerT;
   var onlyViewTypes = function onlyViewTypes(dataSet) {
     var allowedView = filterIncludedAndExcludedViews(ALL_VIZZLY_COMPONENT_TYPES, includeComponentTypes,
@@ -15988,7 +15864,7 @@ var init$c = function init(overrides, includeComponentTypes, excludeComponentTyp
       return _extends({}, defaultFormatMapping, overrides.defaultFormats ? overrides.defaultFormats() : {});
     },
     onEditorUpdate: overrides.onEditorUpdate ? overrides.onEditorUpdate : base.onEditorUpdate,
-    dateFilterOptions: build$d(textOverride, overrides.dateFilterOptions),
+    dateFilterOptions: build$c(textOverride, overrides.dateFilterOptions),
     onSave: overrides.onSave ? overrides.onSave : base.onSave,
     onScheduledReportChange: overrides.onScheduledReportChange || base.onScheduledReportChange,
     dashboardFilters: overrides.dashboardFilters ? overrides.dashboardFilters : base.dashboardFilters,
@@ -16042,7 +15918,7 @@ function useSubscription(callback, idOverride) {
 var useFeatureTogglesSetup = function useFeatureTogglesSetup(mode, overrideFeatureToggles, queryEngineConfig, scope, id) {
   var base$1 = base;
   var buildInitialFeatureToggles = function () {
-    var updatedFeatureToggles = build$c(_.merge({}, base$1.featureToggles, overrideFeatureToggles), queryEngineConfig != null ? queryEngineConfig : base$1.queryEngineConfig, mode || base$1.mode, scope || base$1.scope);
+    var updatedFeatureToggles = build$b(_.merge({}, base$1.featureToggles, overrideFeatureToggles), queryEngineConfig != null ? queryEngineConfig : base$1.queryEngineConfig, mode || base$1.mode, scope || base$1.scope);
     return updatedFeatureToggles;
   }();
   var _useState = useState(buildInitialFeatureToggles),
@@ -16072,7 +15948,7 @@ var DashboardBehaviourContextProvider = function DashboardBehaviourContextProvid
   var _useState = useState(null),
     overrideDeveloperInfo = _useState[0],
     setOverrideDeveloperInfo = _useState[1];
-  var dashboardBehaviour = init$c(_extends({}, props.dashboardBehaviour || {}, {
+  var dashboardBehaviour = init$b(_extends({}, props.dashboardBehaviour || {}, {
     mode: props.mode
   }), props.includeComponentTypes, props.excludeComponentTypes, textOverride, featureToggles);
   return jsx(DashboardBehaviourContext.Provider, {
@@ -34839,7 +34715,7 @@ var AreaChart$3 = /*#__PURE__*/forwardRef(function (props, ref) {
   });
 });
 
-var init$d = function init(attributes) {
+var init$c = function init(attributes) {
   var dimension = [];
   if ('dimension' in attributes) {
     dimension = [].concat(dimension, attributes.dimension || []);
@@ -35731,7 +35607,7 @@ var AreaChartView = function AreaChartView(props) {
   if (isLoading(props.result)) return jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(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);
@@ -37018,7 +36894,7 @@ var BarChartView = function BarChartView(props) {
   if (isLoading(props.result)) return jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(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);
@@ -37423,12 +37299,12 @@ var LineChartView = function LineChartView(props) {
   if (isLoading(props.result)) return jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(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$a({
+      var trends = init$9({
         pivotConfig: pivotConfig,
         measures: props.measure,
         resultSet: resultSet$1,
@@ -37668,7 +37544,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$d(props);
+  var pivotConfig = init$c(props);
   var scatterData = props.result ? resultSet(props.result, measure, pivotConfig) : [];
   var xField = key([], [], props.xMeasure.field, props.xMeasure["function"]);
   scatterData.map(function (d) {
@@ -39034,7 +38910,7 @@ var PieChartView = function PieChartView(props) {
   }
   if (hasFailed(props.result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$d({
+  var pivotConfig = init$c({
     dimension: props.dimension
   });
   var rS = resultSet$1(props.result, pivotConfig, fakeQuery, false, checkForNullValue(props.dataSetId, props.dimension, props.timeDimension, textOverride, valueAlias));
@@ -43192,7 +43068,7 @@ var BubbleChartView = function BubbleChartView(props) {
   var measure = [];
   measure.push(props.xMeasure);
   measure.push(props.yMeasure);
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(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"]) : '';
@@ -47033,7 +46909,7 @@ var BubbleChartV2View = function BubbleChartV2View(props) {
   var showHeadline = headlineAvailable(props.attributes.order, props.attributes.headline, null);
   var theme = useTheme();
   var BubbleChartV2Component = getComponentInterface(props.attributes.type);
-  var pivotConfig = init$d(props.attributes);
+  var pivotConfig = init$c(props.attributes);
   var chartRepresentation = null;
   if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && BubbleChartV2Component.isRunnable(props.attributes)) {
     var _theme$charts$colors, _theme$charts, _props$attributes$goa;
@@ -47993,7 +47869,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$d(props.attributes);
+  var pivotConfig = init$c(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;
@@ -48510,13 +48386,13 @@ var ComboChartView = function ComboChartView(props) {
   }
   if (isLoading(props.lineResult) || isLoading(props.barResult)) return jsx(LoadingComponent, {});
   if (hasFailed(props.lineResult) && hasFailed(props.barResult)) return jsx(FailedToLoadDataNotice, {});
-  var barPivotConfig = init$d({
+  var barPivotConfig = init$c({
     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$d({
+  var linePivotConfig = init$c({
     dimension: props.lineDimension,
     timeDimension: props.timeDimension
   });
@@ -48807,7 +48683,7 @@ var FunnelChartView = function FunnelChartView(props) {
   if (isLoading(props.result)) return jsx(LoadingComponent, {});
   if (hasFailed(props.result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(props.result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(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);
@@ -51460,7 +51336,7 @@ var DataTable$2 = function DataTable(props) {
   }));
 };
 
-var validate$3 = function validate(component, dataSets, dashboardBehaviour) {
+var validate$2 = function validate(component, dataSets, dashboardBehaviour) {
   try {
     var dataSet = find(dataSets, component.attributes.dataSetId);
     if (!dataSet) throw new DataSetNotFound(dataSets, component.attributes.dataSetId);
@@ -51986,7 +51862,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$d(props.attributes);
+  var pivotConfig = init$c(props.attributes);
   var numberOfDimensions = props.attributes.dimension.length;
   var chartRepresentation = useMemo(function () {
     if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && BarChartV2Component.isRunnable(props.attributes)) {
@@ -53042,7 +52918,7 @@ var WaterfallChartView = function WaterfallChartView(props) {
   if (hasFailed(result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
   var showHeadline = headlineAvailable(order, headline, timeDimension);
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(props);
   var _buildWaterfallChartR = buildWaterfallChartRepresentation({
       approxYAxisLabelCount: approxYAxisLabelCount === 'auto' ? 10 : approxYAxisLabelCount,
       axisTitles: axisTitles,
@@ -53370,7 +53246,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$d(props.attributes);
+  var pivotConfig = init$c(props.attributes);
   console.log(props.attributes, pivotConfig);
   var chartRepresentation = null;
   if (!isLoading(props.result) && !hasFailed(props.result) && !isEmpty(props.result) && AreaChartV2Component.isRunnable(props.attributes)) {
@@ -53868,7 +53744,7 @@ var RadarChartView = function RadarChartView(props) {
   if (hasFailed(result)) return jsx(FailedToLoadDataNotice, {});
   if (isEmpty(result)) return jsx(NoResultContentToShowNotice, _extends({}, headerProps));
   var showHeadline = headlineAvailable(order, headline, timeDimension);
-  var pivotConfig = init$d(props);
+  var pivotConfig = init$c(props);
   var chartRepresentation = buildRadarChartRepresentation({
     result: result,
     xAxisFormat: xAxisFormat,
@@ -54305,7 +54181,7 @@ var ComboChartViewV2 = function ComboChartViewV2(props) {
     queryEngineConfig = _useDashboardBehaviou.queryEngineConfig;
   var theme = useTheme();
   var ComboChartComponent = getComponentInterface(props.attributes.type);
-  var barPivotConfig = init$d({
+  var barPivotConfig = init$c({
     dimension: props.attributes.barDimension,
     timeDimension: props.attributes.timeDimension
   });
@@ -54369,7 +54245,7 @@ var ComboChartViewV2 = function ComboChartViewV2(props) {
     }
     return null;
   }, [props.barResult, props.attributes, theme == null || (_theme$charts2 = theme.charts) == null ? void 0 : _theme$charts2.colors, valueAlias, textOverride, barPivotConfig, props.numberFormatOptions, props.dateTimeFormatOptions, props.defaultFormats, labelFormat, queryEngineConfig]);
-  var linePivotConfig = init$d({
+  var linePivotConfig = init$c({
     dimension: props.attributes.lineDimension,
     timeDimension: props.attributes.timeDimension
   });
@@ -54536,7 +54412,7 @@ var Component = function Component(props) {
   var setPartialAttributes = function setPartialAttributes(changes) {
     return props.updateComponentAttributes(componentInterface.setAttributes(props.component.attributes, changes));
   };
-  var validationError = validate$3(props.component, dashboard.dataSets, dashboardBehaviour);
+  var validationError = validate$2(props.component, dashboard.dataSets, dashboardBehaviour);
   if (validationError) {
     if (validationError instanceof DataSetNotFound) {
       return jsx(Empty, {
@@ -55377,7 +55253,7 @@ var PopulatedComponentOptions = function PopulatedComponentOptions(props) {
   var theme = useTheme();
   var dashboardBehaviour = useDashboardBehaviourContext();
   var componentInterface = getComponentInterface(props.component.attributes.type);
-  var validationError = validate$3(props.component, dashboard.dataSets, dashboardBehaviour);
+  var validationError = validate$2(props.component, dashboard.dataSets, dashboardBehaviour);
   var dataSet = find(dashboard.dataSets, props.component.attributes.dataSetId);
   var populatedCellOptions = [];
   var isCustomComponent = props.component.attributes.type === 'custom';
@@ -57777,10 +57653,6 @@ function customMetricText(key, textOverride) {
       title: textOverride('custom_metric_title.conditional', 'Conditional'),
       subtext: textOverride('custom_metric_description.conditional', 'Create a conditional field')
     },
-    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')
@@ -57810,11 +57682,6 @@ 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'
@@ -57878,16 +57745,16 @@ var buildInitOptions = function buildInitOptions(featureToggles, componentType,
       logDebug("Conditional custom field not made available, because it is not supported for the view " + componentInterface.title + ".");
     }
   }
-  if (featureToggles.allowCalculatedField && componentInterface.supportedCustomFields.calculatedField) {
-    initValues.push(_extends({}, customMetricText('calculatedField', textOverride), {
-      value: 'calculatedField'
+  if (featureToggles.allowCustomBuildField && componentInterface.supportedCustomFields.customBuild) {
+    initValues.push(_extends({}, customMetricText('customBuildMetric', textOverride), {
+      value: 'customBuildMetric'
     }));
   } else {
-    if (!featureToggles.allowCalculatedField) {
-      logDebug('Calculated custom field not made available, because of a feature toggle.');
+    if (!featureToggles.allowCustomBuildField) {
+      logDebug('Custom metric build field not made available, because of a feature toggle.');
     }
-    if (!componentInterface.supportedCustomFields.calculatedField) {
-      logDebug("Calculated custom field not made available, because it is not supported for the view " + componentInterface.title + ".");
+    if (!componentInterface.supportedCustomFields.customBuild) {
+      logDebug("Custom metric build field not made available, because it is not supported for the view " + componentInterface.title + ".");
     }
   }
   return initValues;
@@ -57909,7 +57776,6 @@ var ModalType = /*#__PURE__*/function (ModalType) {
   ModalType["ConditionalFormatting"] = "conditionalFormatting";
   ModalType["TrendLines"] = "trendLines";
   ModalType["GoalLines"] = "goalLines";
-  ModalType["CalculatedField"] = "calculatedField";
   ModalType["ItemPicker"] = "itemPicker";
   ModalType["CustomMetricBuilder"] = "customMetricBuilder";
   return ModalType;
@@ -58185,9 +58051,6 @@ function getSubtext(customField, textOverride) {
   if (isRoundedNumberField(customField)) {
     return customMetricText('roundedNumber', textOverride).title;
   }
-  if (isMetric(customField)) {
-    return customMetricText('calculatedField', textOverride).title;
-  }
   if (isCustomBuildMetric(customField)) {
     return customMetricText('customBuildMetric', textOverride).title;
   }
@@ -58207,8 +58070,6 @@ var mapCategoryToModalType = function mapCategoryToModalType(category) {
       return ModalType.RoundedNumberCustomMetric;
     case 'dateCalculation':
       return ModalType.DateCalculationCustomMetric;
-    case 'calculatedField':
-      return ModalType.CalculatedField;
     case 'customBuildMetric':
       return ModalType.CustomMetricBuilder;
     default:
@@ -58241,18 +58102,33 @@ var removeHiddenFieldsFromAttributes = function removeHiddenFieldsFromAttributes
   return [];
 };
 
-/* 
+function metricValuesHaveAggregates(values) {
+  if (!values) {
+    return false;
+  }
+  return values.some(function (value) {
+    if (value.type === PropertyType.Aggregate) {
+      return true;
+    }
+    if ('values' in value) {
+      return metricValuesHaveAggregates(value.values);
+    }
+    return false;
+  });
+}
+
+/*
   NOTES
   -----
   - Most important thing is to find out how to remove the limit of 1 timeDimension
     - This is introduced by the timeDimension being an object in attributes, so, we need to move the timeDimension object into the dimension array
   - We also need to prevent timeDimension being replaced onClick
 
-  ---- 
+  ----
   - Both the above issues stem from preSetPartialAttributes and the value of attributes being passed to it
     1. What is actually passed to preSetPartialAttributes?
       - [Answer] the output of getValues, why is this necessary?
-      - 
+      -
     2. How can we amend the function call to put timeDimension into the dimension array?
 */
 
@@ -58270,7 +58146,6 @@ var FieldCollectorInput = function FieldCollectorInput(inputProps) {
     preventDuplicates = inputProps.preventDuplicates;
   var purpose = fieldFilterOptions != null && fieldFilterOptions.onlyDimensions ? 'grouping' : 'metric';
   var values = getValues(attributes);
-  console.log('inputProps', JSON.parse(JSON.stringify(inputProps)), values);
 
   // Allow the list of new values to be formatted before calling setPartialAttributes...
   var onChange = function onChange(values) {
@@ -58381,6 +58256,11 @@ function buildDimensionFromField(purpose, field, queryEngineConfig) {
       field: field.id,
       "function": 'none'
     };
+  } else if (isCustomBuildMetric(field) && (field.metric.type === PropertyType.Aggregate || metricValuesHaveAggregates(field.metric.values))) {
+    newValue = {
+      field: field.id,
+      "function": 'none'
+    };
   } else {
     newValue = {
       field: field.id,
@@ -58405,7 +58285,6 @@ function buildFieldsToPickFrom(dataSet, fieldFilterOptions, preventDuplicates, v
   return initValues;
 }
 function buildFieldCollectorItems(values, dataSet, purpose, queryEngineConfig, _onChange) {
-  console.log('buildFieldCollectorItems', values, purpose);
   return [].concat(values).map(function (value, valueIndex) {
     var field = findField(dataSet, value.field);
     var selectOptions = [];
@@ -66151,7 +66030,7 @@ var useSimpleMathModal = function useSimpleMathModal(queryEngineConfig, initialM
     }
     if (state.mathType === 'aggregate') {
       if (state.left && state.right && state.operator) {
-        var _buildAggregate = buildAggregate(state),
+        var _buildAggregate = buildAggregate$1(state),
           nestedLeft = _buildAggregate.nestedLeft,
           nestedRight = _buildAggregate.nestedRight,
           leftField = _buildAggregate.leftField,
@@ -66222,7 +66101,7 @@ var extractFields = function extractFields(field) {
     nested: nested
   };
 };
-var buildAggregate = function buildAggregate(args) {
+var buildAggregate$1 = function buildAggregate(args) {
   var left = args.left,
     right = args.right;
   var _extractFields = extractFields(left),
@@ -67496,7 +67375,7 @@ var useRoundedNumberBuilder = function useRoundedNumberBuilder(initialValue, que
   var onCreateNewRoundedNumber = function onCreateNewRoundedNumber() {
     if (selected && selected.dataSetField) {
       var _selected$dataSetFiel;
-      var newCustomField = init$9(metricName, (_selected$dataSetFiel = selected.dataSetField) == null ? void 0 : _selected$dataSetFiel.id, selected.transformationFunctionKey == 'round_to_0_dp' ? 0 : 2, queryEngineConfig);
+      var newCustomField = init$8(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
       }));
@@ -68549,13 +68428,23 @@ var CustomMetricVariable = function CustomMetricVariable(_ref) {
 };
 
 var initMetric = function initMetric(selected) {
-  if ((selected == null ? void 0 : selected.id) === OperatorType.Add || (selected == null ? void 0 : selected.id) === OperatorType.Divide || (selected == null ? void 0 : selected.id) === OperatorType.Subtract || (selected == null ? void 0 : selected.id) === OperatorType.Multiply) {
+  if (!selected) return;
+  if (selected.id === OperatorType.Add || selected.id === OperatorType.Divide || selected.id === OperatorType.Subtract || selected.id === OperatorType.Multiply) {
     return initOperator(selected.id);
   }
-  if ((selected == null ? void 0 : selected.id) === PropertyType.IfLogic) {
+  if (selected.id === PropertyType.IfLogic) {
     return initIfLogic();
   }
-  return undefined;
+  if (selected.type === PropertyType.Aggregate) {
+    return initAggregate(selected.id);
+  }
+  if (selected.type === PropertyType.Field) {
+    return initField(selected.id);
+  }
+  if (selected.type === PropertyType.NumberInput) {
+    return initNumberInput();
+  }
+  return;
 };
 var initIfLogic = function initIfLogic() {
   return {
@@ -68574,6 +68463,26 @@ var initOperator = function initOperator(op) {
     values: []
   };
 };
+var initAggregate = function initAggregate(fieldId) {
+  return {
+    type: PropertyType.Aggregate,
+    fieldId: fieldId,
+    "function": undefined
+  };
+};
+var initField = function initField(fieldId) {
+  return {
+    type: PropertyType.Field,
+    fieldId: fieldId,
+    "function": 'none'
+  };
+};
+var initNumberInput = function initNumberInput() {
+  return {
+    type: PropertyType.NumberInput,
+    value: undefined
+  };
+};
 
 function updateOperatorValue(value, index, item) {
   var newValue = _extends({}, value);
@@ -68624,11 +68533,7 @@ function createNewValueFromSelected(selected) {
           "function": 'none'
         };
       case PropertyType.Aggregate:
-        return {
-          type: PropertyType.Aggregate,
-          fieldId: selected.id,
-          "function": undefined
-        };
+        return initAggregate(selected.id);
       case PropertyType.Operator:
         return initOperator(selected.id);
       case PropertyType.IfLogic:
@@ -68727,7 +68632,7 @@ var _formatFormula = function formatFormula(obj, isNested, textOverride, dataSet
     case PropertyType.Aggregate:
       return findField(dataSet, obj.fieldId).publicName + " " + (obj["function"] ? "(" + obj["function"] + ")" : '');
     case PropertyType.Field:
-      return obj.fieldId;
+      return findField(dataSet, obj.fieldId).publicName;
     case PropertyType.Operator:
       {
         var op = obj.op,
@@ -68755,7 +68660,7 @@ var _formatFormula = function formatFormula(obj, isNested, textOverride, dataSet
           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);
+            return filterCondition(f, c.filter.length > 1, textOverride, dataSet);
           }).join(' || ') + ") " + then;
         }).join(' else ');
         var elsePart = obj["else"] ? " else " + _formatFormula(obj["else"], true, textOverride, dataSet) : '';
@@ -68765,7 +68670,7 @@ var _formatFormula = function formatFormula(obj, isNested, textOverride, dataSet
       return '';
   }
 };
-var filterCondition = function filterCondition(filter, nested, textOverride) {
+var filterCondition = function filterCondition(filter, nested, textOverride, dataSet) {
   var filterString = filter.map(function (f) {
     var op = f.op,
       value = f.value,
@@ -68777,7 +68682,7 @@ var filterCondition = function filterCondition(filter, nested, textOverride) {
         var duration = defaultDurationOptions(textOverride)[relativeValue.unit].description.toLowerCase();
         var timeframe = defaultTimeframeOptions(textOverride)[relativeValue.timeFrame].description.toLowerCase();
         return textOverride('metric_overview.relative_date', '[[field]] [[op]] [[value]] [[duration]] in [[timeframe]]', {
-          field: field,
+          field: findField(dataSet, field).publicName,
           op: op,
           value: (_value$value = value.value) != null ? _value$value : '',
           duration: duration,
@@ -68785,7 +68690,7 @@ var filterCondition = function filterCondition(filter, nested, textOverride) {
         });
       }
     }
-    return field + " " + op + " \u201C" + value + "\u201C";
+    return findField(dataSet, field).publicName + " " + op + " \u201C" + value + "\u201C";
   }).join(', ');
   return nested ? "(" + filterString + ")" : filterString;
 };
@@ -68821,34 +68726,8 @@ var code$1 = /*#__PURE__*/styles({
   fontSize: 11
 });
 
-var getUsableItems = function getUsableItems(supportedTypes) {
-  var possibleItems = {};
-  if (supportedTypes.includes(AcceptedTypes.Maths)) {
-    possibleItems = _extends({}, possibleItems, {
-      operator: [OperatorType.Add, OperatorType.Divide, OperatorType.Subtract, OperatorType.Multiply]
-    });
-  }
-  if (supportedTypes.includes(AcceptedTypes.IfStatement)) {
-    possibleItems = _extends({}, possibleItems, {
-      logic: [PropertyType.IfLogic]
-    });
-  }
-  return pickAvailableItems(possibleItems);
-};
-var pickAvailableItems = function pickAvailableItems(selection) {
-  return availableItems().map(function (group) {
-    return _extends({}, group, {
-      things: group.things.filter(function (thing) {
-        var _selection$group$id$i, _selection$group$id;
-        return (_selection$group$id$i = (_selection$group$id = selection[group.id]) == null ? void 0 : _selection$group$id.includes(thing.id)) != null ? _selection$group$id$i : false;
-      })
-    });
-  }).filter(function (group) {
-    return group.things.length > 0;
-  });
-};
-var availableItems = function availableItems() {
-  return [{
+var buildOperatorItems = function buildOperatorItems() {
+  return {
     title: 'Operators',
     id: 'operator',
     things: [{
@@ -68884,79 +68763,7 @@ var availableItems = function availableItems() {
       }),
       subtext: 'Returns the product of two or more numbers.'
     }]
-  }, {
-    title: 'Logic',
-    id: 'logic',
-    things: [{
-      id: PropertyType.IfLogic,
-      type: PropertyType.IfLogic,
-      title: 'If Statement',
-      icon: jsx("svg", {
-        version: "1.1",
-        id: "Layer_1",
-        xmlns: "http://www.w3.org/2000/svg",
-        viewBox: "0 0 121.83 122.88",
-        children: jsx("g", {
-          children: jsx("path", {
-            d: "M27.61,34.37l-4.07,4.6l0.4,1.74h10.48c-2.14,12.38-3.74,23.54-6.81,40.74c-3.67,21.94-5.78,27.33-7.03,29.3 c-1.1,1.95-2.68,2.96-4.82,2.96c-2.35,0-6.6-1.86-8.88-3.97c-0.82-0.56-1.79-0.42-2.82,0.26C2,111.74,0,114.42,0,116.82 c-0.12,3.24,4.21,6.06,8.34,6.06c3.64,0,9-2.28,14.64-7.64c7.71-7.31,13.48-17.34,18.3-39.02c3.1-13.84,4.56-22.84,6.74-35.5 l13.02-1.18l2.82-5.17H49.2C52.99,10.53,55.95,7,59.59,7c2.42,0,5.24,1.86,8.48,5.52c0.96,1.32,2.4,1.18,3.5,0.28 c1.85-1.1,4.13-3.92,4.28-6.48C75.96,3.5,72.6,0,66.82,0C61.58,0,53.55,3.5,46.8,10.38c-5.92,6.27-9.02,14.1-11.16,23.99H27.61 L27.61,34.37z M69.27,50.33c4.04-5.38,6.46-7.17,7.71-7.17c1.29,0,2.32,1.27,4.53,8.41l3.78,12.19 c-7.31,11.18-12.66,17.41-15.91,17.41c-1.08,0-2.17-0.34-2.94-1.1c-0.76-0.76-1.6-1.39-2.42-1.39c-2.68,0-6,3.25-6.06,7.28 c-0.06,4.11,2.82,7.05,6.6,7.05c6.49,0,11.98-6.37,22.58-23.26l3.1,10.45c2.66,8.98,5.78,12.81,9.68,12.81 c4.82,0,11.3-4.11,18.37-15.22l-2.96-3.38c-4.25,5.12-7.07,7.52-8.74,7.52c-1.86,0-3.49-2.84-5.64-9.82l-4.53-14.73 c2.68-3.95,5.32-7.27,7.64-9.92c2.76-3.15,4.89-4.49,6.34-4.49c1.22,0,2.28,0.52,2.94,1.25c0.87,0.96,1.39,1.41,2.42,1.41 c2.33,0,5.93-2.96,6.06-6.88c0.12-3.64-2.14-6.74-6.06-6.74c-5.92,0-11.14,5.1-21.19,20.04l-2.07-6.41 c-2.9-9-4.82-13.63-8.86-13.63c-4.7,0-11.16,5.78-17.48,14.94L69.27,50.33L69.27,50.33z"
-          })
-        })
-      }),
-      subtext: 'Returns the first value if the condition is true; otherwise, returns the second value.'
-    }, {
-      id: PropertyType.NumberInput,
-      type: PropertyType.NumberInput,
-      title: 'Number',
-      icon: jsx("svg", {
-        version: "1.1",
-        id: "Layer_1",
-        viewBox: "0 0 122.88 102.06",
-        children: jsx("g", {
-          children: jsx("path", {
-            d: "M8.18,23.12h67.09v5.39H8.18c-0.77,0-1.47,0.31-1.98,0.82c-0.5,0.51-0.82,1.21-0.82,1.98v39.46c0,0.77,0.31,1.47,0.82,1.98 c0.51,0.5,1.21,0.82,1.98,0.82h67.09v5.39H8.18c-2.24,0-4.29-0.92-5.77-2.4L2.4,76.53C0.92,75.05,0,73.01,0,70.76V31.3 c0-2.24,0.92-4.29,2.4-5.77l0.01-0.01C3.89,24.04,5.94,23.12,8.18,23.12L8.18,23.12z M71.77,53.85c-1.52,0-2.75-1.23-2.75-2.75 c0-1.52,1.23-2.75,2.75-2.75h12.78V18.04c-0.39-3.8-1.56-6.62-3.34-8.6c-1.93-2.16-4.67-3.43-7.99-3.98 c-1.49-0.24-2.51-1.65-2.26-3.15c0.24-1.49,1.65-2.51,3.15-2.26c4.54,0.75,8.37,2.57,11.19,5.74c0.72,0.8,1.37,1.69,1.94,2.66 c0.72-1.25,1.58-2.35,2.56-3.32c2.94-2.92,6.88-4.51,11.59-5.1c1.51-0.18,2.88,0.89,3.06,2.4c0.18,1.51-0.89,2.88-2.4,3.06 c-3.52,0.44-6.38,1.54-8.39,3.53c-1.99,1.97-3.25,4.91-3.61,9.04v5.07h24.65c2.24,0,4.29,0.92,5.77,2.4l0.01,0.01 c1.48,1.48,2.4,3.53,2.4,5.77v39.46c0,2.24-0.92,4.29-2.4,5.77l-0.01,0.01c-1.48,1.48-3.53,2.4-5.77,2.4H90.05v5.07 c0.36,4.13,1.62,7.08,3.61,9.04c2,1.98,4.86,3.09,8.39,3.53c1.51,0.18,2.58,1.56,2.4,3.06c-0.18,1.51-1.55,2.58-3.06,2.4 c-4.7-0.59-8.65-2.18-11.59-5.1c-0.98-0.97-1.84-2.07-2.56-3.32c-0.57,0.97-1.22,1.85-1.94,2.66c-2.83,3.16-6.66,4.99-11.19,5.74 c-1.49,0.24-2.9-0.77-3.15-2.26c-0.24-1.49,0.77-2.9,2.26-3.15c3.32-0.55,6.06-1.81,7.99-3.98c1.78-1.99,2.94-4.81,3.34-8.6 l0-30.17H71.77L71.77,53.85L71.77,53.85z M90.05,28.5v19.84h12.98c1.52,0,2.75,1.23,2.75,2.75c0,1.52-1.23,2.75-2.75,2.75H90.05 v19.71h24.65c0.77,0,1.47-0.31,1.98-0.82c0.5-0.51,0.82-1.21,0.82-1.98V31.3c0-0.77-0.31-1.47-0.82-1.98 c-0.51-0.5-1.21-0.82-1.98-0.82H90.05L90.05,28.5z"
-          })
-        })
-      }),
-      subtext: 'Assign a static number'
-    }]
-  }];
-};
-
-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 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) {
@@ -68988,6 +68795,51 @@ var buildAggregateItems = function buildAggregateItems(dataSet) {
   };
 };
 
+var buildLogicItems = function buildLogicItems(onlyNumber) {
+  if (onlyNumber === void 0) {
+    onlyNumber = false;
+  }
+  var ifLogicThings = {
+    id: PropertyType.IfLogic,
+    type: PropertyType.IfLogic,
+    title: 'If Statement',
+    icon: jsx("svg", {
+      version: "1.1",
+      id: "Layer_1",
+      xmlns: "http://www.w3.org/2000/svg",
+      viewBox: "0 0 121.83 122.88",
+      children: jsx("g", {
+        children: jsx("path", {
+          d: "M27.61,34.37l-4.07,4.6l0.4,1.74h10.48c-2.14,12.38-3.74,23.54-6.81,40.74c-3.67,21.94-5.78,27.33-7.03,29.3 c-1.1,1.95-2.68,2.96-4.82,2.96c-2.35,0-6.6-1.86-8.88-3.97c-0.82-0.56-1.79-0.42-2.82,0.26C2,111.74,0,114.42,0,116.82 c-0.12,3.24,4.21,6.06,8.34,6.06c3.64,0,9-2.28,14.64-7.64c7.71-7.31,13.48-17.34,18.3-39.02c3.1-13.84,4.56-22.84,6.74-35.5 l13.02-1.18l2.82-5.17H49.2C52.99,10.53,55.95,7,59.59,7c2.42,0,5.24,1.86,8.48,5.52c0.96,1.32,2.4,1.18,3.5,0.28 c1.85-1.1,4.13-3.92,4.28-6.48C75.96,3.5,72.6,0,66.82,0C61.58,0,53.55,3.5,46.8,10.38c-5.92,6.27-9.02,14.1-11.16,23.99H27.61 L27.61,34.37z M69.27,50.33c4.04-5.38,6.46-7.17,7.71-7.17c1.29,0,2.32,1.27,4.53,8.41l3.78,12.19 c-7.31,11.18-12.66,17.41-15.91,17.41c-1.08,0-2.17-0.34-2.94-1.1c-0.76-0.76-1.6-1.39-2.42-1.39c-2.68,0-6,3.25-6.06,7.28 c-0.06,4.11,2.82,7.05,6.6,7.05c6.49,0,11.98-6.37,22.58-23.26l3.1,10.45c2.66,8.98,5.78,12.81,9.68,12.81 c4.82,0,11.3-4.11,18.37-15.22l-2.96-3.38c-4.25,5.12-7.07,7.52-8.74,7.52c-1.86,0-3.49-2.84-5.64-9.82l-4.53-14.73 c2.68-3.95,5.32-7.27,7.64-9.92c2.76-3.15,4.89-4.49,6.34-4.49c1.22,0,2.28,0.52,2.94,1.25c0.87,0.96,1.39,1.41,2.42,1.41 c2.33,0,5.93-2.96,6.06-6.88c0.12-3.64-2.14-6.74-6.06-6.74c-5.92,0-11.14,5.1-21.19,20.04l-2.07-6.41 c-2.9-9-4.82-13.63-8.86-13.63c-4.7,0-11.16,5.78-17.48,14.94L69.27,50.33L69.27,50.33z"
+        })
+      })
+    }),
+    subtext: 'Returns the first value if the condition is true; otherwise, returns the second value.'
+  };
+  var numberInputThings = {
+    id: PropertyType.NumberInput,
+    type: PropertyType.NumberInput,
+    title: 'Number',
+    icon: jsx("svg", {
+      version: "1.1",
+      id: "Layer_1",
+      viewBox: "0 0 122.88 102.06",
+      children: jsx("g", {
+        children: jsx("path", {
+          d: "M8.18,23.12h67.09v5.39H8.18c-0.77,0-1.47,0.31-1.98,0.82c-0.5,0.51-0.82,1.21-0.82,1.98v39.46c0,0.77,0.31,1.47,0.82,1.98 c0.51,0.5,1.21,0.82,1.98,0.82h67.09v5.39H8.18c-2.24,0-4.29-0.92-5.77-2.4L2.4,76.53C0.92,75.05,0,73.01,0,70.76V31.3 c0-2.24,0.92-4.29,2.4-5.77l0.01-0.01C3.89,24.04,5.94,23.12,8.18,23.12L8.18,23.12z M71.77,53.85c-1.52,0-2.75-1.23-2.75-2.75 c0-1.52,1.23-2.75,2.75-2.75h12.78V18.04c-0.39-3.8-1.56-6.62-3.34-8.6c-1.93-2.16-4.67-3.43-7.99-3.98 c-1.49-0.24-2.51-1.65-2.26-3.15c0.24-1.49,1.65-2.51,3.15-2.26c4.54,0.75,8.37,2.57,11.19,5.74c0.72,0.8,1.37,1.69,1.94,2.66 c0.72-1.25,1.58-2.35,2.56-3.32c2.94-2.92,6.88-4.51,11.59-5.1c1.51-0.18,2.88,0.89,3.06,2.4c0.18,1.51-0.89,2.88-2.4,3.06 c-3.52,0.44-6.38,1.54-8.39,3.53c-1.99,1.97-3.25,4.91-3.61,9.04v5.07h24.65c2.24,0,4.29,0.92,5.77,2.4l0.01,0.01 c1.48,1.48,2.4,3.53,2.4,5.77v39.46c0,2.24-0.92,4.29-2.4,5.77l-0.01,0.01c-1.48,1.48-3.53,2.4-5.77,2.4H90.05v5.07 c0.36,4.13,1.62,7.08,3.61,9.04c2,1.98,4.86,3.09,8.39,3.53c1.51,0.18,2.58,1.56,2.4,3.06c-0.18,1.51-1.55,2.58-3.06,2.4 c-4.7-0.59-8.65-2.18-11.59-5.1c-0.98-0.97-1.84-2.07-2.56-3.32c-0.57,0.97-1.22,1.85-1.94,2.66c-2.83,3.16-6.66,4.99-11.19,5.74 c-1.49,0.24-2.9-0.77-3.15-2.26c-0.24-1.49,0.77-2.9,2.26-3.15c3.32-0.55,6.06-1.81,7.99-3.98c1.78-1.99,2.94-4.81,3.34-8.6 l0-30.17H71.77L71.77,53.85L71.77,53.85z M90.05,28.5v19.84h12.98c1.52,0,2.75,1.23,2.75,2.75c0,1.52-1.23,2.75-2.75,2.75H90.05 v19.71h24.65c0.77,0,1.47-0.31,1.98-0.82c0.5-0.51,0.82-1.21,0.82-1.98V31.3c0-0.77-0.31-1.47-0.82-1.98 c-0.51-0.5-1.21-0.82-1.98-0.82H90.05L90.05,28.5z"
+        })
+      })
+    }),
+    subtext: 'Assign a static number'
+  };
+  var things = onlyNumber ? [numberInputThings] : [ifLogicThings, numberInputThings];
+  return {
+    title: 'Logic',
+    id: 'logic',
+    things: things
+  };
+};
+
 var buildFieldItems = function buildFieldItems(dataSet) {
   var numberFieldsOptions = {
     onlyFieldTypes: ['number'],
@@ -69016,55 +68868,93 @@ var buildFieldItems = function buildFieldItems(dataSet) {
   };
 };
 
+var getInitialUsableItems = function getInitialUsableItems(supportedTypes, dataSet) {
+  var possibleItems = [];
+  possibleItems.push(getUsableMathItems(supportedTypes));
+  possibleItems.push(getUsableAggregateItems(supportedTypes, dataSet));
+  possibleItems.push(getUsableFieldItems(dataSet));
+  possibleItems.push(getUsableLogicItems(supportedTypes));
+  return possibleItems.filter(function (item) {
+    return item !== undefined;
+  });
+};
+var getUsableMathItems = function getUsableMathItems(supportedTypes) {
+  if (supportedTypes.includes(AcceptedTypes.Maths)) {
+    return buildOperatorItems();
+  }
+  return undefined;
+};
+var getUsableAggregateItems = function getUsableAggregateItems(supportedTypes, dataSet) {
+  if (supportedTypes.includes(AcceptedTypes.Aggregates)) {
+    return buildAggregateItems(dataSet);
+  }
+  return undefined;
+};
+var getUsableFieldItems = function getUsableFieldItems(dataSet) {
+  return buildFieldItems(dataSet);
+};
+var getUsableLogicItems = function getUsableLogicItems(supportedTypes) {
+  if (supportedTypes.includes(AcceptedTypes.IfStatement)) {
+    return buildLogicItems();
+  }
+  return undefined;
+};
+
+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 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
+  });
+};
+
 function buildFieldsAndAggregates(value, dataSet, supportedTypes, 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 && supportedTypes.includes(AcceptedTypes.Aggregates)) {
-    updatedParentHasAggregate = true;
-  }
-  if (hasField) {
-    updatedParentHasField = true;
-  }
-  if (isOperator) {
-    if (!updatedParentHasField && supportedTypes.includes(AcceptedTypes.Aggregates)) {
-      updatedItems.push(buildAggregateItems(dataSet));
-    }
-    if (!updatedParentHasAggregate) updatedItems.push(buildFieldItems(dataSet));
+  var updatedParentHasAggregate = parentHasAggregate != null ? parentHasAggregate : hasAggregate && supportedTypes.includes(AcceptedTypes.Aggregates);
+  var updatedParentHasField = parentHasField != null ? parentHasField : hasField;
+  if (isOperator && !updatedParentHasField && supportedTypes.includes(AcceptedTypes.Aggregates)) {
+    updatedItems.push(buildAggregateItems(dataSet));
   }
-  if (isIfLogic) {
-    if (!updatedParentHasField && hasAggregateCase && supportedTypes.includes(AcceptedTypes.Aggregates)) {
-      updatedItems.push(buildAggregateItems(dataSet));
-    }
-    if (!updatedParentHasAggregate && hasFieldCase) {
-      updatedItems.push(buildFieldItems(dataSet));
-    }
-    if (hasNoReturns) {
-      if (supportedTypes.includes(AcceptedTypes.Aggregates)) {
-        updatedItems.push(buildAggregateItems(dataSet));
-      }
-      updatedItems.push(buildFieldItems(dataSet));
-    }
+  if (!updatedParentHasAggregate) {
+    updatedItems.push(buildFieldItems(dataSet));
   }
+  updatedItems.push(buildLogicItems(true));
   return {
     updatedItems: updatedItems,
     updatedParentHasAggregate: updatedParentHasAggregate,
@@ -69159,7 +69049,6 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
     index = _ref.index,
     onDeleteItem = _ref.onDeleteItem,
     parentIsIfLogic = _ref.parentIsIfLogic,
-    isEditing = _ref.isEditing,
     parentHasAggregate = _ref.parentHasAggregate,
     parentHasField = _ref.parentHasField,
     supportedTypes = _ref.supportedTypes;
@@ -69207,10 +69096,8 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
       id: level + "-" + index + "-field"
     });
   }
-  var items = [].concat(pickAvailableItems({
-    operator: [OperatorType.Add, OperatorType.Divide, OperatorType.Subtract, OperatorType.Multiply],
-    logic: [PropertyType.NumberInput]
-  }));
+  var usableMathItems = getUsableMathItems(supportedTypes);
+  var items = usableMathItems ? [usableMathItems] : [];
   if (!parentIsIfLogic) {
     var _buildFieldsAndAggreg = buildFieldsAndAggregates(value, dataSet, supportedTypes, parentHasAggregate, parentHasField),
       updatedItems = _buildFieldsAndAggreg.updatedItems,
@@ -69219,6 +69106,9 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
     items.push.apply(items, updatedItems);
     parentHasAggregate = updatedParentHasAggregate;
     parentHasField = updatedParentHasField;
+  } else {
+    items.push(buildFieldItems(dataSet));
+    items.push(buildLogicItems(true));
   }
   if (variables != null && variables.variables) {
     var builtVariables = buildVariableItems(variables.variables, 'numbers');
@@ -69229,12 +69119,11 @@ var _RecursiveMetric = function RecursiveMetric(_ref) {
   if (value.type === PropertyType.IfLogic) {
     parentIsIfLogic = true;
   }
-  var enableRemove = isEditing ? false : true;
   return jsxs("div", {
     className: styles({
       position: 'relative'
     }),
-    children: [enableRemove && jsx(DeleteAction, {
+    children: [jsx(DeleteAction, {
       id: level + "-block-" + index,
       onDeleteItem: onDeleteItem,
       label: textOverride('remove', 'Remove') + " level " + (level + 1) + " " + value.type
@@ -69431,6 +69320,28 @@ var CustomMetric = function CustomMetric(props) {
   var deleteMetric = function deleteMetric() {
     updateMetric(undefined);
   };
+  var _hasAggregate = function hasAggregate(value) {
+    if (value.type === PropertyType.Aggregate) {
+      return true;
+    }
+    if (value.type === PropertyType.Operator) {
+      return value.values.some(function (v) {
+        return _hasAggregate(v);
+      });
+    }
+    return false;
+  };
+  var _hasField = function hasField(value) {
+    if (value.type === PropertyType.Field) {
+      return true;
+    }
+    if (value.type === PropertyType.Operator) {
+      return value.values.some(function (v) {
+        return _hasField(v);
+      });
+    }
+    return false;
+  };
   return jsx(Fragment, {
     children: jsxs("div", {
       children: [state.wipCustomMetric && jsx(_RecursiveMetric, {
@@ -69442,10 +69353,11 @@ var CustomMetric = function CustomMetric(props) {
         },
         index: 0,
         onDeleteItem: deleteMetric,
-        isEditing: props.isEditing,
-        supportedTypes: props.supportedTypes
+        supportedTypes: props.supportedTypes,
+        parentHasAggregate: _hasAggregate(state.wipCustomMetric),
+        parentHasField: _hasField(state.wipCustomMetric)
       }), !state.wipCustomMetric && jsx(AddItem, {
-        items: getUsableItems(props.supportedTypes),
+        items: getInitialUsableItems(props.supportedTypes, props.dataSet),
         onSelect: initialiseMetric
       }), jsx(View, {
         marginTop: 20,
@@ -69508,14 +69420,14 @@ var CustomMetricModal = function CustomMetricModal(props) {
   var componentInterface = getComponentInterface(props.componentType);
   var state = useCustomMetric(props.queryEngineConfig, props.initialValue || undefined, props.onNewCustomField);
   var _onChange = state.onChange;
-  if (componentInterface.supportedCustomFields.calculatedField === false) return null;
+  if (componentInterface.supportedCustomFields.customBuild === false) return null;
   return jsxs(Modal, {
     width: "4xl",
     isOpen: props.show,
     onClose: props.onClose,
     disableDnD: true,
     children: [jsx(Modal.Header, {
-      title: "Calculated Field"
+      title: "Custom Metric Builder"
     }), jsxs(Modal.Content, {
       children: [jsx(PanelProperty, {
         children: jsx(Input, {
@@ -69539,7 +69451,7 @@ var CustomMetricModal = function CustomMetricModal(props) {
             });
           },
           isEditing: state.isEditing,
-          supportedTypes: componentInterface.supportedCustomFields.calculatedField
+          supportedTypes: componentInterface.supportedCustomFields.customBuild
         })
       })]
     }), jsx(Modal.Footer, {
@@ -69552,6 +69464,7 @@ var CustomMetricModal = function CustomMetricModal(props) {
           secondary: true,
           children: textOverride('cancel', 'Cancel')
         }), jsx(Button, {
+          testId: state.isEditing ? 'update-custom-metric-builder' : 'create-custom-metric-builder',
           onClick: function onClick() {
             return state.handleUpsert();
           },
@@ -69703,117 +69616,6 @@ var ItemPicker = function ItemPicker(props) {
   });
 };
 
-var emptyConditional$1 = {
-  publicName: '',
-  metric: undefined
-};
-var useCustomMetricBuilderModal = function useCustomMetricBuilderModal(queryEngineConfig, customField, onUpdateField) {
-  var isEditing = !!customField;
-  var _useState = useState(emptyConditional$1),
-    state = _useState[0],
-    setState = _useState[1];
-  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
-      }));
-    }
-  };
-  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 jsxs(Modal, {
-    width: "4xl",
-    isOpen: props.show,
-    onClose: props.onClose,
-    disableDnD: true,
-    children: [jsx(Modal.Header, {
-      title: customMetricText('customBuildMetric', textOverride).title
-    }), jsxs(Modal.Content, {
-      children: [jsx(PanelProperty, {
-        children: 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 && jsx(CustomMetric, {
-        dataSet: dataSet,
-        metric: state.metric,
-        onChange: function onChange(metric) {
-          return _onChange({
-            metric: metric
-          });
-        },
-        supportedTypes: supportedTypes
-      }, isEditing + "-" + state.publicName)]
-    }), jsx(Modal.Footer, {
-      buttons: "end",
-      children: jsxs(ButtonGroup, {
-        children: [jsx(Button$2, {
-          onClick: function onClick() {
-            return props.onClose();
-          },
-          secondary: true,
-          children: textOverride('cancel', 'Cancel')
-        }), 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";
@@ -69887,13 +69689,11 @@ var ModalRouting = function ModalRouting() {
           }), modalType);
         case ModalType.ConditionalCustomMetric:
           return jsx(ConditionalModal, _extends({}, attributes), modalType);
-        case ModalType.CustomMetricBuilder:
-          return jsx(CustomMetricBuilderModal, _extends({}, attributes), modalType);
         case ModalType.PercentageCustomMetric:
           return jsx(PercentageModal, _extends({}, attributes), modalType);
         case ModalType.MathCustomMetric:
           return jsx(MathModal, _extends({}, attributes), modalType);
-        case ModalType.CalculatedField:
+        case ModalType.CustomMetricBuilder:
           return jsx(CustomMetricModal, _extends({}, attributes), modalType);
         case ModalType.RulesCustomMetric:
           return jsx(RulesModal, _extends({}, attributes), modalType);
@@ -70590,7 +70390,7 @@ var fromToken = function fromToken(token) {
   });
 };
 
-var init$e = function init(dashboardSessionToken, dataAccessToken, queryEngineAccessToken, dashboardAdminOverrideToken) {
+var init$d = function init(dashboardSessionToken, dataAccessToken, queryEngineAccessToken, dashboardAdminOverrideToken) {
   var dashboardAccessContent = fromToken(dashboardSessionToken);
   if (!('scope' in dashboardAccessContent)) {
     dashboardAccessContent.scope = 'read_write';
@@ -70656,7 +70456,7 @@ var fetchIdentityConfig = /*#__PURE__*/function () {
           throw new FailedToLoadIdentity('Failed to fetch identity config.');
         case 6:
           dashboardAdminOverride = isClientSide() ? getDashboardAdminOverride(window.location.href) : null;
-          identityConfig = init$e(tokens.dashboardAccessToken, tokens.dataAccessToken, tokens.queryEngineAccessToken, dashboardAdminOverride);
+          identityConfig = init$d(tokens.dashboardAccessToken, tokens.dataAccessToken, tokens.queryEngineAccessToken, dashboardAdminOverride);
           return _context.abrupt("return", {
             identityConfig: identityConfig,
             tokens: tokens
@@ -71283,7 +71083,7 @@ var Header = /*#__PURE__*/function () {
   function Header(title) {
     /** The header component. */
     this.component = undefined;
-    var newHeader = init$b('New Header');
+    var newHeader = init$a('New Header');
     if (title) {
       newHeader = _extends({}, newHeader, {
         displayTitle: title
@@ -71993,7 +71793,7 @@ function getOptionsOrders(dataSetField) {
 }
 
 var commonToQueries = function commonToQueries(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$b(dataSet, attributes.measure, attributes.order, attributes.dimension,
+  var _Query$build = build$a(dataSet, attributes.measure, attributes.order, attributes.dimension,
     // @ts-ignore
     attributes.timeDimension || null, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
@@ -72018,8 +71818,8 @@ var toQueries$6 = commonToQueries;
 var toQueries$7 = commonToQueries;
 
 var buildMainQueries = function buildMainQueries(attributes, dataSet, 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);
+  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);
   return {
     bar: bar,
     line: line
@@ -72046,8 +71846,8 @@ var toQueries$b = commonToQueries;
 var toQueries$c = commonToQueries;
 
 var buildMainQueries$1 = function buildMainQueries(attributes, dataSet, 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);
+  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);
   return {
     bar: bar,
     line: line
@@ -72066,7 +71866,7 @@ var toQueries$d = function toQueries(attributes, dataSet, queryEngineConfig, par
 };
 
 var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$b(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$a(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
 
@@ -72094,7 +71894,7 @@ var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineCon
 };
 var buildDeltaQuery = function buildDeltaQuery(dataSet, attributes, queryEngineConfig, params) {
   if (!attributes.deltaTimeDimension) return null;
-  return build$b(dataSet, attributes.measure, [{
+  return build$a(dataSet, attributes.measure, [{
     field: attributes.deltaTimeDimension.field,
     direction: 'asc',
     "function": attributes.deltaTimeDimension.truncate
@@ -72126,7 +71926,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$b(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$a(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);
@@ -72140,7 +71940,7 @@ var toQueries$g = function toQueries(attributes, dataSet, queryEngineConfig, par
   var measures = [];
   attributes.xMeasure && measures.push(attributes.xMeasure);
   attributes.yMeasure && measures.push(attributes.yMeasure);
-  var _Query$build = build$b(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$a(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);
@@ -72152,7 +71952,7 @@ var toQueries$g = function toQueries(attributes, dataSet, queryEngineConfig, par
 
 var toQueries$h = function toQueries(attributes, dataSet, queryEngineConfig, params) {
   var measures = [].concat(attributes.measure || [], attributes.xMeasure || [], attributes.zMeasure || []);
-  var _Query$build = build$b(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$a(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);
@@ -73530,7 +73330,7 @@ var VizzlyServices = /*#__PURE__*/function () {
               }
               return undefined;
             }();
-            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);
+            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);
             fetch = /*#__PURE__*/function () {
               var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
                 var _params$abortControll;
@@ -76479,7 +76279,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$d(textOverride, resolvedDateFilterOptions), variables.variables, props.runQueries, props.data, props.queryEngineEndpoint, props.timeZone);
+  var runQueriesCallback = getRunQueriesCallback(session.identityConfig, session.queryEngineConfig, build$c(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) {