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 2804: Reuse the ResponsiveWrapper component from esm-framework #1673

Merged
merged 4 commits into from
Feb 23, 2024

Conversation

himanshu-malviya15
Copy link
Contributor

@himanshu-malviya15 himanshu-malviya15 commented Feb 16, 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

This replaces all instances of ResponsiveWrapper with the similarly-named reusable component that's defined in the @openmrs/esm-framework library. It also removes all custom implementations of the component in this repo as well as unused imports of the Layer carbon component and the useLayoutType hook.

Related Issue

O3-2804

@ibacher ibacher requested a review from denniskigen February 16, 2024 13:21
@ibacher ibacher changed the title (feat) O3 2804: Replace instances of ResponsiveWrapper with the component from the framework (fix) O3 2804: Replace instances of ResponsiveWrapper with the component from the framework Feb 16, 2024
Copy link
Member

@denniskigen denniskigen left a comment

Choose a reason for hiding this comment

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

@himanshu-malviya15, @ibacher code looks mostly ok to me! I can't test it locally though because I'm running into this:

CleanShot 2024-02-16 at 11  22 09@2x

Also, @himanshu-malviya15, CI builds are failing because you need to bump the framework version and commit the change to yarn.lock:

CleanShot 2024-02-16 at 11  24 10@2x

You can do that by running:

yarn up @openmrs/esm-framework@next

@himanshu-malviya15
Copy link
Contributor Author

@denniskigen As per your suggestion I run yarn up @openmrs/esm-framework@next and pushed yarn.lock

