@vizzly/dashboard 0.15.0-dev-c5f05b4321b2456a7b799661438c1d9b99f79de4 → 0.15.0-dev-641cbfac7b4b489d218fea2f77a8c1c3eb2b0d96

package/dist/dashboard.cjs.development.js

@@ -1119,26 +1119,98 @@ var FieldNotFoundInDataSet = /*#__PURE__*/function (_ValidationError) {
   return FieldNotFoundInDataSet;
 }(ValidationError);
 
-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 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;
   }
-  var date = new Date(filter.value);
-  if (isNaN(date.getTime())) {
-    return false;
+  _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 = [];
 
-  // 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) {
+  // 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;
   }
-  return true;
 };
+function extractValue(variables, key) {
+  return variables[key].value;
+}
 
 var _Joi$string, _Joi$string2;
 var defaultDurationOptions = function defaultDurationOptions(textOverride) {
@@ -1252,107 +1324,6 @@ var buildRelativeRange = function buildRelativeRange(relativeFilters, dataSet, a
   });
 };
 
-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;
-}
-
 /** Upcasts from an old global filter, to a new "additional filter" */
 var upcastToAdditionalFilter = function upcastToAdditionalFilter(globalFilter) {
   if (globalFilter.type == 'globalSelectFilter') {
@@ -1404,6 +1375,14 @@ var MULTI_SELECT_FILTER = 'multiSelectFilter';
 var NUMERIC_FILTER = 'numericFilter';
 var ADVANCED_FILTER = 'advancedFilter';
 
+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;
@@ -1413,11 +1392,11 @@ var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter,
 
     // might be able to remove this
     if (dataSetField.dataType == 'string[]' && filter.type !== MULTI_SELECT_FILTER && !isAdditionalFilter(filter.value)) {
-      return [{
+      return [[{
         field: field.fieldId,
         op: 'array_contains',
         value: filter.value
-      }];
+      }]];
     }
     if ((filter.type == DATE_FILTER || filter.type == DATE_AND_TIME_FILTER) && ((_filter$value = filter.value) == null ? void 0 : _filter$value.type) == 'relativeRange') {
       return [];
@@ -1425,7 +1404,7 @@ var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter,
     if ((filter.type == DATE_FILTER || filter.type == DATE_AND_TIME_FILTER) && ((_filter$value2 = filter.value) == null ? void 0 : _filter$value2.type) == 'fixedRange') {
       // We have a fixed time range, so we can use those values.
 
-      return [{
+      return [[{
         field: field.fieldId,
         op: inclusiveExclusiveCurrent(DateOp.Greater, filter),
         value: getUTCDate(filter.value.after)
@@ -1433,27 +1412,31 @@ var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter,
         field: field.fieldId,
         op: inclusiveExclusiveCurrent(DateOp.Less, filter),
         value: getUTCDate(filter.value.before)
-      }];
+      }]];
     } else if ((filter.type == DATE_FILTER || filter.type == DATE_AND_TIME_FILTER) && ((_filter$value3 = filter.value) == null ? void 0 : _filter$value3.type) == 'relative') {
       // We have a relative time filter, so need to call the time functions to get the values....
 
       var _customTimeRangeFuncs = customTimeRangeFuncs[filter.value.value].range,
         before = _customTimeRangeFuncs.before,
         after = _customTimeRangeFuncs.after;
-      var filters = [];
+      var filters = [[]];
       if (before) {
-        filters = [].concat(filters, [{
-          field: field.fieldId,
-          op: inclusiveExclusiveCurrent(DateOp.Less, filter),
-          value: before
-        }]);
+        filters = filters.map(function (f) {
+          return [].concat(f, [{
+            field: field.fieldId,
+            op: inclusiveExclusiveCurrent(DateOp.Less, filter),
+            value: before
+          }]);
+        });
       }
       if (after) {
-        filters = [].concat(filters, [{
-          field: field.fieldId,
-          op: inclusiveExclusiveCurrent(DateOp.Greater, filter),
-          value: after
-        }]);
+        filters = filters.map(function (f) {
+          return [].concat(f, [{
+            field: field.fieldId,
+            op: inclusiveExclusiveCurrent(DateOp.Greater, filter),
+            value: after
+          }]);
+        });
       }
       return filters;
     } else if (filter.type == SINGLE_SELECT_FILTER) {
@@ -1461,31 +1444,31 @@ var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter,
       if (filter.value === NULL_VALUE_OPT) {
         value = null;
       }
-      return [{
+      return [[{
         field: field.fieldId,
         op: '=',
         value: value
-      }];
+      }]];
     } else if (isAdditionalFilter(filter.value)) {
       return buildAdvancedFilters(filter.value, field, dataSet.id);
     } else if (filter.type == MULTI_SELECT_FILTER && filter.value.length > 0) {
-      return [{
+      return [[{
         field: field.fieldId,
         op: 'is_one_of',
         value: filter.value
-      }];
+      }]];
     } else if (filter.type == DATE_FILTER && !filter.value || filter.type == DATE_AND_TIME_FILTER && !filter.value || filter.type == MULTI_SELECT_FILTER && filter.value.length === 0) {
       // No value set on the filter, so it cannot become a query attribute.
       return [];
     } else if (filter.type == NUMERIC_FILTER) {
       if ('op' in filter.value && 'value' in filter.value) {
-        return [{
+        return [[{
           field: field.fieldId,
           op: filter.value.op,
           value: filter.value.value
-        }];
+        }]];
       }
-      return [];
+      return [[]];
     }
     throw "Cannot convert filter type " + filter.type + " to query attributes filter. " + JSON.stringify(filter);
   });
@@ -1547,16 +1530,16 @@ var toRelativeQueryAttributesFilters = function toRelativeQueryAttributesFilters
   var _filters$value;
   if (((_filters$value = filters.value) == null ? void 0 : _filters$value.type) !== 'relativeRange') return [];
   if (filters.value.filters.length === 0) return [];
-  var resolvedFilters = [];
   var preparedFilters = buildRelativeRange(filters.value.filters, dataSet, filters.appliesToFields);
-  preparedFilters[0].forEach(function (f) {
-    resolvedFilters.push({
-      field: f.field,
-      op: f.op,
-      value: calculateRelativeDate(f.value, startDate)
+  return preparedFilters.map(function (filter) {
+    return filter.map(function (f) {
+      return {
+        field: f.field,
+        op: f.op,
+        value: calculateRelativeDate(f.value, startDate)
+      };
     });
   });
-  return resolvedFilters;
 };
 var hasActiveFilter = function hasActiveFilter(additionalFilters) {
   return _.some(additionalFilters, function (_ref) {
@@ -1700,14 +1683,17 @@ function getCascadeOptionsFilters(globalFilters, dataSets, dateFilterOptions, ca
       if (Array.isArray(dataObj.value) && dataObj.value.length === 0) {
         return acc;
       }
-      dataObj.appliesToFields.forEach(function (_ref2) {
-        var dataSetId = _ref2.dataSetId;
+      var uniqueDataSetIds = new Set(dataObj.appliesToFields.map(function (f) {
+        return f.dataSetId;
+      }));
+      uniqueDataSetIds.forEach(function (dataSetId) {
         var dataSet = find(dataSets, dataSetId);
         if (!acc[dataSetId]) {
           acc[dataSetId] = [];
         }
         if (dataSet !== null) {
-          acc[dataSetId] = [].concat(acc[dataSetId], toQueryAttributesFilter(dataSet, dataObj, dateFilterOptions));
+          var filters = toQueryAttributesFilter(dataSet, dataObj, dateFilterOptions);
+          acc[dataSetId] = addAndFilters(acc[dataSetId], filters);
         }
       });
     }
@@ -1733,14 +1719,21 @@ function removeEmptyConditions(conditions) {
 }
 var buildAdvancedFilters = function buildAdvancedFilters(filterValue, field, dataSetId) {
   if (!filterValue) return [];
-  if (Array.isArray(filterValue) && Array.isArray(filterValue[0])) {
+  var hasValidConditions = Array.isArray(filterValue) && filterValue.every(function (conditionGroup) {
+    return Array.isArray(conditionGroup);
+  });
+  if (hasValidConditions) {
     filterValue = removeEmptyConditions(filterValue);
     if (filterValue.length === 0) return [];
     if (field.dataSetId !== dataSetId) return [];
-    var correctFiltersForField = filterValue[0].filter(function (filter) {
-      return filter.field === field.fieldId;
+    var correctFiltersForField = filterValue.map(function (conditionGroup) {
+      return conditionGroup.filter(function (filter) {
+        return filter.field === field.fieldId;
+      });
+    }).filter(function (conditionGroup) {
+      return conditionGroup.length > 0;
     });
-    return correctFiltersForField.length > 0 ? correctFiltersForField : [];
+    return correctFiltersForField;
   }
   return [];
 };
@@ -1769,7 +1762,8 @@ var fromFilterConfig = function fromFilterConfig(filterConfig, dataSet, timeRang
     if (additionalFilter.type === DATE_AND_TIME_FILTER || additionalFilter.type === DATE_FILTER) {
       addFilter = toRelativeQueryAttributesFilters(additionalFilter, dataSet);
     }
-    filters = [].concat(filters, addFilter, toQueryAttributesFilter(dataSet, additionalFilter, timeRangeOptions));
+    filters = addAndFilters(filters, addFilter);
+    filters = addAndFilters(filters, toQueryAttributesFilter(dataSet, additionalFilter, timeRangeOptions));
   });
   var localAdditionalFilters = Object.values(filterConfig.localFilters || {}).flat();
   localAdditionalFilters.forEach(function (additionalFilter) {
@@ -1777,24 +1771,57 @@ var fromFilterConfig = function fromFilterConfig(filterConfig, dataSet, timeRang
     if (additionalFilter.type === DATE_AND_TIME_FILTER || additionalFilter.type === DATE_FILTER) {
       addFilter = toRelativeQueryAttributesFilters(additionalFilter, dataSet);
     }
-    filters = [].concat(filters, addFilter, toQueryAttributesFilter(dataSet, additionalFilter, timeRangeOptions));
+    filters = addAndFilters(filters, addFilter);
+    filters = addAndFilters(filters, toQueryAttributesFilter(dataSet, additionalFilter, timeRangeOptions));
   });
   return filters;
 };
 
+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 (_.isEmpty(filterToAddToAll)) return [].concat(filter);
   if (!filter || _.isEmpty(filter)) filter = [[]];
-  return [].concat(filter).map(function (andFilter) {
-    return [].concat(andFilter, filterToAddToAll);
-  });
+  var result = [];
+  for (var _iterator = _createForOfIteratorHelperLoose(filterToAddToAll), _step; !(_step = _iterator()).done;) {
+    var additionalAndFilter = _step.value;
+    for (var _iterator2 = _createForOfIteratorHelperLoose(filter), _step2; !(_step2 = _iterator2()).done;) {
+      var andFilter = _step2.value;
+      var combined = [].concat(additionalAndFilter, andFilter);
+      if (!_.isEmpty(combined)) {
+        result.push(combined);
+      }
+    }
+  }
+  return result;
 };
 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 filter = filterAttrs.length > 0 && filterAttrs.some(function (group) {
+    return group.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)) {
@@ -1885,17 +1912,6 @@ var combineFilters = function combineFilters(array1, array2) {
     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 uuid.v4().replace(/-/g, '');
@@ -1926,8 +1942,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.viewFilters) != null ? _params$filterConfig$ : [], localAndDashboardFilters), customField),
+  var _buildPercentageFilte = buildPercentageFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.viewFilters) != null ? _params$filterConfig$ : [], customField),
     combinedNominatorFilters = _buildPercentageFilte.combinedNominatorFilters,
     combinedDenominatorFilters = _buildPercentageFilte.combinedDenominatorFilters;
   var left = {
@@ -2015,16 +2030,12 @@ function buildPercentageFilters(filters, customField) {
   var combinedNominatorFilters = [];
   var combinedDenominatorFilters = [];
   if (customField.numeratorFilter && isAvailable(customField.numeratorFilter)) {
-    customField.numeratorFilter.forEach(function (orFilterGroup) {
-      combinedNominatorFilters = [].concat(combinedNominatorFilters, addAndFilters(filters != null ? filters : [], orFilterGroup));
-    });
+    combinedNominatorFilters = addAndFilters(filters != null ? filters : [], customField.numeratorFilter);
   } else {
     combinedNominatorFilters = filters != null ? filters : [];
   }
   if (customField.denominatorFilter && isAvailable(customField.denominatorFilter)) {
-    customField.denominatorFilter.forEach(function (orFilterGroup) {
-      combinedDenominatorFilters = [].concat(combinedDenominatorFilters, addAndFilters(filters != null ? filters : [], orFilterGroup));
-    });
+    combinedDenominatorFilters = addAndFilters(filters != null ? filters : [], customField.denominatorFilter);
   } else {
     combinedDenominatorFilters = filters != null ? filters : [];
   }
@@ -2308,6 +2319,13 @@ var init$7 = function init(publicName, metric, queryEngineConfig) {
   };
 };
 
+function combineForCustomMetricFilters(filters, customFilters) {
+  if (customFilters && isAvailable(customFilters)) {
+    return addAndFilters(filters != null ? filters : [], customFilters);
+  }
+  return filters != null ? filters : [];
+}
+
 var PropertyType = /*#__PURE__*/function (PropertyType) {
   PropertyType["Operator"] = "operator";
   PropertyType["IfLogic"] = "ifLogic";
@@ -2327,7 +2345,7 @@ var OperatorType = /*#__PURE__*/function (OperatorType) {
 
 var build$8 = function build(measureAttribute, customField, dataSet, queryEngineConfig, params) {
   if (customField.metric.type === PropertyType.IfLogic) {
-    return buildIfLogic(customField.metric, dataSet, fromFilterConfig(params.filterConfig, dataSet, params.timeRangeOptions), queryEngineConfig, params, measureAttribute);
+    return buildIfLogic(customField.metric, dataSet, queryEngineConfig, params, measureAttribute);
   }
   if (customField.metric.type === PropertyType.Aggregate) {
     return buildAggregate(customField.metric);
@@ -2340,7 +2358,7 @@ var build$8 = function build(measureAttribute, customField, dataSet, queryEngine
   }
   return buildOperator(customField.metric, dataSet, params, measureAttribute, false);
 };
-var buildIfLogic = function buildIfLogic(ifLogic, dataSet, localAndDashboardFilters, queryEngineConfig, params, measureAttribute) {
+var buildIfLogic = function buildIfLogic(ifLogic, dataSet, queryEngineConfig, params, measureAttribute) {
   var alwaysTrueFilter = [[{
     value: 1,
     op: '=',
@@ -2352,7 +2370,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.viewFilters) != null ? _params$filterConfig$ : [], localAndDashboardFilters), c.filter);
+      var customMetricFilter = combineForCustomMetricFilters((_params$filterConfig$ = params == null || (_params$filterConfig = params.filterConfig) == null ? void 0 : _params$filterConfig.viewFilters) != null ? _params$filterConfig$ : [], c.filter);
       return {
         returns: buildMetric(c.returns, dataSet, params, measureAttribute),
         filter: filterAttributeToQueryFilter(customMetricFilter, queryEngineConfig, dataSet, params)
@@ -15109,9 +15127,8 @@ var fieldSchema = /*#__PURE__*/Joi.object({
   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 innerArraySchema = Joi.array().items(filterSchema(queryEngineConfig));
+  return Joi.object().pattern(Joi.string(), Joi.array().items(innerArraySchema).optional());
 };
 var sharedAdditionalFilterSchema = function sharedAdditionalFilterSchema(queryEngineConfig) {
   return {
@@ -26534,7 +26551,7 @@ var buildFilterQuery = function buildFilterQuery(dataSet, fieldId, optionsFilter
     "function": 'count'
   }];
   var order = optionsOrders != null ? optionsOrders : [];
-  var filter = optionsFilters ? [optionsFilters] : [];
+  var filter = optionsFilters != null ? optionsFilters : [];
   var dimension = [{
     field: fieldId,
     "function": 'none'
@@ -39544,7 +39561,7 @@ var PanelProperty = function PanelProperty(props) {
 
 var buildFieldOptions = function buildFieldOptions(filterType, dataSets, selectedDataSetIndexes) {
   return [].concat(dataSets).flatMap(function (dataSet, dataSetIndex) {
-    var hide = !selectedDataSetIndexes.includes(dataSetIndex);
+    if (!selectedDataSetIndexes.includes(dataSetIndex)) return [];
     return [].concat(takeNonCustomFields(dataSet)).filter(function (field) {
       var allowedDataTypes = allowedDataTypesForFilter(filterType);
       return allowedDataTypes.includes(field.dataType);
@@ -39554,8 +39571,7 @@ var buildFieldOptions = function buildFieldOptions(filterType, dataSets, selecte
         value: {
           dataSetId: dataSet.id,
           field: field
-        },
-        hide: hide
+        }
       };
     });
   });
@@ -39776,11 +39792,13 @@ var AddFilterForm = function AddFilterForm(props) {
       filterType: filterType
     });
   };
-  var setSelectedDataSets = function setSelectedDataSets(dataSetIndexes) {
-    dispatch({
-      type: 'setSelectedDataSets',
-      selectedDataSetIndexes: dataSetIndexes
-    });
+  var setSelectedDataSets = function setSelectedDataSets(_, dataSetIndex) {
+    if (dataSetIndex !== null) {
+      dispatch({
+        type: 'setSelectedDataSets',
+        selectedDataSetIndexes: [dataSetIndex]
+      });
+    }
   };
   var setAdvancedOptions = function setAdvancedOptions(options) {
     dispatch({
@@ -39788,11 +39806,13 @@ var AddFilterForm = function AddFilterForm(props) {
       options: options
     });
   };
-  var setSelectedFields = function setSelectedFields(fieldIndexes) {
-    dispatch({
-      type: 'setSelectedFields',
-      selectedFieldIndexes: fieldIndexes
-    });
+  var setSelectedFields = function setSelectedFields(_, fieldIndex) {
+    if (fieldIndex !== null) {
+      dispatch({
+        type: 'setSelectedFields',
+        selectedFieldIndexes: [fieldIndex]
+      });
+    }
   };
   var getFilterTypeOptions = function getFilterTypeOptions() {
     var filterTypes = [{
@@ -39819,6 +39839,8 @@ var AddFilterForm = function AddFilterForm(props) {
     }
     return filterTypes;
   };
+  var selectedDataSet = selectedDataSetIndexes.length > 0 ? dataSetOptions[selectedDataSetIndexes[0]].value : null;
+  var selectedField = selectedFieldIndexes.length > 0 ? fieldOptions[selectedFieldIndexes[0]].value : null;
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx(Modal.Header, {
       title: textOverride('new_filter', 'New filter'),
@@ -39835,13 +39857,13 @@ var AddFilterForm = function AddFilterForm(props) {
           }
         })
       }), dataSetOptions.length > 1 && jsxRuntime.jsx(PanelProperty, {
-        children: jsxRuntime.jsx(MultiSelect, {
+        children: jsxRuntime.jsx(Select$2, {
           id: "data-set",
           label: textOverride('data_sets', 'Data sets'),
           placeholder: textOverride('data_sets_placeholder', 'Which data sets will this filter impact?'),
           options: dataSetOptions,
-          selected: selectedDataSetIndexes,
-          setSelected: setSelectedDataSets,
+          selected: selectedDataSet,
+          onChange: setSelectedDataSets,
           textOverride: textOverride
         })
       }), jsxRuntime.jsx(PanelProperty, {
@@ -39855,13 +39877,13 @@ var AddFilterForm = function AddFilterForm(props) {
           textOverride: textOverride
         })
       }), jsxRuntime.jsx(PanelProperty, {
-        children: jsxRuntime.jsx(MultiSelect, {
+        children: jsxRuntime.jsx(Select$2, {
           label: textOverride('fields', 'Fields'),
           id: "data-set-fields",
           placeholder: textOverride('fields_placeholder', 'Which fields will this filter impact?'),
           options: fieldOptions,
-          selected: selectedFieldIndexes,
-          setSelected: setSelectedFields,
+          selected: selectedField,
+          onChange: setSelectedFields,
           textOverride: textOverride
         })
       }), draftFilter.type === 'dateFilter' && jsxRuntime.jsx(PanelProperty, {
@@ -40250,9 +40272,9 @@ var _GlobalFiltersView = /*#__PURE__*/withCustomRenderGuard(function (props) {
           }),
           filterIndex: globalFilterIndex,
           onChange: function onChange(newFilter) {
-            var newGlobabalFilters = [].concat(props.globalFilters);
-            newGlobabalFilters[globalFilterIndex] = newFilter;
-            props.setGlobalFilters(newGlobabalFilters);
+            var newGlobalFilters = [].concat(props.globalFilters);
+            newGlobalFilters[globalFilterIndex] = newFilter;
+            props.setGlobalFilters(newGlobalFilters);
           }
         }, globalFilterIndex);
       })
@@ -44457,7 +44479,7 @@ var buildMargin = function buildMargin(yTicks, showYAxisLabels, hasYAxisTitle, h
 };
 var buildMarginForHorizontalChart = function buildMarginForHorizontalChart(xTicks, yTicks, showXAxisLabels, showYAxisLabels, hasYAxisTitle, hasXAxisTitle) {
   var maxWidth = _.max(yTicks.map(function (tick) {
-    return (tick.formattedValue || '').length * ASSUMED_AVERAGE_CHAR_WIDTH;
+    return (tick.formattedValue || '').split(/[\n\s]+/)[0].length * ASSUMED_AVERAGE_CHAR_WIDTH;
   }));
   var showXTicks = showXAxisLabels && xTicks.length > 0;
   var showYTicks = showYAxisLabels && yTicks.length > 0;
@@ -52761,17 +52783,19 @@ var CustomCell = function CustomCell(_ref) {
  * Adds in drill down filters as `AND` conditions to the existing filter query.
  */
 var addDrillDownFilters = function addDrillDownFilters(selectedRow, dimension, filter) {
-  var drillDownFilters = [].concat(selectedRow).map(function (row) {
-    var _dimension$find;
-    var field = Object.keys(row)[0];
-    return {
-      field: field,
-      op: '=',
-      value: row[field],
-      "function": ((_dimension$find = dimension.find(function (d) {
-        return d.field === field;
-      })) == null ? void 0 : _dimension$find["function"]) || 'none'
-    };
+  var drillDownFilters = selectedRow.map(function (row) {
+    var fields = Object.keys(row);
+    return fields.map(function (field) {
+      var _dimension$find;
+      return {
+        field: field,
+        op: '=',
+        value: row[field],
+        "function": ((_dimension$find = dimension.find(function (d) {
+          return d.field === field;
+        })) == null ? void 0 : _dimension$find["function"]) || 'none'
+      };
+    });
   });
   return addAndFilters(filter, drillDownFilters);
 };
@@ -74126,7 +74150,7 @@ var toQueries$1 = function toQueries$1(additionalFilter, dataSets, queryEngineCo
     if (!dataSet) throw 'Data set not found for additional filter query';
     var dataSetField = findField(dataSet, field.fieldId);
     if (dataSetField.dataType == 'string[]') {
-      var queryFilter = filterAttributeToQueryFilter([getOptionsFilters(additionalFilter, field)], queryEngineConfig, dataSet, params);
+      var queryFilter = filterAttributeToQueryFilter(getOptionsFilters(additionalFilter, field), queryEngineConfig, dataSet, params);
       var _QueryLogic$buildUniq = buildUniqueArrayValuesPreparedQuery(field.dataSetId, dataSetField, queryFilter),
         query = _QueryLogic$buildUniq.query,
         resultFields = _QueryLogic$buildUniq.resultFields;
@@ -74149,9 +74173,20 @@ var toQueries$1 = function toQueries$1(additionalFilter, dataSets, queryEngineCo
   };
 };
 function getOptionsFilters(additionalFilter, field) {
-  var optionsFilters = additionalFilter.optionsFilters ? additionalFilter.optionsFilters[field.dataSetId] : [];
-  return optionsFilters == null ? void 0 : optionsFilters.filter(function (filter) {
-    return filter.field !== field.fieldId;
+  if (!additionalFilter.optionsFilters) {
+    return [];
+  }
+  if (!(field.dataSetId in additionalFilter.optionsFilters)) {
+    return [];
+  }
+  var optionsFilters = additionalFilter.optionsFilters[field.dataSetId];
+  var orFilter = optionsFilters.map(function (filter) {
+    return filter.filter(function (f) {
+      return f.field !== field.fieldId;
+    });
+  });
+  return orFilter.filter(function (f) {
+    return f.length > 0;
   });
 }
 function getOptionsOrders(dataSetField) {
@@ -74438,8 +74473,11 @@ var buildVizzlyQuery = function buildVizzlyQuery(thing, queryEngineConfig, param
       query = _QueryLogic$buildPreA.query,
       rF = _QueryLogic$buildPreA.resultFields;
     var underlyingDataSet = find(params.dataSets, underlyingDataSetId);
-    var localAndDashboardFilters = fromFilterConfig(params.filterConfig, underlyingDataSet, params.timeRangeOptions);
-    var filter = filterAttributeToQueryFilter([localAndDashboardFilters], queryEngineConfig, underlyingDataSet, params);
+    var filter = filterAttributeToQueryFilter([], queryEngineConfig, underlyingDataSet, _extends({}, params, {
+      filterConfig: _extends({}, params.filterConfig, {
+        viewFilters: undefined
+      })
+    }));
     queriesToSend = [_extends({}, query, {
       filter: (_filter = {}, _filter[underlyingDataSet.id] = filter, _filter)
     })];