@vizzly/dashboard 0.15.0-dev-df6a888afc7272341aed2da83a5290bca83e406b → 0.15.0-dev-abd38c3135e9c81774564b32bbe7750a29cc6448

package/dist/dashboard.esm.js

@@ -1108,33 +1108,6 @@ var FieldNotFoundInDataSet = /*#__PURE__*/function (_ValidationError) {
   return FieldNotFoundInDataSet;
 }(ValidationError);
 
-var timeDimensionsConstants = QueryEngineConfig.Constants.timeDimensionsConstants;
-
-// All the aggregates Vizzly supports somewhere...
-// Not necessarily all the aggregates that are supported because each
-// integration could support different aggregates
-
-var id$1 = function id(metric) {
-  if (!(metric != null && metric.truncate) || (metric == null ? void 0 : metric.truncate) == 'none') return metric == null ? void 0 : metric.field;
-  return metric.field + "_" + metric.truncate;
-};
-var decodeId$1 = function decodeId(metric, supportedTimeTruncFunctions) {
-  var parts = metric.split('_');
-  var truncate = parts.pop();
-  if (truncate && !isSupportedTimeTruncFunction(supportedTimeTruncFunctions, truncate)) {
-    return null;
-  }
-  var field = parts.join('_');
-  return {
-    field: field,
-    truncate: truncate != null ? truncate : ''
-  };
-};
-var vizzlyManagedTimeDimensions = timeDimensionsConstants;
-var isSupportedTimeTruncFunction = function isSupportedTimeTruncFunction(supportedTimeFunctions, proposedFunction) {
-  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)) {
@@ -1369,103 +1342,6 @@ 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 : [[]];
-
-  // If array1 has more than one sub-array, loop through each sub-array in array1
-  if (validArray1.length > 1) {
-    return validArray1.map(function (subArray) {
-      return [].concat(validArray2[0] || [], subArray || []);
-    });
-  }
-  // Otherwise, if array2 has more than one sub-array, loop through array2
-  else if (validArray2.length > 1) {
-    return validArray2.map(function (subArray) {
-      return [].concat(validArray1[0] || [], subArray || []);
-    });
-  }
-  // Default: merge both single sub-arrays
-  else {
-    return [[].concat(validArray1[0] || [], validArray2[0] || [])];
-  }
-};
-function combineForCustomMetricFilters(filters, customFilters) {
-  var combinedFilters = [];
-  if (customFilters && isAvailable(customFilters)) {
-    customFilters.forEach(function (orFilterGroup) {
-      combinedFilters = [].concat(combinedFilters, addAndFilters(filters != null ? filters : [], orFilterGroup));
-    });
-  } else {
-    combinedFilters = filters != null ? filters : [];
-  }
-  return combinedFilters;
-}
-
-var generateId = function generateId() {
-  return v4().replace(/-/g, '');
-};
-
 /** Upcasts from an old global filter, to a new "additional filter" */
 var upcastToAdditionalFilter = function upcastToAdditionalFilter(globalFilter) {
   if (globalFilter.type == 'globalSelectFilter') {
@@ -1895,6 +1771,125 @@ var fromFilterConfig = function fromFilterConfig(filterConfig, dataSet, timeRang
   return filters;
 };
 
+var addAndFilters = function addAndFilters(filter, filterToAddToAll) {
+  if (isEmpty$2(filterToAddToAll)) return [].concat(filter);
+  if (!filter || isEmpty$2(filter)) filter = [[]];
+  return [].concat(filter).map(function (andFilter) {
+    return [].concat(andFilter, filterToAddToAll);
+  });
+};
+var filterAttributeToQueryFilter = function filterAttributeToQueryFilter(filterAttrs, queryEngineConfig, dataSet, params) {
+  var _params$filterConfig;
+  // Either build using the filter attributes passed in, or take the viewFilters in the filter config.
+  // They represent the same thing, however some view-filters are passed around in the filter config
+  // to reduce custom metrics arguments being passed around.
+  var filter = filterAttrs.length > 0 ? filterAttrs : ((_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.viewFilters) || [];
+  var extraFilters = fromFilterConfig(params.filterConfig, dataSet, params.timeRangeOptions);
+  var combinedFilters = addAndFilters(filter, extraFilters);
+  if (Array.isArray(filter)) {
+    return {
+      type: 'orWhere',
+      value: combinedFilters.map(function (andFilters) {
+        return {
+          type: 'andWhere',
+          value: andFilters.map(function (filter) {
+            var dataSetField = findField(dataSet, filter.field);
+            var field = {
+              type: 'field',
+              value: filter.field,
+              "function": filter["function"] || 'none'
+            };
+            if (isCustomField(dataSetField)) {
+              var _filter$function;
+              field = toQueryMeasure({
+                field: dataSetField.id,
+                "function": (_filter$function = filter["function"]) != null ? _filter$function : 'none'
+              }, dataSetField, queryEngineConfig, dataSet, false, params);
+            }
+
+            // If the value is an array, and we're checking that all values ARE or ARE NOT in a field, then we need to split
+            // out this check into multiple filters, as a value in a filter cannot be an array.
+            if ((filter.op == 'array_contains' || filter.op == 'array_does_not_contain') && Array.isArray(filter.value)) {
+              return {
+                type: 'andWhere',
+                value: [].concat(filter.value).map(function (value) {
+                  return {
+                    type: 'where',
+                    value: {
+                      field: field,
+                      op: filter.op,
+                      value: value
+                    }
+                  };
+                })
+              };
+            }
+            var value = useValue(filter.value, params.variables);
+            if (isRelativeDateDefined(filter.value)) {
+              value = calculateRelativeDate(filter.value);
+            }
+            if (filterIsDate(filter)) {
+              value = getUTCDate(filter.value);
+            }
+            return {
+              type: 'where',
+              value: {
+                field: field,
+                op: filter.op,
+                value: value
+              }
+            };
+          })
+        };
+      })
+    };
+  }
+  return filter;
+};
+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 : [[]];
+
+  // If array1 has more than one sub-array, loop through each sub-array in array1
+  if (validArray1.length > 1) {
+    return validArray1.map(function (subArray) {
+      return [].concat(validArray2[0] || [], subArray || []);
+    });
+  }
+  // Otherwise, if array2 has more than one sub-array, loop through array2
+  else if (validArray2.length > 1) {
+    return validArray2.map(function (subArray) {
+      return [].concat(validArray1[0] || [], subArray || []);
+    });
+  }
+  // Default: merge both single sub-arrays
+  else {
+    return [[].concat(validArray1[0] || [], validArray2[0] || [])];
+  }
+};
+function combineForCustomMetricFilters(filters, customFilters) {
+  var combinedFilters = [];
+  if (customFilters && isAvailable(customFilters)) {
+    customFilters.forEach(function (orFilterGroup) {
+      combinedFilters = [].concat(combinedFilters, addAndFilters(filters != null ? filters : [], orFilterGroup));
+    });
+  } else {
+    combinedFilters = filters != null ? filters : [];
+  }
+  return combinedFilters;
+}
+
+var generateId = function generateId() {
+  return v4().replace(/-/g, '');
+};
+
 /**
  * Creates a new custom percentage field.
  */
@@ -1921,7 +1916,7 @@ var init$1 = function init(publicName, denominatorFieldId, denominatorAggregate,
 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),
+  var _buildPercentageFilte = buildPercentageFilters(addAndFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.viewFilters) != null ? _params$filterConfig$ : [], localAndDashboardFilters), customField),
     combinedNominatorFilters = _buildPercentageFilte.combinedNominatorFilters,
     combinedDenominatorFilters = _buildPercentageFilte.combinedDenominatorFilters;
   var left = {
@@ -1943,24 +1938,36 @@ var build$2 = function build(customField, queryEngineConfig, dataSet, _queryHasD
       filter: filterAttributeToQueryFilter(combinedDenominatorFilters || [], queryEngineConfig, dataSet, params)
     }
   };
