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.

Sign up for GitHub

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

Jump to bottom

fix: [DHIS2-16994] Image and File DE and TEA not Displayed in Changelog #3837

Merged
merged 35 commits into from
Nov 19, 2024
Merged

fix: [DHIS2-16994] Image and File DE and TEA not Displayed in Changelog #3837

merged 35 commits into from
Nov 19, 2024

Conversation

henrikmv
Copy link
Contributor

@henrikmv henrikmv commented Oct 9, 2024 •
edited
Loading

DHIS2-16994:

  • Added support for displaying files and images in the changelog for events and tracked entities.

  • Added asynchronous fetching of previous and current values for files and images in changelog entries using useEffect.

  • Created a new helper file getSubValueForChangelogData.js to handle fetching sub-values for files and images based on the entity type (event, trackedEntity).

  • Fixed a bug where values in the changelog do not utilize available space if the previous value is short and the current value is long.

  • Compared the changelog data to the event/tracked entity data to find out which image or file is the latest

@henrikmv henrikmv marked this pull request as ready for review October 13, 2024 19:08
@henrikmv henrikmv requested a review from a team as a code owner October 13, 2024 19:08
@henrikmv henrikmv marked this pull request as draft October 16, 2024 07:39
@henrikmv
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
72b9d50 
…/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog
@henrikmv henrikmv marked this pull request as ready for review October 23, 2024 07:09
simonadomnisoru
simonadomnisoru reviewed Oct 24, 2024
View reviewed changes
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

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

The The user can change changelog page size Cypress test is failing. Is this related to your changes @henrikmv? Thanks!

...modules/capture-core/components/WidgetsChangelog/common/utils/getSubValueForChangelogData.js Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
@henrikmv henrikmv added preview e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud and removed preview labels Oct 25, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 25, 2024 •
edited
Loading

🚀 Deployed on https://deploy-preview-3837.capture.netlify.dhis2.org

@henrikmv henrikmv removed e2e-tests e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud labels Oct 25, 2024
JoakimSM
JoakimSM reviewed Nov 8, 2024
View reviewed changes
Copy link
Member

@JoakimSM JoakimSM left a comment

Choose a reason for hiding this comment

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

This looks good overall @henrikmv 👍

Made some comments in one of the files.

src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
src/core_modules/capture-core/components/WidgetsChangelog/common/hooks/useClientDataValues.js Outdated Show resolved Hide resolved
@henrikmv henrikmv added testing and removed testing labels Nov 12, 2024
@henrikmv
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
69f0075 
…/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog
@henrikmv henrikmv added testing and removed testing labels Nov 13, 2024
geethaalwan
geethaalwan approved these changes Nov 13, 2024
View reviewed changes
Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

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

Tested successfully on 2.42,2.41.3 versions

@henrikmv henrikmv added testing and removed testing labels Nov 13, 2024
@henrikmv
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
32adfb3 
…/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog
@henrikmv
Merge branch 'hv/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInCh…
9d54e47 
…angelog' of https://github.com/dhis2/capture-app into hv/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog
@henrikmv henrikmv added testing and removed testing labels Nov 14, 2024
@eirikhaugstulen eirikhaugstulen added e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud testing and removed testing labels Nov 14, 2024
@henrikmv
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
94b5994 
…/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog
@henrikmv henrikmv added testing and removed testing labels Nov 18, 2024
@henrikmv henrikmv merged commit 9327210 into master Nov 19, 2024
35 of 40 checks passed
@henrikmv henrikmv deleted the hv/fix/DHIS2-16994_ImageAndFileDEAndTEANotDisplayedInChangelog branch November 19, 2024 07:56
dhis2-bot added a commit that referenced this pull request Nov 19, 2024
@dhis2-bot
chore(release): cut 101.16.2 [skip release]
1e37cf4 
## [101.16.2](v101.16.1...v101.16.2) (2024-11-19)

### Bug Fixes

* [DHIS2-16994] Image and File DE and TEA not Displayed in Changelog ([#3837](#3837)) ([9327210](9327210))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.16.2 🎉

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
Reviewers

@JoakimSM JoakimSM JoakimSM left review comments

@geethaalwan geethaalwan geethaalwan approved these changes

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

@eirikhaugstulen eirikhaugstulen Awaiting requested review from eirikhaugstulen

Assignees
No one assigned
Labels
e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud released testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@henrikmv @dhis2-bot @simonadomnisoru @JoakimSM @geethaalwan @eirikhaugstulen