@vizzly/dashboard 0.14.4-dev-638c4c213227d29bb6a665fc62b13368e8b8bc5b → 0.14.4-dev-ccfbdccebc45fb0361ebf39ecb0ab567ca7a1067

package/dist/dashboard.esm.js

@@ -2,10 +2,9 @@ import React__default, { Fragment, useEffect, useState, useContext, createContex
 import isEmpty$3 from 'lodash-es/isEmpty';
 import _, { isArray, capitalize, isEmpty as isEmpty$2, isFunction, replace, isObject, isNumber, every, some, mergeWith, remove as remove$2, cloneDeep, findIndex, reduce, merge, sumBy, mapValues, zipObject, isDate, omit as omit$1, maxBy, reject, defaultsDeep, isString, flatMap, filter, uniq, uniqBy, debounce as debounce$1, orderBy, minBy, throttle, get as get$1, min, max, groupBy, intersection, isEqual } from 'lodash-es';
 import { QueryEngineConfig } from '@vizzly/semantic-layer-public';
-import { v4 } from 'uuid';
 import Joi from '@vizzly/joi';
 import moment from 'moment-timezone';
-import { DATE_MATHS_OPERATORS } from '@vizzly/sqlbuilder-public';
+import { v4 } from 'uuid';
 import { Global, css as css$2, CacheProvider, createElement as createElement$1 } from '@emotion/react';
 import { jsx, jsxs, Fragment as Fragment$1 } from '@emotion/react/jsx-runtime';
 import chroma from 'chroma-js';
@@ -64,6 +63,7 @@ import cx from 'classnames';
 import VisibilitySensor from 'react-visibility-sensor';
 import ExcelJS from 'exceljs';
 import { saveAs } from 'file-saver';
+import { DATE_MATHS_OPERATORS } from '@vizzly/sqlbuilder-public';
 import { Authentication, VizzlyQueryEngineApi, VizzlyApi, VizzlyAppApi, Vizzly as Vizzly$2, PersistViaQueryEngine, PersistDirectToVizzlyApi, Errors, VizzlyApiClientLogger } from '@vizzly/api-client';
 import throttle$1 from 'lodash-es/throttle';
 
@@ -1080,6 +1080,34 @@ var checkForNullValue = function checkForNullValue(dataSetId, dimensions, timeDi
   return textOverride ? textOverride(textOverrideKey ? textOverrideKey : 'no_value', NULL_REPLACEMENT) : undefined;
 };
 
+var ValidationError = /*#__PURE__*/function (_Error) {
+  function ValidationError(message) {
+    var _this;
+    _this = _Error.call(this, message) || this; // (1)
+    _this.name = 'ValidationError'; // (2)
+    return _this;
+  }
+  _inheritsLoose(ValidationError, _Error);
+  return ValidationError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
+var FieldNotFoundInDataSet = /*#__PURE__*/function (_ValidationError) {
+  function FieldNotFoundInDataSet(dataSet, missingFieldId) {
+    var _this;
+    _this = _ValidationError.call(this, "\n    An expected field is missing from a dataSet.\n\n    Missing '" + missingFieldId + "'. Got;\n    " + JSON.stringify(dataSet) + "\n  ") || this;
+    _this.missingFieldId = void 0;
+    _this.name = 'FieldNotFoundInDataSet';
+    _this.missingFieldId = missingFieldId;
+    return _this;
+  }
+  _inheritsLoose(FieldNotFoundInDataSet, _ValidationError);
+  var _proto = FieldNotFoundInDataSet.prototype;
+  _proto.getMissingFieldId = function getMissingFieldId() {
+    return this.missingFieldId;
+  };
+  return FieldNotFoundInDataSet;
+}(ValidationError);
+
 var timeDimensionsConstants = QueryEngineConfig.Constants.timeDimensionsConstants;
 
 // All the aggregates Vizzly supports somewhere...
@@ -1107,6 +1135,300 @@ var isSupportedTimeTruncFunction = function isSupportedTimeTruncFunction(support
   return [].concat(Object.keys(supportedTimeFunctions), ['none']).includes(proposedFunction);
 };
 
+var filterIsDate = function filterIsDate(filter) {
+  var isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+  if (!isoDateRegex.test(filter.value)) {
+    return false;
+  }
+  var date = new Date(filter.value);
+  if (isNaN(date.getTime())) {
+    return false;
+  }
+
+  // Additional check to verify that the date parts match exactly
+  var _filter$value$split$ = filter.value.split('T')[0].split('-').map(Number),
+    year = _filter$value$split$[0],
+    month = _filter$value$split$[1],
+    day = _filter$value$split$[2];
+  if (date.getUTCFullYear() !== year || date.getUTCMonth() + 1 !== month || date.getUTCDate() !== day) {
+    return false;
+  }
+  return true;
+};
+
+var _Joi$string, _Joi$string2;
+var defaultDurationOptions = function defaultDurationOptions(textOverride) {
+  return {
+    minutes: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Minutes') : 'Minutes',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setMinutes(currentDate.getMinutes() + value);
+      }
+    },
+    hours: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Hours') : 'Hours',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setHours(currentDate.getHours() + value);
+      }
+    },
+    days: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Days') : 'Days',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setDate(currentDate.getDate() + value);
+      }
+    },
+    weeks: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Weeks') : 'Weeks',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setDate(currentDate.getDate() + value * 7); // 1 week = 7 days
+      }
+    },
+    months: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Months') : 'Months',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setMonth(currentDate.getMonth() + value);
+      }
+    },
+    years: {
+      description: textOverride ? textOverride('duration_option.minutes', 'Years') : 'Years',
+      formatter: function formatter(currentDate, value) {
+        currentDate.setFullYear(currentDate.getFullYear() + value);
+      }
+    }
+  };
+};
+var defaultTimeframeOptions = function defaultTimeframeOptions(textOverride) {
+  return {
+    future: {
+      description: textOverride ? textOverride('timeframe_option.minutes', 'Future') : 'Future'
+    },
+    past: {
+      description: textOverride ? textOverride('timeframe_option.past', 'Past') : 'Past'
+    }
+  };
+};
+var getDurationKeys = function getDurationKeys() {
+  var options = defaultDurationOptions();
+  return Object.keys(options);
+};
+var getTimeframeKeys = function getTimeframeKeys() {
+  var options = defaultTimeframeOptions();
+  return Object.keys(options);
+};
+var relativeSchema = /*#__PURE__*/Joi.object({
+  unit: /*#__PURE__*/(_Joi$string = Joi.string()).valid.apply(_Joi$string, getDurationKeys()).required(),
+  value: /*#__PURE__*/Joi.number().integer().required(),
+  timeFrame: /*#__PURE__*/(_Joi$string2 = Joi.string()).valid.apply(_Joi$string2, getTimeframeKeys()).required()
+});
+function isRelative(value) {
+  return value && typeof value === 'object' && 'unit' in value && 'value' in value && 'timeFrame' in value;
+}
+function isRelativeDateDefined(value) {
+  var _relativeSchema$valid = relativeSchema.validate(value),
+    error = _relativeSchema$valid.error;
+  return !error;
+}
+var init = function init() {
+  return {
+    value: null,
+    unit: null,
+    timeFrame: 'future'
+  };
+};
+var calculateRelativeDate = function calculateRelativeDate(relativeDate, startDate) {
+  var currentDate = startDate ? new Date(startDate) : new Date();
+  if (!relativeDate.value || relativeDate.unit === null) {
+    throw new Error("Unrecognized value: " + relativeDate.value);
+  }
+  var newDate = relativeDate.timeFrame === 'future' ? relativeDate.value : -relativeDate.value;
+  defaultDurationOptions()[relativeDate.unit].formatter(currentDate, newDate);
+  return currentDate;
+};
+var buildRelativeRange = function buildRelativeRange(relativeFilters, dataSet, appliesToFields) {
+  if (!appliesToFields) {
+    throw new Error('appliesToFields is required');
+  }
+  return relativeFilters.map(function (group) {
+    var templates = group.map(function (condition) {
+      return {
+        op: condition.op,
+        value: _extends({}, condition.value)
+      };
+    });
+    var newGroup = [];
+    appliesToFields.forEach(function (field) {
+      if (field.dataSetId != dataSet.id) return;
+      templates.forEach(function (template) {
+        newGroup.push(_extends({}, template, {
+          field: field.fieldId
+        }));
+      });
+    });
+    return newGroup;
+  });
+};
+
+var getUTCDate = function getUTCDate(date) {
+  if (date !== null) {
+    var momentDate = moment(new Date(date));
+    return momentDate.tz(Intl.DateTimeFormat().resolvedOptions().timeZone)._d;
+  }
+  return date;
+};
+
+var VariableNotFoundForVariables = /*#__PURE__*/function (_ValidationError) {
+  function VariableNotFoundForVariables(variableList, missingVariableId) {
+    var _this;
+    _this = _ValidationError.call(this, "\n    An expected variable is missing from the defined Variables.\n\n    Missing '" + missingVariableId + "'. Got;\n    " + JSON.stringify(variableList) + "\n  ") || this;
+    _this.missingVariableId = void 0;
+    _this.name = 'VariableNotFoundForVariables';
+    _this.missingVariableId = missingVariableId;
+    return _this;
+  }
+  _inheritsLoose(VariableNotFoundForVariables, _ValidationError);
+  var _proto = VariableNotFoundForVariables.prototype;
+  _proto.getMissingFieldId = function getMissingFieldId() {
+    return this.missingVariableId;
+  };
+  return VariableNotFoundForVariables;
+}(ValidationError);
+
+var detect = function detect(input) {
+  var regex = /\{\{\s*([^\s{}][^{}]*?)\s*\}\}/g;
+  var matches = [];
+  var match;
+  while ((match = regex.exec(input)) !== null) {
+    matches.push(match[1].trim());
+  }
+  return matches.length > 0 ? matches : undefined;
+};
+var build$1 = function build(variables) {
+  if (variables) {
+    var dashboardDefinedVariables = variables();
+    logInfo('Detected variables', dashboardDefinedVariables);
+    return dashboardDefinedVariables;
+  }
+  return {};
+};
+var findVariable = function findVariable(value, detect, variableList) {
+  if (!variableList) return undefined;
+
+  // Use the detect function to check if the value is a variable
+  var variables = detect(value);
+
+  // If no variables are detected, return early
+  if (!variables || variables.length === 0) {
+    return undefined; // Early return if the value is not a variable
+  }
+  var matchedVariables = [];
+
+  // Check for matching variables in the variable list
+  for (var _iterator = _createForOfIteratorHelperLoose(variables), _step; !(_step = _iterator()).done;) {
+    var variable = _step.value;
+    var variableEntry = variableList[variable];
+    if (variableEntry) {
+      // If the variable is found but its value is undefined or empty, throw an error
+      if (variableEntry.value === undefined || variableEntry.value === '') {
+        throw new Error("Variable '" + variable + "' is defined in the list but has no value.");
+      }
+
+      // Add the variable to the matched variables list
+      matchedVariables.push(variable);
+    }
+  }
+
+  // If no matches are found, throw an error
+  if (matchedVariables.length === 0 && value) {
+    throw new VariableNotFoundForVariables(variableList, value);
+  }
+  return matchedVariables.length > 0 ? matchedVariables : undefined;
+};
+var useValue = function useValue(value, variables) {
+  if (typeof value === 'string') {
+    var valueHasVariables = detect(value);
+    if (valueHasVariables && variables) {
+      for (var _iterator2 = _createForOfIteratorHelperLoose(valueHasVariables), _step2; !(_step2 = _iterator2()).done;) {
+        var key = _step2.value;
+        if (key in variables) {
+          return extractValue(variables, key);
+        }
+      }
+    }
+  }
+  return value;
+};
+var validate = function validate(value, variables) {
+  try {
+    findVariable(value, detect, variables);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+function extractValue(variables, key) {
+  return variables[key].value;
+}
+
+var addAndFilters = function addAndFilters(filter, filterToAddToAll) {
+  if (!filter || isEmpty$2(filter)) filter = [[]];
+  return [].concat(filter).map(function (andFilter) {
+    return [].concat(andFilter, filterToAddToAll);
+  });
+};
+var filterAttributeToQueryFilter = function filterAttributeToQueryFilter(filters, queryEngineConfig, dataSet, params) {
+  return filters.map(function (andFilters) {
+    return [].concat(andFilters).flatMap(function (andFilter) {
+      var _andFilter$function;
+      // Stop unsupported time functions being used.
+      if (andFilter["function"] && !isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, andFilter["function"])) {
+        throw "Query engine does not support the query function " + andFilter["function"] + ".";
+      }
+      var dataSetField = findField(dataSet, andFilter.field);
+      var field = {
+        type: 'field',
+        value: andFilter.field,
+        "function": (_andFilter$function = andFilter["function"]) != null ? _andFilter$function : 'none'
+      };
+      if (isCustomField(dataSetField)) {
+        var _andFilter$function2;
+        field = toQueryMeasure({
+          field: dataSetField.id,
+          "function": (_andFilter$function2 = andFilter["function"]) != null ? _andFilter$function2 : 'none'
+        }, dataSetField, queryEngineConfig, dataSet, false, params);
+      }
+      // If `array_contains` operation has multiple. Then split these out into individual
+      // checks.
+      if ((andFilter.op == 'array_contains' || andFilter.op == 'array_does_not_contain') && Array.isArray(andFilter.value)) {
+        return [].concat(andFilter.value).map(function (value) {
+          return {
+            field: field,
+            op: andFilter.op,
+            value: value
+          };
+        });
+      }
+      var value = useValue(andFilter.value, params.variables);
+      if (isRelativeDateDefined(andFilter.value)) {
+        value = calculateRelativeDate(andFilter.value);
+      }
+      if (filterIsDate(andFilter)) {
+        value = getUTCDate(andFilter.value);
+      }
+      return [{
+        field: field,
+        op: andFilter.op,
+        value: value
+      }];
+    });
+  });
+};
+var isAvailable = function isAvailable(filter) {
+  return filter && isArray(filter) && isArray(filter[0]);
+};
+var isAdditionalFilter = function isAdditionalFilter(value) {
+  return value && isArray(value) && isArray(value[0]) && 'field' in value[0][0] && 'op' in value[0][0] && 'value' in value[0][0];
+};
+
 var combineFilters = function combineFilters(array1, array2) {
   var validArray1 = array1.length > 0 && array1[0] ? array1 : [[]];
   var validArray2 = array2.length > 0 && array2[0] ? array2 : [[]];
@@ -1195,126 +1517,6 @@ var MULTI_SELECT_FILTER = 'multiSelectFilter';
 var NUMERIC_FILTER = 'numericFilter';
 var ADVANCED_FILTER = 'advancedFilter';
 
-var _Joi$string, _Joi$string2;
-var defaultDurationOptions = function defaultDurationOptions(textOverride) {
-  return {
-    minutes: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Minutes') : 'Minutes',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setMinutes(currentDate.getMinutes() + value);
-      }
-    },
-    hours: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Hours') : 'Hours',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setHours(currentDate.getHours() + value);
-      }
-    },
-    days: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Days') : 'Days',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setDate(currentDate.getDate() + value);
-      }
-    },
-    weeks: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Weeks') : 'Weeks',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setDate(currentDate.getDate() + value * 7); // 1 week = 7 days
-      }
-    },
-    months: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Months') : 'Months',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setMonth(currentDate.getMonth() + value);
-      }
-    },
-    years: {
-      description: textOverride ? textOverride('duration_option.minutes', 'Years') : 'Years',
-      formatter: function formatter(currentDate, value) {
-        currentDate.setFullYear(currentDate.getFullYear() + value);
-      }
-    }
-  };
-};
-var defaultTimeframeOptions = function defaultTimeframeOptions(textOverride) {
-  return {
-    future: {
-      description: textOverride ? textOverride('timeframe_option.minutes', 'Future') : 'Future'
-    },
-    past: {
-      description: textOverride ? textOverride('timeframe_option.past', 'Past') : 'Past'
-    }
-  };
-};
-var getDurationKeys = function getDurationKeys() {
-  var options = defaultDurationOptions();
-  return Object.keys(options);
-};
-var getTimeframeKeys = function getTimeframeKeys() {
-  var options = defaultTimeframeOptions();
-  return Object.keys(options);
-};
-var relativeSchema = /*#__PURE__*/Joi.object({
-  unit: /*#__PURE__*/(_Joi$string = Joi.string()).valid.apply(_Joi$string, getDurationKeys()).required(),
-  value: /*#__PURE__*/Joi.number().integer().required(),
-  timeFrame: /*#__PURE__*/(_Joi$string2 = Joi.string()).valid.apply(_Joi$string2, getTimeframeKeys()).required()
-});
-function isRelative(value) {
-  return value && typeof value === 'object' && 'unit' in value && 'value' in value && 'timeFrame' in value;
-}
-function isRelativeDateDefined(value) {
-  var _relativeSchema$valid = relativeSchema.validate(value),
-    error = _relativeSchema$valid.error;
-  return !error;
-}
-var init = function init() {
-  return {
-    value: null,
-    unit: null,
-    timeFrame: 'future'
-  };
-};
-var calculateRelativeDate = function calculateRelativeDate(relativeDate, startDate) {
-  var currentDate = startDate ? new Date(startDate) : new Date();
-  if (!relativeDate.value || relativeDate.unit === null) {
-    throw new Error("Unrecognized value: " + relativeDate.value);
-  }
-  var newDate = relativeDate.timeFrame === 'future' ? relativeDate.value : -relativeDate.value;
-  defaultDurationOptions()[relativeDate.unit].formatter(currentDate, newDate);
-  return currentDate;
-};
-var buildRelativeRange = function buildRelativeRange(relativeFilters, dataSet, appliesToFields) {
-  if (!appliesToFields) {
-    throw new Error('appliesToFields is required');
-  }
-  return relativeFilters.map(function (group) {
-    var templates = group.map(function (condition) {
-      return {
-        op: condition.op,
-        value: _extends({}, condition.value)
-      };
-    });
-    var newGroup = [];
-    appliesToFields.forEach(function (field) {
-      if (field.dataSetId != dataSet.id) return;
-      templates.forEach(function (template) {
-        newGroup.push(_extends({}, template, {
-          field: field.fieldId
-        }));
-      });
-    });
-    return newGroup;
-  });
-};
-
-var getUTCDate = function getUTCDate(date) {
-  if (date !== null) {
-    var momentDate = moment(new Date(date));
-    return momentDate.tz(Intl.DateTimeFormat().resolvedOptions().timeZone)._d;
-  }
-  return date;
-};
-
 var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter, customTimeRangeFuncs) {
   return filter.appliesToFields.flatMap(function (field) {
     var _filter$value, _filter$value2, _filter$value3;
@@ -1716,7 +1918,7 @@ var init$1 = function init(publicName, denominatorFieldId, denominatorAggregate,
     }, queryEngineConfig)
   };
 };
