diff --git a/packages/react/src/components/TimeSeriesCard/timeSeriesUtils.js b/packages/react/src/components/TimeSeriesCard/timeSeriesUtils.js index 21d9d0af59..37f4e2323c 100644 --- a/packages/react/src/components/TimeSeriesCard/timeSeriesUtils.js +++ b/packages/react/src/components/TimeSeriesCard/timeSeriesUtils.js @@ -219,10 +219,10 @@ export const formatChartData = (timeDataSourceId = 'timestamp', series, values) // Series is the different groups of datasets // ensure is actually is an array since proptypes allow for an object, too. const seriesArray = Array.isArray(series) ? series : [series]; - seriesArray.forEach(({ dataSourceId, dataFilter = {}, label }) => { + seriesArray.forEach(({ dataSourceId, dataFilter = {}, label, disableDataFilter = false }) => { timestamps.forEach((timestamp) => { // First filter based on on the dataFilter - const filteredData = filter(values, dataFilter); + const filteredData = !disableDataFilter ? filter(values, dataFilter) : values; if (!isEmpty(filteredData)) { // have to filter out null values from the dataset, as it causes Carbon Charts to break filteredData diff --git a/packages/react/src/components/ValueCard/ValueContent.jsx b/packages/react/src/components/ValueCard/ValueContent.jsx index 5b8582a649..ce97de9d4f 100644 --- a/packages/react/src/components/ValueCard/ValueContent.jsx +++ b/packages/react/src/components/ValueCard/ValueContent.jsx @@ -71,7 +71,12 @@ const ValueContent = ({ isEditable={isEditable} title={title} renderIconByName={others.renderIconByName} - value={determineValue(attribute.dataSourceId, values, attribute.dataFilter)} + value={determineValue( + attribute.dataSourceId, + values, + attribute.dataFilter, + attribute.disableDataFilter + )} secondaryValue={ attribute.secondaryValue && { ...attribute.secondaryValue, diff --git a/packages/react/src/components/ValueCard/valueCardUtils.js b/packages/react/src/components/ValueCard/valueCardUtils.js index 3003250956..b6167df794 100644 --- a/packages/react/src/components/ValueCard/valueCardUtils.js +++ b/packages/react/src/components/ValueCard/valueCardUtils.js @@ -16,9 +16,11 @@ export const DEFAULT_FONT_SIZE = 42; * @param {Array} values * @param {Object} dataFilter */ -export const determineValue = (dataSourceId, values, dataFilter = {}) => +export const determineValue = (dataSourceId, values, dataFilter = {}, disableDataFilter = false) => Array.isArray(values) - ? filter(values, dataFilter)[0] && filter(values, dataFilter)[0][dataSourceId] + ? !disableDataFilter + ? filter(values, dataFilter)[0] && filter(values, dataFilter)[0][dataSourceId] + : values[0] && values[0][dataSourceId] : values && values[dataSourceId]; /**