-  var denominatorForWithinGroupingScope = buildSide(right, isAvailable(customField.denominatorFilter) ? filterAttributeToQueryFilter(combinedDenominatorFilters, queryEngineConfig, dataSet, params) : []);
+  var denominatorForWithinGroupingScope = buildSide(right, isAvailable(customField.denominatorFilter) ? filterAttributeToQueryFilter(combinedDenominatorFilters, queryEngineConfig, dataSet, params) : {
+    type: 'andWhere',
+    value: []
+  });
   return {
     type: 'maths',
-    left: buildSide(left, isAvailable(customField.numeratorFilter) ? filterAttributeToQueryFilter(combinedNominatorFilters, queryEngineConfig, dataSet, params) : []),
+    left: buildSide(left, isAvailable(customField.numeratorFilter) ? filterAttributeToQueryFilter(combinedNominatorFilters, queryEngineConfig, dataSet, params) : {
+      type: 'andWhere',
+      value: []
+    }),
     op: '/',
     right: customField.denominatorScope === 'withinGrouping' ? denominatorForWithinGroupingScope : denominatorForAllScope
   };
 };
 var buildSide = function buildSide(field, filter) {
-  var alwaysTrueFilter = [[{
-    value: 1,
-    op: '=',
-    field: {
-      type: 'number',
-      value: 1
-    }
-  }]];
-  var hasNumeratorFilter = filter.length > 0 && filter[0].length > 0;
+  var alwaysTrueFilter = {
+    type: 'andWhere',
+    value: [{
+      type: 'where',
+      value: {
+        field: {
+          type: 'number',
+          value: 2
+        },
+        op: '=',
+        value: 2
+      }
+    }]
+  };
+  var hasNumeratorFilter = filter.type === 'where' || filter.value.length > 0;
   if (!hasNumeratorFilter) {
     return {
       type: 'field',
@@ -2334,7 +2341,7 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilt
   var cases = function () {
     var thenCases = ifLogic.cases.map(function (c) {
       var _params$filterConfig$, _params$filterConfig;
-      var customMetricFilter = combineForCustomMetricFilters(addAndFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.advancedFilter) != null ? _params$filterConfig$ : [], localAndDashboardFilters), c.filter);
+      var customMetricFilter = combineForCustomMetricFilters(addAndFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.viewFilters) != null ? _params$filterConfig$ : [], localAndDashboardFilters), c.filter);
       return {
         returns: buildMetric(c.returns, dataSet, params, measureAttribute),
         filter: filterAttributeToQueryFilter(customMetricFilter, queryEngineConfig, dataSet, params)
@@ -2642,6 +2649,33 @@ var mergeAttributes = function mergeAttributes(partial, existingProps) {
   return _doMerge(existingProps, partial);
 };
 
+var timeDimensionsConstants = QueryEngineConfig.Constants.timeDimensionsConstants;
+
+// All the aggregates Vizzly supports somewhere...
+// Not necessarily all the aggregates that are supported because each
+// integration could support different aggregates
+
+var id$1 = function id(metric) {
+  if (!(metric != null && metric.truncate) || (metric == null ? void 0 : metric.truncate) == 'none') return metric == null ? void 0 : metric.field;
+  return metric.field + "_" + metric.truncate;
+};
+var decodeId$1 = function decodeId(metric, supportedTimeTruncFunctions) {
+  var parts = metric.split('_');
+  var truncate = parts.pop();
+  if (truncate && !isSupportedTimeTruncFunction(supportedTimeTruncFunctions, truncate)) {
+    return null;
+  }
+  var field = parts.join('_');
+  return {
+    field: field,
+    truncate: truncate != null ? truncate : ''
+  };
+};
+var vizzlyManagedTimeDimensions = timeDimensionsConstants;
+var isSupportedTimeTruncFunction = function isSupportedTimeTruncFunction(supportedTimeFunctions, proposedFunction) {
+  return [].concat(Object.keys(supportedTimeFunctions), ['none']).includes(proposedFunction);
+};
+
 var id$2 = id;
 var decodeId$2 = decodeId;
 var hasAggregate = function hasAggregate(metric) {
@@ -25908,149 +25942,15 @@ 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 buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measureAttr, filterAttr, orderAttr, dimensionAttr, timeDimensionAttr, limitAttr, offsetAttr, queryEngineConfig, params) {
   var measureDescription = [];
   var measure = [];
   var group = [];
   var order = [];
-  var filters = buildFilters(dataSet, queryEngineConfig, params, prebuiltFilters);
+  var filters = filterAttributeToQueryFilter(filterAttr, queryEngineConfig, dataSet, params);
   if (timeDimensionAttr) {
     // Add the measure for the time field.
     var addedAt = undefined;
@@ -26108,24 +26008,19 @@ var buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measur
       field: findField(dataSet, individualMeasure.field)
     }]);
   });