-var build$1 = function build(customField, queryEngineConfig, dataSet, _queryHasDimension, params) {
+var build$2 = function build(customField, queryEngineConfig, dataSet, _queryHasDimension, params) {
   var _params$filterConfig$, _params$filterConfig, _customField$numerato, _customField$numerato2, _customField$denomina, _customField$denomina2;
   var localAndDashboardFilters = fromFilterConfig(params.filterConfig, dataSet, params.timeRangeOptions);
   var _buildPercentageFilte = buildPercentageFilters(addAndFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.advancedFilter) != null ? _params$filterConfig$ : [], localAndDashboardFilters), customField),
@@ -1814,110 +2016,6 @@ function buildPercentageFilters(filters, customField) {
   };
 }
 
-var ValidationError = /*#__PURE__*/function (_Error) {
-  function ValidationError(message) {
-    var _this;
-    _this = _Error.call(this, message) || this; // (1)
-    _this.name = 'ValidationError'; // (2)
-    return _this;
-  }
-  _inheritsLoose(ValidationError, _Error);
-  return ValidationError;
-}( /*#__PURE__*/_wrapNativeSuper(Error));
-
-var VariableNotFoundForVariables = /*#__PURE__*/function (_ValidationError) {
-  function VariableNotFoundForVariables(variableList, missingVariableId) {
-    var _this;
-    _this = _ValidationError.call(this, "\n    An expected variable is missing from the defined Variables.\n\n    Missing '" + missingVariableId + "'. Got;\n    " + JSON.stringify(variableList) + "\n  ") || this;
-    _this.missingVariableId = void 0;
-    _this.name = 'VariableNotFoundForVariables';
-    _this.missingVariableId = missingVariableId;
-    return _this;
-  }
-  _inheritsLoose(VariableNotFoundForVariables, _ValidationError);
-  var _proto = VariableNotFoundForVariables.prototype;
-  _proto.getMissingFieldId = function getMissingFieldId() {
-    return this.missingVariableId;
-  };
-  return VariableNotFoundForVariables;
-}(ValidationError);
-
-var detect = function detect(input) {
-  var regex = /\{\{\s*([^\s{}][^{}]*?)\s*\}\}/g;
-  var matches = [];
-  var match;
-  while ((match = regex.exec(input)) !== null) {
-    matches.push(match[1].trim());
-  }
-  return matches.length > 0 ? matches : undefined;
-};
-var build$2 = function build(variables) {
-  if (variables) {
-    var dashboardDefinedVariables = variables();
-    logInfo('Detected variables', dashboardDefinedVariables);
-    return dashboardDefinedVariables;
-  }
-  return {};
-};
-var findVariable = function findVariable(value, detect, variableList) {
-  if (!variableList) return undefined;
-
-  // Use the detect function to check if the value is a variable
-  var variables = detect(value);
-
-  // If no variables are detected, return early
-  if (!variables || variables.length === 0) {
-    return undefined; // Early return if the value is not a variable
-  }
-  var matchedVariables = [];
-
-  // Check for matching variables in the variable list
-  for (var _iterator = _createForOfIteratorHelperLoose(variables), _step; !(_step = _iterator()).done;) {
-    var variable = _step.value;
-    var variableEntry = variableList[variable];
-    if (variableEntry) {
-      // If the variable is found but its value is undefined or empty, throw an error
-      if (variableEntry.value === undefined || variableEntry.value === '') {
-        throw new Error("Variable '" + variable + "' is defined in the list but has no value.");
-      }
-
-      // Add the variable to the matched variables list
-      matchedVariables.push(variable);
-    }
-  }
-
-  // If no matches are found, throw an error
-  if (matchedVariables.length === 0 && value) {
-    throw new VariableNotFoundForVariables(variableList, value);
-  }
-  return matchedVariables.length > 0 ? matchedVariables : undefined;
-};
-var useValue = function useValue(value, variables) {
-  if (typeof value === 'string') {
-    var valueHasVariables = detect(value);
-    if (valueHasVariables && variables) {
-      for (var _iterator2 = _createForOfIteratorHelperLoose(valueHasVariables), _step2; !(_step2 = _iterator2()).done;) {
-        var key = _step2.value;
-        if (key in variables) {
-          return extractValue(variables, key);
-        }
-      }
-    }
-  }
-  return value;
-};
-var validate = function validate(value, variables) {
-  try {
-    findVariable(value, detect, variables);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-function extractValue(variables, key) {
-  return variables[key].value;
-}
-
 var init$2 = function init(publicName, leftFieldId, operator, rightFieldId, queryEngineConfig) {
   return {
     id: generateId(),
@@ -2466,7 +2564,7 @@ var isCustomField = function isCustomField(field) {
  */
 var toQueryMeasure = function toQueryMeasure(measureAttribute, customField, queryEngineConfig, dataSet, queryHasDimension, params) {
   if (isPercentageField(customField)) {
-    return build$1(customField, queryEngineConfig, dataSet, queryHasDimension, params);
+    return build$2(customField, queryEngineConfig, dataSet, queryHasDimension, params);
   }
   if (isRules(customField)) {
     return build$6(measureAttribute, customField, queryEngineConfig, dataSet, params);
@@ -2533,790 +2631,6 @@ var upcast = function upcast(maybeOldCustomField) {
   return maybeOldCustomField;
 };
 
-var filterIsDate = function filterIsDate(filter) {
-  var isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
-  if (!isoDateRegex.test(filter.value)) {
-    return false;
-  }
-  var date = new Date(filter.value);
-  if (isNaN(date.getTime())) {
-    return false;
-  }
-
-  // Additional check to verify that the date parts match exactly
-  var _filter$value$split$ = filter.value.split('T')[0].split('-').map(Number),
-    year = _filter$value$split$[0],
-    month = _filter$value$split$[1],
-    day = _filter$value$split$[2];
-  if (date.getUTCFullYear() !== year || date.getUTCMonth() + 1 !== month || date.getUTCDate() !== day) {
-    return false;
-  }
-  return true;
-};
-
-var addAndFilters = function addAndFilters(filter, filterToAddToAll) {
-  if (!filter || isEmpty$2(filter)) filter = [[]];
-  return [].concat(filter).map(function (andFilter) {
-    return [].concat(andFilter, filterToAddToAll);
-  });
-};
-var filterAttributeToQueryFilter = function filterAttributeToQueryFilter(filters, queryEngineConfig, dataSet, params) {
-  return filters.map(function (andFilters) {
-    return [].concat(andFilters).flatMap(function (andFilter) {
-      var _andFilter$function;
-      // Stop unsupported time functions being used.
-      if (andFilter["function"] && !isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, andFilter["function"])) {
-        throw "Query engine does not support the query function " + andFilter["function"] + ".";
-      }
-      var dataSetField = findField(dataSet, andFilter.field);
-      var field = {
-        type: 'field',
-        value: andFilter.field,
-        "function": (_andFilter$function = andFilter["function"]) != null ? _andFilter$function : 'none'
-      };
-      if (isCustomField(dataSetField)) {
-        var _andFilter$function2;
-        field = toQueryMeasure({
-          field: dataSetField.id,
-          "function": (_andFilter$function2 = andFilter["function"]) != null ? _andFilter$function2 : 'none'
-        }, dataSetField, queryEngineConfig, dataSet, false, params);
-      }
-      // If `array_contains` operation has multiple. Then split these out into individual
-      // checks.
-      if ((andFilter.op == 'array_contains' || andFilter.op == 'array_does_not_contain') && Array.isArray(andFilter.value)) {
-        return [].concat(andFilter.value).map(function (value) {
-          return {
-            field: field,
-            op: andFilter.op,
-            value: value
-          };
-        });
-      }
-      var value = useValue(andFilter.value, params.variables);
-      if (isRelativeDateDefined(andFilter.value)) {
-        value = calculateRelativeDate(andFilter.value);
-      }
-      if (filterIsDate(andFilter)) {
-        value = getUTCDate(andFilter.value);
-      }
-      return [{
-        field: field,
-        op: andFilter.op,
-        value: value
-      }];
-    });
-  });
-};
-var isAvailable = function isAvailable(filter) {
-  return filter && isArray(filter) && isArray(filter[0]);
-};
-var isAdditionalFilter = function isAdditionalFilter(value) {
-  return value && isArray(value) && isArray(value[0]) && 'field' in value[0][0] && 'op' in value[0][0] && 'value' in value[0][0];
-};
-
-var groupFilters = function groupFilters(dataSets) {
-  var groups = {};
-  dataSets.forEach(function (dataSet) {
-    if (dataSet && dataSet.fields) {
-      dataSet.fields.forEach(function (dataSetField) {
-        (dataSetField.dashboardRequiredFilterGroups || []).forEach(function (filterGroup) {
-          var key = filterGroup.publicName + " - " + dataSetField.dataType;
-          groups[key] = [].concat(groups[key] || [], [{
-            publicName: filterGroup.publicName,
-            dataSetField: dataSetField,
-            dataSetId: dataSet.id
-          }]);
-        });
-      });
-    } else {
-      logError('DataSet is undefined or does not have fields', dataSet);
-    }
-  });
-  return Object.values(groups);
-};
-var fromDashboardRequiredFilterGroups = function fromDashboardRequiredFilterGroups(dataSets) {
-  var groupedFilters = groupFilters(dataSets);
-  return groupedFilters.map(function (group) {
-    return {
-      type: group[0].dataSetField.dataType == 'date_time' ? DATE_FILTER : SINGLE_SELECT_FILTER,
-      managedByConfiguration: true,
-      requiresValue: true,
-      title: group[0].publicName,
-      appliesToFields: group.map(function (g) {
-        return {
-          dataSetId: g.dataSetId,
-          fieldId: g.dataSetField.id
-        };
-      }),
-      value: null
-    };
-  });
-};
-
-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()
-});
-var optionsFiltersSchema = function optionsFiltersSchema(queryEngineConfig) {
-  return Joi.object().pattern(Joi.string(),
-  // keys of the object
-  Joi.array().items(filterSchema(queryEngineConfig)).optional());
-};
-var sharedAdditionalFilterSchema = function sharedAdditionalFilterSchema(queryEngineConfig) {
-  return {
-    title: Joi.string().allow(''),
-    managedByConfiguration: Joi["boolean"]().optional(),
-    requiresValue: Joi["boolean"]().optional(),
-    optionsFilters: optionsFiltersSchema(queryEngineConfig).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()),
-      label: Joi.string()
-    })).optional()
-  };
-};
-var selectFilterSchema = function selectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
-    type: Joi.valid(SINGLE_SELECT_FILTER).required(),
-    value: Joi.alternatives(Joi.string(), Joi.number(), Joi["boolean"](), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]))
-  }));
-};
-var multiSelectFilterSchema = function multiSelectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
-    type: Joi.valid(MULTI_SELECT_FILTER).required(),
-    value: Joi.alternatives(Joi.array().items(Joi.string(), Joi.number()).single(), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))))
-  }));
-};
-var advancedFilterSchema = function advancedFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
-    type: Joi.valid(ADVANCED_FILTER).required(),
-    value: advancedFilterValueSchema(queryEngineConfig, shouldAlwaysHaveValue)
-  }));
-};
-var advancedFilterValueSchema = function advancedFilterValueSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.alternatives(Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))));
-};
-var dateTimeFilterSchema = function dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, type) {
-  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
-    type: Joi.valid(type).required(),
-    inclusiveDate: Joi["boolean"]().optional(),
-    allowTimeSelection: Joi["boolean"]().optional(),
-    value: Joi.alternatives(Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.object({
-      type: Joi.valid('fixedRange'),
-      before: Joi.alternatives(Joi.date()).required(),
-      after: Joi.alternatives(Joi.date()).required()
-    }), Joi.object({
-      type: Joi.valid('relative'),
-      value: Joi.string()
-    }), Joi.object({
-      type: Joi.valid('relativeRange'),
-      filters: Joi.array()
-    }))
-  }));
-};
-var numberFilterSchema = function numberFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
-    type: Joi.valid(NUMERIC_FILTER).required(),
-    value: Joi.alternatives(Joi.object({
-      op: Joi.allow('=', '<', '>', '<=', '>='),
-      value: Joi.number().allow(null, 0)
-    }), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]))
-  }));
-};
-var additionalFilterSchema = function additionalFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
-  return Joi.alternatives().conditional('.type', {
-    is: SINGLE_SELECT_FILTER,
-    then: selectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
-  }).conditional('.type', {
-    is: DATE_FILTER,
-    then: dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, DATE_FILTER)
-  }).conditional('.type', {
-    is: DATE_AND_TIME_FILTER,
-    then: dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, DATE_AND_TIME_FILTER)
-  }).conditional('.type', {
-    is: MULTI_SELECT_FILTER,
-    then: multiSelectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
-  }).conditional('.type', {
-    is: NUMERIC_FILTER,
-    then: numberFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
-  }).conditional('.type', {
-    is: ADVANCED_FILTER,
-    then: advancedFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
-  });
-};
-function globalFilterSchema(queryEngineConfig) {
-  return Joi.array().items(Joi.custom(function (value, helpers) {
-    if (!queryEngineConfig) {
-      return helpers.error('any.invalid');
-    }
-    var schema = additionalFilterSchema(queryEngineConfig, !!value.requiresValue);
-    var _schema$validate = schema.validate(value),
-      error = _schema$validate.error;
-    if (error) {
-      return helpers.error('any.invalid', {
-        message: error.message
-      });
-    }
-    return value;
-  })).required();
-}
-
-var Clause = /*#__PURE__*/function (Clause) {
-  Clause["AND_WHERE"] = "andWhere";
-  Clause["OR_WHERE"] = "orWhere";
-  Clause["WHERE"] = "where";
-  return Clause;
-}({});
-
-// export type WhereClause = SqlAST.MultiWhereToken<any>;
-
-var filterConfigToWhere = function filterConfigToWhere(dataSet, queryEngineConfig, params) {
-  if (!params) return undefined;
-  var filterConfig = params.filterConfig;
-  if (!params || !filterConfig || (!filterConfig.globalFilters || filterConfig.globalFilters.length === 0) && (!filterConfig.localFilters || filterConfig.localFilters.length === 0) && (!filterConfig.advancedFilter || filterConfig.advancedFilter.length === 0 || filterConfig.advancedFilter.every(function (arr) {
-    return arr.length === 0;
-  }))) {
-    return undefined;
-  }
-  var dash = buildAndWhere(dataSet, queryEngineConfig, params, filterConfig.globalFilters);
-  var local = buildAndWhere(dataSet, queryEngineConfig, params, filterConfig.localFilters);
-  var advancedFilters = buildFromFiltersArray(dataSet, queryEngineConfig, params, filterConfig.advancedFilter);
-  var combinedAndWhere = [dash, local, advancedFilters].filter(Boolean).filter(function (whereClause) {
-    return whereClause && whereClause.value.length > 0;
-  });
-  if (combinedAndWhere.length === 0) return undefined;
-  return {
-    type: Clause.AND_WHERE,
-    value: combinedAndWhere
-  };
-};
-var buildAndWhere = function buildAndWhere(dataSet, queryEngineConfig, params, additionalFilters) {
-  if (!additionalFilters || additionalFilters.length === 0) return undefined;
-  var whereClauses = [];
-  additionalFilters.forEach(function (additionalFilter) {
-    if (additionalFilter.type === DATE_AND_TIME_FILTER || additionalFilter.type === DATE_FILTER) {
-      toRelativeQueryAttributesFilters(additionalFilter, dataSet).forEach(function (f) {
-        whereClauses.push(buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params));
-      });
-    }
-    if (Array.isArray(additionalFilter.value) && additionalFilter.value.length > 1 && isAdditionalFilter(additionalFilter.value)) {
-      additionalFilter.appliesToFields.flatMap(function (field) {
-        if (field.dataSetId != dataSet.id) return [];
-        var convertedToWhere = buildFromFiltersArray(dataSet, queryEngineConfig, params, additionalFilter.value);
-        if (convertedToWhere) {
-          whereClauses.push(convertedToWhere);
-        }
-        return;
-      });
-    } else {
-      toQueryAttributesFilter(dataSet, additionalFilter, params.timeRangeOptions).forEach(function (f) {
-        whereClauses.push(buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params));
-      });
-    }
-  });
-  return {
-    type: Clause.AND_WHERE,
-    value: whereClauses
-  };
-};
-var buildWhereFromSingleFilter = function buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params) {
-  var field;
-  if (f["function"] && !isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, f["function"])) {
-    throw "Query engine does not support the query function " + f["function"] + ".";
-  }
-  var dataSetField = findField(dataSet, f.field);
-  if (isCustomField(dataSetField)) {
-    var _f$function;
-    field = toQueryMeasure({
-      field: dataSetField.id,
-      "function": (_f$function = f["function"]) != null ? _f$function : 'none'
-    }, dataSetField, queryEngineConfig, dataSet, false, params);
-  } else {
-    var _decodedField$functio;
-    var decodedField = decodeId(f.field, queryEngineConfig);
-    field = {
-      type: 'field',
-      value: decodedField.field,
-      "function": (_decodedField$functio = decodedField["function"]) != null ? _decodedField$functio : 'none'
-    };
-  }
-  if ((f.op == 'array_contains' || f.op == 'array_does_not_contain') && Array.isArray(f.value)) {
-    return arrayContainsFilters(f, dataSet, queryEngineConfig, params);
-  }
-  var value = useValue(f.value, params.variables);
-  if (isRelativeDateDefined(f.value)) {
-    value = calculateRelativeDate(f.value);
-  }
-  if (filterIsDate(f)) {
-    value = getUTCDate(f.value);
-  }
-  return {
-    type: Clause.WHERE,
-    value: {
-      op: f.op,
-      value: value,
-      field: field
-    }
-  };
-};
-var buildFromFiltersArray = function buildFromFiltersArray(dataSet, queryEngineConfig, params, filters) {
-  if (!filters || filters.length === 0 || filters.every(function (arr) {
-    return arr.length === 0;
-  })) {
-    return undefined;
-  }
-  if (filters.length === 1) return buildFromFilters(filters[0], dataSet, queryEngineConfig, params);
-  return {
-    type: Clause.OR_WHERE,
-    value: filters.map(function (filter) {
-      return buildFromFilters(filter, dataSet, queryEngineConfig, params);
-    })
-  };
-};
-var buildFromFilters = function buildFromFilters(filter, dataSet, queryEngineConfig, params) {
-  return {
-    type: Clause.AND_WHERE,
-    value: filter.map(function (filter) {
-      if ((filter.op == 'array_contains' || filter.op == 'array_does_not_contain') && Array.isArray(filter.value)) {
-        return arrayContainsFilters(filter, dataSet, queryEngineConfig, params);
-      }
-      return buildWhereFromSingleFilter(dataSet, filter, queryEngineConfig, params);
-    })
-  };
-};
-var arrayContainsFilters = function arrayContainsFilters(filter, dataSet, queryEngineConfig, params) {
-  return {
-    type: Clause.AND_WHERE,
-    value: [].concat(filter.value).map(function (value) {
-      return buildWhereFromSingleFilter(dataSet, _extends({}, filter, {
-        value: value
-      }), queryEngineConfig, params);
-    })
-  };
-};
-
-var addMeasure = function addMeasure(current, toAdd) {
-  return [[].concat(current, [toAdd]), current.length];
-};
-var buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measureAttr, orderAttr, dimensionAttr, timeDimensionAttr, limitAttr, offsetAttr, queryEngineConfig, params, prebuiltFilters) {
-  var measureDescription = [];
-  var measure = [];
-  var group = [];
-  var order = [];
-  var filters = buildFilters(dataSet, queryEngineConfig, params, prebuiltFilters);
-  if (timeDimensionAttr) {
-    // Add the measure for the time field.
-    var addedAt = undefined;
-
-    // Stop unsupported time trunc functions being used.
-    if (!isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, timeDimensionAttr.truncate)) {
-      throw "Query engine does not support the time trunc function " + timeDimensionAttr.truncate + ".";
-    }
-    var _addMeasure = addMeasure(measure, {
-      type: 'field',
-      value: timeDimensionAttr.field,
-      "function": timeDimensionAttr.truncate
-    });
-    measure = _addMeasure[0];
-    addedAt = _addMeasure[1];
-    measureDescription = [].concat(measureDescription, [{
-      functionId: timeDimensionAttr.truncate,
-      field: findField(dataSet, timeDimensionAttr.field)
-    }]);
-    group = [].concat(group, [{
-      index: addedAt
-    }]);
-  }
-  dimensionAttr.forEach(function (dimension) {
-    // Add the measure for the time field.
-    var addedAt = undefined;
-    var _addMeasure2 = addMeasure(measure, {
-      type: 'field',
-      value: dimension == null ? void 0 : dimension.field,
-      "function": dimension["function"]
-    });
-    measure = _addMeasure2[0];
-    addedAt = _addMeasure2[1];
-    measureDescription = [].concat(measureDescription, [{
-      functionId: dimension["function"],
-      field: findField(dataSet, dimension.field)
-    }]);
-    group = [].concat(group, [{
-      index: addedAt
-    }]);
-  });
-  measureAttr.forEach(function (individualMeasure) {
-    // Stop unsupported aggregate functions being used.
-    if (!isSupportedAggregateFunction(queryEngineConfig.supportedAggregates, individualMeasure["function"])) {
-      throw "Query engine does not support the query function " + individualMeasure["function"] + ".";
-    }
-    var _addMeasure3 = addMeasure(measure, {
-      type: 'field',
-      value: individualMeasure.field,
-      "function": individualMeasure["function"]
-    });
-    measure = _addMeasure3[0];
-    measureDescription = [].concat(measureDescription, [{
-      functionId: individualMeasure["function"],
-      field: findField(dataSet, individualMeasure.field)
-    }]);
-  });
-  orderAttr.forEach(function (apiQueryOrderItem) {
-    var index = measure.findIndex(function (individualMeasure) {
-      if (individualMeasure.type == 'field') {
-        var sameFunction = individualMeasure["function"] == apiQueryOrderItem["function"];
-        // const isTimeFunc = Object.keys(queryEngineConfig.supportedTimeTruncFunctions).includes(
-        //   individualMeasure.function
-        // );
-        var sameField = individualMeasure.value == apiQueryOrderItem.field;
-        return sameField && sameFunction;
-
-        // return found;
-      }
-      return false;
-    });
-    if (index >= 0) {
-      order = [].concat(order, [{
-        index: index,
-        direction: apiQueryOrderItem.direction
-      }]);
-    }
-  });
-  measure = measure.map(function (measure) {
-    if (measure.type == 'field' && typeof measure.value == 'string') {
-      var dataSetField = findField(dataSet, measure.value);
-      if (isCustomField(dataSetField)) {
-        var customMeasure = toQueryMeasure({
-          "function": measure["function"],
-          field: measure.value
-        }, dataSetField, queryEngineConfig, dataSet, hasDimensions({
-          group: group
-        }), params);
-        return customMeasure;
-      }
-    }
-    return measure;
-  });
-  return {
-    query: {
-      type: 'query',
-      dataSetId: dataSet.id,
-      measure: measure,
-      group: group,
-      // TODO: Fix this type
-      filter: filters,
-      order: order,
-      limit: limitAttr,
-      offset: offsetAttr
-    },
-    measureDescription: measureDescription
-  };
-};
-var buildFilters = function buildFilters(dataSet, queryEngineConfig, params, prebuiltFilters) {
-  if (prebuiltFilters && prebuiltFilters.length > 0) {
-    var filter = [];
-    prebuiltFilters.forEach(function (andFilters) {
-      var newAndFilters = filterAttributeToQueryFilter([andFilters], queryEngineConfig, dataSet, params);
-      filter = [].concat(filter, [newAndFilters[0]]);
-    });
-    return filter;
-  }
-  var whereClause = filterConfigToWhere(dataSet, queryEngineConfig, params);
-  if (whereClause) return whereClause;
-  return [];
-};
-
-var build$a = buildFromQueryAttributes;
-var hasDimensions = function hasDimensions(query) {
-  return query.group.length > 0;
-};
-var buildPreAggregatedPreparedQuery = function buildPreAggregatedPreparedQuery(query, dataSet) {
-  return {
-    query: query,
-    resultFields: dataSet.fields.map(function (field) {
-      return {
-        id: field.id,
-        publicName: field.publicName,
-        dataType: field.dataType,
-        fieldId: field.id,
-        "function": 'none',
-        outputDataType: field.dataType
-      };
-    })
-  };
-};
-var buildUniqueArrayValuesPreparedQuery = function buildUniqueArrayValuesPreparedQuery(dataSetId, dataSetField, optionsFilters) {
-  return {
-    query: {
-      type: 'preparedQuery',
-      preparedQueryType: 'uniqueArrayValues',
-      dataSetId: dataSetId,
-      fieldId: dataSetField.id,
-      filter: optionsFilters || []
-    },
-    resultFields: [{
-      id: dataSetField.id,
-      publicName: dataSetField.publicName,
-      dataType: dataSetField.dataType,
-      fieldId: dataSetField.id,
-      "function": 'none',
-      outputDataType: 'string'
-    }]
-  };
-};
-var buildFilterQuery = function buildFilterQuery(dataSet, fieldId, optionsFilters, optionsOrders) {
-  var measure = [{
-    field: fieldId,
-    "function": 'count'
-  }];
-  var order = optionsOrders != null ? optionsOrders : [];
-  var filter = optionsFilters ? [optionsFilters] : [];
-  var dimension = [{
-    field: fieldId,
-    "function": 'none'
-  }];
-  var timeDimension = null;
-  var limit = 5000;
-  return {
-    dataSetId: dataSet.id,
-    measure: measure,
-    order: order,
-    filter: filter,
-    dimension: dimension,
-    timeDimension: timeDimension,
-    limit: limit,
-    offset: 0
-  };
-};
-var supportsFeature = function supportsFeature(queryEngineConfig, feature) {
-  return queryEngineConfig.supportedFeatures.includes(feature);
-};
-var toDataSetDashboardFilters = function toDataSetDashboardFilters(dataSets, additionalFilters, dateFilterOptions) {
-  var dashboardFilters = {};
-  dataSets.forEach(function (dataSet) {
-    var filtered = additionalFilters.filter(function (filter) {
-      return filter.appliesToFields.find(function (field) {
-        return field.dataSetId === dataSet.id;
-      });
-    }).map(function (filter) {
-      return toQueryAttributesFilter(dataSet, filter, dateFilterOptions);
-    });
-    dashboardFilters[dataSet.id] = filtered;
-  });
-  return dashboardFilters;
-};
-function addGlobalFiltersToQueries(queries, dashboardFilters) {
-  var enhancedQueries = queries;
-  if (dashboardFilters) {
-    enhancedQueries.map(function (query) {
-      var flattenedFilters = dashboardFilters[query.dataSetId].flat();
-      if (flattenedFilters.length === 0) return;
-      query.filter.push(flattenedFilters);
-      return;
-    });
-  }
-  return enhancedQueries;
-}
-
-var FieldNotFoundInDataSet = /*#__PURE__*/function (_ValidationError) {
-  function FieldNotFoundInDataSet(dataSet, missingFieldId) {
-    var _this;
-    _this = _ValidationError.call(this, "\n    An expected field is missing from a dataSet.\n\n    Missing '" + missingFieldId + "'. Got;\n    " + JSON.stringify(dataSet) + "\n  ") || this;
-    _this.missingFieldId = void 0;
-    _this.name = 'FieldNotFoundInDataSet';
-    _this.missingFieldId = missingFieldId;
-    return _this;
-  }
-  _inheritsLoose(FieldNotFoundInDataSet, _ValidationError);
-  var _proto = FieldNotFoundInDataSet.prototype;
-  _proto.getMissingFieldId = function getMissingFieldId() {
-    return this.missingFieldId;
-  };
-  return FieldNotFoundInDataSet;
-}(ValidationError);
-
 var _doMerge = function doMerge(a, b) {
   return mergeWith({}, a, b, function (objValue, srcValue) {
     if (isArray(srcValue)) return srcValue;
@@ -3493,6 +2807,186 @@ var setAttributes = function setAttributes(attributes, partialAttributes, schema
   return validAttributes;
 };
 
+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 conditionalFormattingRuleSchema = function conditionalFormattingRuleSchema(queryEngineConfig) {
   return Joi.object({
     filters: Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig)).required().max(1)).required().max(1),
@@ -14879,7 +14373,7 @@ var Code = function Code(_ref12) {
   }));
 };
 
