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.

Sign up for GitHub

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

Jump to bottom

[3437] Migrate to MUI 5 #3438

Merged
merged 1 commit into from
Aug 6, 2024
Merged

[3437] Migrate to MUI 5 #3438

merged 1 commit into from
Aug 6, 2024

Conversation

AresEkb
Copy link
Contributor

@AresEkb AresEkb commented Apr 30, 2024

Pull request template

General purpose

What is the main goal of this pull request?

  • Bug fixes
  • New features
  • Documentation
  • Cleanup
  • Tests
  • Build / releng

Project management

  • Has the pull request been added to the relevant project and milestone? (Only if you know that your work is part of a specific iteration such as the current one)
  • Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
  • Have the relevant issues been added to the pull request?
  • Have the relevant labels been added to the issues? (area:, difficulty:, type:)
  • Have the relevant issues been added to the same project and milestone as the pull request?
  • Has the CHANGELOG.adoc been updated to reference the relevant issues?
  • Have the relevant API breaks been described in the CHANGELOG.adoc? (Including changes in the GraphQL API)
  • In case of a change with a visual impact, are there any screenshots in the CHANGELOG.adoc? For example in doc/screenshots/2022.5.0-my-new-feature.png

Architectural decision records (ADR)

  • Does the title of the commit contributing the ADR start with [doc]?
  • Are the ADRs mentioned in the relevant section of the CHANGELOG.adoc?

Dependencies

  • Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc?
  • Are the new dependencies justified in the CHANGELOG.adoc?

Frontend

This section is not relevant if your contribution does not come with changes to the frontend.

General purpose

  • Is the code properly tested? (Plain old JavaScript tests for business code and tests based on React Testing Library for the components)

Typing

We need to improve the typing of our code, as such, we require every contribution to come with proper TypeScript typing for both changes contributing new files and those modifying existing files.
Please ensure that the following statements are true for each file created or modified (this may require you to improve code outside of your contribution).

  • Variables have a proper type
  • Functions’ arguments have a proper type
  • Functions’ return type are specified
  • Hooks are properly typed:
    • useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
    • useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
    • useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
    • useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
    • useState<STATE_TYPE>(…)
  • All components have a proper typing for their props
  • No useless optional chaining with ?. (if the GraphQL API specifies that a field cannot be null, do not treat it has potentially null for example)
  • Nullable values have a proper type (for example let diagram: Diagram | null = null;)

Backend

This section is not relevant if your contribution does not come with changes to the backend.

General purpose

  • Are all the event handlers tested?
  • Are the event processor tested?
  • Is the business code (services) tested?
  • Are diagram layout changes tested?

Architecture

  • Are data structure classes properly separated from behavioral classes?
  • Are all the relevant fields final?
  • Is any data structure mutable? If so, please write a comment indicating why
  • Are behavioral classes either stateless or side effect free?

Review

How to test this PR?

Please describe here the various use cases to test this pull request

  • Has the Kiwi TCMS test suite been updated with tests for this contribution?

@AresEkb AresEkb mentioned this pull request Apr 30, 2024
Closed
@AresEkb AresEkb changed the title [3437] Migrated to MUI 5 [3437] Migrate to MUI 5 Apr 30, 2024
@AxelRICHARD AxelRICHARD linked an issue Apr 30, 2024 that may be closed by this pull request
Migrate to MUI 5 #3437
Closed
@AresEkb AresEkb force-pushed the den/enh/mui5 branch 5 times, most recently from e09e49b to cc1ed2b Compare May 1, 2024 07:27
@AresEkb AresEkb marked this pull request as ready for review May 1, 2024 08:08
@sbegaudeau sbegaudeau self-assigned this May 3, 2024
@sbegaudeau sbegaudeau added this to the 2024.7.0 milestone May 7, 2024
@AresEkb AresEkb force-pushed the den/enh/mui5 branch 5 times, most recently from 547f119 to 8754df2 Compare June 3, 2024 03:15
@AresEkb
Copy link
Contributor Author

AresEkb commented Jun 3, 2024

Two Cypress-tests are unstable:

  • cypress/e2e/project/forms/widget-reference.cy.ts
  • cypress/e2e/project/portals/portals.cy.ts

They sometimes fail. But I can't reproduce it locally.

@gcoutable
Copy link
Member

gcoutable commented Jun 7, 2024 •
edited
Loading

There are still references to material-ui@v4 in package-lock.json.
Can you generate package-lock.json from scratch?

@AresEkb AresEkb mentioned this pull request Jun 7, 2024
Merged
@AresEkb
Copy link
Contributor Author

AresEkb commented Jun 7, 2024 •
edited
Loading

There are still references to material-ui@v4 in package-lock.json. Can you generate package-lock.json from scratch?

I've regenerated. But there are still Material UI 4 dependencies because of gantt-task-react

Created a pull request to migrate it to MUI 5 ObeoNetwork/gantt-task-react#9

Probably it can be made in 3 stages:

  1. Migrate Sirius Web to MUI 5
  2. Migrate gantt-task-react to MUI 5
  3. Migrate Sirius Web to new gantt-task-react

Or in two stages:

  1. Migrate gantt-task-react to MUI 5
  2. Migrate Sirius Web to MUI 5 and new gantt-task-react

@AresEkb AresEkb force-pushed the den/enh/mui5 branch 5 times, most recently from 036c0f6 to 2b77943 Compare July 24, 2024 02:58
mcharfadi
mcharfadi previously requested changes Jul 30, 2024
View reviewed changes
Copy link
Contributor

