@vizzly/dashboard 0.15.0-dev-966d08f66bb4c83a14c4b77d8e622320035ddaf5 → 0.15.0-dev-45f4268b92d46ac8f53b9683a04bb9e8d2dac16a
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.
- package/dist/charts/src/v2/components/HorizontalBarChart/HorizontalBarChart.d.ts +3 -1
- package/dist/dashboard.cjs.development.js +200 -70
- package/dist/dashboard.cjs.production.min.js +1 -1
- package/dist/dashboard.esm.js +200 -70
- package/dist/shared-logic/src/AdditionalFilter/AdditionalFilter.d.ts +1 -0
- package/dist/shared-logic/src/ChartsV2/types.d.ts +2 -0
- package/package.json +1 -1
package/dist/dashboard.esm.js
CHANGED
|
@@ -1777,6 +1777,25 @@ function inclusiveExclusiveCurrent(op, filter) {
|
|
|
1777
1777
|
throw new Error('Unknown date operation');
|
|
1778
1778
|
}
|
|
1779
1779
|
}
|
|
1780
|
+
var buildAdvancedFilters = function buildAdvancedFilters(filterValue, fieldIds) {
|
|
1781
|
+
if (!filterValue) return [];
|
|
1782
|
+
var hasValidConditions = Array.isArray(filterValue) && filterValue.every(function (conditionGroup) {
|
|
1783
|
+
return Array.isArray(conditionGroup);
|
|
1784
|
+
});
|
|
1785
|
+
if (hasValidConditions) {
|
|
1786
|
+
filterValue = removeEmptyConditions(filterValue);
|
|
1787
|
+
if (filterValue.length === 0) return [];
|
|
1788
|
+
var correctFiltersForField = filterValue.map(function (conditionGroup) {
|
|
1789
|
+
return conditionGroup.filter(function (filter) {
|
|
1790
|
+
return fieldIds.includes(filter.field);
|
|
1791
|
+
});
|
|
1792
|
+
}).filter(function (conditionGroup) {
|
|
1793
|
+
return conditionGroup.length > 0;
|
|
1794
|
+
});
|
|
1795
|
+
return correctFiltersForField;
|
|
1796
|
+
}
|
|
1797
|
+
return [];
|
|
1798
|
+
};
|
|
1780
1799
|
function getCascadeOptionsFilters(globalFilters, dataSets, dateFilterOptions, variables, cascadeFilterSelection) {
|
|
1781
1800
|
if (!cascadeFilterSelection) return undefined;
|
|
1782
1801
|
var dataSetMap = new Map(dataSets.map(function (ds) {
|
|
@@ -1856,7 +1875,10 @@ function getFilterDataType(filter, dataSets) {
|
|
|
1856
1875
|
var toQueryAttributesFilter = function toQueryAttributesFilter(dataSet, filter, customTimeRangeFuncs) {
|
|
1857
1876
|
// For any filter that already contains the full filter object,
|
|
1858
1877
|
if (isAdditionalFilter(filter.value)) {
|
|
1859
|
-
|
|
1878
|
+
var dataSetFieldIds = dataSet.fields.map(function (field) {
|
|
1879
|
+
return field.id;
|
|
1880
|
+
});
|
|
1881
|
+
return buildAdvancedFilters(filter.value, dataSetFieldIds);
|
|
1860
1882
|
}
|
|
1861
1883
|
return filter.appliesToFields.flatMap(function (field) {
|
|
1862
1884
|
var _filter$value, _filter$value2, _filter$value3;
|
|
@@ -3061,7 +3083,7 @@ var queryFilterSchema = function queryFilterSchema(queryEngineConfig, maxDepth)
|
|
|
3061
3083
|
value: whereFilterSchema.required()
|
|
3062
3084
|
}), Joi.object({
|
|
3063
3085
|
type: Joi.string().valid('andWhere', 'orWhere').required(),
|
|
3064
|
-
value: Joi.array().items(_buildRecursiveSchema(depth - 1)).
|
|
3086
|
+
value: Joi.array().items(_buildRecursiveSchema(depth - 1)).required().description('Array of nested filters')
|
|
3065
3087
|
}));
|
|
3066
3088
|
};
|
|
3067
3089
|
return _buildRecursiveSchema(maxDepth);
|
|
@@ -23650,8 +23672,7 @@ var dashboardFilters = function dashboardFilters(state, pipelineTransformationOp
|
|
|
23650
23672
|
return !gF.managedByConfiguration;
|
|
23651
23673
|
});
|
|
23652
23674
|
var dashboardFiltersFromDataSets = fromDashboardRequiredFilterGroups(state.dashboard.dataSets);
|
|
23653
|
-
var
|
|
23654
|
-
var programmaticallyManagedDashboardFilters = dashboardFilters(dataSetsInUse, EMPTY_USER_DEFINED_DASHBOARD_FILTERS).map(function (f) {
|
|
23675
|
+
var programmaticallyManagedDashboardFilters = dashboardFilters(state.dashboard.dataSets, EMPTY_USER_DEFINED_DASHBOARD_FILTERS).map(function (f) {
|
|
23655
23676
|
return _extends({}, f, {
|
|
23656
23677
|
managedByConfiguration: true
|
|
23657
23678
|
});
|
|
@@ -44160,6 +44181,10 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__$5() { return "You have tried to string
|
|
|
44160
44181
|
var MIN_TOOLTIP_WIDTH = 180;
|
|
44161
44182
|
var TOOLTIP_OFFSET = 20;
|
|
44162
44183
|
var SCROLLBAR_WIDTH = 40;
|
|
44184
|
+
var getTooltipValue = function getTooltipValue(tooltipData, yKey) {
|
|
44185
|
+
var data = tooltipData[yKey];
|
|
44186
|
+
return (data == null ? void 0 : data.formattedValue) || (data == null ? void 0 : data.value) || '';
|
|
44187
|
+
};
|
|
44163
44188
|
var Tooltip$1 = function Tooltip(_ref) {
|
|
44164
44189
|
var _tooltipData$xKey$for, _tooltipData$xKey;
|
|
44165
44190
|
var keys = _ref.keys,
|
|
@@ -44221,7 +44246,7 @@ var Tooltip$1 = function Tooltip(_ref) {
|
|
|
44221
44246
|
fontSize: '15px',
|
|
44222
44247
|
width: '100%',
|
|
44223
44248
|
minWidth: MIN_TOOLTIP_WIDTH
|
|
44224
|
-
}, process.env.NODE_ENV === "production" ? "" : ";label:Tooltip;", process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
44249
|
+
}, process.env.NODE_ENV === "production" ? "" : ";label:Tooltip;", process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["Tooltip.tsx"],"names":[],"mappings":"AAkGqB","file":"Tooltip.tsx","sourcesContent":["import React, { CSSProperties, Fragment, useEffect, useRef, useState } from 'react';\nimport { createPortal } from 'react-dom';\n\nimport { getColor } from '../../utils';\nimport { LegendItemBox } from '../Legend/LegendItemBox';\nimport { ShapeDefinition, ConditionalFormattingRule, DataItem, Key } from 'shared-logic/src/ChartsV2/types';\nimport { LineStyles } from 'shared-logic/src/LineChartV2/types';\nimport { BarStyles } from 'shared-logic/src/BarChartV2/types';\nimport { AreaStyles } from 'shared-logic/src/AreaChartV2/types';\nimport { BubbleStyles } from 'shared-logic/src/BubbleChartV2/types';\nimport { css } from '@emotion/css';\n\nconst MIN_TOOLTIP_WIDTH = 180;\nconst TOOLTIP_OFFSET = 20;\nconst SCROLLBAR_WIDTH = 40;\n\nconst getTooltipValue = (tooltipData: { [keyId: string]: DataItem }, yKey: string): string | number => {\n  const data = tooltipData[yKey];\n  return data?.formattedValue || data?.value || '';\n};\n\ninterface TooltipProps<T> {\n  keys: { [key: string]: Key };\n  showRoundedTotal: boolean;\n  tooltipData: {\n    [keyId: string]: DataItem;\n  };\n  tooltipLeft: number;\n  tooltipTop: number;\n  xKey: string;\n  yKeys?: string[];\n  items: {\n    legendItems: Array<ShapeDefinition<T>>;\n    conditionalFormattingRules: Array<ConditionalFormattingRule>;\n    visibleYKeys: string[];\n  }[];\n  theme: CSSProperties;\n  shouldShowColorLegend?: boolean;\n}\n\nexport const Tooltip = ({\n  keys,\n  showRoundedTotal,\n  tooltipData,\n  tooltipLeft,\n  tooltipTop,\n  xKey,\n  yKeys,\n  theme,\n  items,\n  shouldShowColorLegend = true,\n}: TooltipProps<LineStyles | BarStyles | AreaStyles | BubbleStyles>) => {\n  const tooltipRef = useRef<HTMLDivElement>(null);\n  const [position, setPosition] = useState<{ left: number }>({\n    left: tooltipLeft,\n  });\n\n  useEffect(() => {\n    const adjustTooltipPosition = () => {\n      const tooltipElement = tooltipRef.current;\n\n      if (tooltipElement) {\n        const screenWidth = window.innerWidth;\n\n        const rect = tooltipElement.getBoundingClientRect();\n\n        let width = rect.width;\n\n        if (width < MIN_TOOLTIP_WIDTH) {\n          width = MIN_TOOLTIP_WIDTH;\n        }\n\n        let left = tooltipLeft + TOOLTIP_OFFSET;\n\n        if (tooltipLeft + width > screenWidth - SCROLLBAR_WIDTH) {\n          left = tooltipLeft - width - TOOLTIP_OFFSET;\n        }\n\n        setPosition({ left });\n      }\n    };\n\n    adjustTooltipPosition();\n  }, [tooltipLeft]);\n\n  return createPortal(\n    <div\n      ref={tooltipRef}\n      style={{\n        position: 'absolute',\n        left: position.left,\n        top: tooltipTop,\n        zIndex: 2147483647 * 10,\n        ...theme,\n      }}\n    >\n      <div style={{ wordBreak: 'break-all' }}>\n        <div\n          className={css({\n            fontFamily: 'inherit',\n            lineHeight: 'inherit',\n            letterSpacing: 'inherit',\n            fontWeight: 'bold',\n            fontSize: '15px',\n            width: '100%',\n            minWidth: MIN_TOOLTIP_WIDTH,\n          })}\n        >\n          {tooltipData[xKey]?.formattedValue ?? tooltipData[xKey].value}\n        </div>\n        <table\n          cellPadding={0}\n          cellSpacing={0}\n          className={css({\n            margin: '0',\n            borderSpacing: '0',\n            borderCollapse: 'inherit',\n            border: 'none',\n          })}\n        >\n          <tbody>\n            {items.map((item, index) => {\n              return (\n                <Fragment key={index}>\n                  {item.legendItems?.map((legendItem, index) => {\n                    if (!tooltipData[legendItem.yKey] || tooltipData[legendItem.yKey].value === null) {\n                      // yKey could not be found in tooltipData\n                      return null;\n                    }\n                    return (\n                      item.visibleYKeys?.includes(legendItem.yKey) && (\n                        <tr key={`${legendItem.yKey}-${index}-${tooltipData[legendItem.yKey].value}`}>\n                          {shouldShowColorLegend && (\n                            <td\n                              style={{\n                                verticalAlign: 'middle',\n                                padding: index === 0 ? '12px 8px 0 0' : '8px 8px 0 0',\n                                width: 'auto',\n                              }}\n                            >\n                              <LegendItemBox\n                                color={getColor({\n                                  defaultColor: legendItem.color,\n                                  value: tooltipData[legendItem.yKey].value,\n                                  yKey: legendItem.yKey,\n                                  conditionalFormattingRules: item.conditionalFormattingRules ?? [],\n                                })}\n                                style={legendItem.style as LineStyles}\n                                yKey={legendItem.yKey}\n                              />\n                            </td>\n                          )}\n                          <td style={{ padding: '8px 0 0 0' }}>{keys[legendItem.yKey].keyFormatted}</td>\n                          <td style={{ fontWeight: 'bold', padding: '8px 0 0 16px' }}>\n                            {getTooltipValue(tooltipData, legendItem.yKey)}\n                          </td>\n                        </tr>\n                      )\n                    );\n                  })}\n                </Fragment>\n              );\n            })}\n\n            {showRoundedTotal && yKeys && (\n              <tr>\n                <td colSpan={2} style={{ padding: '12px 0 0 0' }}>\n                  Rounded Total\n                </td>\n                <td style={{ fontWeight: 'bold', padding: '12px 0 0 16px' }}>\n                  {yKeys.reduce((total, key) => {\n                    return total + Math.round(tooltipData[key].value as number);\n                  }, 0)}\n                </td>\n              </tr>\n            )}\n          </tbody>\n        </table>\n      </div>\n    </div>,\n    document.body,\n  );\n};\n"]} */"),
|
|
44225
44250
|
children: (_tooltipData$xKey$for = (_tooltipData$xKey = tooltipData[xKey]) == null ? void 0 : _tooltipData$xKey.formattedValue) != null ? _tooltipData$xKey$for : tooltipData[xKey].value
|
|
44226
44251
|
}), jsx("table", {
|
|
44227
44252
|
cellPadding: 0,
|
|
@@ -44232,7 +44257,7 @@ var Tooltip$1 = function Tooltip(_ref) {
|
|
|
44232
44257
|
} : {
|
|
44233
44258
|
name: "9a1sa-Tooltip",
|
|
44234
44259
|
styles: "margin:0;border-spacing:0;border-collapse:inherit;border:none;label:Tooltip;",
|
|
44235
|
-
map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
44260
|
+
map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["Tooltip.tsx"],"names":[],"mappings":"AAiHqB","file":"Tooltip.tsx","sourcesContent":["import React, { CSSProperties, Fragment, useEffect, useRef, useState } from 'react';\nimport { createPortal } from 'react-dom';\n\nimport { getColor } from '../../utils';\nimport { LegendItemBox } from '../Legend/LegendItemBox';\nimport { ShapeDefinition, ConditionalFormattingRule, DataItem, Key } from 'shared-logic/src/ChartsV2/types';\nimport { LineStyles } from 'shared-logic/src/LineChartV2/types';\nimport { BarStyles } from 'shared-logic/src/BarChartV2/types';\nimport { AreaStyles } from 'shared-logic/src/AreaChartV2/types';\nimport { BubbleStyles } from 'shared-logic/src/BubbleChartV2/types';\nimport { css } from '@emotion/css';\n\nconst MIN_TOOLTIP_WIDTH = 180;\nconst TOOLTIP_OFFSET = 20;\nconst SCROLLBAR_WIDTH = 40;\n\nconst getTooltipValue = (tooltipData: { [keyId: string]: DataItem }, yKey: string): string | number => {\n  const data = tooltipData[yKey];\n  return data?.formattedValue || data?.value || '';\n};\n\ninterface TooltipProps<T> {\n  keys: { [key: string]: Key };\n  showRoundedTotal: boolean;\n  tooltipData: {\n    [keyId: string]: DataItem;\n  };\n  tooltipLeft: number;\n  tooltipTop: number;\n  xKey: string;\n  yKeys?: string[];\n  items: {\n    legendItems: Array<ShapeDefinition<T>>;\n    conditionalFormattingRules: Array<ConditionalFormattingRule>;\n    visibleYKeys: string[];\n  }[];\n  theme: CSSProperties;\n  shouldShowColorLegend?: boolean;\n}\n\nexport const Tooltip = ({\n  keys,\n  showRoundedTotal,\n  tooltipData,\n  tooltipLeft,\n  tooltipTop,\n  xKey,\n  yKeys,\n  theme,\n  items,\n  shouldShowColorLegend = true,\n}: TooltipProps<LineStyles | BarStyles | AreaStyles | BubbleStyles>) => {\n  const tooltipRef = useRef<HTMLDivElement>(null);\n  const [position, setPosition] = useState<{ left: number }>({\n    left: tooltipLeft,\n  });\n\n  useEffect(() => {\n    const adjustTooltipPosition = () => {\n      const tooltipElement = tooltipRef.current;\n\n      if (tooltipElement) {\n        const screenWidth = window.innerWidth;\n\n        const rect = tooltipElement.getBoundingClientRect();\n\n        let width = rect.width;\n\n        if (width < MIN_TOOLTIP_WIDTH) {\n          width = MIN_TOOLTIP_WIDTH;\n        }\n\n        let left = tooltipLeft + TOOLTIP_OFFSET;\n\n        if (tooltipLeft + width > screenWidth - SCROLLBAR_WIDTH) {\n          left = tooltipLeft - width - TOOLTIP_OFFSET;\n        }\n\n        setPosition({ left });\n      }\n    };\n\n    adjustTooltipPosition();\n  }, [tooltipLeft]);\n\n  return createPortal(\n    <div\n      ref={tooltipRef}\n      style={{\n        position: 'absolute',\n        left: position.left,\n        top: tooltipTop,\n        zIndex: 2147483647 * 10,\n        ...theme,\n      }}\n    >\n      <div style={{ wordBreak: 'break-all' }}>\n        <div\n          className={css({\n            fontFamily: 'inherit',\n            lineHeight: 'inherit',\n            letterSpacing: 'inherit',\n            fontWeight: 'bold',\n            fontSize: '15px',\n            width: '100%',\n            minWidth: MIN_TOOLTIP_WIDTH,\n          })}\n        >\n          {tooltipData[xKey]?.formattedValue ?? tooltipData[xKey].value}\n        </div>\n        <table\n          cellPadding={0}\n          cellSpacing={0}\n          className={css({\n            margin: '0',\n            borderSpacing: '0',\n            borderCollapse: 'inherit',\n            border: 'none',\n          })}\n        >\n          <tbody>\n            {items.map((item, index) => {\n              return (\n                <Fragment key={index}>\n                  {item.legendItems?.map((legendItem, index) => {\n                    if (!tooltipData[legendItem.yKey] || tooltipData[legendItem.yKey].value === null) {\n                      // yKey could not be found in tooltipData\n                      return null;\n                    }\n                    return (\n                      item.visibleYKeys?.includes(legendItem.yKey) && (\n                        <tr key={`${legendItem.yKey}-${index}-${tooltipData[legendItem.yKey].value}`}>\n                          {shouldShowColorLegend && (\n                            <td\n                              style={{\n                                verticalAlign: 'middle',\n                                padding: index === 0 ? '12px 8px 0 0' : '8px 8px 0 0',\n                                width: 'auto',\n                              }}\n                            >\n                              <LegendItemBox\n                                color={getColor({\n                                  defaultColor: legendItem.color,\n                                  value: tooltipData[legendItem.yKey].value,\n                                  yKey: legendItem.yKey,\n                                  conditionalFormattingRules: item.conditionalFormattingRules ?? [],\n                                })}\n                                style={legendItem.style as LineStyles}\n                                yKey={legendItem.yKey}\n                              />\n                            </td>\n                          )}\n                          <td style={{ padding: '8px 0 0 0' }}>{keys[legendItem.yKey].keyFormatted}</td>\n                          <td style={{ fontWeight: 'bold', padding: '8px 0 0 16px' }}>\n                            {getTooltipValue(tooltipData, legendItem.yKey)}\n                          </td>\n                        </tr>\n                      )\n                    );\n                  })}\n                </Fragment>\n              );\n            })}\n\n            {showRoundedTotal && yKeys && (\n              <tr>\n                <td colSpan={2} style={{ padding: '12px 0 0 0' }}>\n                  Rounded Total\n                </td>\n                <td style={{ fontWeight: 'bold', padding: '12px 0 0 16px' }}>\n                  {yKeys.reduce((total, key) => {\n                    return total + Math.round(tooltipData[key].value as number);\n                  }, 0)}\n                </td>\n              </tr>\n            )}\n          </tbody>\n        </table>\n      </div>\n    </div>,\n    document.body,\n  );\n};\n"]} */",
|
|
44236
44261
|
toString: _EMOTION_STRINGIFIED_CSS_ERROR__$5
|
|
44237
44262
|
}),
|
|
44238
44263
|
children: jsxs("tbody", {
|
|
@@ -44272,7 +44297,7 @@ var Tooltip$1 = function Tooltip(_ref) {
|
|
|
44272
44297
|
fontWeight: 'bold',
|
|
44273
44298
|
padding: '8px 0 0 16px'
|
|
44274
44299
|
},
|
|
44275
|
-
children: tooltipData
|
|
44300
|
+
children: getTooltipValue(tooltipData, legendItem.yKey)
|
|
44276
44301
|
})]
|
|
44277
44302
|
}, legendItem.yKey + "-" + index + "-" + tooltipData[legendItem.yKey].value);
|
|
44278
44303
|
})
|
|
@@ -45598,6 +45623,36 @@ function Area(_ref4) {
|
|
|
45598
45623
|
});
|
|
45599
45624
|
}
|
|
45600
45625
|
|
|
45626
|
+
function convertToStackedPercentages(data, yKeys, xKey) {
|
|
45627
|
+
if (!xKey || yKeys.length === 0) {
|
|
45628
|
+
return data;
|
|
45629
|
+
}
|
|
45630
|
+
return data.map(function (item) {
|
|
45631
|
+
var convertedItem = _extends({}, item);
|
|
45632
|
+
var total = 0;
|
|
45633
|
+
yKeys.forEach(function (key) {
|
|
45634
|
+
var _item$key;
|
|
45635
|
+
var value = Number((_item$key = item[key]) == null ? void 0 : _item$key.value) || 0;
|
|
45636
|
+
total += value;
|
|
45637
|
+
});
|
|
45638
|
+
if (total === 0) {
|
|
45639
|
+
return convertedItem;
|
|
45640
|
+
}
|
|
45641
|
+
yKeys.forEach(function (key) {
|
|
45642
|
+
if (item[key]) {
|
|
45643
|
+
var value = Number(item[key].value) || 0;
|
|
45644
|
+
var percentage = value / total * 100;
|
|
45645
|
+
convertedItem[key] = _extends({}, item[key], {
|
|
45646
|
+
value: percentage / 100,
|
|
45647
|
+
originalValue: item[key].value,
|
|
45648
|
+
formattedValue: "" + percentage.toFixed(1)
|
|
45649
|
+
});
|
|
45650
|
+
}
|
|
45651
|
+
});
|
|
45652
|
+
return convertedItem;
|
|
45653
|
+
});
|
|
45654
|
+
}
|
|
45655
|
+
|
|
45601
45656
|
var BAR_RADIUS = 2;
|
|
45602
45657
|
|
|
45603
45658
|
function getBarFill(bars, conditionalFormattingRules, barKey, barValues) {
|
|
@@ -46031,8 +46086,14 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46031
46086
|
var xKey = chart.x.key;
|
|
46032
46087
|
var xScaleKey = chart.x.scale.key;
|
|
46033
46088
|
var xScaleDataType = chart.x.scale.dataType;
|
|
46034
|
-
var xScale = useBarXScale(xScaleDataType, innerWidth, xScaleKey, chart.data);
|
|
46035
46089
|
var yScaleKeys = chart.y.keys;
|
|
46090
|
+
var processedData = useMemo(function () {
|
|
46091
|
+
if (isStacked100) {
|
|
46092
|
+
return convertToStackedPercentages(chart.data, chart.y.keys, xKey);
|
|
46093
|
+
}
|
|
46094
|
+
return chart.data;
|
|
46095
|
+
}, [isStacked100, chart.data, chart.y.keys, xKey]);
|
|
46096
|
+
var xScale = useBarXScale(xScaleDataType, innerWidth, xScaleKey, processedData);
|
|
46036
46097
|
var defaultYScale = useYScale(innerHeight, chart.y.scale);
|
|
46037
46098
|
var yScale = useMemo(function () {
|
|
46038
46099
|
if (isStacked100) {
|
|
@@ -46045,9 +46106,54 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46045
46106
|
}
|
|
46046
46107
|
return defaultYScale;
|
|
46047
46108
|
}, [innerHeight, defaultYScale, options.stacked]);
|
|
46048
|
-
var yTickValues =
|
|
46049
|
-
|
|
46050
|
-
|
|
46109
|
+
var yTickValues = useMemo(function () {
|
|
46110
|
+
if (isStacked100) {
|
|
46111
|
+
return [0, 0.2, 0.4, 0.6, 0.8, 1];
|
|
46112
|
+
}
|
|
46113
|
+
return chart.y.ticks.map(function (tick) {
|
|
46114
|
+
return Number(tick.value);
|
|
46115
|
+
});
|
|
46116
|
+
}, [isStacked100, chart.y.ticks]);
|
|
46117
|
+
var yAxisConfig = useMemo(function () {
|
|
46118
|
+
if (isStacked100) {
|
|
46119
|
+
return _extends({}, chart.y, {
|
|
46120
|
+
ticks: [{
|
|
46121
|
+
value: 0,
|
|
46122
|
+
formattedValue: '0',
|
|
46123
|
+
scaleValue: 0
|
|
46124
|
+
}, {
|
|
46125
|
+
value: 0.2,
|
|
46126
|
+
formattedValue: '20',
|
|
46127
|
+
scaleValue: 0.2
|
|
46128
|
+
}, {
|
|
46129
|
+
value: 0.4,
|
|
46130
|
+
formattedValue: '40',
|
|
46131
|
+
scaleValue: 0.4
|
|
46132
|
+
}, {
|
|
46133
|
+
value: 0.6,
|
|
46134
|
+
formattedValue: '60',
|
|
46135
|
+
scaleValue: 0.6
|
|
46136
|
+
}, {
|
|
46137
|
+
value: 0.8,
|
|
46138
|
+
formattedValue: '80',
|
|
46139
|
+
scaleValue: 0.8
|
|
46140
|
+
}, {
|
|
46141
|
+
value: 1,
|
|
46142
|
+
formattedValue: '100',
|
|
46143
|
+
scaleValue: 1
|
|
46144
|
+
}]
|
|
46145
|
+
});
|
|
46146
|
+
}
|
|
46147
|
+
return chart.y;
|
|
46148
|
+
}, [isStacked100, chart.y]);
|
|
46149
|
+
var xAxisConfig = useMemo(function () {
|
|
46150
|
+
if (isStacked100) {
|
|
46151
|
+
return _extends({}, chart.x, {
|
|
46152
|
+
ticks: chart.x.ticks
|
|
46153
|
+
});
|
|
46154
|
+
}
|
|
46155
|
+
return chart.x;
|
|
46156
|
+
}, [isStacked100, chart.x]);
|
|
46051
46157
|
var yAxisLabels = chart.bars.map(function (legendItem) {
|
|
46052
46158
|
var _chart$keys$legendIte, _chart$keys$legendIte2;
|
|
46053
46159
|
return (_chart$keys$legendIte = (_chart$keys$legendIte2 = chart.keys[legendItem.yKey]) == null ? void 0 : _chart$keys$legendIte2.keyFormatted) != null ? _chart$keys$legendIte : '';
|
|
@@ -46063,7 +46169,7 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46063
46169
|
}
|
|
46064
46170
|
return undefined;
|
|
46065
46171
|
}, [xScale, yScaleKeys, options.stacked]);
|
|
46066
|
-
var dataFlattened = useFlattenedData(xScaleKey, xScaleDataType,
|
|
46172
|
+
var dataFlattened = useFlattenedData(xScaleKey, xScaleDataType, processedData, chart.y.keys);
|
|
46067
46173
|
var themeCSS = useMemo(function () {
|
|
46068
46174
|
return getChartThemeCSS(theme);
|
|
46069
46175
|
}, [theme]);
|
|
@@ -46077,7 +46183,7 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46077
46183
|
var handleMouseMove = useCallback(function (event) {
|
|
46078
46184
|
if (!xKey || !xScaleKey || xScale === null) return;
|
|
46079
46185
|
var tooltipData = getTooltipData({
|
|
46080
|
-
data:
|
|
46186
|
+
data: processedData,
|
|
46081
46187
|
event: event,
|
|
46082
46188
|
margin: margin,
|
|
46083
46189
|
xScaleKey: xScaleKey,
|
|
@@ -46092,12 +46198,12 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46092
46198
|
tooltipTop: event.pageY,
|
|
46093
46199
|
tooltipData: tooltipData == null ? void 0 : tooltipData.tooltipData
|
|
46094
46200
|
});
|
|
46095
|
-
}, [showTooltip, xScale, margin, xKey, xScaleKey, xScaleDataType, chart.x.scale.ordering,
|
|
46201
|
+
}, [showTooltip, xScale, margin, xKey, xScaleKey, xScaleDataType, chart.x.scale.ordering, processedData, isStacked100]);
|
|
46096
46202
|
var handleMouseLeave = useCallback(function () {
|
|
46097
46203
|
hideTooltip();
|
|
46098
46204
|
}, [hideTooltip]);
|
|
46099
46205
|
var handleOnBarClick = useCallback(function (event, barGroup, bar) {
|
|
46100
|
-
var
|
|
46206
|
+
var _processedData$barGro;
|
|
46101
46207
|
onClick == null || onClick({
|
|
46102
46208
|
clickedValue: {
|
|
46103
46209
|
index: barGroup.index,
|
|
@@ -46106,16 +46212,16 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46106
46212
|
value: bar.value
|
|
46107
46213
|
},
|
|
46108
46214
|
x: _extends({}, chart.x.ticks[barGroup.index], {
|
|
46109
|
-
value: (
|
|
46215
|
+
value: (_processedData$barGro = processedData[barGroup.index][xKey].value) != null ? _processedData$barGro : '',
|
|
46110
46216
|
key: xKey
|
|
46111
46217
|
})
|
|
46112
46218
|
},
|
|
46113
46219
|
clickEvent: event
|
|
46114
46220
|
});
|
|
46115
|
-
}, [onClick,
|
|
46221
|
+
}, [onClick, processedData, xKey]);
|
|
46116
46222
|
var formattedLabelsDict = useMemo(function () {
|
|
46117
|
-
return getLabelDictionary(
|
|
46118
|
-
}, [
|
|
46223
|
+
return getLabelDictionary(processedData, yScaleKeys);
|
|
46224
|
+
}, [processedData, yScaleKeys]);
|
|
46119
46225
|
return jsxs(Fragment, {
|
|
46120
46226
|
children: [jsxs(ChartWrapper$1, {
|
|
46121
46227
|
width: width,
|
|
@@ -46134,7 +46240,7 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46134
46240
|
removeStroke: options.removeStroke,
|
|
46135
46241
|
themeCSS: themeCSS
|
|
46136
46242
|
}), jsx(AxisBottom, {
|
|
46137
|
-
x:
|
|
46243
|
+
x: xAxisConfig,
|
|
46138
46244
|
margin: margin,
|
|
46139
46245
|
themeCSS: themeCSS,
|
|
46140
46246
|
show: options.axis.showXAxisLabels,
|
|
@@ -46145,7 +46251,7 @@ var BarChart$5 = function BarChart(_ref) {
|
|
|
46145
46251
|
baselineShift: groupingAxisBaselineShift
|
|
46146
46252
|
}), jsx(AxisLeft, {
|
|
46147
46253
|
show: options.axis.showYAxisLabels,
|
|
46148
|
-
y:
|
|
46254
|
+
y: yAxisConfig,
|
|
46149
46255
|
margin: margin,
|
|
46150
46256
|
themeCSS: themeCSS,
|
|
46151
46257
|
yScale: yScale,
|
|
@@ -47013,7 +47119,9 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47013
47119
|
theme = _ref.theme,
|
|
47014
47120
|
onClick = _ref.onClick,
|
|
47015
47121
|
enableHover = _ref.enableHover,
|
|
47016
|
-
numberOfDimensions = _ref.numberOfDimensions
|
|
47122
|
+
numberOfDimensions = _ref.numberOfDimensions,
|
|
47123
|
+
formatXAxisLabel = _ref.formatXAxisLabel,
|
|
47124
|
+
formatYAxisLabel = _ref.formatYAxisLabel;
|
|
47017
47125
|
var _useTooltip = useTooltip$1(),
|
|
47018
47126
|
tooltipOpen = _useTooltip.tooltipOpen,
|
|
47019
47127
|
_useTooltip$tooltipLe = _useTooltip.tooltipLeft,
|
|
@@ -47055,9 +47163,46 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47055
47163
|
return defaultXScale;
|
|
47056
47164
|
}, [innerWidth, defaultXScale, groupingAxisBaselineShift, options.stacked]);
|
|
47057
47165
|
var barGroupXScale = useHorizontalBarXScale(innerWidth, chart.x.scale, 0);
|
|
47058
|
-
var xTickValues =
|
|
47059
|
-
|
|
47060
|
-
|
|
47166
|
+
var xTickValues = useMemo(function () {
|
|
47167
|
+
if (isStacked100) {
|
|
47168
|
+
return [0, 0.2, 0.4, 0.6, 0.8, 1.0];
|
|
47169
|
+
}
|
|
47170
|
+
return chart.x.ticks.map(function (tick) {
|
|
47171
|
+
return Number(tick.value);
|
|
47172
|
+
});
|
|
47173
|
+
}, [isStacked100, chart.x.ticks]);
|
|
47174
|
+
var xAxisConfig = useMemo(function () {
|
|
47175
|
+
if (isStacked100) {
|
|
47176
|
+
return _extends({}, chart.x, {
|
|
47177
|
+
ticks: [{
|
|
47178
|
+
value: 0,
|
|
47179
|
+
formattedValue: '0',
|
|
47180
|
+
scaleValue: 0
|
|
47181
|
+
}, {
|
|
47182
|
+
value: 0.2,
|
|
47183
|
+
formattedValue: '20',
|
|
47184
|
+
scaleValue: 0.2
|
|
47185
|
+
}, {
|
|
47186
|
+
value: 0.4,
|
|
47187
|
+
formattedValue: '40',
|
|
47188
|
+
scaleValue: 0.4
|
|
47189
|
+
}, {
|
|
47190
|
+
value: 0.6,
|
|
47191
|
+
formattedValue: '60',
|
|
47192
|
+
scaleValue: 0.6
|
|
47193
|
+
}, {
|
|
47194
|
+
value: 0.8,
|
|
47195
|
+
formattedValue: '80',
|
|
47196
|
+
scaleValue: 0.8
|
|
47197
|
+
}, {
|
|
47198
|
+
value: 1,
|
|
47199
|
+
formattedValue: '100',
|
|
47200
|
+
scaleValue: 1
|
|
47201
|
+
}]
|
|
47202
|
+
});
|
|
47203
|
+
}
|
|
47204
|
+
return chart.x;
|
|
47205
|
+
}, [isStacked100, chart.x]);
|
|
47061
47206
|
var xAxisLabels = chart.bars.map(function (legendItem) {
|
|
47062
47207
|
var _chart$keys$legendIte, _chart$keys$legendIte2;
|
|
47063
47208
|
return (_chart$keys$legendIte = (_chart$keys$legendIte2 = chart.keys[legendItem.yKey]) == null ? void 0 : _chart$keys$legendIte2.keyFormatted) != null ? _chart$keys$legendIte : '';
|
|
@@ -47066,7 +47211,13 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47066
47211
|
var yKey = chart.y.key;
|
|
47067
47212
|
var yScaleKey = chart.y.scale.key;
|
|
47068
47213
|
var yScaleDataType = chart.y.scale.dataType;
|
|
47069
|
-
var
|
|
47214
|
+
var processedData = useMemo(function () {
|
|
47215
|
+
if (isStacked100) {
|
|
47216
|
+
return convertToStackedPercentages(chart.data, chart.x.keys, yKey);
|
|
47217
|
+
}
|
|
47218
|
+
return chart.data;
|
|
47219
|
+
}, [isStacked100, chart.data, chart.x.keys, yKey]);
|
|
47220
|
+
var yScale = useHorizontalBarYScale(yScaleDataType, innerHeight, yScaleKey, processedData);
|
|
47070
47221
|
var innerYScale = useMemo(function () {
|
|
47071
47222
|
if (!options.stacked && yScale && 'bandwidth' in yScale) {
|
|
47072
47223
|
return scaleBand({
|
|
@@ -47077,7 +47228,7 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47077
47228
|
}
|
|
47078
47229
|
return undefined;
|
|
47079
47230
|
}, [xScale, xScaleKeys, options.stacked]);
|
|
47080
|
-
var dataFlattened = useFlattenedData(yScaleKey, yScaleDataType,
|
|
47231
|
+
var dataFlattened = useFlattenedData(yScaleKey, yScaleDataType, processedData, chart.x.keys);
|
|
47081
47232
|
var themeCSS = useMemo(function () {
|
|
47082
47233
|
return getChartThemeCSS(theme);
|
|
47083
47234
|
}, [theme]);
|
|
@@ -47091,7 +47242,7 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47091
47242
|
var handleMouseMove = useCallback(function (event) {
|
|
47092
47243
|
if (!yKey || !yScaleKey || yScale === null) return;
|
|
47093
47244
|
var tooltipData = getTooltipDataForHorizontalChart({
|
|
47094
|
-
data:
|
|
47245
|
+
data: processedData,
|
|
47095
47246
|
event: event,
|
|
47096
47247
|
margin: margin,
|
|
47097
47248
|
yScaleKey: yScaleKey,
|
|
@@ -47106,12 +47257,12 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47106
47257
|
tooltipTop: event.pageY,
|
|
47107
47258
|
tooltipData: tooltipData == null ? void 0 : tooltipData.tooltipData
|
|
47108
47259
|
});
|
|
47109
|
-
}, [showTooltip, xScale, margin, yKey, yScaleKey, yScaleDataType, chart.x.scale.ordering,
|
|
47260
|
+
}, [showTooltip, xScale, margin, yKey, yScaleKey, yScaleDataType, chart.x.scale.ordering, processedData, isStacked100, xScaleKeys]);
|
|
47110
47261
|
var handleMouseLeave = useCallback(function () {
|
|
47111
47262
|
hideTooltip();
|
|
47112
47263
|
}, [hideTooltip]);
|
|
47113
47264
|
var handleOnBarClick = useCallback(function (event, barGroup, bar) {
|
|
47114
|
-
var
|
|
47265
|
+
var _processedData$barGro;
|
|
47115
47266
|
onClick == null || onClick({
|
|
47116
47267
|
clickedValue: {
|
|
47117
47268
|
index: barGroup.index,
|
|
@@ -47120,22 +47271,29 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47120
47271
|
value: bar.value
|
|
47121
47272
|
},
|
|
47122
47273
|
y: _extends({}, chart.y.ticks[barGroup.index], {
|
|
47123
|
-
value: (
|
|
47274
|
+
value: (_processedData$barGro = processedData[barGroup.index][yKey].value) != null ? _processedData$barGro : '',
|
|
47124
47275
|
key: yKey
|
|
47125
47276
|
})
|
|
47126
47277
|
},
|
|
47127
47278
|
clickEvent: event
|
|
47128
47279
|
});
|
|
47129
|
-
}, [onClick,
|
|
47280
|
+
}, [onClick, processedData, yKey]);
|
|
47130
47281
|
var tickXAxisFormat = useCallback(function (value) {
|
|
47131
|
-
var item =
|
|
47282
|
+
var item = xAxisConfig.ticks.filter(function (tick) {
|
|
47132
47283
|
return tick.value === value;
|
|
47133
47284
|
})[0];
|
|
47134
47285
|
if (!item) {
|
|
47135
47286
|
return '';
|
|
47136
47287
|
}
|
|
47137
|
-
|
|
47138
|
-
|
|
47288
|
+
var displayValue = item.formattedValue || item.value.toString();
|
|
47289
|
+
if (isStacked100 && !formatXAxisLabel) {
|
|
47290
|
+
displayValue = "" + displayValue;
|
|
47291
|
+
}
|
|
47292
|
+
if (formatXAxisLabel) {
|
|
47293
|
+
return formatXAxisLabel(displayValue);
|
|
47294
|
+
}
|
|
47295
|
+
return displayValue;
|
|
47296
|
+
}, [xAxisConfig.ticks, formatXAxisLabel, isStacked100]);
|
|
47139
47297
|
var tickYAxisFormat = useCallback(function (value) {
|
|
47140
47298
|
var tick = null;
|
|
47141
47299
|
if (yScaleDataType === 'date_time' && value instanceof Date) {
|
|
@@ -47150,16 +47308,17 @@ var HorizontalBarChart$3 = function HorizontalBarChart(_ref) {
|
|
|
47150
47308
|
tick = _matchingTickValue || null;
|
|
47151
47309
|
}
|
|
47152
47310
|
if (tick) {
|
|
47153
|
-
|
|
47154
|
-
|
|
47311
|
+
var displayValue = tick.formattedValue || tick.value.toString();
|
|
47312
|
+
if (formatYAxisLabel) {
|
|
47313
|
+
return formatYAxisLabel(displayValue);
|
|
47155
47314
|
}
|
|
47156
|
-
return
|
|
47315
|
+
return displayValue;
|
|
47157
47316
|
}
|
|
47158
47317
|
return '';
|
|
47159
|
-
}, [chart.y.ticks, yScaleDataType]);
|
|
47318
|
+
}, [chart.y.ticks, yScaleDataType, formatYAxisLabel]);
|
|
47160
47319
|
var formattedLabelsDict = useMemo(function () {
|
|
47161
|
-
return getLabelDictionary(
|
|
47162
|
-
}, [
|
|
47320
|
+
return getLabelDictionary(processedData, xScaleKeys);
|
|
47321
|
+
}, [processedData, xScaleKeys]);
|
|
47163
47322
|
return jsxs(Fragment, {
|
|
47164
47323
|
children: [jsxs(ChartWrapper$1, {
|
|
47165
47324
|
width: width,
|
|
@@ -50198,35 +50357,6 @@ var AreaChartV2 = function AreaChartV2(props) {
|
|
|
50198
50357
|
});
|
|
50199
50358
|
};
|
|
50200
50359
|
|
|
50201
|
-
function convertToStackedPercentages(data, yKeys, xKey) {
|
|
50202
|
-
if (!xKey || yKeys.length === 0) {
|
|
50203
|
-
return data;
|
|
50204
|
-
}
|
|
50205
|
-
return data.map(function (item) {
|
|
50206
|
-
var convertedItem = _extends({}, item);
|
|
50207
|
-
var total = 0;
|
|
50208
|
-
yKeys.forEach(function (key) {
|
|
50209
|
-
var _item$key;
|
|
50210
|
-
var value = Number((_item$key = item[key]) == null ? void 0 : _item$key.value) || 0;
|
|
50211
|
-
total += value;
|
|
50212
|
-
});
|
|
50213
|
-
if (total === 0) {
|
|
50214
|
-
return convertedItem;
|
|
50215
|
-
}
|
|
50216
|
-
yKeys.forEach(function (key) {
|
|
50217
|
-
if (item[key]) {
|
|
50218
|
-
var value = Number(item[key].value) || 0;
|
|
50219
|
-
var percentage = value / total;
|
|
50220
|
-
convertedItem[key] = _extends({}, item[key], {
|
|
50221
|
-
value: percentage,
|
|
50222
|
-
originalValue: item[key].value
|
|
50223
|
-
});
|
|
50224
|
-
}
|
|
50225
|
-
});
|
|
50226
|
-
return convertedItem;
|
|
50227
|
-
});
|
|
50228
|
-
}
|
|
50229
|
-
|
|
50230
50360
|
var buildBarChartRepresentation = function buildBarChartRepresentation(_ref) {
|
|
50231
50361
|
var _xKeys$, _axisTitles$x, _axisTitles$y;
|
|
50232
50362
|
var axisTitles = _ref.axisTitles,
|
|
@@ -42,6 +42,7 @@ export declare enum DateOp {
|
|
|
42
42
|
Less = 1
|
|
43
43
|
}
|
|
44
44
|
export declare function inclusiveExclusiveCurrent(op: DateOp, filter: DateFilter | DateAndTimeFilter): string;
|
|
45
|
+
export declare const buildAdvancedFilters: (filterValue: QueryAttributes.Filter[][], fieldIds: string[]) => QueryAttributes.Filter[][];
|
|
45
46
|
export declare function getCascadeOptionsFilters(globalFilters: AdditionalFilter[], dataSets: DataSet[], dateFilterOptions: DateTimeFilterOptions, variables: VariableList, cascadeFilterSelection?: boolean): OptionalFilters | undefined;
|
|
46
47
|
export declare const updateFilterForOptionalPulledFromOptions: (filter: AdditionalFilter) => AdditionalFilter;
|
|
47
48
|
export declare function removeEmptyConditions(conditions: QueryAttributes.Filter[][]): QueryAttributes.Filter[][];
|
|
@@ -54,6 +54,8 @@ export declare type GoalLine = {
|
|
|
54
54
|
export declare type DataItem = {
|
|
55
55
|
value: number | string | null;
|
|
56
56
|
formattedValue: string | null;
|
|
57
|
+
originalValue?: number | string | null;
|
|
58
|
+
displayValue?: number;
|
|
57
59
|
};
|
|
58
60
|
export declare type DateTimeFormatter = {
|
|
59
61
|
formatter: (date: Date) => string;
|
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-
|
|
4
|
+
"version": "0.15.0-dev-45f4268b92d46ac8f53b9683a04bb9e8d2dac16a",
|
|
5
5
|
"source": "src/index.tsx",
|
|
6
6
|
"types": "./dist/dashboard/src/index.d.ts",
|
|
7
7
|
"module": "./dist/dashboard.esm.js",
|