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

[3655] Support "Delete Task Dependency" tool in gantt #3659

Merged
merged 2 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: vscode
path: vscode-extension/sirius-web-2024.5.1.vsix
path: vscode-extension/sirius-web-2024.5.2.vsix
retention-days: 20

- name: Archive the code coverage results
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ More existing APIs will be migrated to this new common pattern.
- [releng] Remove the dependency to `reflect-metadata`
- [releng] Switch to `subscriptions-transport-ws` 0.11.0
- [releng] Switch to EMF Json 2.3.11
- https://github.com/eclipse-sirius/sirius-web/issues/3523[#3523] [gantt] Move to @ObeoNetwork/gantt-task-react 0.4.17 to benefit for enhancements
- https://github.com/eclipse-sirius/sirius-web/issues/3523[#3523] [gantt] Move to @ObeoNetwork/gantt-task-react 0.4.19 to benefit for enhancements

=== Bug fixes

Expand Down Expand Up @@ -81,6 +81,7 @@ This dialog presents diagram elements in a tree and allows to select them and up
+
image:doc/screenshots/diagramFilterView.png[Diagram Filter View, 70%]
- https://github.com/eclipse-sirius/sirius-web/issues/3523[#3523] [gantt] Support rounding dates when changing dates from gantt
- https://github.com/eclipse-sirius/sirius-web/issues/3655[#3655] [gantt] Support "Delete Task Dependency" tool in gantt

=== Improvements

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/specifier/images/gantt-task-handlers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 9 additions & 2 deletions doc/specifier/representation-gantt.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Available variables:
** `newStartTime`: The new value of the start time.
** `newEndTime`: The new value of the end time.
** `newDescription`: The new value of the description.
** `newProgress`: The new value of the progress.
** `newProgress`: The new value of the progress.

image::images/gantt-task-handlers.png[Task handlers]

Expand All @@ -121,7 +121,14 @@ index=0 means first position.
This tool defines the behavior when creating a task dependency by dragging the dependency handler from one task to another.
Available variables:
** `sourceObject`: The semantic element associated with the task from which the dependency link is initiated.
** `targetObject`: The semantic element associated with the target task where the dependency finishes.
** `targetObject`: The semantic element associated with the dependant task where the dependency finishes.

image::images/gantt-task-relation-tool.png[Create Task Dependency Tool]
* `Delete Task Dependency Tool`:
This tool defines the behavior when deleting a task dependency using the button in the task dependency contextual palette in Gantt.
Available variables:
** `sourceObject`: The semantic element associated with the task from which the dependency link is initiated.
** `targetObject`: The semantic element associated with the dependant task where the dependency finishes.

image:images/gantt-task-dependency-palette.png[Task Dependency Contextual Palette]

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/user/images/gantt-task-handlers.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/user/images/gantt-task-palette.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 16 additions & 1 deletion doc/user/representation-gantt.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ When selecting a `Task` in Gantt or in the Table, the associated semantic elemen
Using handlers on the task, it is possible to change the start/end dates and the progress.
Clicking on the task and moving it left or right, allows to shift the date keeping the same duration.

image:images/gantt-task-handlers.png[Show/Hide Cards]
image:images/gantt-task-handlers.png[Task handlers]

When changing a date, the date is rounded accordingly to the `Date Rounding Expression` define in the `GanttDescription`.
Holiday is set as Saturday and Sunday. If the rounded date is part of the holiday, it is moved to the next or previous working date.
Expand All @@ -78,6 +78,21 @@ image:images/gantt-task-dependency-tool.png[Task Dependency Tool]
image:images/gantt-task-dependency.png[Task Dependency]


### Contextual tool palettes

Clicking on a task displays a contextual menu.

* `Create Task`: It will invoke `Create Task Tool`
* `Delete Task`: It will invoke `Delete Task Tool`

image:images/gantt-task-palette.png[Task Contextual Palette]

Clicking on a task dependency displays a contextual menu.

* `Delete Task Dependency`: It will invoke `Create Task Dependency Tool`

image:images/gantt-task-dependency-palette.png[Task Dependency Contextual Palette]

### Task reordering

From the table, it is possible to drag and drop a Task to reorder the task or change its container.
Expand Down
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": "2024.5.1",
"version": "2024.5.2",
"license": "EPL-2.0",
"private": true,
"devDependencies": {
Expand Down
58 changes: 29 additions & 29 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-sirius/sirius-components-parent",
"version": "2024.5.1",
"version": "2024.5.2",
"author": "Eclipse Sirius",
"license": "EPL-2.0",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-charts-parent</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>

<name>sirius-components-charts-parent</name>
<description>Sirius Components Charts Parent</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-charts-graphql</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>
<name>sirius-components-charts-graphql</name>
<description>Sirius Components Charts GraphQL</description>

Expand All @@ -47,22 +47,22 @@
<dependency>
<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-graphql-api</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-annotations-spring</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-collaborative-charts</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius</groupId>
<artifactId>sirius-components-tests</artifactId>
<version>2024.5.1</version>
<version>2024.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading
Loading