-var supportsFeature$1 = function supportsFeature(queryEngineConfig, feature) {
+var supportsFeature = function supportsFeature(queryEngineConfig, feature) {
   return [].concat(queryEngineConfig.supportedFeatures).includes(feature);
 };
 
@@ -14959,7 +14453,7 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   showSavingIndicator: true,
   disablePersistingGlobalFiltersLocally: false
 };
-var build$b = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
+var build$a = function build(partialFeatureToggles, queryEngineConfig, mode, scope) {
   var featureToggles = {};
   featureToggles = _extends({}, END_USER_DEFAULT_FEATURE_TOGGLES, featureToggles, partialFeatureToggles);
   if (mode == 'admin') {
@@ -14983,22 +14477,22 @@ var build$b = function build(partialFeatureToggles, queryEngineConfig, mode, sco
     featureToggles.showSavingIndicator = false;
     featureToggles.disablePersistingGlobalFiltersLocally = (_featureToggles$disab = featureToggles.disablePersistingGlobalFiltersLocally) != null ? _featureToggles$disab : false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'simpleMaths')) {
+  if (!supportsFeature(queryEngineConfig, 'simpleMaths')) {
     featureToggles.allowSimpleMathsCustomField = false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'aggregateMaths')) {
+  if (!supportsFeature(queryEngineConfig, 'aggregateMaths')) {
     featureToggles.allowAggregateMathsCustomField = false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'subquery')) {
+  if (!supportsFeature(queryEngineConfig, 'subquery')) {
     featureToggles.allowPercentagesCustomField = false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'switchField')) {
+  if (!supportsFeature(queryEngineConfig, 'switchField')) {
     featureToggles.allowRulesCustomField = false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'roundedNumbers')) {
+  if (!supportsFeature(queryEngineConfig, 'roundedNumbers')) {
     featureToggles.allowRoundedNumberCustomField = false;
   }
-  if (!supportsFeature$1(queryEngineConfig, 'dateMaths')) {
+  if (!supportsFeature(queryEngineConfig, 'dateMaths')) {
     featureToggles.allowDateCalculationsCustomField = false;
   }
   if (featureToggles.forceMobile) {
@@ -15053,6 +14547,155 @@ var removeField$3 = function removeField(component, fieldId) {
   return newComponent;
 };
 
+var groupFilters = function groupFilters(dataSets) {
+  var groups = {};
+  dataSets.forEach(function (dataSet) {
+    if (dataSet && dataSet.fields) {
+      dataSet.fields.forEach(function (dataSetField) {
+        (dataSetField.dashboardRequiredFilterGroups || []).forEach(function (filterGroup) {
+          var key = filterGroup.publicName + " - " + dataSetField.dataType;
+          groups[key] = [].concat(groups[key] || [], [{
+            publicName: filterGroup.publicName,
+            dataSetField: dataSetField,
+            dataSetId: dataSet.id
+          }]);
+        });
+      });
+    } else {
+      logError('DataSet is undefined or does not have fields', dataSet);
+    }
+  });
+  return Object.values(groups);
+};
+var fromDashboardRequiredFilterGroups = function fromDashboardRequiredFilterGroups(dataSets) {
+  var groupedFilters = groupFilters(dataSets);
+  return groupedFilters.map(function (group) {
+    return {
+      type: group[0].dataSetField.dataType == 'date_time' ? DATE_FILTER : SINGLE_SELECT_FILTER,
+      managedByConfiguration: true,
+      requiresValue: true,
+      title: group[0].publicName,
+      appliesToFields: group.map(function (g) {
+        return {
+          dataSetId: g.dataSetId,
+          fieldId: g.dataSetField.id
+        };
+      }),
+      value: null
+    };
+  });
+};
+
+var fieldSchema = /*#__PURE__*/Joi.object({
+  fieldId: /*#__PURE__*/Joi.string().required(),
+  dataSetId: /*#__PURE__*/Joi.string().required()
+});
+var optionsFiltersSchema = function optionsFiltersSchema(queryEngineConfig) {
+  return Joi.object().pattern(Joi.string(),
+  // keys of the object
+  Joi.array().items(filterSchema(queryEngineConfig)).optional());
+};
+var sharedAdditionalFilterSchema = function sharedAdditionalFilterSchema(queryEngineConfig) {
+  return {
+    title: Joi.string().allow(''),
+    managedByConfiguration: Joi["boolean"]().optional(),
+    requiresValue: Joi["boolean"]().optional(),
+    optionsFilters: optionsFiltersSchema(queryEngineConfig).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()),
+      label: Joi.string()
+    })).optional()
+  };
+};
+var selectFilterSchema = function selectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
+    type: Joi.valid(SINGLE_SELECT_FILTER).required(),
+    value: Joi.alternatives(Joi.string(), Joi.number(), Joi["boolean"](), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]))
+  }));
+};
+var multiSelectFilterSchema = function multiSelectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
+    type: Joi.valid(MULTI_SELECT_FILTER).required(),
+    value: Joi.alternatives(Joi.array().items(Joi.string(), Joi.number()).single(), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))))
+  }));
+};
+var advancedFilterSchema = function advancedFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
+    type: Joi.valid(ADVANCED_FILTER).required(),
+    value: advancedFilterValueSchema(queryEngineConfig, shouldAlwaysHaveValue)
+  }));
+};
+var advancedFilterValueSchema = function advancedFilterValueSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.alternatives(Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))));
+};
+var dateTimeFilterSchema = function dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, type) {
+  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
+    type: Joi.valid(type).required(),
+    inclusiveDate: Joi["boolean"]().optional(),
+    allowTimeSelection: Joi["boolean"]().optional(),
+    value: Joi.alternatives(Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]), Joi.object({
+      type: Joi.valid('fixedRange'),
+      before: Joi.alternatives(Joi.date()).required(),
+      after: Joi.alternatives(Joi.date()).required()
+    }), Joi.object({
+      type: Joi.valid('relative'),
+      value: Joi.string()
+    }), Joi.object({
+      type: Joi.valid('relativeRange'),
+      filters: Joi.array()
+    }))
+  }));
+};
+var numberFilterSchema = function numberFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.object(_extends({}, sharedAdditionalFilterSchema(queryEngineConfig), {
+    type: Joi.valid(NUMERIC_FILTER).required(),
+    value: Joi.alternatives(Joi.object({
+      op: Joi.allow('=', '<', '>', '<=', '>='),
+      value: Joi.number().allow(null, 0)
+    }), Joi.array().items(Joi.array().items(filterSchema(queryEngineConfig))), Joi.valid.apply(Joi, shouldAlwaysHaveValue ? [] : [null]))
+  }));
+};
+var additionalFilterSchema = function additionalFilterSchema(queryEngineConfig, shouldAlwaysHaveValue) {
+  return Joi.alternatives().conditional('.type', {
+    is: SINGLE_SELECT_FILTER,
+    then: selectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
+  }).conditional('.type', {
+    is: DATE_FILTER,
+    then: dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, DATE_FILTER)
+  }).conditional('.type', {
+    is: DATE_AND_TIME_FILTER,
+    then: dateTimeFilterSchema(queryEngineConfig, shouldAlwaysHaveValue, DATE_AND_TIME_FILTER)
+  }).conditional('.type', {
+    is: MULTI_SELECT_FILTER,
+    then: multiSelectFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
+  }).conditional('.type', {
+    is: NUMERIC_FILTER,
+    then: numberFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
+  }).conditional('.type', {
+    is: ADVANCED_FILTER,
+    then: advancedFilterSchema(queryEngineConfig, shouldAlwaysHaveValue)
+  });
+};
+function globalFilterSchema(queryEngineConfig) {
+  return Joi.array().items(Joi.custom(function (value, helpers) {
+    if (!queryEngineConfig) {
+      return helpers.error('any.invalid');
+    }
+    var schema = additionalFilterSchema(queryEngineConfig, !!value.requiresValue);
+    var _schema$validate = schema.validate(value),
+      error = _schema$validate.error;
+    if (error) {
+      return helpers.error('any.invalid', {
+        message: error.message
+      });
+    }
+    return value;
+  })).required();
+}
+
 var init$a = function init(displayTitle) {
   return {
     displayTitle: displayTitle,
@@ -15540,7 +15183,7 @@ var defaultDateFilterOptions = function defaultDateFilterOptions() {
   }
   return defaultDateFilterOptions;
 };
-var build$c = function build(textOverride, overrides) {
+var build$b = 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;
@@ -15874,7 +15517,7 @@ var init$b = function init(overrides, includeComponentTypes, excludeComponentTyp
       return _extends({}, defaultFormatMapping, overrides.defaultFormats ? overrides.defaultFormats() : {});
     },
     onEditorUpdate: overrides.onEditorUpdate ? overrides.onEditorUpdate : base.onEditorUpdate,
-    dateFilterOptions: build$c(textOverride, overrides.dateFilterOptions),
+    dateFilterOptions: build$b(textOverride, overrides.dateFilterOptions),
     onSave: overrides.onSave ? overrides.onSave : base.onSave,
     onScheduledReportChange: overrides.onScheduledReportChange || base.onScheduledReportChange,
     dashboardFilters: overrides.dashboardFilters ? overrides.dashboardFilters : base.dashboardFilters,
@@ -15928,7 +15571,7 @@ function useSubscription(callback, idOverride, deps) {
 var useFeatureTogglesSetup = function useFeatureTogglesSetup(mode, overrideFeatureToggles, queryEngineConfig, scope, id) {
   var base$1 = base;
   var buildInitialFeatureToggles = function () {
-    var updatedFeatureToggles = build$b(_.merge({}, base$1.featureToggles, overrideFeatureToggles), queryEngineConfig != null ? queryEngineConfig : base$1.queryEngineConfig, mode || base$1.mode, scope || base$1.scope);
+    var updatedFeatureToggles = build$a(_.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),
@@ -26272,6 +25915,334 @@ var filterStyles = /*#__PURE__*/Object.assign(function () {
   complete: complete
 });
 
+var Clause = /*#__PURE__*/function (Clause) {
+  Clause["AND_WHERE"] = "andWhere";
+  Clause["OR_WHERE"] = "orWhere";
+  Clause["WHERE"] = "where";
+  return Clause;
+}({});
+
+// export type WhereClause = SqlAST.MultiWhereToken<any>;
+
+var filterConfigToWhere = function filterConfigToWhere(dataSet, queryEngineConfig, params) {
+  if (!params) return undefined;
+  var filterConfig = params.filterConfig;
+  if (!params || !filterConfig || (!filterConfig.globalFilters || filterConfig.globalFilters.length === 0) && (!filterConfig.localFilters || filterConfig.localFilters.length === 0) && (!filterConfig.advancedFilter || filterConfig.advancedFilter.length === 0 || filterConfig.advancedFilter.every(function (arr) {
+    return arr.length === 0;
+  }))) {
+    return undefined;
+  }
+  var dash = buildAndWhere(dataSet, queryEngineConfig, params, filterConfig.globalFilters);
+  var local = buildAndWhere(dataSet, queryEngineConfig, params, filterConfig.localFilters);
+  var advancedFilters = buildFromFiltersArray(dataSet, queryEngineConfig, params, filterConfig.advancedFilter);
+  var combinedAndWhere = [dash, local, advancedFilters].filter(Boolean).filter(function (whereClause) {
+    return whereClause && whereClause.value.length > 0;
+  });
+  if (combinedAndWhere.length === 0) return undefined;
+  return {
+    type: Clause.AND_WHERE,
+    value: combinedAndWhere
+  };
+};
+var buildAndWhere = function buildAndWhere(dataSet, queryEngineConfig, params, additionalFilters) {
+  if (!additionalFilters || additionalFilters.length === 0) return undefined;
+  var whereClauses = [];
+  additionalFilters.forEach(function (additionalFilter) {
+    if (additionalFilter.type === DATE_AND_TIME_FILTER || additionalFilter.type === DATE_FILTER) {
+      toRelativeQueryAttributesFilters(additionalFilter, dataSet).forEach(function (f) {
+        whereClauses.push(buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params));
+      });
+    }
+    if (Array.isArray(additionalFilter.value) && additionalFilter.value.length > 1 && isAdditionalFilter(additionalFilter.value)) {
+      additionalFilter.appliesToFields.flatMap(function (field) {
+        if (field.dataSetId != dataSet.id) return [];
+        var convertedToWhere = buildFromFiltersArray(dataSet, queryEngineConfig, params, additionalFilter.value);
+        if (convertedToWhere) {
+          whereClauses.push(convertedToWhere);
+        }
+        return;
+      });
+    } else {
+      toQueryAttributesFilter(dataSet, additionalFilter, params.timeRangeOptions).forEach(function (f) {
+        whereClauses.push(buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params));
+      });
+    }
+  });
+  return {
+    type: Clause.AND_WHERE,
+    value: whereClauses
+  };
+};
+var buildWhereFromSingleFilter = function buildWhereFromSingleFilter(dataSet, f, queryEngineConfig, params) {
+  var field;
+  if (f["function"] && !isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, f["function"])) {
+    throw "Query engine does not support the query function " + f["function"] + ".";
+  }
+  var dataSetField = findField(dataSet, f.field);
+  if (isCustomField(dataSetField)) {
+    var _f$function;
+    field = toQueryMeasure({
+      field: dataSetField.id,
+      "function": (_f$function = f["function"]) != null ? _f$function : 'none'
+    }, dataSetField, queryEngineConfig, dataSet, false, params);
+  } else {
+    var _decodedField$functio;
+    var decodedField = decodeId(f.field, queryEngineConfig);
+    field = {
+      type: 'field',
+      value: decodedField.field,
+      "function": (_decodedField$functio = decodedField["function"]) != null ? _decodedField$functio : 'none'
+    };
+  }
+  if ((f.op == 'array_contains' || f.op == 'array_does_not_contain') && Array.isArray(f.value)) {
+    return arrayContainsFilters(f, dataSet, queryEngineConfig, params);
+  }
+  var value = useValue(f.value, params.variables);
+  if (isRelativeDateDefined(f.value)) {
+    value = calculateRelativeDate(f.value);
+  }
+  if (filterIsDate(f)) {
+    value = getUTCDate(f.value);
+  }
+  return {
+    type: Clause.WHERE,
+    value: {
+      op: f.op,
+      value: value,
+      field: field
+    }
+  };
+};
+var buildFromFiltersArray = function buildFromFiltersArray(dataSet, queryEngineConfig, params, filters) {
+  if (!filters || filters.length === 0 || filters.every(function (arr) {
+    return arr.length === 0;
+  })) {
+    return undefined;
+  }
+  if (filters.length === 1) return buildFromFilters(filters[0], dataSet, queryEngineConfig, params);
+  return {
+    type: Clause.OR_WHERE,
+    value: filters.map(function (filter) {
+      return buildFromFilters(filter, dataSet, queryEngineConfig, params);
+    })
+  };
+};
+var buildFromFilters = function buildFromFilters(filter, dataSet, queryEngineConfig, params) {
+  return {
+    type: Clause.AND_WHERE,
+    value: filter.map(function (filter) {
+      if ((filter.op == 'array_contains' || filter.op == 'array_does_not_contain') && Array.isArray(filter.value)) {
+        return arrayContainsFilters(filter, dataSet, queryEngineConfig, params);
+      }
+      return buildWhereFromSingleFilter(dataSet, filter, queryEngineConfig, params);
+    })
+  };
+};
+var arrayContainsFilters = function arrayContainsFilters(filter, dataSet, queryEngineConfig, params) {
+  return {
+    type: Clause.AND_WHERE,
+    value: [].concat(filter.value).map(function (value) {
+      return buildWhereFromSingleFilter(dataSet, _extends({}, filter, {
+        value: value
+      }), queryEngineConfig, params);
+    })
+  };
+};
+
+var addMeasure = function addMeasure(current, toAdd) {
+  return [[].concat(current, [toAdd]), current.length];
+};
+var buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measureAttr, orderAttr, dimensionAttr, timeDimensionAttr, limitAttr, offsetAttr, queryEngineConfig, params, prebuiltFilters) {
+  var measureDescription = [];
+  var measure = [];
+  var group = [];
+  var order = [];
+  var filters = buildFilters(dataSet, queryEngineConfig, params, prebuiltFilters);
+  if (timeDimensionAttr) {
+    // Add the measure for the time field.
+    var addedAt = undefined;
+
+    // Stop unsupported time trunc functions being used.
+    if (!isSupportedTimeTruncFunction(queryEngineConfig.supportedTimeTruncFunctions, timeDimensionAttr.truncate)) {
+      throw "Query engine does not support the time trunc function " + timeDimensionAttr.truncate + ".";
+    }
+    var _addMeasure = addMeasure(measure, {
+      type: 'field',
+      value: timeDimensionAttr.field,
+      "function": timeDimensionAttr.truncate
+    });
+    measure = _addMeasure[0];
+    addedAt = _addMeasure[1];
+    measureDescription = [].concat(measureDescription, [{
+      functionId: timeDimensionAttr.truncate,
+      field: findField(dataSet, timeDimensionAttr.field)
+    }]);
+    group = [].concat(group, [{
+      index: addedAt
+    }]);
+  }
+  dimensionAttr.forEach(function (dimension) {
+    // Add the measure for the time field.
+    var addedAt = undefined;
+    var _addMeasure2 = addMeasure(measure, {
+      type: 'field',
+      value: dimension == null ? void 0 : dimension.field,
+      "function": dimension["function"]
+    });
+    measure = _addMeasure2[0];
+    addedAt = _addMeasure2[1];
+    measureDescription = [].concat(measureDescription, [{
+      functionId: dimension["function"],
+      field: findField(dataSet, dimension.field)
+    }]);
+    group = [].concat(group, [{
+      index: addedAt
+    }]);
+  });
+  measureAttr.forEach(function (individualMeasure) {
+    // Stop unsupported aggregate functions being used.
+    if (!isSupportedAggregateFunction(queryEngineConfig.supportedAggregates, individualMeasure["function"])) {
+      throw "Query engine does not support the query function " + individualMeasure["function"] + ".";
+    }
+    var _addMeasure3 = addMeasure(measure, {
+      type: 'field',
+      value: individualMeasure.field,
+      "function": individualMeasure["function"]
+    });
+    measure = _addMeasure3[0];
+    measureDescription = [].concat(measureDescription, [{
+      functionId: individualMeasure["function"],
+      field: findField(dataSet, individualMeasure.field)
+    }]);
+  });
+  orderAttr.forEach(function (apiQueryOrderItem) {
+    var index = measure.findIndex(function (individualMeasure) {
+      if (individualMeasure.type == 'field') {
+        var sameFunction = individualMeasure["function"] == apiQueryOrderItem["function"];
+        // const isTimeFunc = Object.keys(queryEngineConfig.supportedTimeTruncFunctions).includes(
+        //   individualMeasure.function
+        // );
+        var sameField = individualMeasure.value == apiQueryOrderItem.field;
+        return sameField && sameFunction;
+
+        // return found;
+      }
+      return false;
+    });
+    if (index >= 0) {
+      order = [].concat(order, [{
+        index: index,
+        direction: apiQueryOrderItem.direction
+      }]);
+    }
+  });
+  measure = measure.map(function (measure) {
+    if (measure.type == 'field' && typeof measure.value == 'string') {
+      var dataSetField = findField(dataSet, measure.value);
+      if (isCustomField(dataSetField)) {
+        var customMeasure = toQueryMeasure({
+          "function": measure["function"],
+          field: measure.value
+        }, dataSetField, queryEngineConfig, dataSet, hasDimensions({
+          group: group
+        }), params);
+        return customMeasure;
+      }
+    }
+    return measure;
+  });
+  return {
+    query: {
+      type: 'query',
+      dataSetId: dataSet.id,
+      measure: measure,
+      group: group,
+      // TODO: Fix this type
+      filter: filters,
+      order: order,
+      limit: limitAttr,
+      offset: offsetAttr
+    },
+    measureDescription: measureDescription
+  };
+};
+var buildFilters = function buildFilters(dataSet, queryEngineConfig, params, prebuiltFilters) {
+  if (prebuiltFilters && prebuiltFilters.length > 0) {
+    var filter = [];
+    prebuiltFilters.forEach(function (andFilters) {
+      var newAndFilters = filterAttributeToQueryFilter([andFilters], queryEngineConfig, dataSet, params);
+      filter = [].concat(filter, [newAndFilters[0]]);
+    });
+    return filter;
+  }
+  var whereClause = filterConfigToWhere(dataSet, queryEngineConfig, params);
+  if (whereClause) return whereClause;
+  return [];
+};
+
+var build$c = buildFromQueryAttributes;
+var hasDimensions = function hasDimensions(query) {
+  return query.group.length > 0;
+};
+var buildPreAggregatedPreparedQuery = function buildPreAggregatedPreparedQuery(query, dataSet) {
+  return {
+    query: query,
+    resultFields: dataSet.fields.map(function (field) {
+      return {
+        id: field.id,
+        publicName: field.publicName,
+        dataType: field.dataType,
+        fieldId: field.id,
+        "function": 'none',
+        outputDataType: field.dataType
+      };
+    })
+  };
+};
+var buildUniqueArrayValuesPreparedQuery = function buildUniqueArrayValuesPreparedQuery(dataSetId, dataSetField, optionsFilters) {
+  return {
+    query: {
+      type: 'preparedQuery',
+      preparedQueryType: 'uniqueArrayValues',
+      dataSetId: dataSetId,
+      fieldId: dataSetField.id,
+      filter: optionsFilters || []
+    },
+    resultFields: [{
+      id: dataSetField.id,
+      publicName: dataSetField.publicName,
+      dataType: dataSetField.dataType,
+      fieldId: dataSetField.id,
+      "function": 'none',
+      outputDataType: 'string'
+    }]
+  };
+};
+var buildFilterQuery = function buildFilterQuery(dataSet, fieldId, optionsFilters, optionsOrders) {
+  var measure = [{
+    field: fieldId,
+    "function": 'count'
+  }];
+  var order = optionsOrders != null ? optionsOrders : [];
+  var filter = optionsFilters ? [optionsFilters] : [];
+  var dimension = [{
+    field: fieldId,
+    "function": 'none'
+  }];
+  var timeDimension = null;
+  var limit = 5000;
+  return {
+    dataSetId: dataSet.id,
+    measure: measure,
+    order: order,
+    filter: filter,
+    dimension: dimension,
+    timeDimension: timeDimension,
+    limit: limit,
+    offset: 0
+  };
+};
+
 /** Returns a key to be used in an useEffect dependency, that changes if there's any change to a field in a data set. */
 var watchDataSetFieldChanges = function watchDataSetFieldChanges(dataSet, queryable) {
   if ('dataSetId' in queryable) {
@@ -26376,12 +26347,12 @@ var useVariables = function useVariables(variables, dashboardId) {
     subscriptionChanges = _useState2[0],
     setSubscriptionChanges = _useState2[1];
   useEffect(function () {
-    var staticVariables = build$2(variables);
+    var staticVariables = build$1(variables);
     setVariablesState(staticVariables);
   }, [JSON.stringify(variables)]);
   useSubscription(function (data) {
     if (data.variables) {
-      var staticVariables = build$2(variables);
+      var staticVariables = build$1(variables);
       var updatedVariables = _extends({}, staticVariables, data.variables);
       logDebug('Updated variables', updatedVariables);
       setSubscriptionChanges(data.variables);
@@ -34825,8 +34796,6 @@ var showLegend = function showLegend(legend, verbose) {
   return false;
 };
 
-// import { hasMeasure } from '../../../shared-logic/src/Query';
-
 var EMPTY_METRICS = 'The Data settings are missing a Metric. Select from the list of Metrics to display the Chart.';
 var EMPTY_PARAMETER = 'The Data settings are missing a parameter. Select from the list of parameters to display the Chart.';
 function noMetricMessage(query) {
@@ -41599,7 +41568,7 @@ var AdminTools = function AdminTools(props) {
     onOpenConfigManagerUi = _useDashboardBehaviou.onOpenConfigManagerUi,
     disableToolbar = _useDashboardBehaviou.disableToolbar;
   var saveableDashboard = toSaveableDefinition(dashboard);
-  var supportsConfigManagerUi = supportsFeature$1(queryEngineConfig, 'configManagerUi') && onOpenConfigManagerUi;
+  var supportsConfigManagerUi = supportsFeature(queryEngineConfig, 'configManagerUi') && onOpenConfigManagerUi;
   useEffect(function () {
     var abortController = new AbortController();
     var trySave = /*#__PURE__*/function () {
@@ -47122,8 +47091,7 @@ var CustomView = function CustomView(_ref) {
   var component = _ref.component;
   var attributes = component.attributes;
   var _useDashboardBehaviou = useDashboardBehaviourContext(),
-    customViews = _useDashboardBehaviou.customViews,
-    dateFilterOptions = _useDashboardBehaviou.dateFilterOptions;
+    customViews = _useDashboardBehaviou.customViews;
   var _useDashboardContext = useDashboardContext(),
     dashboard = _useDashboardContext.dashboard;
   var FoundComponent = null;
@@ -47136,7 +47104,9 @@ var CustomView = function CustomView(_ref) {
     if (!FoundComponent) return null;
     var result = FoundComponent.Component({
       attributes: attributes,
-      dashboardFilters: toDataSetDashboardFilters(dashboard.dataSets, dashboard.globalFilters, dateFilterOptions)
+      filterConfig: {
+        globalFilters: dashboard.globalFilters
+      }
     });
     if (typeof result === 'string') {
       return jsx("div", {
@@ -60073,12 +60043,13 @@ var StaticCustomView = function StaticCustomView(_ref) {
     component = _ref.component;
   var _useDashboardContext = useDashboardContext(),
     dashboard = _useDashboardContext.dashboard;
-  var _useDashboardBehaviou = useDashboardBehaviourContext(),
-    dateFilterOptions = _useDashboardBehaviou.dateFilterOptions;
+  var _useDashboardBehaviou = useDashboardBehaviourContext();
   var renderComponent = function renderComponent() {
     var result = customView.Component({
       attributes: component.attributes,
-      dashboardFilters: toDataSetDashboardFilters(dashboard.dataSets, dashboard.globalFilters, dateFilterOptions)
+      filterConfig: {
+        globalFilters: dashboard.globalFilters
+      }
     });
     if (typeof result === 'string') {
       return jsx("div", {
@@ -71818,7 +71789,7 @@ function getOptionsOrders(dataSetField) {
 }
 
 var commonToQueries = function commonToQueries(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$a(dataSet, attributes.measure, attributes.order, attributes.dimension,
+  var _Query$build = build$c(dataSet, attributes.measure, attributes.order, attributes.dimension,
     // @ts-ignore
     attributes.timeDimension || null, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
@@ -71843,8 +71814,8 @@ var toQueries$6 = commonToQueries;
 var toQueries$7 = commonToQueries;
 
 var buildMainQueries = function buildMainQueries(attributes, dataSet, queryEngineConfig, params) {
-  var line = build$a(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
-  var bar = build$a(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var line = build$c(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var bar = build$c(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
   return {
     bar: bar,
     line: line
@@ -71871,8 +71842,8 @@ var toQueries$b = commonToQueries;
 var toQueries$c = commonToQueries;
 
 var buildMainQueries$1 = function buildMainQueries(attributes, dataSet, queryEngineConfig, params) {
-  var line = build$a(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
-  var bar = build$a(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var line = build$c(dataSet, attributes.lineMeasure, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var bar = build$c(dataSet, attributes.barMeasure, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
   return {
     bar: bar,
     line: line
@@ -71891,7 +71862,7 @@ var toQueries$d = function toQueries(attributes, dataSet, queryEngineConfig, par
 };
 
 var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$a(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
 
@@ -71919,7 +71890,7 @@ var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineCon
 };
 var buildDeltaQuery = function buildDeltaQuery(dataSet, attributes, queryEngineConfig, params) {
   if (!attributes.deltaTimeDimension) return null;
-  return build$a(dataSet, attributes.measure, [{
+  return build$c(dataSet, attributes.measure, [{
     field: attributes.deltaTimeDimension.field,
     direction: 'asc',
     "function": attributes.deltaTimeDimension.truncate
@@ -71951,7 +71922,7 @@ var toQueries$f = function toQueries(attributes, dataSet, queryEngineConfig, par
   var measures = [];
   attributes.xMeasure && measures.push(attributes.xMeasure);
   attributes.yMeasure && measures.push(attributes.yMeasure);
-  var _Query$build = build$a(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(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);
@@ -71965,7 +71936,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$a(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(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);
@@ -71977,7 +71948,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$a(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(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);
@@ -72093,6 +72064,7 @@ var buildVizzlyQuery = function buildVizzlyQuery(thing, queryEngineConfig, param
       var dataSet = find(params.dataSets, queryAttributes.dataSetId);
       if (!dataSet) throw 'Data set not found for query-attributes query';
       return _extends({}, queryAttributes, {
+        // TODO; this means that services queries that povide a query, cannot work... GTDEV-6947
         filter: [],
         whereClause: filterConfigToWhere(dataSet, queryEngineConfig, _extends({}, params, {
           filterConfig: _extends({}, params.filterConfig, {
@@ -73329,7 +73301,7 @@ var VizzlyServices = /*#__PURE__*/function () {
   _proto.query = /*#__PURE__*/function () {
     var _query = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(queries, params) {
       var _this2 = this;
-      var instanceId, service, enhancedQueries, queryEngineEndpoint, runQueriesCallback, fetch;
+      var instanceId, service, queryEngineEndpoint, runQueriesCallback, fetch;
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
@@ -73339,8 +73311,7 @@ var VizzlyServices = /*#__PURE__*/function () {
               instanceId = params.instanceId;
             }
             service = VizzlyServices._instanceStore[instanceId];
-            enhancedQueries = addGlobalFiltersToQueries(queries, params == null ? void 0 : params.dashboardFilters);
-            validateQuery(enhancedQueries, service.queryEngineConfig);
+            validateQuery(queries, service.queryEngineConfig);
             queryEngineEndpoint = function () {
               if (params != null && params.queryEngineEndpoint) {
                 return params.queryEngineEndpoint;
@@ -73355,7 +73326,7 @@ var VizzlyServices = /*#__PURE__*/function () {
               }
               return undefined;
             }();
-            runQueriesCallback = getRunQueriesCallback(service.identityConfig, service.queryEngineConfig, build$c(defaultText, params == null ? void 0 : params.dateFilterOptions), (params == null ? void 0 : params.variables) || {}, params == null ? void 0 : params.runQueries, params == null ? void 0 : params.data, queryEngineEndpoint);
+            runQueriesCallback = getRunQueriesCallback(service.identityConfig, service.queryEngineConfig, build$b(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;
@@ -73364,9 +73335,10 @@ var VizzlyServices = /*#__PURE__*/function () {
                     case 0:
                       _context10.prev = 0;
                       _context10.next = 3;
-                      return runQueriesCallback(enhancedQueries, {
+                      return runQueriesCallback(queries, {
                         abortSignal: params == null || (_params$abortControll = params.abortController) == null ? void 0 : _params$abortControll.signal,
-                        dataSets: _this2.dataSets
+                        dataSets: _this2.dataSets,
+                        filterConfig: params == null ? void 0 : params.filterConfig
                       });
                     case 3:
                       return _context10.abrupt("return", _context10.sent);
@@ -73385,14 +73357,14 @@ var VizzlyServices = /*#__PURE__*/function () {
                 return _ref.apply(this, arguments);
               };
             }();
-            _context11.next = 11;
+            _context11.next = 10;
             return fetch();
-          case 11:
+          case 10:
             _context11.t0 = _context11.sent;
             return _context11.abrupt("return", {
               results: _context11.t0
             });
-          case 13:
+          case 12:
           case "end":
             return _context11.stop();
         }
@@ -76323,7 +76295,7 @@ var GlobalProviderContents = function GlobalProviderContents(props) {
     }
   };
   var resolvedDateFilterOptions = (_props$dateFilterOpti = props.dateFilterOptions) != null ? _props$dateFilterOpti : props.dateTimeFilterOptions;
-  var runQueriesCallback = getRunQueriesCallback(session.identityConfig, session.queryEngineConfig, build$c(textOverride, resolvedDateFilterOptions), variables.variables, props.runQueries, props.data, props.queryEngineEndpoint, props.timeZone);
+  var runQueriesCallback = getRunQueriesCallback(session.identityConfig, session.queryEngineConfig, build$b(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) {
@@ -76540,7 +76512,7 @@ var index = {
   displayPositions: displayPositions,
   DataSetField: DataSetField
 };
-var VIRDIS_COLOR_PALETTE = ["#440154FF", "#414487FF", "#2A788EFF", "#22A884FF", "#7AD151FF", "#FDE725FF"];
+var VIRDIS_COLOR_PALETTE = ['#440154FF', '#414487FF', '#2A788EFF', '#22A884FF', '#7AD151FF', '#FDE725FF'];
 
 export default index;
 export { Dashboard$2 as Dashboard, DataSetField, Editor$1 as Editor, NewVizzlyImplementation, VIRDIS_COLOR_PALETTE, VizzlyState, VizzlyTheming, displayPositions, useVizzly, vizzlyState };