-  orderAttr.forEach(function (apiQueryOrderItem) {
+  orderAttr.forEach(function (orderItem) {
     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;
+        var sameFunction = individualMeasure["function"] == orderItem["function"];
+        var sameField = individualMeasure.value == orderItem.field;
         return sameField && sameFunction;
-
-        // return found;
       }
       return false;
     });
     if (index >= 0) {
       order = [].concat(order, [{
         index: index,
-        direction: apiQueryOrderItem.direction
+        direction: orderItem.direction
       }]);
     }
   });
@@ -26150,7 +26045,6 @@ var buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measur
       dataSetId: dataSet.id,
       measure: measure,
       group: group,
-      // TODO: Fix this type
       filter: filters,
       order: order,
       limit: limitAttr,
@@ -26159,19 +26053,6 @@ var buildFromQueryAttributes = function buildFromQueryAttributes(dataSet, measur
     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) {
@@ -26199,7 +26080,10 @@ var buildUniqueArrayValuesPreparedQuery = function buildUniqueArrayValuesPrepare
       preparedQueryType: 'uniqueArrayValues',
       dataSetId: dataSetId,
       fieldId: dataSetField.id,
-      filter: optionsFilters || []
+      filter: optionsFilters || {
+        type: 'andWhere',
+        value: []
+      }
     },
     resultFields: [{
       id: dataSetField.id,
@@ -71658,32 +71542,6 @@ var TimeoutWaitingForVizzlyInstance = /*#__PURE__*/function (_Error) {
   return TimeoutWaitingForVizzlyInstance;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
-var joiOptions$1 = {
-  convert: false,
-  stripUnknown: false,
-  allowUnknown: true
-};
-var validateQuery = function validateQuery(params, queryEngineConfig) {
-  var validationResult = Joi.array().items(schema(queryEngineConfig)).validate(params, joiOptions$1);
-  if (validationResult.error) {
-    throw new ServicesValidationError(validationResult.error.message);
-  }
-};
-var filterSchema$1 = function filterSchema(queryEngineConfig) {
-  var _Joi$string;
-  return Joi.array().items(Joi.alternatives()["try"](Joi.object({
-    field: Joi.string().required().description('The ID of the field from the data set to reference.'),
-    op: (_Joi$string = Joi.string()).valid.apply(_Joi$string, Object.keys(queryEngineConfig.supportedOperators)).required(),
-    value: Joi.any().required()
-  }).description('A filter object to apply to the data set.'), Joi.array()));
-};
-var schema = function schema(queryEngineConfig) {
-  return Joi.object(_extends({}, querySchema(queryEngineConfig, {}), {
-    filter: filterSchema$1(queryEngineConfig),
-    timeDimension: Joi.alternatives(timeDimensionSchema(queryEngineConfig.supportedTimeTruncFunctions), Joi.valid(null))
-  }));
-};
-
 var validateDashboardJoiOptions = {
   convert: false,
   stripUnknown: false,
@@ -71761,7 +71619,7 @@ var toQueries = function toQueries(dataSets, queryAttributes, queryEngineConfig,
   var queries = queryAttributes.map(function (qA) {
     var dataSet = find(dataSets, qA.dataSetId);
     if (!dataSet) throw 'Data set not found for query attributes query';
-    return buildFromQueryAttributes(dataSet, qA.measure, qA.order, qA.dimension, qA.timeDimension, qA.limit, qA.offset, queryEngineConfig, params, qA.filter);
+    return buildFromQueryAttributes(dataSet, qA.measure, qA.filter, qA.order, qA.dimension, qA.timeDimension, qA.limit, qA.offset, queryEngineConfig, params);
   });
   return {
     queries: queries.map(function (q) {
@@ -71819,7 +71677,7 @@ function getOptionsOrders(dataSetField) {
 }
 
 var commonToQueries = function commonToQueries(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$c(dataSet, attributes.measure, attributes.order, attributes.dimension,
+  var _Query$build = build$c(dataSet, attributes.measure, attributes.filter, attributes.order, attributes.dimension,
     // @ts-ignore
     attributes.timeDimension || null, attributes.limit, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
@@ -71844,8 +71702,8 @@ var toQueries$6 = commonToQueries;
 var toQueries$7 = commonToQueries;
 
 var buildMainQueries = function buildMainQueries(attributes, dataSet, 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);
+  var line = build$c(dataSet, attributes.lineMeasure, attributes.filter, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var bar = build$c(dataSet, attributes.barMeasure, attributes.filter, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
   return {
     bar: bar,
     line: line
@@ -71872,8 +71730,8 @@ var toQueries$b = commonToQueries;
 var toQueries$c = commonToQueries;
 
 var buildMainQueries$1 = function buildMainQueries(attributes, dataSet, 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);
+  var line = build$c(dataSet, attributes.lineMeasure, attributes.filter, attributes.order, attributes.lineDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
+  var bar = build$c(dataSet, attributes.barMeasure, attributes.filter, attributes.order, attributes.barDimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params);
   return {
     bar: bar,
     line: line
@@ -71892,7 +71750,7 @@ var toQueries$d = function toQueries(attributes, dataSet, queryEngineConfig, par
 };
 
 var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineConfig, params) {
-  var _Query$build = build$c(dataSet, attributes.measure, [], [], null, 1, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(dataSet, attributes.measure, attributes.filter, [], [], null, 1, attributes.offset, queryEngineConfig, params),
     query = _Query$build.query,
     measureDescription = _Query$build.measureDescription;
 
@@ -71920,7 +71778,7 @@ var buildMainQuery = function buildMainQuery(attributes, dataSet, queryEngineCon
 };
 var buildDeltaQuery = function buildDeltaQuery(dataSet, attributes, queryEngineConfig, params) {
   if (!attributes.deltaTimeDimension) return null;
-  return build$c(dataSet, attributes.measure, [{
+  return build$c(dataSet, attributes.measure, attributes.filter, [{
     field: attributes.deltaTimeDimension.field,
     direction: 'asc',
     "function": attributes.deltaTimeDimension.truncate
@@ -71952,7 +71810,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$c(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(dataSet, measures, attributes.filter, 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);
@@ -71966,7 +71824,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$c(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(dataSet, measures, attributes.filter, 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);
@@ -71978,7 +71836,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$c(dataSet, measures, attributes.order, attributes.dimension, attributes.timeDimension, attributes.limit, attributes.offset, queryEngineConfig, params),
+  var _Query$build = build$c(dataSet, measures, attributes.filter, 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);
@@ -72090,20 +71948,7 @@ var buildVizzlyQuery = function buildVizzlyQuery(thing, queryEngineConfig, param
     queriesToSend = [_query];
     resultFields = [_rF];
   } else if (Array.isArray(thing)) {
-    var queriesInAttributesFormat = [].concat(thing).map(function (queryAttributes) {
-      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, {
-            advancedFilter: queryAttributes.filter
-          })
-        }))
-      });
-    });
-    var _fromQueryAttributes = toQueries(params.dataSets, queriesInAttributesFormat, queryEngineConfig, params),
+    var _fromQueryAttributes = toQueries(params.dataSets, thing, queryEngineConfig, params),
       q = _fromQueryAttributes.queries,
       _rF2 = _fromQueryAttributes.resultFields;
     queriesToSend = q;
@@ -72115,7 +71960,7 @@ var buildVizzlyQuery = function buildVizzlyQuery(thing, queryEngineConfig, param
     if (!_dataSet) throw 'Data set not found for view attributes query';
     var _buildVizzlyViewQueri = buildVizzlyViewQueries(thing, _dataSet, queryEngineConfig, _extends({}, params, {
         filterConfig: _extends({}, params.filterConfig, {
-          advancedFilter: thing.filter
+          viewFilters: thing.filter
         })
       })),
       _q = _buildVizzlyViewQueri.queries,
@@ -72152,7 +71997,7 @@ var set = function set(cacheKey, item, expiryInSeconds) {
   var key = JSON.stringify(cacheKey);
   var expires = new Date();
   expires.setSeconds(expires.getSeconds() + expiryInSeconds);
-  logDebug("Browser cache new object set.", key);
+  logDebug('Browser cache new object set.', key);
   cache$1[key] = {
     item: item,
     expires: expires
@@ -72162,10 +72007,10 @@ var get = function get(cacheKey) {
   var key = JSON.stringify(cacheKey);
   var retrieved = cache$1[key];
   if (!retrieved) {
-    logDebug("Browser cache miss.", cacheKey);
+    logDebug('Browser cache miss.', cacheKey);
     return null;
   }
-  logDebug("Browser cache hit.", cacheKey);
+  logDebug('Browser cache hit.', cacheKey);
   var item = retrieved.item,
     expires = retrieved.expires;
   var now = new Date();
@@ -72177,7 +72022,7 @@ var get = function get(cacheKey) {
   return null;
 };
 var clear$1 = function clear() {
-  logDebug("Browser cache cleared.");
+  logDebug('Browser cache cleared.');
   cache$1 = {};
 };
 
@@ -73341,7 +73186,6 @@ var VizzlyServices = /*#__PURE__*/function () {
               instanceId = params.instanceId;
             }
             service = VizzlyServices._instanceStore[instanceId];
-            validateQuery(queries, service.queryEngineConfig);
             queryEngineEndpoint = function () {
               if (params != null && params.queryEngineEndpoint) {
                 return params.queryEngineEndpoint;
@@ -73387,14 +73231,14 @@ var VizzlyServices = /*#__PURE__*/function () {
                 return _ref.apply(this, arguments);
               };
             }();
-            _context11.next = 10;
+            _context11.next = 9;
             return fetch();
-          case 10:
+          case 9:
             _context11.t0 = _context11.sent;
             return _context11.abrupt("return", {
               results: _context11.t0
             });
-          case 12:
+          case 11:
           case "end":
             return _context11.stop();
         }
@@ -73620,7 +73464,7 @@ VizzlyServices.HorizontalBarChart = HorizontalBarChart$2;
 VizzlyServices.MercatorMap = MercatorMap$4;
 VizzlyServices.SingleStat = SingleStat$3;
 VizzlyServices.Progress = Progress$3;
-VizzlyServices.WaterfallChart = WaterfallChart$4;
+VizzlyServices.WaterfallChart = WaterfallChart$4; // export type Query = Omit<SQLQuery, 'timeZone'> & { timeZone?: string };
 // @ts-ignore
 if (typeof window !== 'undefined' && !window.Vizzly) {
   // @ts-ignore