-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(partition): add debuggable state (#1117)
Add the debug state for partition charts with the following type signature: fix #917
- Loading branch information
Showing
8 changed files
with
241 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
src/chart_types/partition_chart/state/selectors/get_debug_state.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import { Store } from 'redux'; | ||
|
||
import { MockGlobalSpec, MockSeriesSpec } from '../../../../mocks/specs/specs'; | ||
import { MockStore } from '../../../../mocks/store/store'; | ||
import { | ||
HeatmapElementEvent, | ||
LayerValue, | ||
PartitionElementEvent, | ||
XYChartElementEvent, | ||
} from '../../../../specs/settings'; | ||
import { onMouseDown, onMouseUp, onPointerMove } from '../../../../state/actions/mouse'; | ||
import { GlobalChartState } from '../../../../state/chart_state'; | ||
import { DebugState, PartitionDebugState, SinglePartitionDebugState } from '../../../../state/types'; | ||
import { PartitionLayout } from '../../layout/types/config_types'; | ||
import { isSunburst } from '../../layout/viewmodel/viewmodel'; | ||
import { getDebugStateSelector } from './get_debug_state'; | ||
import { createOnElementClickCaller } from './on_element_click_caller'; | ||
|
||
describe.each([ | ||
[PartitionLayout.sunburst, 9, 9], | ||
[PartitionLayout.treemap, 9, 6], | ||
[PartitionLayout.flame, 9, 6], | ||
[PartitionLayout.icicle, 9, 6], | ||
[PartitionLayout.mosaic, 9, 6], | ||
])('Partition - debug state %s', (partitionLayout, numberOfElements, numberOfCalls) => { | ||
type TestDatum = { cat1: string; cat2: string; val: number }; | ||
const specJSON = { | ||
config: { | ||
partitionLayout, | ||
}, | ||
data: [ | ||
{ cat1: 'Asia', cat2: 'Japan', val: 1 }, | ||
{ cat1: 'Asia', cat2: 'China', val: 1 }, | ||
{ cat1: 'Europe', cat2: 'Germany', val: 1 }, | ||
{ cat1: 'Europe', cat2: 'Italy', val: 1 }, | ||
{ cat1: 'North America', cat2: 'United States', val: 1 }, | ||
{ cat1: 'North America', cat2: 'Canada', val: 1 }, | ||
], | ||
valueAccessor: (d: TestDatum) => d.val, | ||
layers: [ | ||
{ | ||
groupByRollup: (d: TestDatum) => d.cat1, | ||
}, | ||
{ | ||
groupByRollup: (d: TestDatum) => d.cat2, | ||
}, | ||
], | ||
}; | ||
let store: Store<GlobalChartState>; | ||
let onClickListener: jest.Mock< | ||
undefined, | ||
Array<(XYChartElementEvent | PartitionElementEvent | HeatmapElementEvent)[]> | ||
>; | ||
let debugState: DebugState; | ||
|
||
beforeEach(() => { | ||
onClickListener = jest.fn((): undefined => undefined); | ||
store = MockStore.default({ width: 500, height: 500, top: 0, left: 0 }); | ||
const onElementClickCaller = createOnElementClickCaller(); | ||
store.subscribe(() => { | ||
onElementClickCaller(store.getState()); | ||
}); | ||
MockStore.addSpecs( | ||
[ | ||
MockSeriesSpec.sunburst(specJSON), | ||
MockGlobalSpec.settings({ debugState: true, onElementClick: onClickListener }), | ||
], | ||
store, | ||
); | ||
debugState = getDebugStateSelector(store.getState()); | ||
}); | ||
|
||
it('can compute debug state', () => { | ||
// small multiple panels | ||
expect(debugState.partition).toHaveLength(1); | ||
// partition sectors | ||
expect(debugState.partition![0].partitions).toHaveLength(numberOfElements); | ||
}); | ||
|
||
it('can click on every sector', () => { | ||
const [{ partitions }] = debugState.partition as PartitionDebugState[]; | ||
let counter = 0; | ||
for (let index = 0; index < partitions.length; index++) { | ||
const partition = partitions[index]; | ||
if (!isSunburst(partitionLayout) && partition.depth < 2) { | ||
continue; | ||
} | ||
expectCorrectClickInfo(store, onClickListener, partition, counter); | ||
counter++; | ||
} | ||
expect(onClickListener).toBeCalledTimes(numberOfCalls); | ||
}); | ||
}); | ||
|
||
function expectCorrectClickInfo( | ||
store: Store<GlobalChartState>, | ||
onClickListener: jest.Mock<undefined, Array<(XYChartElementEvent | PartitionElementEvent | HeatmapElementEvent)[]>>, | ||
partition: SinglePartitionDebugState, | ||
index: number, | ||
) { | ||
const { | ||
depth, | ||
value, | ||
name, | ||
coords: [x, y], | ||
} = partition; | ||
|
||
store.dispatch(onPointerMove({ x, y }, index * 3)); | ||
store.dispatch(onMouseDown({ x, y }, index * 3 + 1)); | ||
store.dispatch(onMouseUp({ x, y }, index * 3 + 2)); | ||
|
||
expect(onClickListener).toBeCalledTimes(index + 1); | ||
const obj = onClickListener.mock.calls[index][0][0][0] as LayerValue[]; | ||
// pick the last element of the path | ||
expect(obj[obj.length - 1]).toMatchObject({ | ||
depth, | ||
groupByRollup: name, | ||
value, | ||
}); | ||
} |
72 changes: 72 additions & 0 deletions
72
src/chart_types/partition_chart/state/selectors/get_debug_state.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
/* | ||
* Licensed to Elasticsearch B.V. under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch B.V. licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
import createCachedSelector from 're-reselect'; | ||
|
||
import { TAU } from '../../../../common/constants'; | ||
import { Pixels, PointObject } from '../../../../common/geometry'; | ||
import { getChartIdSelector } from '../../../../state/selectors/get_chart_id'; | ||
import { DebugState, PartitionDebugState } from '../../../../state/types'; | ||
import { QuadViewModel } from '../../layout/types/viewmodel_types'; | ||
import { isSunburst } from '../../layout/viewmodel/viewmodel'; | ||
import { partitionMultiGeometries } from './geometries'; | ||
|
||
/** @internal */ | ||
export const getDebugStateSelector = createCachedSelector( | ||
[partitionMultiGeometries], | ||
(geoms): DebugState => { | ||
return { | ||
partition: geoms.reduce<PartitionDebugState[]>((acc, { panelTitle, config, quadViewModel, diskCenter }) => { | ||
const partitions: PartitionDebugState['partitions'] = quadViewModel.map((model) => { | ||
const { dataName, depth, fillColor, value } = model; | ||
return { | ||
name: dataName, | ||
depth, | ||
color: fillColor, | ||
value, | ||
coords: isSunburst(config.partitionLayout) | ||
? getCoordsForSector(model, diskCenter) | ||
: getCoordsForRectangle(model, diskCenter), | ||
}; | ||
}); | ||
acc.push({ | ||
panelTitle, | ||
partitions, | ||
}); | ||
return acc; | ||
}, []), | ||
}; | ||
}, | ||
)(getChartIdSelector); | ||
|
||
function getCoordsForSector({ x0, x1, y1px, y0px }: QuadViewModel, diskCenter: PointObject): [Pixels, Pixels] { | ||
const X0 = x0 - TAU / 4; | ||
const X1 = x1 - TAU / 4; | ||
const cr = y0px + (y1px - y0px) / 2; | ||
const angle = X0 + (X1 - X0) / 2; | ||
const x = Math.round(Math.cos(angle) * cr + diskCenter.x); | ||
const y = Math.round(Math.sin(angle) * cr + diskCenter.y); | ||
return [x, y]; | ||
} | ||
|
||
function getCoordsForRectangle({ x0, x1, y1px, y0px }: QuadViewModel, diskCenter: PointObject): [Pixels, Pixels] { | ||
const y = Math.round(y0px + (y1px - y0px) / 2 + diskCenter.y); | ||
const x = Math.round(x0 + (x1 - x0) / 2 + diskCenter.x); | ||
return [x, y]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters