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

( fix ) - O3-3171 Replace overlays in the Appointments app #1133

Merged
merged 2 commits into from
May 23, 2024

Conversation

kb019
Copy link
Contributor

@kb019 kb019 commented May 9, 2024

Requirements

  • This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
  • My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
  • My work includes tests or is validated by existing tests.

Summary

To replace the overlay in the esm-appointments-app with the workspaces. Also i think the size of the workspaceOverlay seems quite big which comes from the min-width property assigned in the esm-framework.

https://openmrs.atlassian.net/browse/O3-3171

Video

OpenMRS.-.Personal.-.Microsoft_.Edge.2024-05-09.12-45-54.webm

@kb019 kb019 force-pushed the fix/O3-3171 branch 2 times, most recently from 8685460 to 26ec9c4 Compare May 9, 2024 10:27
@brandones
Copy link
Contributor

Please get rid of the explicit passing of closeWorkspace.

You can probably delete './overlay.component' and its associated files at this point.

At some point we should probably refactor the appointments system. It is weird that it has three different form names for the same component and that there is a context: 'editing' that maybe makes that component behave differently. Don't worry about that for this PR though.

Copy link
Contributor

@brandones brandones left a comment

Choose a reason for hiding this comment

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

As above

@kb019
Copy link
Contributor Author

kb019 commented May 15, 2024

Hey @brandones 😃. Thank you so much for reviewing. I have made the changes suggested by you. Also a overlay is used by a widget in appointments app which is rendered in extension slot of home app . The Component is here . So should i replace that by workspaceOverlay or keep as it is .


export const createAppointment = getSyncLifecycle(appointementsForm, options);

export const addAppointment = getSyncLifecycle(appointementsForm, options);
Copy link
Member

Choose a reason for hiding this comment

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

Defer to @brandones but wouldn't it make sense to the just create a single "appointmentForm" here instead of "editAppointmentForm", "createAppointment" and "addAppointment" and then just that same component when registering the three different workspaces below?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure @mogoodrich , got your point . Will work on that and update the progress . Thank you .

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah that would be great, thanks @mogoodrich , thanks @kb019

@mogoodrich mogoodrich requested a review from brandones May 17, 2024 13:51
@brandones
Copy link
Contributor

Hey @brandones 😃. Thank you so much for reviewing. I have made the changes suggested by you. Also a overlay is used by a widget in appointments app which is rendered in extension slot of home app . The Component is here . So should i replace that by workspaceOverlay or keep as it is .

We want to migrate everything to the new workspace system. There should only be one workspace renderer per page, and the home page already has one, so we probably don't need that overlay component there at all. Please make sure to find where it is in the UI and verify that everything still works after you make the change.

@kb019 kb019 force-pushed the fix/O3-3171 branch 3 times, most recently from 44e77bc to 2ba5221 Compare May 19, 2024 15:08
@kb019
Copy link
Contributor Author

kb019 commented May 19, 2024

Hi @brandones and @mogoodrich , I have made the necessary changes . Could you please review it. I have attached the updated video.Thanks @mogoodrich .Thanks @brandones .
OpenMRS - Personal - Microsoft_ Edge 2024-05-19 20-39-42.webm

@kb019 kb019 requested a review from mogoodrich May 19, 2024 15:33
Copy link
Member

@mogoodrich mogoodrich left a comment

Choose a reason for hiding this comment

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

LGTM, assuming all the overlays have been tested and still open, thanks @kb019 !

I also just triggered a run of the tests to confirm they pass.

@kb019
Copy link
Contributor Author

kb019 commented May 20, 2024

LGTM, assuming all the overlays have been tested and still open, thanks @kb019 !

I also just triggered a run of the tests to confirm they pass.

Thanks @mogoodrich.

@brandones
Copy link
Contributor

@mogoodrich : LGTM, assuming all the overlays have been tested and still open,

No need to assume, that's what the video is for 😆

Thanks @kb019 , and thanks for the review @mogoodrich !

@brandones brandones merged commit 1b9eed4 into openmrs:main May 23, 2024
6 checks passed
@mogoodrich
Copy link
Member

So there's definitely a bug with this PR, see attached screencast of I took of toggling the selectors on the appointments form before and after the change.

Before:

Screencast.from.05-28-2024.10.12.29.AM.webm

After:

Screencast.from.05-28-2024.10.14.23.AM.webm

Can we please fix @kb019 , fyi @brandones ? Also, I don't know if the overlay size is suppose to change as it did (it's wider now).

@kb019
Copy link
Contributor Author

kb019 commented May 28, 2024

So there's definitely a bug with this PR, see attached screencast of I took of toggling the selectors on the appointments form before and after the change.

Before:

Screencast.from.05-28-2024.10.12.29.AM.webm
After:

Screencast.from.05-28-2024.10.14.23.AM.webm
Can we please fix @kb019 , fyi @brandones ? Also, I don't know if the overlay size is suppose to change as it did (it's wider now).

Thank you @mogoodrich for the info.I will work on it and update the progress.

@kb019
Copy link
Contributor Author

kb019 commented May 29, 2024

Hi @mogoodrich and @brandones , sorry for not checking this out earlier. I have raised a pr for this here could you please look into it.

mogoodrich added a commit that referenced this pull request May 31, 2024
Co-authored-by: Mark Goodrich <mgoodrich@pih.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants