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: update interpretations component so it can be used in dashboard items #1510

Merged
merged 27 commits into from
Mar 4, 2024

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented Jun 20, 2023

Implements DHIS2-15441

Required for dhis2/dashboard-app#2430

Changes to the interpretation component so that it can be used in the dashboard app. The main difference between interpretations in dashboard vs DV/LL is that replies are viewed "inline" rather than through opening a modal. In order to add this functionality, the appUrl property is sent from the dashboard app, so that a "Launch Url" button can be added to the interpretation button strip. The button opens the relevant app in interpretation view mode.

The component will continue to work as before for DV and LL so this is safe as a "feat" release.

The appUrl property is kind of doing double duty

  1. provide the url for the LaunchURL link in the interpretation button strip (right side red arrow)
    image
  2. tweak the interface for dashboard
    1. hide the See interpretation button (screenshot from DV)
      image
    2. add the 👁️ buttonbar button (left side red arrow as shown above) for viewing the interpretation (in place of the See interpretation big button)
      image

TODO

  • retest after fixing the conflicts, that all the access checks were fixed.

@jenniferarnesen jenniferarnesen marked this pull request as ready for review June 23, 2023 11:51
Copy link
Contributor

@HendrikThePendric HendrikThePendric left a comment

Choose a reason for hiding this comment

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

As discussed on Slack, it would be good to add some comments and/or rename some variable in src/components/Interpretations/common/Interpretation/Interpretation.js for clarification. But the underlying logic is sound and the implementation is clean. So I'm approving.

@jenniferarnesen jenniferarnesen marked this pull request as draft July 7, 2023 14:28
@jenniferarnesen jenniferarnesen marked this pull request as ready for review August 7, 2023 13:54
@jenniferarnesen jenniferarnesen changed the title feat: interpretations for dashboard feat: update interpretations component so it can be used in dashboard items Sep 26, 2023
@jenniferarnesen jenniferarnesen marked this pull request as draft September 28, 2023 09:43
@jenniferarnesen jenniferarnesen marked this pull request as ready for review December 20, 2023 17:45
@edoardo edoardo removed the on hold label Mar 4, 2024
@edoardo edoardo merged commit 163abf6 into master Mar 4, 2024
2 checks passed
@edoardo edoardo deleted the feat/interpretations-for-dashboard branch March 4, 2024 13:47
dhis2-bot added a commit that referenced this pull request Mar 4, 2024
# [26.4.0](v26.3.1...v26.4.0) (2024-03-04)

### Features

* update interpretations component so it can be used in dashboard items ([#1510](#1510)) ([163abf6](163abf6))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 26.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.

4 participants