Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
fix(sunburst-chart): Refactoring isChild method to be more precise.
Browse files Browse the repository at this point in the history
  • Loading branch information
@PedroMosquera @tomheller
PedroMosquera authored and tomheller committed Jul 27, 2020
1 parent d8e5453 commit 759e97e
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 3 deletions.
250 changes: 250 additions & 0 deletions libs/barista-components/sunburst-chart/src/sunburst-chart.mock.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,253 @@ export const sunburstChartMock = [
],
},
];

export const sunburstChartExtendedMock = [
{
label: 'APAC',
children: [
{
label: '8:00 p.m.',
children: [
{
value: 3,
label: 'Dude — 8:00 p.m.',
},
{
value: 5,
label: 'Guy — 8:00 p.m.',
},
],
},
{
label: '9:00 p.m.',
children: [
{
value: 3,
label: 'Dude — 9:00 p.m.',
},
],
},
{
label: '10:00 p.m.',
children: [
{
value: 3,
label: 'Dude — 10:00 p.m.',
},
],
},
{
label: '11:00 p.m.',
children: [
{
value: 5,
label: 'Dude — 11:00 p.m.',
},
],
},
{
label: '12:00 a.m.',
children: [
{
value: 4,
label: 'Girl — 12:00 a.m.',
},
],
},
{
label: '1:00 a.m.',
children: [
{
value: 4,
label: 'Girl — 1:00 a.m.',
},
],
},
{
label: '2:00 a.m.',
children: [
{
value: 4,
label: 'Girl — 2:00 a.m.',
},
{
value: 4,
label: 'Person — 2:00 a.m.',
},
],
},
],
},
{
label: 'EMEA',
children: [
{
label: '3:00 a.m.',
children: [
{
value: 4,
label: 'Thomas — 3:00 a.m.',
},
],
},
{
label: '4:00 a.m.',
children: [
{
value: 4,
label: 'Thomas — 4:00 a.m.',
},
],
},
{
label: '5:00 a.m.',
children: [
{
value: 4,
label: 'Thomas — 5:00 a.m.',
},
],
},
{
label: '6:00 a.m.',
children: [
{
value: 4,
label: 'Thomas — 6:00 a.m.',
},
{
value: 4,
label: 'Frunk — 6:00 a.m.',
},
{
value: 4,
label: 'Spain — 6:00 a.m.',
},
],
},
],
},
{
label: 'NORAM',
children: [
{
label: '7:00 a.m.',
children: [
{
value: 4,
label: 'Alex — 7:00 a.m.',
},
],
},
{
label: '8:00 a.m.',
children: [
{
value: 4,
label: 'Alex — 8:00 a.m.',
},
],
},
{
label: '9:00 a.m.',
children: [
{
value: 4,
label: 'Alex — 9:00 a.m.',
},
],
},
{
label: '10:00 a.m.',
children: [
{
value: 4,
label: 'Alex — 10:00 a.m.',
},
],
},
{
label: '11:00 a.m.',
children: [
{
value: 4,
label: 'Josh — 11:00 a.m.',
},
],
},
{
label: '12:00 p.m.',
children: [
{
value: 4,
label: 'Anthony — 12:00 p.m.',
},
],
},
{
label: '1:00 p.m.',
children: [
{
value: 4,
label: 'Ben — 1:00 p.m.',
},
],
},
{
label: '2:00 p.m.',
children: [
{
value: 4,
label: 'Ben — 2:00 p.m.',
},
],
},
{
label: '3:00 p.m.',
children: [
{
value: 4,
label: 'Ben — 3:00 p.m.',
},
],
},
{
label: '4:00 p.m.',
children: [
{
value: 4,
label: 'Justin — 4:00 p.m.',
},
],
},
{
label: '5:00 p.m.',
children: [
{
value: 4,
label: 'Justin — 5:00 p.m.',
},
],
},
{
label: '6:00 p.m.',
children: [
{
value: 4,
label: 'Daniel — 6:00 p.m.',
},
],
},
{
label: '7:00 p.m.',
children: [
{
value: 4,
label: 'Daniel — 7:00 p.m.',
},
],
},
],
},
];
37 changes: 36 additions & 1 deletion libs/barista-components/sunburst-chart/src/sunburst-chart.util.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
* limitations under the License.
*/

import { sunburstChartMock } from './sunburst-chart.mock';
import {
sunburstChartMock,
sunburstChartExtendedMock,
} from './sunburst-chart.mock';
import {
fillNodes,
getNodesWithState,
Expand Down Expand Up @@ -323,6 +326,38 @@ describe('SunburstChart util', () => {

expect(actual).toEqual(expected);
});

it('should set visible the proper node based on the selected id', () => {
const SELECTED_PARTENT_NODE = '2';
const SELECTED_CHILD_NODE = '1';
const SIBLING_NODE = '12';

const actualResults = getNodesWithState(
fillNodes(sunburstChartExtendedMock),
`${SELECTED_PARTENT_NODE}.${SELECTED_CHILD_NODE}`,
);
const selectedGrandParent = actualResults.find(
(i) => i.id === SELECTED_PARTENT_NODE,
);

const selectedParent = selectedGrandParent?.children?.find(
(i) => i.id === `${SELECTED_PARTENT_NODE}.${SELECTED_CHILD_NODE}`,
);
const selectedChild = selectedParent?.children?.find(
(i) => i.id === `${SELECTED_PARTENT_NODE}.${SELECTED_CHILD_NODE}.0`,
);

const selectedSiblingParent = selectedGrandParent?.children?.find(
(i) => i.id === `${SELECTED_PARTENT_NODE}.${SIBLING_NODE}`,
);
const sibling = selectedSiblingParent?.children?.find(
(i) => i.id === `${SELECTED_PARTENT_NODE}.${SIBLING_NODE}.0`,
);

expect(selectedChild?.visible).toBeTruthy();

expect(sibling?.visible).toBeFalsy();
});
});

describe('getSelectedNodes', () => {
Expand Down
5 changes: 3 additions & 2 deletions libs/barista-components/sunburst-chart/src/sunburst-chart.util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,9 @@ const getAncestorsIds = (id: string): string[] =>
* @param id
*/
const isChild = (node, id?: string): boolean =>
!!id && node.id.indexOf(id) === 0 && getLevel(node.id) === getLevel(id) + 1;

!!id &&
node.id.replace(new RegExp(`\\${IS_SEPARATOR}\\w+$`), '') === id &&
getLevel(node.id) === getLevel(id) + 1;
/**
* @description Get if node matches given id
*
Expand Down

0 comments on commit 759e97e

Please sign in to comment.