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.

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

feat(stacked-bar-chart): Create component #988

Merged
merged 1 commit into from
Jun 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
/libs/barista-components/select/** @thomaspink
/libs/barista-components/selection-area/** @ffriedl89 @lukasholzer
/libs/barista-components/show-more/** @rowa-audil
/libs/barista-components/stacked-series-chart/** @subarroca @airime
/libs/barista-components/stepper/** @ffriedl89 @thomaspink
/libs/barista-components/sunburst-chart/** @subarroca @pedromosquera
/libs/barista-components/switch/** @thomaspink
Expand Down Expand Up @@ -144,6 +145,7 @@
/apps/dev/src/select/** @thomaspink
/apps/dev/src/selection-area/** @ffriedl89 @lukasholzer
/apps/dev/src/show-more/** @rowa-audil
/apps/dev/src/stacked-series-chart/** @subarroca @airime
/apps/dev/src/stepper/** @ffriedl89 @thomaspink
/apps/dev/src/sunburst-chart/** @subarroca
/apps/dev/src/switch/** @thomaspink
Expand Down
40 changes: 40 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -3056,6 +3056,46 @@
},
"schematics": {}
},
"stacked-series-chart": {
"projectType": "library",
"root": "libs/barista-components/stacked-series-chart",
"sourceRoot": "libs/barista-components/stacked-series-chart/src",
"prefix": "dt",
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/barista-components/stacked-series-chart/tsconfig.lib.json",
"libs/barista-components/stacked-series-chart/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"!libs/barista-components/stacked-series-chart/**"
]
}
},
"lint-styles": {
"builder": "./dist/libs/workspace:stylelint",
"options": {
"stylelintConfig": ".stylelintrc",
"reportFile": "dist/stylelint/report.xml",
"exclude": ["**/node_modules/**"],
"files": ["libs/barista-components/stacked-series-chart/**/*.scss"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/barista-components/stacked-series-chart/jest.config.js",
"tsConfig": "libs/barista-components/stacked-series-chart/tsconfig.spec.json",
"setupFile": "libs/barista-components/stacked-series-chart/src/test-setup.ts",
"passWithNoTests": true
}
}
},
"schematics": {}
},
"stepper": {
"projectType": "library",
"root": "libs/barista-components/stepper",
Expand Down
7 changes: 7 additions & 0 deletions apps/components-e2e/src/app/app.routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ export const routes: Routes = [
(module) => module.DtE2EShowMoreModule,
),
},
{
path: 'stacked-series-chart',
loadChildren: () =>
import(
'../components/stacked-series-chart/stacked-series-chart.module'
).then((module) => module.DtE2EStackedSeriesChartModule),
},
{
path: 'sunburst-chart',
loadChildren: () =>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,254 @@
/**
* @license
* Copyright 2020 Dynatrace LLC
* Licensed 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 { resetWindowSizeToDefault, waitForAngular } from '../../utils';
import { absoluteBtn, percentBtn } from '../sunburst-chart/sunburst-chart.po';
import {
barBtn,
barChart,
body,
columnBtn,
columnChart,
fullTrackBtn,
getLabel,
getLegendItem,
getSlice,
getTick,
getTrack,
labels,
legend,
legendItems,
max10Btn,
noMaxBtn,
noneBtn,
nonSelectableBtn,
nonVisibleLabelBtn,
nonVisibleLegendBtn,
nonVisibleTrackBkgBtn,
nonVisibleValueAxisBtn,
overlay,
resetBtn,
selectableBtn,
selectBtn,
setLegendsBtn,
singleTrackBtn,
slices,
ticks,
tracks,
unselectBtn,
valueAxis,
} from './stacked-series-chart.po';

// Reduced speed of hovering should get our e2e tests stable.
// We should think about removing the dtOverlay and using the cdk one,
// that is not flaky on other e2e tests #86
const hover: MouseActionOptions = {
// Slowest possible speed should help as workaround til the issue is fixed.
// The issue #646 is opened for this.
speed: 0.6,
};

const selectedSliceClassname = 'dt-stacked-series-chart-slice-selected';

fixture('Stacked series chart')
.page('http://localhost:4200/stacked-series-chart')
.beforeEach(async () => {
await resetWindowSizeToDefault();
await waitForAngular();
});

test('should have the defaults', async (testController) => {
await testController
.click(resetBtn)
.expect(barChart)
.ok()
.expect(tracks.count)
.eql(4)
.expect(labels.count)
.eql(4)
.expect(slices.count)
.eql(8)
.expect(legend)
.ok()
.expect(valueAxis)
.ok()
.expect(ticks.count)
.eql(6)
.expect(getLabel(0).textContent)
.match(/Espresso/)
.expect(getSlice(0, 0).clientWidth)
.within(135, 150)
.expect(getSlice(0, 0).clientHeight)
.eql(16)
.expect(getSlice(0, 0).getStyleProperty('background-color'))
.eql('rgb(0, 158, 96)')
.expect(legendItems.count)
.eql(4);
});

test('should change the mode and fillMode', async (testController) => {
await testController
.click(resetBtn)
// mode
.click(columnBtn)
.expect(columnChart)
.ok()
.expect(tracks.count)
.eql(4)
.expect(labels.count)
.eql(4)
.expect(slices.count)
.eql(8)
.expect(ticks.count)
.eql(6)
.expect(getLabel(0).textContent)
.match(/Espresso/)
.expect(getSlice(0, 0).clientWidth)
.eql(16)
.expect(getSlice(0, 0).clientHeight)
.within(60, 70)
.expect(legendItems.count)
.eql(4)
// fillMode
.click(fullTrackBtn)
.expect(getSlice(0, 0).clientHeight)
.within(315, 325)
.click(barBtn)
.expect(getSlice(0, 0).clientWidth)
.within(705, 720);
});

test('should change to single and multitrack with corresponding value display modes', async (testController) => {
await testController
.click(resetBtn)
// multi
.expect(getTick(0).textContent)
.match(/0/)
.expect(getLegendItem(0).textContent)
.match(/Coffee/)

.click(percentBtn)
.expect(getTick(0).textContent)
.match(/0 %/)
.expect(getLegendItem(0).textContent)
.match(/Coffee/)
// single
.click(singleTrackBtn)
.click(noneBtn)
.expect(getTick(0).textContent)
.match(/0/)
.expect(getLegendItem(0).textContent)
.match(/Coffee/)

.click(absoluteBtn)
.expect(getTick(0).textContent)
.match(/0/)
.expect(getLegendItem(0).textContent)
.match(/2 Coffee/)

.click(percentBtn)
.expect(getTick(0).textContent)
.match(/0 %/)
.expect(getLegendItem(0).textContent)
.match(/66.7 % Coffee/);
});

test('should enable selection and select by input', async (testController) => {
await testController
// by click
.click(resetBtn)
.click(selectableBtn)
.click(getSlice(0, 0))
.expect(getSlice(0, 0).classNames)
.contains(selectedSliceClassname)
.click(getSlice(0, 0))
.expect(getSlice(0, 0).classNames)
.notContains(selectedSliceClassname)

// by input
.click(resetBtn)
.click(selectableBtn)
.click(selectBtn)
.expect(getSlice(0, 0).classNames)
.contains(selectedSliceClassname)
.click(unselectBtn)
.expect(getSlice(0, 0).classNames)
.notContains(selectedSliceClassname)

// non selectable
.click(resetBtn)
.click(nonSelectableBtn)
.click(getSlice(0, 0))
.expect(getSlice(0, 0).classNames)
.notContains(selectedSliceClassname)
.click(selectBtn)
.expect(getSlice(0, 0).classNames)
.notContains(selectedSliceClassname);
});

test('should toggle legend and use an external one', async (testController) => {
await testController
.click(resetBtn)
.click(setLegendsBtn)
.expect(getSlice(0, 0).clientWidth)
.eql(0)
.click(nonVisibleLegendBtn)
.expect(legend.count)
.eql(0);
});

test('should toggle valueAxis and label', async (testController) => {
await testController
.click(resetBtn)
.click(nonVisibleValueAxisBtn)
.expect(valueAxis.count)
.eql(0)
.click(nonVisibleLabelBtn)
.expect(labels.count)
.eql(0);
});

test('should accept a max and toggle track background', async (testController) => {
await testController
.click(resetBtn)
// max
.click(max10Btn)
.expect(getSlice(0, 0).clientWidth)
.within(68, 75)
.click(noMaxBtn)
.expect(getSlice(0, 0).clientWidth)
.within(135, 150)

// track background
.expect(getTrack(0).getStyleProperty('background-color'))
.eql('rgb(230, 230, 230)')
.click(nonVisibleTrackBkgBtn)
.expect(getTrack(0).getStyleProperty('background-color'))
.eql('rgba(0, 0, 0, 0)');
});

test('should show overlay on hover', async (testController: TestController) => {
await testController
.click(resetBtn)
.hover(getSlice(0, 0), hover)
.expect(overlay.exists)
.ok()
.expect(overlay.textContent)
.match(/EspressoCoffee: 1/)
.hover(body, { ...hover, offsetX: 10, offsetY: 10 })
.expect(overlay.exists)
.notOk();
});