@denniskigen denniskigen changed the title (fix) O3 2804: Replace instances of ResponsiveWrapper with the component from the framework (fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework Feb 21, 2024
@denniskigen
Copy link
Member

Sorry, this has taken a while to get in, @himanshu-malviya15. Thanks for the great work!

@denniskigen denniskigen merged commit dbc0a88 into openmrs:main Feb 23, 2024
6 checks passed
jnsereko added a commit to jnsereko/openmrs-esm-patient-chart that referenced this pull request Mar 3, 2024
(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689)

* Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved

* Passing 'closeWorkspaceWithSavedChanges' as workspace props

(docs) Amend steps for updating core libraries in README (openmrs#1690)

(chore) Bump @openmrs/ngx-formentry (openmrs#1684)

(fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>

(refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661)

* (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl

* Fixup

---------

Co-authored-by: jwnasambu <wamalwa1844.com>
Co-authored-by: Dennis Kigen <[email protected]>

(feat) Add ability to cancel orders (openmrs#1640)

* (feat) cancel order

* clean up

* pr changes, reload fixes and clean up

* translations

* wip cancel order via action

* mutate orders on cancel

* order mutations and pr comments

* fixes to labs

* button text change

* Fixup

* More tweaks

---------

Co-authored-by: Dennis Kigen <[email protected]>

(chore) Add generic slot to Visit Form (openmrs#1688)

* (chore) Add billing slot to Start Visit Form

* Add generic visit attribute slot

* remove slot from config

---------

Co-authored-by: CynthiaKamau <[email protected]>

(chore) Bump Angular form engine (openmrs#1694)

(feat) Makes orders widget expandable and adds detailed order view (openmrs#1696)

* (feat) Expandable orders widget

* adds order item cards when expanded

* changes button to tooltip

(fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699)

fix the allergy reaction dependency

(feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695)

(feat) Relocate Load More button in visits section (openmrs#1702)

(chore) Relocate Load More button in visits section

add closeWorkspaceWithSavedChanges argument to Allergy form

parameterised allergy reaction should be checked correctly

maintain non-coded allergen array

remove test

(chore) Prettier should only list files that don't formatting config

(feat) Add config to handle bill submission in start visit form (openmrs#1700)

Upgrade peter-evans/create-pull-request

See peter-evans/create-pull-request#2790

(chore) Update translations from Transifex (openmrs#1683)

add test

fix added test
jnsereko added a commit to jnsereko/openmrs-esm-patient-chart that referenced this pull request Mar 3, 2024
(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689)

* Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved

* Passing 'closeWorkspaceWithSavedChanges' as workspace props

(docs) Amend steps for updating core libraries in README (openmrs#1690)

(chore) Bump @openmrs/ngx-formentry (openmrs#1684)

(fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>

(refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661)

* (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl

* Fixup

---------

Co-authored-by: jwnasambu <wamalwa1844.com>
Co-authored-by: Dennis Kigen <[email protected]>

(feat) Add ability to cancel orders (openmrs#1640)

* (feat) cancel order

* clean up

* pr changes, reload fixes and clean up

* translations

* wip cancel order via action

* mutate orders on cancel

* order mutations and pr comments

* fixes to labs

* button text change

* Fixup

* More tweaks

---------

Co-authored-by: Dennis Kigen <[email protected]>

(chore) Add generic slot to Visit Form (openmrs#1688)

* (chore) Add billing slot to Start Visit Form

* Add generic visit attribute slot

* remove slot from config

---------

Co-authored-by: CynthiaKamau <[email protected]>

(chore) Bump Angular form engine (openmrs#1694)

(feat) Makes orders widget expandable and adds detailed order view (openmrs#1696)

* (feat) Expandable orders widget

* adds order item cards when expanded

* changes button to tooltip

(fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699)

fix the allergy reaction dependency

(feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695)

(feat) Relocate Load More button in visits section (openmrs#1702)

(chore) Relocate Load More button in visits section

add closeWorkspaceWithSavedChanges argument to Allergy form

parameterised allergy reaction should be checked correctly

maintain non-coded allergen array

remove test

(chore) Prettier should only list files that don't formatting config

(feat) Add config to handle bill submission in start visit form (openmrs#1700)

Upgrade peter-evans/create-pull-request

See peter-evans/create-pull-request#2790

(chore) Update translations from Transifex (openmrs#1683)

add test

fix added test
jnsereko pushed a commit to jnsereko/openmrs-esm-patient-chart that referenced this pull request Mar 4, 2024
…rk (openmrs#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>
denniskigen added a commit that referenced this pull request Mar 7, 2024
)

* Add functionality to allow deleting and editing an allergy

(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (#1689)

* Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved

* Passing 'closeWorkspaceWithSavedChanges' as workspace props

(docs) Amend steps for updating core libraries in README (#1690)

(chore) Bump @openmrs/ngx-formentry (#1684)

(fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>

(refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (#1661)

* (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl

* Fixup

---------

Co-authored-by: jwnasambu <wamalwa1844.com>
Co-authored-by: Dennis Kigen <[email protected]>

(feat) Add ability to cancel orders (#1640)

* (feat) cancel order

* clean up

* pr changes, reload fixes and clean up

* translations

* wip cancel order via action

* mutate orders on cancel

* order mutations and pr comments

* fixes to labs

* button text change

* Fixup

* More tweaks

---------

Co-authored-by: Dennis Kigen <[email protected]>

(chore) Add generic slot to Visit Form (#1688)

* (chore) Add billing slot to Start Visit Form

* Add generic visit attribute slot

* remove slot from config

---------

Co-authored-by: CynthiaKamau <[email protected]>

(chore) Bump Angular form engine (#1694)

(feat) Makes orders widget expandable and adds detailed order view (#1696)

* (feat) Expandable orders widget

* adds order item cards when expanded

* changes button to tooltip

(fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (#1699)

fix the allergy reaction dependency

(feat) Hide bottom navigation on tablets and phones when workspace is active (#1695)

(feat) Relocate Load More button in visits section (#1702)

(chore) Relocate Load More button in visits section

add closeWorkspaceWithSavedChanges argument to Allergy form

parameterised allergy reaction should be checked correctly

maintain non-coded allergen array

remove test

(chore) Prettier should only list files that don't formatting config

(feat) Add config to handle bill submission in start visit form (#1700)

Upgrade peter-evans/create-pull-request

See peter-evans/create-pull-request#2790

(chore) Update translations from Transifex (#1683)

add test

fix added test

* clean deletePatientAllergy function

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx

Co-authored-by: Dennis Kigen <[email protected]>

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx

Co-authored-by: Dennis Kigen <[email protected]>

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.resource.ts

Co-authored-by: Dennis Kigen <[email protected]>

* (chore) Bump @openmrs/ngx-formentry

* make default allergy loading more clean

* fix linting

---------

Co-authored-by: Dennis Kigen <[email protected]>
usamaidrsk pushed a commit to usamaidrsk/openmrs-esm-patient-chart that referenced this pull request Mar 11, 2024
…rk (openmrs#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>
usamaidrsk pushed a commit to usamaidrsk/openmrs-esm-patient-chart that referenced this pull request Mar 11, 2024
…enmrs#1703)

* Add functionality to allow deleting and editing an allergy

(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689)

* Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved

* Passing 'closeWorkspaceWithSavedChanges' as workspace props

(docs) Amend steps for updating core libraries in README (openmrs#1690)

(chore) Bump @openmrs/ngx-formentry (openmrs#1684)

(fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673)

* (feat) Reuse ResponsiveWrapper component from esm-framework

* feat: Added Layer in visit-notes-form

* Fix styleguide imports by bumping both openmrs tooling and framework

* Misc fixes

---------

Co-authored-by: Dennis Kigen <[email protected]>

(refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661)

* (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl

* Fixup

---------

Co-authored-by: jwnasambu <wamalwa1844.com>
Co-authored-by: Dennis Kigen <[email protected]>

(feat) Add ability to cancel orders (openmrs#1640)

* (feat) cancel order

* clean up

* pr changes, reload fixes and clean up

* translations

* wip cancel order via action

* mutate orders on cancel

* order mutations and pr comments

* fixes to labs

* button text change

* Fixup

* More tweaks

---------

Co-authored-by: Dennis Kigen <[email protected]>

(chore) Add generic slot to Visit Form (openmrs#1688)

* (chore) Add billing slot to Start Visit Form

* Add generic visit attribute slot

* remove slot from config

---------

Co-authored-by: CynthiaKamau <[email protected]>

(chore) Bump Angular form engine (openmrs#1694)

(feat) Makes orders widget expandable and adds detailed order view (openmrs#1696)

* (feat) Expandable orders widget

* adds order item cards when expanded

* changes button to tooltip

(fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699)

fix the allergy reaction dependency

(feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695)

(feat) Relocate Load More button in visits section (openmrs#1702)

(chore) Relocate Load More button in visits section

add closeWorkspaceWithSavedChanges argument to Allergy form

parameterised allergy reaction should be checked correctly

maintain non-coded allergen array

remove test

(chore) Prettier should only list files that don't formatting config

(feat) Add config to handle bill submission in start visit form (openmrs#1700)

Upgrade peter-evans/create-pull-request

See peter-evans/create-pull-request#2790

(chore) Update translations from Transifex (openmrs#1683)

add test

fix added test

* clean deletePatientAllergy function

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx

Co-authored-by: Dennis Kigen <[email protected]>

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx

Co-authored-by: Dennis Kigen <[email protected]>

* Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.resource.ts

Co-authored-by: Dennis Kigen <[email protected]>

* (chore) Bump @openmrs/ngx-formentry

* make default allergy loading more clean

* fix linting

---------

Co-authored-by: Dennis Kigen <[email protected]>
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.

2 participants