@mcharfadi mcharfadi left a comment

Choose a reason for hiding this comment

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

I listed some issues that would need to be addressed before merging.
I'm about to review ObeoNetwork/gantt-task-react#9 and then I will try to fixe the above.

packages/formdescriptioneditors/frontend/sirius-components-formdescriptioneditors/package.json Show resolved Hide resolved
...ormdescriptioneditors/frontend/sirius-components-formdescriptioneditors/src/ButtonWidget.tsx Show resolved Hide resolved
...mdescriptioneditors/frontend/sirius-components-formdescriptioneditors/src/CheckboxWidget.tsx Show resolved Hide resolved
...formdescriptioneditors/frontend/sirius-components-formdescriptioneditors/src/ImageWidget.tsx Show resolved Hide resolved
...formdescriptioneditors/frontend/sirius-components-formdescriptioneditors/src/RadioWidget.tsx Show resolved Hide resolved
packages/forms/frontend/sirius-components-widget-reference/src/ReferencePropertySection.tsx Show resolved Hide resolved
packages/sirius-web/frontend/sirius-web-application/src/diagrams/DiagramFilter.tsx Show resolved Hide resolved
...end/sirius-web-application/src/views/project-browser/list-projects-area/ListProjectsArea.tsx Show resolved Hide resolved
...ontend/sirius-web-application/src/views/edit-project/workbench-views/RelatedElementsView.tsx Show resolved Hide resolved
packages/validation/frontend/sirius-components-validation/src/ValidationView.tsx Show resolved Hide resolved
@AresEkb
Copy link
Contributor Author

AresEkb commented Aug 1, 2024

During one of rebases I forgot to update dependencies from MUI 4 to 5 in TreeItemAction.tsx. That was the reason of most style problems. Conflicts between MUI 4 and 5 can cause such a problems. It should be fine now

I've also fixed menu position, project link underline and removed dependency on @emotion/react

@AresEkb AresEkb requested a review from mcharfadi August 1, 2024 06:48
@mcharfadi
Copy link
Contributor

Thanks you @AresEkb, this indeed fixed most issues.
I'll release a new version of gantt-task-react now before doing what should be the last review.

@mcharfadi mcharfadi force-pushed the den/enh/mui5 branch 9 times, most recently from 4bc3412 to 8254078 Compare August 5, 2024 09:41
@sbegaudeau sbegaudeau modified the milestones: 2024.7.0, 2024.9.0 Aug 5, 2024
sbegaudeau
sbegaudeau requested changes Aug 6, 2024
View reviewed changes
Copy link
Member

@sbegaudeau sbegaudeau left a comment

Choose a reason for hiding this comment

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

I'll take over this PR to fix the last issue that I have and ensure that it gets merged as soon as possible

packages/deck/frontend/sirius-components-deck/package.json Show resolved Hide resolved
packages/diagrams/frontend/sirius-components-diagrams/package.json Show resolved Hide resolved
packages/formdescriptioneditors/frontend/sirius-components-formdescriptioneditors/package.json Show resolved Hide resolved
packages/forms/frontend/sirius-components-forms/package.json Show resolved Hide resolved
packages/forms/frontend/sirius-components-forms/src/propertysections/SliderPropertySection.tsx Outdated Show resolved Hide resolved
packages/sirius-web/frontend/sirius-web/package.json Show resolved Hide resolved
packages/trees/frontend/sirius-components-trees/package.json Show resolved Hide resolved
packages/validation/frontend/sirius-components-validation/package.json Show resolved Hide resolved
vscode-extension/package.json Show resolved Hide resolved
packages/core/frontend/sirius-components-core/package.json Show resolved Hide resolved
@AresEkb @sbegaudeau
[3437] Migrate to MUI 5
5e761df 
Bug: eclipse-sirius#3437
Signed-off-by: Denis Nikiforov <[email protected]>
Signed-off-by: Michaël Charfadi <[email protected]>
Signed-off-by: Stéphane Bégaudeau <[email protected]>
@sbegaudeau sbegaudeau dismissed mcharfadi’s stale review August 6, 2024 09:20

The changes have been taken into account so I'll move forward and merge it

@sbegaudeau sbegaudeau merged commit baef1d6 into eclipse-sirius:master Aug 6, 2024
4 checks passed
@sbegaudeau
Copy link
Member

Thanks Denis for the contribution, it took quite some time to integrate it in Sirius Web but it's now finally merged \o/

@AresEkb
Copy link
Contributor Author

AresEkb commented Aug 6, 2024

Thanks a lot for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbegaudeau sbegaudeau sbegaudeau approved these changes

@pcdavid pcdavid Awaiting requested review from pcdavid pcdavid is a code owner

@gcoutable gcoutable Awaiting requested review from gcoutable gcoutable is a code owner

@AxelRICHARD AxelRICHARD Awaiting requested review from AxelRICHARD AxelRICHARD is a code owner

@mcharfadi mcharfadi Awaiting requested review from mcharfadi

Assignees

@sbegaudeau sbegaudeau

Labels
pr: to review later priority: high
Projects
None yet
Milestone
2024.9.0
Development

Successfully merging this pull request may close these issues.

Migrate to MUI 5
4 participants
@AresEkb @gcoutable @mcharfadi @sbegaudeau