@vizzly/dashboard 0.15.0-dev-825e222034d95127ba57aec3c08d7617ffa39237 → 0.15.0-dev-44a72e3d078c44a4eb0ff66a6a34fcca384e1c71

package/dist/dashboard.cjs.development.js

@@ -2527,18 +2527,19 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, queryEngineConfig, pa
       filter: alwaysTrueFilter // Do not remove
     }]);
   }();
+  var value = {
+    type: 'switchField',
+    value: {
+      cases: cases
+    }
+  };
   if (!(measureAttribute != null && measureAttribute["function"]) || measureAttribute["function"] === 'none') {
-    throw new Error('measure needs to be defined for if logic');
+    return value;
   }
   return {
     type: 'function',
     "function": measureAttribute["function"],
-    value: {
-      type: 'switchField',
-      value: {
-        cases: cases
-      }
-    }
+    value: value
   };
 };
 var buildOperator = function buildOperator(operator, dataSet, params, measureAttribute, topLevel, buildFieldCallback) {
@@ -2568,7 +2569,7 @@ var buildOperator = function buildOperator(operator, dataSet, params, measureAtt
   var hasFieldValue = operator.values.some(function (value) {
     return value.type === PropertyType.Field;
   });
-  if (topLevel && hasFieldValue) {
+  if (topLevel && hasFieldValue && measureAttribute["function"] !== 'none') {
     return {
       type: 'function',
       "function": measureAttribute["function"],
@@ -12376,7 +12377,7 @@ function filterFields(originalFields, options) {
   }
   if (options != null && options.removeAggregateCustomBuildMetric) {
     fields = fields.filter(function (field) {
-      return !isCustomBuildMetric(field) || field.metric.type === PropertyType.Field || field.metric.type === PropertyType.NumberInput;
+      return !isCustomBuildMetric(field) || field.metric.type === PropertyType.Field || field.metric.type === PropertyType.NumberInput || field.metric.type === PropertyType.Operator || field.metric.type === PropertyType.IfLogic;
     });
   }
   if (options != null && options.removeConditional) {
@@ -61486,6 +61487,24 @@ var MeasuresInput = function MeasuresInput(inputProps) {
   });
 };
 
+var isHidden = function isHidden(_ref) {
+  var itemIndex = _ref.itemIndex,
+    attributes = _ref.attributes,
+    values = _ref.values,
+    _ref$isMeasure = _ref.isMeasure,
+    isMeasure = _ref$isMeasure === void 0 ? true : _ref$isMeasure;
+  var fieldId = values[itemIndex].field;
+  if (attributes.type !== 'dataTable' && attributes.type !== 'basicTable') return false;
+  if (!attributes.hiddenFields || attributes.hiddenFields.length === 0) return false;
+
+  // only return true if the field is in measure, not dimension
+  if (attributes.hiddenFields.includes(fieldId) && isMeasure) {
+    return true;
+  } else {
+    return false;
+  }
+};
+
 var onToggleHidden = function onToggleHidden(_ref) {
   var itemIndex = _ref.itemIndex,
     values = _ref.values,
@@ -61518,24 +61537,6 @@ var onToggleHidden = function onToggleHidden(_ref) {
   return newAttributes;
 };
 
-var isHidden = function isHidden(_ref) {
-  var itemIndex = _ref.itemIndex,
-    attributes = _ref.attributes,
-    values = _ref.values,
-    _ref$isMeasure = _ref.isMeasure,
-    isMeasure = _ref$isMeasure === void 0 ? true : _ref$isMeasure;
-  var fieldId = values[itemIndex].field;
-  if (attributes.type !== 'dataTable' && attributes.type !== 'basicTable') return false;
-  if (!attributes.hiddenFields || attributes.hiddenFields.length === 0) return false;
-
-  // only return true if the field is in measure, not dimension
-  if (attributes.hiddenFields.includes(fieldId) && isMeasure) {
-    return true;
-  } else {
-    return false;
-  }
-};
-
 var FieldsInput = function FieldsInput(inputProps) {
   var attributes = inputProps.attributes,
     setPartialAttributes = inputProps.setPartialAttributes,
@@ -61588,7 +61589,9 @@ var FieldsInput = function FieldsInput(inputProps) {
   });
   var initValues = [].concat(filterFields(dataSet.fields, {
     removeAggregateMaths: true,
-    removePercentage: true
+    removePercentage: true,
+    removeAggregateCustomBuildMetric: true,
+    removeConditional: true
   })).map(function (field) {
     return {
       title: field.publicName,