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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2518,18 +2518,19 @@ var buildIfLogic = function buildIfLogic(ifLogic, dataSet, queryEngineConfig, pa
2518
2518
  filter: alwaysTrueFilter // Do not remove
2519
2519
  }]);
2520
2520
  }();
2521
+ var value = {
2522
+ type: 'switchField',
2523
+ value: {
2524
+ cases: cases
2525
+ }
2526
+ };
2521
2527
  if (!(measureAttribute != null && measureAttribute["function"]) || measureAttribute["function"] === 'none') {
2522
- throw new Error('measure needs to be defined for if logic');
2528
+ return value;
2523
2529
  }
2524
2530
  return {
2525
2531
  type: 'function',
2526
2532
  "function": measureAttribute["function"],
2527
- value: {
2528
- type: 'switchField',
2529
- value: {
2530
- cases: cases
2531
- }
2532
- }
2533
+ value: value
2533
2534
  };
2534
2535
  };
2535
2536
  var buildOperator = function buildOperator(operator, dataSet, params, measureAttribute, topLevel, buildFieldCallback) {
@@ -2559,7 +2560,7 @@ var buildOperator = function buildOperator(operator, dataSet, params, measureAtt
2559
2560
  var hasFieldValue = operator.values.some(function (value) {
2560
2561
  return value.type === PropertyType.Field;
2561
2562
  });
2562
- if (topLevel && hasFieldValue) {
2563
+ if (topLevel && hasFieldValue && measureAttribute["function"] !== 'none') {
2563
2564
  return {
2564
2565
  type: 'function',
2565
2566
  "function": measureAttribute["function"],
@@ -12367,7 +12368,7 @@ function filterFields(originalFields, options) {
12367
12368
  }
12368
12369
  if (options != null && options.removeAggregateCustomBuildMetric) {
12369
12370
  fields = fields.filter(function (field) {
12370
- return !isCustomBuildMetric(field) || field.metric.type === PropertyType.Field || field.metric.type === PropertyType.NumberInput;
12371
+ return !isCustomBuildMetric(field) || field.metric.type === PropertyType.Field || field.metric.type === PropertyType.NumberInput || field.metric.type === PropertyType.Operator || field.metric.type === PropertyType.IfLogic;
12371
12372
  });
12372
12373
  }
12373
12374
  if (options != null && options.removeConditional) {
@@ -61553,6 +61554,24 @@ var MeasuresInput = function MeasuresInput(inputProps) {
61553
61554
  });
61554
61555
  };
61555
61556
 
61557
+ var isHidden = function isHidden(_ref) {
61558
+ var itemIndex = _ref.itemIndex,
61559
+ attributes = _ref.attributes,
61560
+ values = _ref.values,
61561
+ _ref$isMeasure = _ref.isMeasure,
61562
+ isMeasure = _ref$isMeasure === void 0 ? true : _ref$isMeasure;
61563
+ var fieldId = values[itemIndex].field;
61564
+ if (attributes.type !== 'dataTable' && attributes.type !== 'basicTable') return false;
61565
+ if (!attributes.hiddenFields || attributes.hiddenFields.length === 0) return false;
61566
+
61567
+ // only return true if the field is in measure, not dimension
61568
+ if (attributes.hiddenFields.includes(fieldId) && isMeasure) {
61569
+ return true;
61570
+ } else {
61571
+ return false;
61572
+ }
61573
+ };
61574
+
61556
61575
  var onToggleHidden = function onToggleHidden(_ref) {
61557
61576
  var itemIndex = _ref.itemIndex,
61558
61577
  values = _ref.values,
@@ -61585,24 +61604,6 @@ var onToggleHidden = function onToggleHidden(_ref) {
61585
61604
  return newAttributes;
61586
61605
  };
61587
61606
 
61588
- var isHidden = function isHidden(_ref) {
61589
- var itemIndex = _ref.itemIndex,
61590
- attributes = _ref.attributes,
61591
- values = _ref.values,
61592
- _ref$isMeasure = _ref.isMeasure,
61593
- isMeasure = _ref$isMeasure === void 0 ? true : _ref$isMeasure;
61594
- var fieldId = values[itemIndex].field;
61595
- if (attributes.type !== 'dataTable' && attributes.type !== 'basicTable') return false;
61596
- if (!attributes.hiddenFields || attributes.hiddenFields.length === 0) return false;
61597
-
61598
- // only return true if the field is in measure, not dimension
61599
- if (attributes.hiddenFields.includes(fieldId) && isMeasure) {
61600
- return true;
61601
- } else {
61602
- return false;
61603
- }
61604
- };
61605
-
61606
61607
  var FieldsInput = function FieldsInput(inputProps) {
61607
61608
  var attributes = inputProps.attributes,
61608
61609
  setPartialAttributes = inputProps.setPartialAttributes,
@@ -61655,7 +61656,9 @@ var FieldsInput = function FieldsInput(inputProps) {
61655
61656
  });
61656
61657
  var initValues = [].concat(filterFields(dataSet.fields, {
61657
61658
  removeAggregateMaths: true,
61658
- removePercentage: true
61659
+ removePercentage: true,
61660
+ removeAggregateCustomBuildMetric: true,
61661
+ removeConditional: true
61659
61662
  })).map(function (field) {
61660
61663
  return {
61661
61664
  title: field.publicName,
@@ -1,3 +1,3 @@
1
- import { DataSet } from './types';
2
1
  import { FieldFilterOptions } from './fieldFilterOptions';
2
+ import { DataSet } from './types';
3
3
  export declare function filterFields(originalFields: DataSet.Field[], options?: FieldFilterOptions): DataSet.Field[];
@@ -1,7 +1,7 @@
1
1
  /// <reference types="react" />
2
2
  import { Component } from '../../../../shared-logic/src/Component/types';
3
- import { VizzlyComponents } from '../../types';
4
3
  import { QueryAttributes } from '../../../../shared-logic/src/QueryAttributes/types';
4
+ import { VizzlyComponents } from '../../types';
5
5
  declare type ManagedProps = Component.Attributes & {
6
6
  measure: QueryAttributes.Measure[];
7
7
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@vizzly/dashboard",
3
3
  "author": "james@vizzly.co",
4
- "version": "0.15.0-dev-825e222034d95127ba57aec3c08d7617ffa39237",
4
+ "version": "0.15.0-dev-44a72e3d078c44a4eb0ff66a6a34fcca384e1c71",
5
5
  "source": "src/index.tsx",
6
6
  "types": "./dist/dashboard/src/index.d.ts",
7
7
  "module": "./dist/dashboard.esm.js",