Merge our mvp branch back to our main branch
#304
Merged
Conversation
This file contains hidden or 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
Quite handy to test things.
Before, we could have had a race condition resulting in the splash screen sometimes being shown and sometimes not. Here, we create the main window only once we know for sure that the splash screen has been created. Not also that we "manually" show the splash screen ourselves rather than rely on the `show` property being `true` by default to do it for us. This avoids potentially getting a temporary white window.
This has the indirect consequence of messing up the handling of our URI scheme (see issue opencor#268).
Indeed, when it is packaged, electron-builder uses `build/icon.icns` or `build/icon.ico` to set the app icon. Also, to manually set the app icon results, on macOS at least, in the app icon being bigger for some reasons while it looks "right" when packaging OpenCOR using electron-builder.
Removed the button aspect of it.
Also, moved the PNG file needed on Windows and Linux to `src/main/assets` so that it gets packaged by electron-builder (!!).
qwe qwe
…documents and instances as we want for a given file.
… peer dependencies. They were originally here so that we could easily find out when a new version of them is available (since we "manually" import them), but it's not good to have things under `peerDependencies` unless actually needed. So, removing them... which means that we will need to "manually" check whether a new version of `mathjs` and/or `plotly.js-gl2d-dist-min` is available.
… the toolbar. The objective is for the center template to always in the same place.
…igonometric operators.
There was a problem hiding this comment.
Pull request overview
This pull request merges the mvp branch back into main, introducing significant architectural changes to OpenCOR's simulation framework. The changes refactor how SED-ML documents and instances are managed, shifting from file-path-based identification to numeric ID-based tracking, and add GitHub integration capabilities via Firebase authentication.
Key Changes:
- Refactored C++ API to use numeric IDs instead of file paths for SED documents and instances
- Consolidated simulation views by merging interactive and standard modes into a single component
- Added Firebase-based GitHub OAuth integration for repository access
- Updated dependency versions and configuration files for improved tooling support
Reviewed changes
Copilot reviewed 46 out of 48 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/renderer/src/libopencor/src/sed.{h,cpp} | Changed return types from void to napi_value for create/instantiate functions; implemented ID-based tracking |
| src/renderer/src/libopencor/src/common.{h,cpp} | Replaced FileData struct with separate ID-based maps; renamed helper functions from valueTo* to to* |
| src/renderer/src/libopencor/src/file.cpp | Updated to use new file path-based storage instead of file pointer keys |
| src/renderer/src/libopencor/locSedApi.ts | Major refactor: removed base classes, added validation logic, changed to ID-based parameter passing |
| src/renderer/src/libopencor/locFileApi.ts | Simplified by removing document/instance caching from File class |
| src/renderer/src/components/views/SimulationExperimentView.vue | Merged standard and interactive modes; added toggle button and consolidated UI |
| src/renderer/src/components/OpenCOR.vue | Added GitHub OAuth integration with Firebase authentication |
| src/renderer/src/common/firebaseConfig.ts | New file for Firebase configuration management |
| src/renderer/src/common/gitHubIntegration.ts | New file for secure token storage using system keychain |
| src/renderer/src/common/rendererServer.ts | New HTTP server for OAuth callback handling in packaged desktop app |
| src/renderer/package.json | Version bump to 0.20251203.1; added firebase and octokit dependencies |
| biome.json, src/renderer/biome.json | Simplified formatter/linter includes; enabled VCS integration |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.