Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
Browse files Browse the repository at this point in the history
…rm-plugin-components
  • Loading branch information
edoardo committed Oct 9, 2024
2 parents 9d86485 + 04dee94 commit ba9d5f1
Show file tree
Hide file tree
Showing 68 changed files with 768 additions and 808 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
call-workflow-e2e-prod:
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
needs: [build, lint, test, setup-matrix]
uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master
uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@feat/support-hardcoded-dev-version
with:
should_record: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record')}}
spec-group: ${{ needs.setup-matrix.outputs.matrix }}
Expand Down
13 changes: 13 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const { config } = require('@dhis2/cli-style')

module.exports = {
extends: [config.stylelint],
rules: {
'csstools/use-logical': [
true,
{
severity: 'error',
},
],
},
}
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [100.8.0](https://github.com/dhis2/data-visualizer-app/compare/v100.7.2...v100.8.0) (2024-10-07)


### Features

* improve support for right-to-left languages ([#3073](https://github.com/dhis2/data-visualizer-app/issues/3073)) ([777b36d](https://github.com/dhis2/data-visualizer-app/commit/777b36d454a8f029c8eea566e4f6954617398a6f)), closes [ui#1448](https://github.com/ui/issues/1448) [app-platform#825](https://github.com/app-platform/issues/825) [cli-style#464](https://github.com/cli-style/issues/464)

## [100.7.2](https://github.com/dhis2/data-visualizer-app/compare/v100.7.1...v100.7.2) (2024-09-25)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([#3200](https://github.com/dhis2/data-visualizer-app/issues/3200)) ([4f5635d](https://github.com/dhis2/data-visualizer-app/commit/4f5635dbdac8dc744d02f432dd5aa5cc9190388f))

## [100.7.1](https://github.com/dhis2/data-visualizer-app/compare/v100.7.0...v100.7.1) (2024-08-26)


Expand Down
38 changes: 19 additions & 19 deletions cypress/integration/customErrors/visualizationError.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,49 +33,49 @@ const REGULAR_ITEM = {
}

describe('Visualization error', () => {
it('navigates to the start page and changes vis type to PT', () => {
it('displays an error when item is not valid for column chart', () => {
// navigate to the start page and change vis type to PT
goToStartPage()
changeVisType(visTypeDisplayNames[VIS_TYPE_PIVOT_TABLE])
})
it("selects period 'This year'", () => {

// select period 'This year'
openDimension(DIMENSION_ID_PERIOD)
unselectAllItemsByButton()
selectRelativePeriods(['This year'], 'Years')
clickDimensionModalUpdateButton()
})
it('selects a narrative item', () => {

// select a narrative item
openDimension(DIMENSION_ID_DATA)
inputSearchTerm('narrative')
selectDataElements([NARRATIVE_ITEM.name])
clickDimensionModalUpdateButton()
expectVisualizationToBeVisible(VIS_TYPE_PIVOT_TABLE)
})
it('narrative item is displayed correctly', () => {

// narrative item is displayed correctly
cy.contains(NARRATIVE_ITEM.content)
})
it('selects a regular item', () => {

// select a regular item
openDimension(DIMENSION_ID_DATA)
selectDataElements([REGULAR_ITEM.name])
clickDimensionModalUpdateButton()
expectVisualizationToBeVisible(VIS_TYPE_PIVOT_TABLE)
})
it('both items are displayed correctly', () => {

// both items are displayed correctly
cy.contains(NARRATIVE_ITEM.content)
cy.contains(REGULAR_ITEM.content)
})

it('changes vis type to Column', () => {
// change vis type to Column
changeVisType(visTypeDisplayNames[VIS_TYPE_COLUMN])
})
it('regular item is displayed correctly', () => {

// regular item is displayed correctly
cy.contains(REGULAR_ITEM.content)
})
it('removes the regular item', () => {

// remove the regular item
openDimension(DIMENSION_ID_DATA)
unselectItemByDoubleClick(REGULAR_ITEM.name)
clickDimensionModalUpdateButton()
})
it('error is shown', () => {

// error is shown
expectErrorToContainTitle('Invalid data type')
})
})
2 changes: 2 additions & 0 deletions d2.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const config = {

pluginType: 'DASHBOARD',

direction: 'auto',

pwa: {
enabled: true,
caching: {
Expand Down
Loading

0 comments on commit ba9d5f1

Please sign in to comment.