Skip to content

feat: add disableDataFilter option to timeseries and value card #4037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.x.x
Choose a base branch
from
+12 −5
Open

feat: add disableDataFilter option to timeseries and value card #4037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/react/src/components/TimeSeriesCard/timeSeriesUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion packages/react/src/components/ValueCard/ValueContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions packages/react/src/components/ValueCard/valueCardUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ export const DEFAULT_FONT_SIZE = 42;
* @param {Array<Object>} 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];

/**
Expand Down