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: merge dev to master #3122

Merged
merged 5 commits into from
Feb 13, 2024
Merged

feat: merge dev to master #3122

merged 5 commits into from
Feb 13, 2024

Conversation

jenniferarnesen
Copy link
Collaborator

Includes the new data table

dependabot bot and others added 4 commits January 24, 2024 13:28
* chore(release): cut 100.3.0 [skip release]

# [100.3.0](v100.2.3...v100.3.0) (2024-01-12)

### Features

* add support for hash routing in line with other analytics apps [DHIS2-15762] ([#3009](#3009)) ([b25267d](b25267d))

* chore(deps): bump @dhis2/app-runtime from 3.9.4 to 3.10.2

Bumps
[@dhis2/app-runtime](https://github.com/dhis2/app-runtime/tree/HEAD/runtime)
from 3.9.4 to 3.10.2.
- [Release notes](https://github.com/dhis2/app-runtime/releases)
- [Changelog](https://github.com/dhis2/app-runtime/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dhis2/app-runtime/commits/v3.10.2/runtime)

---
updated-dependencies:
- dependency-name: "@dhis2/app-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: @dhis2-bot <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jen Jones Arnesen <[email protected]>
set resolution to ^9 since cli-app-scripts hasn't been upgraded to ui^9 yet.
Implements https://dhis2.atlassian.net/browse/DHIS2-15795

Features:
* horizontal scrolling
* styling in line with our style guide
* virtualization (performance matches old implementation)
@dhis2-bot
Copy link
Contributor

dhis2-bot commented Feb 12, 2024

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

@dhis2-bot dhis2-bot temporarily deployed to netlify February 12, 2024 13:18 Inactive
Copy link

cypress bot commented Feb 12, 2024

2 flaky tests on run #2982 ↗︎

0 55 15 0 Flakiness 2

Details:

Merge 0696fba into 0799c0a...
Project: maps Commit: c3bbe32421 ℹ️
Status: Passed Duration: 03:24 💡
Started: Feb 13, 2024 10:07 AM Ended: Feb 13, 2024 10:11 AM
Flakiness  dataTable.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test Artifacts
data table > opens the data table for an Event layer Screenshots
Flakiness  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

Review all test suite changes for PR #3122 ↗︎

Copy link

cypress bot commented Feb 12, 2024

2 flaky tests on run #2981 ↗︎

0 55 15 0 Flakiness 2

Details:

chore: include release notes in slack bot message (#3123)
Project: maps Commit: 0696fbaab1
Status: Passed Duration: 03:34 💡
Started: Feb 13, 2024 10:00 AM Ended: Feb 13, 2024 10:03 AM
Flakiness  interpretations.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test Artifacts
Interpretations > view interpretation after creating a map Screenshots
Flakiness  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

Review all test suite changes for PR #3122 ↗︎

@dhis2-bot dhis2-bot temporarily deployed to netlify February 13, 2024 09:55 Inactive
@turban turban self-requested a review February 13, 2024 12:15
Copy link
Contributor

@turban turban left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jenniferarnesen jenniferarnesen merged commit e57d85d into master Feb 13, 2024
28 checks passed
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants