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

Re-organize lib/dashboard/ #8587

Merged
merged 45 commits into from
Jan 10, 2024
Merged

Re-organize lib/dashboard/ #8587

merged 45 commits into from
Jan 10, 2024

Conversation

somebody1234
Copy link
Contributor

@somebody1234 somebody1234 commented Dec 19, 2023

Pull Request Description

  • Significantly flattens directory structure of lib/dashboard/

Important Notes

  • Basic testing done on:
    • dashboard's npm run dev which (since quite recently) uses Vite.
      • specifically: npm run dev in app/ide-desktop/lib/dashboard, OR npm run dashboard:dev in app/ide-desktop
    • dashboard's bundle script (npm run build) which uses ESBuild.
    • GUI2's own entry point (GUI2's npm run dev).
    • ./run ide build
    • ./run ide watch
    • ./run ide2 build
    • ./run gui watch

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

  • The documentation has been updated, if necessary.
  • Screenshots/screencasts have been attached, if there are any visual changes. For interactive or animated visual changes, a screencast is preferred.
  • All code follows the
    Scala,
    Java,
    and
    Rust
    style guides. In case you are using a language not listed above, follow the Rust style guide.
  • All code has been tested:
    • Unit tests have been written where possible.
    • If GUI codebase was changed, the GUI was tested when built using ./run ide build.

@somebody1234 somebody1234 added CI: No changelog needed Do not require a changelog entry for this PR. g-dashboard labels Dec 19, 2023
@somebody1234 somebody1234 marked this pull request as ready for review December 20, 2023 03:53
@somebody1234
Copy link
Contributor Author

restructure finished! the new directory structure might not be perfect, but i think this is probably worth merging regardless?

but anyway, given that it should be more or less complete, i'm now beginning to test using the ./run script.

@somebody1234 somebody1234 added the CI: Clean build required CI runners will be cleaned before and after this PR is built. label Dec 20, 2023
Copy link
Contributor

@farmaazon farmaazon left a comment

Choose a reason for hiding this comment

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

The /app/gui2 part looks good.

@somebody1234 somebody1234 removed the CI: Clean build required CI runners will be cleaned before and after this PR is built. label Jan 5, 2024
@somebody1234
Copy link
Contributor Author

not sure why there was a merge error, automatic merged worked fine locally.

@somebody1234 somebody1234 added the CI: Clean build required CI runners will be cleaned before and after this PR is built. label Jan 5, 2024
@PabloBuchu PabloBuchu added the CI: Ready to merge This PR is eligible for automatic merge label Jan 9, 2024
@somebody1234
Copy link
Contributor Author

Basic testing re-done on all cases after merge.

@mergify mergify bot merged commit 8597de1 into develop Jan 10, 2024
30 of 33 checks passed
@mergify mergify bot deleted the wip/sb/reorganize-dashboard branch January 10, 2024 16:22
mergify bot pushed a commit that referenced this pull request Jan 16, 2024
This is required because `index.ts` was renamed to `entrypoint.ts` in order to avoid colliding with the main export of the `enso-dashboard` module, which is used by `gui2` as `dashboard.run()`. This file was renamed in #8587, causing the issue.

Build script changes also included thanks to @mwu-tow.

# Important Notes
This should only affect projects opened against the remote (cloud) backend, meaning that to test this, you should open a project against the cloud backend.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Clean build required CI runners will be cleaned before and after this PR is built. CI: No changelog needed Do not require a changelog entry for this PR. CI: Ready to merge This PR is eligible for automatic merge g-dashboard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants