-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into fix/title-translation-DHIS2-16216
- Loading branch information
Showing
70 changed files
with
1,696 additions
and
587 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,6 +82,7 @@ jobs: | |
| REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }} | ||
|
|
||
| call-workflow-e2e-prod: | ||
| if: "!contains(github.event.head_commit.message, '[skip ci]')" | ||
| needs: [build, lint, test] | ||
| uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master | ||
| secrets: | ||
|
|
@@ -98,7 +99,7 @@ jobs: | |
| if: | | ||
| !github.event.push.repository.fork && | ||
| github.actor != 'dependabot[bot]' && | ||
| github.event_name != 'pull_request' | ||
| github.ref == 'refs/heads/master' | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
|
|
@@ -133,13 +134,98 @@ jobs: | |
| if: | | ||
| failure() && | ||
| !cancelled() && | ||
| github.ref == 'refs/heads/master' | ||
| github.ref == 'refs/heads/master' && | ||
| contains(github.event.head_commit.message, 'chore(release)') | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@master | ||
|
|
||
| - name: Extract version | ||
| id: extract_version | ||
| uses: Saionaro/[email protected] | ||
|
|
||
| - name: Send failure message to analytics-internal-bot slack channel | ||
| id: slack | ||
| uses: slackapi/[email protected] | ||
| with: | ||
| channel-id: ${{ secrets.SLACK_CHANNEL_ID }} | ||
| slack-message: ':small_red_triangle_down: Data-visualizer-app release <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure>' | ||
| payload: | | ||
| { | ||
| "text": ":small_red_triangle_down: :data-visualizer-app: Data Visualizer release <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>", | ||
| "blocks": [ | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": ":small_red_triangle_down: :data-visualizer-app: Data Visualizer release <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Afailure|failed>" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| env: | ||
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} | ||
|
|
||
| report-release-success: | ||
| runs-on: ubuntu-latest | ||
| needs: release | ||
| if: | | ||
| success() && | ||
| !cancelled() && | ||
| github.ref == 'refs/heads/master' && | ||
| contains(github.event.head_commit.message, 'chore(release)') | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@master | ||
|
|
||
| - name: Extract version | ||
| id: extract_version | ||
| uses: Saionaro/[email protected] | ||
|
|
||
| - name: Send success message to analytics-internal-bot slack channel | ||
| id: slack | ||
| uses: slackapi/[email protected] | ||
| with: | ||
| channel-id: ${{ secrets.SLACK_CHANNEL_ID }} | ||
| payload: | | ||
| { | ||
| "text": "Data Visualizer app release ${{ steps.extract_version.outputs.version }} succeeded", | ||
| "blocks": [ | ||
| { | ||
| "type": "header", | ||
| "text": { | ||
| "type": "plain_text", | ||
| "text": ":large_green_circle: :data-visualizer-app: Data Visualizer version ${{ steps.extract_version.outputs.version }} released :tada:", | ||
| "emoji": true | ||
| } | ||
| }, | ||
| { | ||
| "type": "divider" | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": "*Release Notes*" | ||
| } | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": ${{ toJSON(github.event.head_commit.message) }} | ||
| } | ||
| }, | ||
| { | ||
| "type": "divider" | ||
| }, | ||
| { | ||
| "type": "section", | ||
| "text": { | ||
| "type": "mrkdwn", | ||
| "text": "Link to <https://github.com/dhis2/data-visualizer-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|build>" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| env: | ||
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { clickCheckbox } from '../common.js' | ||
| import { checkCheckbox } from '../common.js' | ||
|
|
||
| const outliersCheckboxEl = 'option-outliers-enabled-checkbox' | ||
|
|
||
| export const clickOutliersCheckbox = () => clickCheckbox(outliersCheckboxEl) | ||
| export const checkOutliersCheckbox = () => checkCheckbox(outliersCheckboxEl) |
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,100 @@ | ||
| export const colTotalsOptionEl = 'option-col-totals' | ||
| const colSubTotalsOptionEl = 'option-col-subtotals' | ||
| const rowTotalsOptionEl = 'option-row-totals' | ||
| const rowSubTotalsOptionEl = 'option-row-subtotals' | ||
|
|
||
| export const expectColumnsTotalsToBeDisabled = () => | ||
| cy | ||
| .getBySel(colTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.disabled') | ||
|
|
||
| export const expectColumnsTotalsToBeEnabled = () => | ||
| cy | ||
| .getBySel(colTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('not.be.disabled') | ||
|
|
||
| export const expectColumnsTotalsToBeChecked = () => | ||
| cy | ||
| .getBySel(colTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.checked') | ||
|
|
||
| export const expectColumnsTotalsToBeUnchecked = () => | ||
| cy | ||
| .getBySel(colTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('not.be.checked') | ||
|
|
||
| export const expectColumnsSubTotalsToBeDisabled = () => | ||
| cy | ||
| .getBySel(colSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.disabled') | ||
|
|
||
| export const expectColumnsSubTotalsToBeEnabled = () => | ||
| cy | ||
| .getBySel(colSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.enabled') | ||
|
|
||
| export const expectColumnsSubTotalsToBeChecked = () => | ||
| cy | ||
| .getBySel(colSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.checked') | ||
|
|
||
| export const expectColumnsSubTotalsToBeUnchecked = () => | ||
| cy | ||
| .getBySel(colSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('not.be.checked') | ||
|
|
||
| export const expectRowsTotalsToBeDisabled = () => | ||
| cy | ||
| .getBySel(rowTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.disabled') | ||
|
|
||
| export const expectRowsTotalsToBeEnabled = () => | ||
| cy | ||
| .getBySel(rowTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.enabled') | ||
|
|
||
| export const expectRowsTotalsToBeChecked = () => | ||
| cy | ||
| .getBySel(rowTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.checked') | ||
|
|
||
| export const expectRowsTotalsToBeUnchecked = () => | ||
| cy | ||
| .getBySel(rowTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('not.be.checked') | ||
|
|
||
| export const expectRowsSubTotalsToBeDisabled = () => | ||
| cy | ||
| .getBySel(rowSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.disabled') | ||
|
|
||
| export const expectRowsSubTotalsToBeEnabled = () => | ||
| cy | ||
| .getBySel(rowSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.enabled') | ||
|
|
||
| export const expectRowsSubTotalsToBeChecked = () => | ||
| cy | ||
| .getBySel(rowSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('be.checked') | ||
|
|
||
| export const expectRowsSubTotalsToBeUnchecked = () => | ||
| cy | ||
| .getBySel(rowSubTotalsOptionEl) | ||
| .find('[type="checkbox"]') | ||
| .should('not.be.checked') |
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 |
|---|---|---|
| @@ -1,7 +1,14 @@ | ||
| const valueCellEl = 'visualization-value-cell' | ||
| const headerCellEl = 'visualization-column-header' | ||
|
|
||
| export const clickTableValueCell = (index) => | ||
| cy.getBySel(valueCellEl).eq(index).click() | ||
|
|
||
| export const expectTableValueCellsToHaveLength = (length) => | ||
| cy.getBySel(valueCellEl).should('have.length', length) | ||
|
|
||
| export const expectTableValueCellToContainValue = (index, value) => | ||
| cy.getBySel(valueCellEl).eq(index).contains(value) | ||
|
|
||
| export const clickTableHeaderCell = (name) => | ||
| cy.getBySel(headerCellEl).contains(name).click() |
Oops, something went wrong.