Skip to content

Commit

Permalink
Merge branch 'eclipse-sirius:master' into mch/enh/view-icons-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
mcharfadi authored Aug 17, 2023
2 parents c8d7b64 + 964e832 commit a424ed1
Show file tree
Hide file tree
Showing 269 changed files with 3,587 additions and 7,859 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Continuous integration
on:
push:
paths-ignore:
- 'CHANGELOG.adoc'
- 'doc/**'
- "CHANGELOG.adoc"
- "doc/**"
branches:
- '**'
- "**"
tags:
- '*'
- "*"
pull_request:
workflow_dispatch:

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/setup-java@v3.9.0
with:
java-version: 17
distribution: 'temurin'
distribution: "temurin"

- name: Setup some global environment variables
run: |
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: vscode
path: vscode-extension/sirius-web-2023.6.5.vsix
path: vscode-extension/sirius-web-2023.8.0.vsix
retention-days: 20

- name: Compress the code coverage results
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
with:
build: docker-compose -f ../packages/sirius-web/backend/sirius-web-sample-application/docker-compose.yml up -d
start: docker-compose -f ../packages/sirius-web/backend/sirius-web-sample-application/docker-compose.yml ps
wait-on: 'http://localhost:8080/login'
wait-on: "http://localhost:8080/login"
wait-on-timeout: 180
working-directory: integration-tests
record: false
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@ jobs:
env:
GITHUB_EVENT: ${{ toJSON(github.event) }}
run: node scripts/check-milestone.js

- name: Check that the TypeScript files do not have an issue
env:
GITHUB_EVENT: ${{ toJSON(github.event) }}
run: node scripts/check-ts.js
49 changes: 48 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
= Changelog

== v2023.8.0 (unreleased)
== v2023.10.0 (work in progress)

=== Shapes


=== Architectural decision records


=== Breaking changes

- https://github.com/eclipse-sirius/sirius-components/issues/2250[#2250] [core] Remove all references to notistack from `sirius-components-core`.
As a result, the link between notistack and Sirius Components needs to be updated in applications using Sirius Components.
See the Sirius Web `ToastProvider` and `ToastContextInitializer` to see how to give Sirius Components the relevant function(s) from notistack.
Without the dependency to notistack in `sirius-components-core`, it will be easier to leverage native VS Code popup to display our errors.

=== Dependency update


=== Bug fixes


=== New Features


=== Improvements

- [releng] Add some automatic checks to simplify code reviews


== v2023.8.0

=== Shapes

Expand Down Expand Up @@ -54,6 +83,13 @@ An absent/empty candidates expression now simply means the widget is empty.
- https://github.com/eclipse-sirius/sirius-components/issues/2179[#2179] [tree] Fix an issue where labels of tree items matching exactly pattern typed in the filter bar were not detected.
- https://github.com/eclipse-sirius/sirius-components/issues/2178[#2178] [view] Fix an error when selecting an EdgeStyle.
- https://github.com/eclipse-sirius/sirius-components/issues/2019[#2019] [project] Fix exporting and re-importing studio projects
- https://github.com/eclipse-sirius/sirius-components/issues/2190[#2190] [view] Fix an issue where diagram nodes with image style didn't use the width and height defined in view node descriptions.
- https://github.com/eclipse-sirius/sirius-components/issues/2211[#2211] [diagram] Fix an issue where the icons of an edge label where broken with ReactFlow.
- https://github.com/eclipse-sirius/sirius-components/issues/2197[#2197] [project] Fix an issue where the renaming of a project from the project page needed a refresh to be visible.
- https://github.com/eclipse-sirius/sirius-components/issues/2194[#2194] [view] Fix an issue where it was impossible to set the None value to a color property in a View Node/Edge Description from the Details view.
- https://github.com/eclipse-sirius/sirius-components/issues/2225[#2225] [form] Fix an issue where tabs displaying page name could be hidden.
- https://github.com/eclipse-sirius/sirius-components/issues/2220[#2220] [vs-code] Fix an issue where some React contexts where missing, the treeID variable was missing in graphQLSubscription for the explorer and the Forms were not parts of the list of representations availables.
- https://github.com/eclipse-sirius/sirius-components/issues/2217[#2217] [diagram] Fix the svg export when the file extension was not available. It falls back to the image content type to determine the image type.

=== New Features

Expand Down Expand Up @@ -131,6 +167,17 @@ Use the same style properties as the list widget.
- https://github.com/eclipse-sirius/sirius-components/issues/2168[#2168] [tree] Add option on tree to disable multiple selection.
- https://github.com/eclipse-sirius/sirius-components/issues/2183[#2183] [form] Add some data-testid to help cypress tests redaction.
- https://github.com/eclipse-sirius/sirius-components/issues/2103[#2103] [diagram] Add support for edge reconnection with React Flow.
- https://github.com/eclipse-sirius/sirius-components/issues/2086[#2086] [diagram] Add the support for the hide and fade of a node
+
The diagram panel with unhide all and unfade all:
+
image:doc/images/DiagramPanelUnhideUnfade.png[Unhide all and Unfade all]
+
The node palette with hide and fade:
+
image:doc/images/NodePaletteWithHideFade.png[Hide and Fade on node palette]
- https://github.com/eclipse-sirius/sirius-components/issues/2095[#2095] [diagram] Add support for the creation of new edges in the alternate diagram rendering solution
- https://github.com/eclipse-sirius/sirius-components/issues/2104[#2104] [diagram] Improve the frontend rendering. Labels and node list are rendered with css.

== v2023.6.0

Expand Down
Binary file added doc/images/DiagramPanelUnhideUnfade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/NodePaletteWithHideFade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion integration-tests/cypress/e2e/project/edit/diagram.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ describe('/projects/:projectId/edit - Diagram', () => {
cy.getByTestId('Image - Motion_Engine').should('exist');
});

it.only('can create views by Drag and Drop on an unsynchronized diagram when a representation is selected', () => {
it('can create views by Drag and Drop on an unsynchronized diagram when a representation is selected', () => {
cy.getByTestId('robot').dblclick();
cy.getByTestId('Robot').dblclick();
cy.getByTestId('Robot-more').click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,19 @@ describe('/projects/:projectId/edit - Project Context Menu', () => {
cy.getByTestId('delete-project').click();
cy.url().should('match', new RegExp(Cypress.config().baseUrl + '/projects'));
});

it('can rename a project', () => {
cy.getByTestId('navbar-New Project Name').should('not.exist');
cy.getByTestId('navbar-Cypress Project').should('exist');

cy.getByTestId('more').click();
cy.getByTestId('navbar-contextmenu').findByTestId('rename').click();

cy.getByTestId('rename-textfield').type('{selectAll}{backspace}');
cy.getByTestId('rename-textfield').type('New Project Name');
cy.getByTestId('rename-project').click();

cy.getByTestId('navbar-New Project Name').should('exist');
cy.getByTestId('navbar-Cypress Project').should('not.exist');
});
});
4 changes: 2 additions & 2 deletions integration-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sirius-web-integration-tests",
"version": "2023.6.5",
"version": "2023.8.0",
"license": "EPL-2.0",
"private": true,
"devDependencies": {
Expand Down
Loading

0 comments on commit a424ed1

Please sign in to comment.