(fix) Various fixes for compatibility of new versions #707
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* esm-framework itself should use System-style output * Properly handle multiple routes overriding each other * Properly handle ordering of pages across apps and app indices based on page order
|
Size Change: -232 kB (-10%) 👏 Total Size: 2.11 MB
ℹ️ View Unchanged
|
ibacher
commented
Jun 23, 2023
| @@ -182,22 +182,26 @@ export function registerApp(appName: string, routes: OpenmrsAppRoutes) { | |||
| * Each page is rendered into a div with an appropriate name. | |||
| */ | |||
| export function finishRegisteringAllApps() { | |||
| pages.sort((a, b) => a.order - b.order); | |||
There was a problem hiding this comment.
So, I think we were implicitly relying on sorting pages by app and then by page order. Pages are now sorted purely by order (and then appName according to English rules) so we're not implicitly relying on anything.
This is also why the index-counting behaviour needed to be changed to track an index-per-app.
ibacher
commented
Jun 23, 2023
| let index = 0; | ||
| let lastAppName: string | undefined = undefined; | ||
|
|
||
| let appIndices = new Map(); |
There was a problem hiding this comment.
We probably have a lot of places where we're using Objects and it would make sense to use Maps. That said, the syntax for objects is much more comfortable, i.e., I don't think there's as ergonomic a version of {...base, ...overrides} for merging maps as for objects, though I suppose:
function mapMerge(base: Map, overrides: Map): Map
wouldn't be hard to write.
ibacher
commented
Jun 23, 2023
| */ | ||
| async function setupApps() { | ||
| const scriptTags = document.querySelectorAll<HTMLScriptElement>( | ||
| "script[type='openmrs-routes']" | ||
| ); | ||
|
|
||
| const promises: Array<Promise<typeof window.installedModules>> = []; | ||
| const promises: Array<Promise<OpenmrsRoutes>> = []; |
There was a problem hiding this comment.
We process each script tag asynchronously, but we need to merge them into a single consistent view of routes before we do anything else. We were accidentally double-loading some routes in development, which was not great.
ibacher
commented
Jun 23, 2023
| ); | ||
|
|
||
| const modules: typeof window.installedModules = []; | ||
| Object.entries(routes).forEach(async ([module, routes]) => { |
There was a problem hiding this comment.
Technically, this doesn't guarantee that all modules will be in installedModules, i.e., the array can continue to grow asynchronously. I don't know if it's worth implementing the kind of blocking that would be required to ensure that once it was set it's value was not changed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
For changes to apps
If applicable
Summary
Screenshots
Related Issue
Other