Skip to content
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

No issue: Add a unit test for get measure display info #4014

Merged
merged 3 commits into from
Jul 4, 2022
Merged

No issue: Add a unit test for get measure display info #4014

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af07609
Remove unused functions
biaoli0 Jul 4, 2022
9169e31
Add an unit test for getMeasureDisplayInfo()
biaoli0 Jul 4, 2022
98b95c0
Add description to unit test
biaoli0 Jul 4, 2022
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
19 changes: 19 additions & 0 deletions packages/ui-components/src/components/Map/__tests__/markerFormats.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,25 @@ describe('measures', () => {
const display3 = getMeasureDisplayInfo({ questionC: 0.5 }, [optionsSpectrum]);
expect(display3).toHaveProperty('color', 'hsl(50, 100%, 50%)');
});

it('Coloured radius choose a colour from a spectrum, and pick radius from radius', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test title is a little hard to understand. I suggest we call it something shorter like 'should support coloured radius' and if you want the longer description pop in in a comment inside the test case

const questionAValue = 100;
const display = getMeasureDisplayInfo(
{
questionC: 0.5,
questionA: questionAValue,
},
[
{
...optionsSpectrum,
scaleType: 'performanceDesc',
},
{ ...optionsRadius, key: 'questionA' },
],
);
expect(display).toHaveProperty('color', 'hsl(50, 100%, 50%)');
expect(display).toHaveProperty('radius', questionAValue);
});
});

describe('popup', () => {
Expand Down
6 changes: 1 addition & 5 deletions packages/web-frontend/src/utils/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ export { isMobile, delayMobileTapCallback } from './mobile';
export { getCenterAndZoomForBounds } from './getCenterAndZoomForBounds';
export { getOrgUnitPhotoUrl } from './getOrgUnitPhotoUrl';
export { getMapUrl } from './getMapUrl';
export {
processMeasureInfo,
getSingleFormattedValue,
flattenNumericalMeasureData,
} from './measures';
export { processMeasureInfo, flattenNumericalMeasureData } from './measures';
export {
getMapOverlaysFromHierarchy,
checkHierarchyIncludesMapOverlayCodes,
Expand Down
94 changes: 0 additions & 94 deletions packages/web-frontend/src/utils/measures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
} from '@tupaia/ui-components/lib/map';
import { VALUE_TYPES } from '../components/View/constants';
import { MAP_COLORS } from '../styles';
import { formatDataValue } from './formatters';
import { MARKER_TYPES, SCALE_TYPES } from '../constants';

export const MEASURE_TYPE_ICON = 'icon';
Expand Down Expand Up @@ -104,27 +103,6 @@ const getNullValueMapping = type => {
return baseMapping;
};

function getFormattedValue(value, type, valueInfo, scaleType, valueType, submissionDate) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love when code gets deleted, nice one!

switch (type) {
case MEASURE_TYPE_SPECTRUM:
case MEASURE_TYPE_SHADED_SPECTRUM:
if (scaleType === SCALE_TYPES.TIME) {
return `last submission on ${submissionDate}`;
}
return formatDataValue(value, valueType);
case MEASURE_TYPE_RADIUS:
case MEASURE_TYPE_ICON:
case MEASURE_TYPE_COLOR:
case MEASURE_TYPE_SHADING:
if (scaleType === SCALE_TYPES.TIME) {
return `last submission on ${submissionDate}`;
}
return valueInfo.name || value;
default:
return value;
}
}

const getSpectrumScaleValues = (measureData, measureOption) => {
const { key, scaleType, startDate, endDate } = measureOption;

Expand Down Expand Up @@ -223,78 +201,6 @@ export function processMeasureInfo(response) {
};
}

function getValueInfo(value, valueMapping, hiddenValues = {}) {
if (!value && typeof value !== 'number' && valueMapping.null) {
// use 'no data' value
const nullValue = hiddenValues.null || hiddenValues[valueMapping.null.value];

return {
...valueMapping.null,
isHidden: nullValue,
};
}

const matchedValue = valueMapping[value];

if (!matchedValue) {
// use 'other' value
return {
...valueMapping.other,
isHidden: hiddenValues.other,
value,
};
}

return {
...matchedValue,
isHidden: hiddenValues[matchedValue.value],
};
}

export function getFormattedInfo(orgUnitData, measureOption) {
const { key, valueMapping, type, displayedValueKey, scaleType, valueType } = measureOption;

const value = orgUnitData[key];
const valueInfo = getValueInfo(value, valueMapping);

if (
displayedValueKey &&
(orgUnitData[displayedValueKey] || orgUnitData[displayedValueKey] === 0)
) {
return {
formattedValue: formatDataValue(
orgUnitData[displayedValueKey],
valueType,
orgUnitData.metadata,
),
valueInfo,
};
}

// note: dont use !value here, as 0 is a valid value.
if (value === null || value === undefined) {
return { formattedValue: valueInfo.name || 'No data', valueInfo };
}

return {
formattedValue: getFormattedValue(
value,
type,
valueInfo,
scaleType,
valueType,
orgUnitData.submissionDate,
),
valueInfo,
};
}

export function getSingleFormattedValue(orgUnitData, measureOptions) {
// For situations where we can only show one value, just show the value
// of the first measure.
return getFormattedInfo(orgUnitData, measureOptions[0]).formattedValue;
}

// Take a measureData array where the [key]: value is a number
// and filters NaN values (e.g. undefined).
export function flattenNumericalMeasureData(measureData, key) {
Expand Down