fix: merge to master Dec 20 #3087

jenniferarnesen · 2023-12-20T11:10:05Z

Fixes:

3 transifex PRs
Analytics 26.0.17 -> 26.2.0 upgrade fixes:
- translations
- saving map copy: https://dhis2.atlassian.net/browse/DHIS2-15722
- interpretations timestamps: https://dhis2.atlassian.net/browse/DHIS2-15825,
- interpretations modal height: https://dhis2.atlassian.net/browse/DHIS2-15558
- renaming causes error https://dhis2.atlassian.net/browse/DHIS2-16154

Chores:

report portal configuration

Automatically merged.

find a launch by PR_TITLE , BRANCH_NAME and CI_BUILD_ID

chore: use reportportal fork

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2 - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](browserify/browserify-sign@v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0. - [Commits](brix/crypto-js@4.1.1...4.2.0) --- updated-dependencies: - dependency-name: crypto-js dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [@dhis2/maps-gl](https://github.com/dhis2/maps-gl) from 3.8.5 to 3.8.6. - [Release notes](https://github.com/dhis2/maps-gl/releases) - [Changelog](https://github.com/dhis2/maps-gl/blob/master/CHANGELOG.md) - [Commits](dhis2/maps-gl@v3.8.5...v3.8.6) --- updated-dependencies: - dependency-name: "@dhis2/maps-gl" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

Automatically merged.

This code was hard to understand because of the double-negatives and multiple clauses in this statement. Refactored it to a more verbose style. The logic is the same: you can run the tests on the old code and it will pass.

* chore: 26.2.0-cumulative-values-alpha.1 * chore: [email protected]

* test: send jest test results only when env is setup not push the test results to report portal when running the test locally * chore: use hyphens for app names * test: add report portal attributes BRANCH_NAME CI_BUILD_ID PR_TITLE to easily identify jest tests runs in report portal --------- Co-authored-by: Jen Jones Arnesen <[email protected]>

dhis2-bot · 2023-12-20T11:13:10Z

🚀 Deployed on https://pr-3087--dhis2-maps.netlify.app

cypress · 2023-12-20T11:22:05Z

3 flaky tests on run #2822 ↗︎

0	45	16	0	3

Details:

Merge `a3c4a09` into `93acdaf`...
Project: maps	Commit: `c367f0eba5 ℹ️`
Status: Passed	Duration: 03:00 💡
Started: Dec 21, 2023 7:45 AM	Ended: Dec 21, 2023 7:48 AM

dataDownload.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test		Artifacts
Data Download > downloads data from an event layer		`Screenshots`

basemaps.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test		Artifacts
Basemap checks > open map with basemap = object uses id from the object		`Screenshots`

filemenu.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test		Artifacts
File menu > saves a new map		`Screenshots`

Review all test suite changes for PR #3087 ↗︎

…3083) Bumps [@dhis2/cli-app-scripts](https://github.com/dhis2/app-platform/tree/HEAD/cli) from 10.3.10 to 10.3.11. - [Release notes](https://github.com/dhis2/app-platform/releases) - [Changelog](https://github.com/dhis2/app-platform/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/app-platform/commits/v10.3.11/cli) --- updated-dependencies: - dependency-name: "@dhis2/cli-app-scripts" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

* chore(deps): bump @dhis2/ui from 8.13.15 to 8.16.0 Bumps [@dhis2/ui](https://github.com/dhis2/ui/tree/HEAD/collections/ui) from 8.13.15 to 8.16.0. - [Release notes](https://github.com/dhis2/ui/releases) - [Changelog](https://github.com/dhis2/ui/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/ui/commits/v8.16.0/collections/ui) --- updated-dependencies: - dependency-name: "@dhis2/ui" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: test updates that decouple test to ui version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

Bumps [@dhis2/d2-i18n](https://github.com/dhis2/d2-i18n) from 1.1.1 to 1.1.3. - [Release notes](https://github.com/dhis2/d2-i18n/releases) - [Changelog](https://github.com/dhis2/d2-i18n/blob/master/CHANGELOG.md) - [Commits](dhis2/d2-i18n@v1.1.1...v1.1.3) --- updated-dependencies: - dependency-name: "@dhis2/d2-i18n" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

* fix: conditionally set PR title in dhis2-verify-app workflow * fix: conditionally set PR title in dhis2-verify-app workflow

cypress · 2023-12-20T15:30:56Z

2 flaky tests on run #2826 ↗︎

0	45	16	0	2

Details:

fix: report as MAP_VIEW not VISUALIZATION_VIEW (#3086)
Project: maps	Commit: `008e7fe325`
Status: Passed	Duration: 03:04 💡
Started: Dec 21, 2023 8:52 AM	Ended: Dec 21, 2023 8:55 AM

dataDownload.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test		Artifacts
Data Download > downloads data from a thematic layer		`Screenshots`

filemenu.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test		Artifacts
File menu > saves a new map		`Screenshots`

Review all test suite changes for PR #3087 ↗︎

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.2 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

) Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.13.3 to 2.15.1. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](cypress-io/eslint-plugin-cypress@v2.13.3...v2.15.1) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

Co-authored-by: Jan Henrik Øverland <[email protected]>

Bumps [start-server-and-test](https://github.com/bahmutov/start-server-and-test) from 2.0.1 to 2.0.3. - [Release notes](https://github.com/bahmutov/start-server-and-test/releases) - [Commits](bahmutov/start-server-and-test@v2.0.1...v2.0.3) --- updated-dependencies: - dependency-name: start-server-and-test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen <[email protected]>

) Bumps [@reportportal/agent-js-jest](https://github.com/reportportal/agent-js-jest) from 5.0.6 to 5.0.7. - [Release notes](https://github.com/reportportal/agent-js-jest/releases) - [Changelog](https://github.com/reportportal/agent-js-jest/blob/develop/CHANGELOG.md) - [Commits](reportportal/agent-js-jest@v5.0.6...v5.0.7) --- updated-dependencies: - dependency-name: "@reportportal/agent-js-jest" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

dhis2-bot · 2023-12-21T09:27:28Z

🎉 This PR is included in version 100.2.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

dhis2-bot and others added 12 commits November 5, 2023 02:39

fix(translations): sync translations from transifex (dev)

6e8b82b

Automatically merged.

chore: use reportportal fork

146cd8d

find a launch by PR_TITLE , BRANCH_NAME and CI_BUILD_ID

Merge pull request #3042 from dhis2/use-fork-reportportal

4d6cbc0

chore: use reportportal fork

chore: use renamed github shared workflow (#3046)

bcf344b

fix(translations): sync translations from transifex (dev)

7d98a8a

Automatically merged.

fix(translations): sync translations from transifex (dev)

dcf7743

Automatically merged.

chore: [email protected] (#3081)

ef72d06

* chore: 26.2.0-cumulative-values-alpha.1 * chore: [email protected]

jenniferarnesen changed the title ~~fix: merge to master~~ fix: merge to master Dec 20 Dec 20, 2023

dhis2-bot temporarily deployed to netlify December 20, 2023 11:13 Inactive

jenniferarnesen requested a review from martinkrulltott December 20, 2023 12:11

martinkrulltott approved these changes Dec 20, 2023

View reviewed changes

dhis2-bot temporarily deployed to netlify December 20, 2023 13:26 Inactive

dhis2-bot temporarily deployed to netlify December 20, 2023 14:48 Inactive

dhis2-bot temporarily deployed to netlify December 20, 2023 15:16 Inactive

fix: conditionally set PR title in dhis2-verify-app workflow (#3089)

03eed2d

* fix: conditionally set PR title in dhis2-verify-app workflow * fix: conditionally set PR title in dhis2-verify-app workflow

dhis2-bot temporarily deployed to netlify December 20, 2023 15:23 Inactive

dhis2-bot temporarily deployed to netlify December 20, 2023 15:40 Inactive

dhis2-bot temporarily deployed to netlify December 20, 2023 17:17 Inactive

fix: report as MAP_VIEW not VISUALIZATION_VIEW (#3086)

008e7fe

Co-authored-by: Jan Henrik Øverland <[email protected]>

dhis2-bot temporarily deployed to netlify December 20, 2023 17:40 Inactive

dhis2-bot temporarily deployed to netlify December 21, 2023 06:53 Inactive

dhis2-bot temporarily deployed to netlify December 21, 2023 07:39 Inactive

jenniferarnesen merged commit 04c9821 into master Dec 21, 2023
28 checks passed

dhis2-bot added the released label Dec 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merge to master Dec 20 #3087

fix: merge to master Dec 20 #3087

jenniferarnesen commented Dec 20, 2023 •

edited by martinkrulltott

Loading

dhis2-bot commented Dec 20, 2023 •

edited

Loading

cypress bot commented Dec 20, 2023 •

edited

Loading

cypress bot commented Dec 20, 2023 •

edited

Loading

dhis2-bot commented Dec 21, 2023

fix: merge to master Dec 20 #3087

fix: merge to master Dec 20 #3087

Conversation

jenniferarnesen commented Dec 20, 2023 • edited by martinkrulltott Loading

dhis2-bot commented Dec 20, 2023 • edited Loading

cypress bot commented Dec 20, 2023 • edited Loading

3 flaky tests on run #2822 ↗︎

Review all test suite changes for PR #3087 ↗︎

cypress bot commented Dec 20, 2023 • edited Loading

2 flaky tests on run #2826 ↗︎

Review all test suite changes for PR #3087 ↗︎

dhis2-bot commented Dec 21, 2023

jenniferarnesen commented Dec 20, 2023 •

edited by martinkrulltott

Loading

dhis2-bot commented Dec 20, 2023 •

edited

Loading

cypress bot commented Dec 20, 2023 •

edited

Loading

cypress bot commented Dec 20, 2023 •

edited

Loading