From 6197271a387e99cb2fddfa00d57e3f5867212136 Mon Sep 17 00:00:00 2001 From: Nicolas Couvert Date: Tue, 24 Mar 2026 15:38:42 +0100 Subject: [PATCH 1/3] [35] Fix end date being set one day too early in workpackage creation Issue : https://github.com/ObeoNetwork/pepper/issues/35 --- CHANGELOG.adoc | 4 +++- .../pepper/starter/services/view/PepperMMJavaService.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index dbeba7d..cc3cd11 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -11,9 +11,11 @@ - https://github.com/ObeoNetwork/pepper/issues/13[#13] Add checkbox cells to WorkpackageArtefactPageDescription instead of the old text field - https://github.com/ObeoNetwork/pepper/issues/6[#6] Use "00:00" as default value for Start Time and "23:59" as default value for End Time - https://github.com/ObeoNetwork/pepper/issues/5[#5] In calendar widget, improve default values of "Start Date", "End Date", "Start Time" and "End Time" +- https://github.com/ObeoNetwork/pepper/issues/14[#14] Week number are now displayed centered between week separation line -=== Bug fixes +=== Bug fixes +- https://github.com/ObeoNetwork/pepper/issues/35[#35] Workpackages created from another in the Gantt panel now have the same duration as the original one. == v2024.11.0 diff --git a/backend/pepper-starter/src/main/java/pepper/starter/services/view/PepperMMJavaService.java b/backend/pepper-starter/src/main/java/pepper/starter/services/view/PepperMMJavaService.java index 9564836..fcb01b9 100644 --- a/backend/pepper-starter/src/main/java/pepper/starter/services/view/PepperMMJavaService.java +++ b/backend/pepper-starter/src/main/java/pepper/starter/services/view/PepperMMJavaService.java @@ -106,7 +106,7 @@ public void createWorkpackage(EObject context) { // The new task follows the context task and has the same duration than the context task. if (workpackage.getEndDate() != null && workpackage.getStartDate() != null) { newWorkpackage.setStartDate(workpackage.getEndDate().plusDays(1)); - newWorkpackage.setEndDate(workpackage.getEndDate().plusDays(workpackage.getEndDate().toEpochDay() - workpackage.getStartDate().toEpochDay())); + newWorkpackage.setEndDate(workpackage.getEndDate().plusDays(workpackage.getEndDate().toEpochDay() - workpackage.getStartDate().toEpochDay() + 1)); } EObject parent = context.eContainer(); From 66f59219e64675b96a4a0ea5a8523d8b636ab3d4 Mon Sep 17 00:00:00 2001 From: Nicolas Couvert Date: Wed, 25 Mar 2026 14:15:59 +0100 Subject: [PATCH 2/3] [13] [14] Switch to SW 2026.3.0 This version of Sirius-web correct a bug to solve these issues. Issue: https://github.com/ObeoNetwork/pepper/issues/13 linked with : Sirius Web Issue : https://github.com/eclipse-sirius/sirius-web/issues/6141 Issue: https://github.com/ObeoNetwork/pepper/issues/14 --- backend/pepper-parent/pom.xml | 4 +- .../PepperTableEditCellHandler.java | 3 +- frontend/package-lock.json | 430 +++++++++--------- frontend/pepper-web/package.json | 38 +- frontend/pepper-web/src/nodes/EllipseNode.tsx | 11 +- .../src/nodes/EllipseNodeConverter.ts | 2 + .../src/nodes/EllipseNodeLayoutHandler.ts | 5 +- 7 files changed, 250 insertions(+), 243 deletions(-) diff --git a/backend/pepper-parent/pom.xml b/backend/pepper-parent/pom.xml index d59a3da..df3445b 100644 --- a/backend/pepper-parent/pom.xml +++ b/backend/pepper-parent/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.9 + 3.5.11 pepper @@ -30,7 +30,7 @@ 17 - 2026.1.0 + 2026.3.0 7.4.14-SNAPSHOT 2026.1.0 diff --git a/backend/pepper-starter/src/main/java/pepper/starter/services/descriptions/PepperTableEditCellHandler.java b/backend/pepper-starter/src/main/java/pepper/starter/services/descriptions/PepperTableEditCellHandler.java index 858d33f..c9b5c30 100644 --- a/backend/pepper-starter/src/main/java/pepper/starter/services/descriptions/PepperTableEditCellHandler.java +++ b/backend/pepper-starter/src/main/java/pepper/starter/services/descriptions/PepperTableEditCellHandler.java @@ -61,7 +61,8 @@ public PepperTableEditCellHandler(IObjectSearchService objectSearchService) { @Override public boolean canHandle(TableDescription tableDescription) { - return tableDescription.getId().equals("workpackagesTableId"); + String tableId = tableDescription.getId(); + return tableId.equals("workpackagesTableId") || tableId.equals("workpackageArtefactsTableId") || tableId.equals("risksTableId"); } @Override diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 2ab4f88..fabc229 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -364,9 +364,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-browser": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-browser/2026.1.0/5dbfbb9984057dc9ce4806a0c6f48a272c1be91c", - "integrity": "sha512-I8P+9skBnO9Op4hOZHLfxRQ19taLAhBBPR2izAaNAWHxW8YUvBbwzcfCDqj228WeHdLgILhCcI9cd8ShMdof2g==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-browser/2026.3.0/f97a4aed8b8d1645bbe2fbc09f2bcef3f7b53236", + "integrity": "sha512-YUdHe1L2HtHeXx9sMj/Vm2H6X58z2tDq/hGlEx6TUzRYVxNLjeRplXHKFcwPnJlKdowYLCug3VyvPrVbAXVRJw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -388,9 +388,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-charts": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-charts/2026.1.0/46462fe92df579d9dc0bbc62eb56c085ec89ece2", - "integrity": "sha512-fROO9djTQpj/egK7B5Q9vSaINxZCrQjFePtR4Oty5VhVDDS5l2j27OwxEaYm2HObZZn86wswxX5f95+M5WYx3Q==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-charts/2026.3.0/fac6f1b4483f99f2e2ac8e41bde259a08f54ac8e", + "integrity": "sha512-P4dpdhDQP7d6H27HOeYF8g/E5h+QUzqTwnev21navBKz04tmRkGFgwaBgoy+1SWE5F/4W6g7nUnc8mdkg6JERA==", "license": "EPL-2.0", "peerDependencies": { "d3": "7.0.0", @@ -398,9 +398,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-core": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-core/2026.1.0/a9d66be8ee6d8cdcb06de0f86b9fb4e24c51f6f5", - "integrity": "sha512-gU8JX69TpdhcR2tIqpzb8UetZ5pwdjUB3AdTfd1/0nOrMKoqM5+oCihwfonSoB72Qp5Xum51x649gdC4Jf21hg==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-core/2026.3.0/5a2c8b307209800a5821baefaf0e093a10785174", + "integrity": "sha512-t0ScUrrLpKD2Vd7FJkCKl1u6eQl6Yrspxayg2WAeA1jneMxm82/Lqdq7uqS/GDTNfb+wnKtBJA6tnb4SvI2ntA==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -434,9 +434,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-deck": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-deck/2026.1.0/b047f0a7eb70272464be833bbaa3c820b955a5cf", - "integrity": "sha512-Y5gxUYnOP52IRv6cg4Fm0FYBVlp16fKy1Ob2cnqiTHcipqOxqv4R62o8MuTxRw26Exer3OTolgHOHtCMr7DMYQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-deck/2026.3.0/2e7c1073b407ba121ae9a5c38408cd2c80c2e528", + "integrity": "sha512-0R1UiCT5T35+8/H4e6iRzPWgg4mpGEnvqhJiKlaK87ky8QTNPvPchBam75IreIz/hMBZFBl3w3z6Vh/k6SM3Mw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -453,9 +453,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-diagrams": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-diagrams/2026.1.0/880247740ab19a932f94cdfff27f4b1dfa0b7edc", - "integrity": "sha512-jCALe4t2xPxWBd32woJpu14teIdKdwhTct526qGyCC+gjqacQgoiGsgcz40I8FMnsxMIrSUiuaed5QX3otbCbA==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-diagrams/2026.3.0/642c154c70190d98706f2e65bde7789963dd2184", + "integrity": "sha512-0upSBANxAmreY/wsBWkKvaAlHEixzTsyJyZzNIgK8g4GU1z6+xeXG78/PC4B0AAX83/4QF8UfFxieylXrd4BQA==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -480,9 +480,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-formdescriptioneditors": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-formdescriptioneditors/2026.1.0/73f4deba60619c595305f237661010b26c233c4b", - "integrity": "sha512-RmEFDAakoaW8KXmUfxJSu7VBKXXBxKxtirqwqu+LEcfoMz98YvDTVX/VmC205vHyXbKJvqkAkF2l1Y32IPm6Wg==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-formdescriptioneditors/2026.3.0/6ad9c5d39812642809911a5c6fc6e9e0c0724b44", + "integrity": "sha512-z0+QfClcUOIWbgLeHx15QLDZ2uPylYuEyIDqWJHR66/Id0qjfx3FW32WwC0vkuyU7PPbehBququ0zDiXsXQqBw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -506,9 +506,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-forms": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-forms/2026.1.0/aba55fe77ed8989c28050ead009f0f0871e08502", - "integrity": "sha512-3hCr4vHnMvdr1+ur+Ui07EeLTA4wxNUqGvtSTNfEqjegblsMiWCV8fYoiTPRK4HNiSrpXMzHqi+v9debip5VsQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-forms/2026.3.0/958c6cef008cab9ab803a044d2ee0e9c6de58d81", + "integrity": "sha512-V4JaZJZxK6ndrh+FpLUuwpykb5e/pVC8XRlCpp3YlWfvZIS+Un2AQZvsdzCx4oPw7UA2m3iQeX0JGpZvqXgshQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -530,25 +530,6 @@ "tss-react": "4.9.16" } }, - "node_modules/@eclipse-sirius/sirius-components-gantt": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-gantt/2026.1.0/7875acc6080ecf1fe07fecd5d4b19677a4a22c55", - "integrity": "sha512-fiiPehOp0Cj41tX/KOFvFGfc2xXTgooDo5H35To+NfIZIrh1eHFmAGSVhBPYodXJf4h7EIPCdLSNMBv/dWN91g==", - "license": "EPL-2.0", - "peerDependencies": { - "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-core": "*", - "@mui/icons-material": "7.0.2", - "@mui/material": "7.0.2", - "@ObeoNetwork/gantt-task-react": "0.6.2", - "graphql": "16.8.1", - "react": "18.3.1", - "react-dom": "18.3.1", - "react-i18next": "16.2.3", - "react-resizable-panels": "3.0.2", - "tss-react": "4.9.16" - } - }, "node_modules/@eclipse-sirius/sirius-components-impactanalysis": { "version": "2026.3.0", "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-impactanalysis/2026.3.0/ba712a3dc3aef0db2671000f286fdacda8982cf3", @@ -570,9 +551,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-omnibox": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-omnibox/2026.1.0/49f2d9a66e12c83ad344a2ecedbc370cb7fb0322", - "integrity": "sha512-UgmDDsTk/5FMgTRIZwxDaD5rt+unlN/7EAPVPk137PGatCLcC42Giu5qDmwteQDr0tkr44PoCRxJyZRzrK1TZA==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-omnibox/2026.3.0/d2cb892ee01547c5f018918b6c00c081dd3afeff", + "integrity": "sha512-hwEosv2KnW4obU/ku8j38ERj7naCXYYEPPsGje+ZfQgVhNXDL6snBSiDUXmmtJxFOoBaNWFGp2Yj2HPPaIXgEQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -607,9 +588,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-portals": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-portals/2026.1.0/fc6d82830f4f8bf4f67152651d745d63d2a3ab82", - "integrity": "sha512-qlu1NnP6kd/PAxlsnfgTZ6hbKQGbSRqvxmmHDnPkoBx3G++X4Zrma4y3UzxOHYM74rwd5exEVfnydZ5Z6nsXmA==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-portals/2026.3.0/63c34dbc5f1d455973ef5711f190ea7f38f3c9fd", + "integrity": "sha512-52QYqgD5daBaUtUl7/LdIxhoudVNJZRtVM7qNXy3WXC9xlwkibXqgaQa/Wz0GGKQNkE/0HwqhXKo4pOEDL7VVw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -626,9 +607,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-selection": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-selection/2026.1.0/e63db72d8387e74b78ee017d365baad6b01c166d", - "integrity": "sha512-eX3mzGCGnwka4KgmAZdyOTne9TwikiQsSNq9WuvJmwkLMv4ZoJrp55FxaLoHO8YQ5mG4NjRMHQJn24+WHrB0bQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-selection/2026.3.0/202f13bd5d99a57dfc23ff7bd923b2882ec0057e", + "integrity": "sha512-Zmu7710W8SaSWSWcMSmSFutC5Vqq5yjDmwnkNqDuNBIDIjzGZuZd7oNVgrFU0JwMDpbukYVnfN8Ud2UkD9ntfQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -655,9 +636,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-tables": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tables/2026.1.0/54a7756acf24fdfa502d6bf1698360dd05005918", - "integrity": "sha512-s41TsBxzxj28htGckS7PmZUcAPs9m48seoPIsxktgjiFpKmjSkNZV6ki2EslFwwG6ShUZOdKl+zdtlIj4k0/Wg==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-tables/2026.3.0/0bd571366d9ecb114f1b55f1072b7187c68ac7d2", + "integrity": "sha512-CnxkmNE3jA9pwgGa0HIEJ20DBIG8RpckD/LyQrqw9XnhTTv+mrWeFmdomnsNB/xw6NhIY8pt+S1AFgfjuAbeVQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -675,9 +656,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-trees": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-trees/2026.1.0/7e10174c9f075cb9f7b9d64dcdc2950dd25bbbb4", - "integrity": "sha512-cneIPWtJrahsbP6iBJ6YuyYIYrnOYk9zxBc/PCotcfeXlHbZbP+SnedBIYipEPmkjMGJJVn84UjzAM6Amj1whQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-trees/2026.3.0/e9a5a62d01818d70ad5eda56a5c24b9320cbbc85", + "integrity": "sha512-bqAaYXwgXhfrd0kq5Dnf0B4P21INJ3B/+ADuiJJcoaS54zx37XiwNj+LVleMaoZEL0FukKs174pW/3nQbVZHZQ==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -695,9 +676,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-validation": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-validation/2026.1.0/d913c992887469aa3568d24be47955fde2fcb5cc", - "integrity": "sha512-c6xrRkq4OmXRpyu+rBbmsD8t3DDp1nHGTVfQeJLncWGjEamNrYbwmWoYBPWrPNpgiIN7v9v1AN7r9o2R6VchFQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-validation/2026.3.0/9d0b6eeebafc9022bd088f6f6c9b069ed886ed0c", + "integrity": "sha512-5ApzA7Zh9fBjbILq9Q87NSCT+EmPlq57nRmX75ayJIl/iEr5lfos+RGdKAPF6Zf8O0foOrYX2feUkst5hdut/w==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -713,9 +694,9 @@ } }, "node_modules/@eclipse-sirius/sirius-components-widget-reference": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-reference/2026.1.0/d8407bf39726c3bdc1716c91f522366459bec90e", - "integrity": "sha512-g2w8SGJy0g5VWrgOQhgiL/Ujqc4JqPo8zMr3vGwxNKtgOIjeyvPPl8JZxGmnNjx6SLeDHLVTWagshbuDl2PrFQ==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-reference/2026.3.0/1e9403af80c1b42c9f02c32eee712a7629212f56", + "integrity": "sha512-wohq4la3lPJ6gjjvvOGkt6DHVizIsincIxyv7wzrB0LUt2j/F9mP2UXaqaOzVAM6LR15Ng5RQbw/jThcytxoYg==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", @@ -743,142 +724,29 @@ } }, "node_modules/@eclipse-sirius/sirius-components-widget-table": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-table/2026.1.0/7f0439cdb495f878271354893603cc14944a8031", - "integrity": "sha512-pwMdNEPEB0E5uWsAm4UCesSy/xAIL4PQdZiaWgrvFzGsKMGh36zR1Q0aonxS51OqpsGtm47NtQpIfKVihK4S7Q==", - "license": "EPL-2.0", - "peerDependencies": { - "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-charts": "*", - "@eclipse-sirius/sirius-components-core": "*", - "@eclipse-sirius/sirius-components-forms": "*", - "@eclipse-sirius/sirius-components-tables": "*", - "@lexical/react": "0.8.1", - "@mui/icons-material": "7.0.2", - "@mui/material": "7.0.2", - "@mui/x-tree-view": "7.29.1", - "d3": "7.0.0", - "export-to-csv": "1.3.0", - "graphql": "16.8.1", - "lexical": "0.8.1", - "material-react-table": "3.2.1", - "react": "18.3.1", - "react-dom": "18.3.1", - "react-i18next": "16.2.3", - "react-resizable-panels": "3.0.2", - "tss-react": "4.9.16" - } - }, - "node_modules/@eclipse-sirius/sirius-web-application": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-application/2026.1.0/c52221d639f21e008c7285a3d81d9e4c5dae5b55", - "integrity": "sha512-5lDk2Zx8sM6yrAD4fMA2lGPCM7wjVV5Q7zNgouQXPuhpIxIkNISEqFAldlBPWOl2PKhgYaBeYHoTHanNRpKklg==", - "license": "EPL-2.0", - "peerDependencies": { - "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "*", - "@eclipse-sirius/sirius-components-charts": "*", - "@eclipse-sirius/sirius-components-core": "*", - "@eclipse-sirius/sirius-components-datatree": "*", - "@eclipse-sirius/sirius-components-deck": "*", - "@eclipse-sirius/sirius-components-diagrams": "*", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "*", - "@eclipse-sirius/sirius-components-forms": "*", - "@eclipse-sirius/sirius-components-gantt": "*", - "@eclipse-sirius/sirius-components-impactanalysis": "*", - "@eclipse-sirius/sirius-components-omnibox": "*", - "@eclipse-sirius/sirius-components-palette": "*", - "@eclipse-sirius/sirius-components-portals": "*", - "@eclipse-sirius/sirius-components-selection": "*", - "@eclipse-sirius/sirius-components-tables": "*", - "@eclipse-sirius/sirius-components-trees": "*", - "@eclipse-sirius/sirius-components-validation": "*", - "@eclipse-sirius/sirius-components-widget-reference": "*", - "@eclipse-sirius/sirius-components-widget-table": "*", - "@lexical/react": "0.8.1", - "@mui/icons-material": "7.0.2", - "@mui/material": "7.0.2", - "@mui/x-tree-view": "7.29.1", - "@ObeoNetwork/gantt-task-react": "0.6.2", - "@ObeoNetwork/react-trello": "2.4.11", - "@xyflow/react": "12.6.0", - "d3": "7.0.0", - "elkjs": "0.11.0", - "export-to-csv": "1.3.0", - "graphql": "16.8.1", - "html-to-image": "1.11.11", - "i18next-http-backend": "3.0.2", - "lexical": "0.8.1", - "material-react-table": "3.2.1", - "notistack": "3.0.1", - "pathfinding": "0.4.18", - "react": "18.3.1", - "react-dom": "18.3.1", - "react-draggable": "4.4.6", - "react-grid-layout": "1.4.4", - "react-i18next": "16.2.3", - "react-resizable": "3.0.5", - "react-resizable-panels": "3.0.2", - "react-router-dom": "6.26.0", - "react-window": "2.2.2", - "svg-path-parser": "1.1.0", - "tss-react": "4.9.16" - } - }, - "node_modules/@eclipse-sirius/sirius-web-view-fork": { - "version": "2026.1.0", - "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-view-fork/2026.1.0/57c72e473db2af922954906895290519005f904f", - "integrity": "sha512-IN2MR/R6NQv5Gms7RwUJ2CzhEgBjET5qOu7LSM24oj5P61YIooo4M5XdFbweOQO+PVmEg+Jkkt6K2ycZzxg6Wg==", + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-widget-table/2026.3.0/48ba49adedfe3a53c894a24ba84fd97b315395f2", + "integrity": "sha512-IuRC+zuxppK9fbjspeTH9bx6zMRcwGMT+RmWuU3BfA7qbzrQmOjODjlGvGaXxxKg1szLihDG0CNBzsSt2VIZEw==", "license": "EPL-2.0", "peerDependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "*", "@eclipse-sirius/sirius-components-charts": "*", "@eclipse-sirius/sirius-components-core": "*", - "@eclipse-sirius/sirius-components-datatree": "*", - "@eclipse-sirius/sirius-components-deck": "*", - "@eclipse-sirius/sirius-components-diagrams": "*", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "*", "@eclipse-sirius/sirius-components-forms": "*", - "@eclipse-sirius/sirius-components-gantt": "*", - "@eclipse-sirius/sirius-components-impactanalysis": "*", - "@eclipse-sirius/sirius-components-omnibox": "*", - "@eclipse-sirius/sirius-components-palette": "*", - "@eclipse-sirius/sirius-components-portals": "*", - "@eclipse-sirius/sirius-components-selection": "*", "@eclipse-sirius/sirius-components-tables": "*", - "@eclipse-sirius/sirius-components-trees": "*", - "@eclipse-sirius/sirius-components-validation": "*", - "@eclipse-sirius/sirius-components-widget-reference": "*", - "@eclipse-sirius/sirius-components-widget-table": "*", - "@eclipse-sirius/sirius-web-application": "*", "@lexical/react": "0.8.1", "@mui/icons-material": "7.0.2", "@mui/material": "7.0.2", "@mui/x-tree-view": "7.29.1", - "@ObeoNetwork/gantt-task-react": "0.6.2", - "@ObeoNetwork/react-trello": "2.4.11", - "@xyflow/react": "12.6.0", "d3": "7.0.0", - "elkjs": "0.11.0", "export-to-csv": "1.3.0", "graphql": "16.8.1", - "html-to-image": "1.11.11", - "i18next-http-backend": "3.0.2", "lexical": "0.8.1", "material-react-table": "3.2.1", - "notistack": "3.0.1", - "pathfinding": "0.4.18", "react": "18.3.1", "react-dom": "18.3.1", - "react-draggable": "4.4.6", - "react-grid-layout": "1.4.4", "react-i18next": "16.2.3", - "react-resizable": "3.0.5", "react-resizable-panels": "3.0.2", - "react-router-dom": "6.26.0", - "react-window": "2.2.2", - "svg-path-parser": "1.1.0", "tss-react": "4.9.16" } }, @@ -2262,25 +2130,6 @@ "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, - "node_modules/@ObeoNetwork/gantt-task-react": { - "version": "0.6.2", - "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.6.2/c587807f833bfe67d06650f643d60203a41bb651", - "integrity": "sha512-3wrLIVXDu7GEZlGwhpWph5HeqfbGA1MtMIa4I1eRP8/wvvTDc0M33lwy/dAmupZTESSnJrL+R7VF5+WQ+YnLfw==", - "license": "MIT", - "dependencies": { - "@floating-ui/dom": "1.1.1", - "@floating-ui/react": "0.19.0", - "date-fns": "2.29.3" - }, - "peerDependencies": { - "@mui/icons-material": "7.0.2", - "@mui/material": "7.0.2", - "@types/react": "18.3.3", - "@types/react-dom": "18.3.0", - "react": "18.3.1", - "react-dom": "18.3.1" - } - }, "node_modules/@ObeoNetwork/pepper": { "resolved": "pepper-web", "link": true @@ -7888,29 +7737,29 @@ "license": "EPL-2.0", "dependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.1.0", - "@eclipse-sirius/sirius-components-charts": "2026.1.0", - "@eclipse-sirius/sirius-components-core": "2026.1.0", - "@eclipse-sirius/sirius-components-deck": "2026.1.0", - "@eclipse-sirius/sirius-components-diagrams": "2026.1.0", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.1.0", - "@eclipse-sirius/sirius-components-forms": "2026.1.0", - "@eclipse-sirius/sirius-components-gantt": "2026.1.0", - "@eclipse-sirius/sirius-components-omnibox": "2026.1.0", - "@eclipse-sirius/sirius-components-portals": "2026.1.0", - "@eclipse-sirius/sirius-components-selection": "2026.1.0", - "@eclipse-sirius/sirius-components-tables": "2026.1.0", - "@eclipse-sirius/sirius-components-trees": "2026.1.0", - "@eclipse-sirius/sirius-components-validation": "2026.1.0", - "@eclipse-sirius/sirius-components-widget-reference": "2026.1.0", - "@eclipse-sirius/sirius-components-widget-table": "2026.1.0", - "@eclipse-sirius/sirius-web-application": "2026.1.0", - "@eclipse-sirius/sirius-web-view-fork": "2026.1.0", + "@eclipse-sirius/sirius-components-browser": "2026.3.0", + "@eclipse-sirius/sirius-components-charts": "2026.3.0", + "@eclipse-sirius/sirius-components-core": "2026.3.0", + "@eclipse-sirius/sirius-components-deck": "2026.3.0", + "@eclipse-sirius/sirius-components-diagrams": "2026.3.0", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.0", + "@eclipse-sirius/sirius-components-forms": "2026.3.0", + "@eclipse-sirius/sirius-components-gantt": "2026.3.0", + "@eclipse-sirius/sirius-components-omnibox": "2026.3.0", + "@eclipse-sirius/sirius-components-portals": "2026.3.0", + "@eclipse-sirius/sirius-components-selection": "2026.3.0", + "@eclipse-sirius/sirius-components-tables": "2026.3.0", + "@eclipse-sirius/sirius-components-trees": "2026.3.0", + "@eclipse-sirius/sirius-components-validation": "2026.3.0", + "@eclipse-sirius/sirius-components-widget-reference": "2026.3.0", + "@eclipse-sirius/sirius-components-widget-table": "2026.3.0", + "@eclipse-sirius/sirius-web-application": "2026.3.0", + "@eclipse-sirius/sirius-web-view-fork": "2026.3.0", "@lexical/react": "0.8.1", "@mui/icons-material": "7.0.2", "@mui/material": "7.0.2", "@mui/x-tree-view": "7.29.1", - "@ObeoNetwork/gantt-task-react": "0.6.2", + "@ObeoNetwork/gantt-task-react": "0.6.3", "@ObeoNetwork/react-trello": "2.4.11", "@xyflow/react": "12.6.0", "d3": "7.0.0", @@ -7955,6 +7804,157 @@ "vite": "7.1.1", "vitest": "3.2.4" } + }, + "pepper-web/node_modules/@eclipse-sirius/sirius-components-gantt": { + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-gantt/2026.3.0/fb51487e0f77504c2ce5f4d1b7c043a6ce638735", + "integrity": "sha512-ATQbnYNRll5uFOe6KfFnBNgJsX551bxyimlb2/+/H9kuoKOt1FhT8LlCIEL8Kb5RtI/dc46HOVN1ujLQ8RT3bQ==", + "license": "EPL-2.0", + "peerDependencies": { + "@apollo/client": "3.10.4", + "@eclipse-sirius/sirius-components-core": "*", + "@mui/icons-material": "7.0.2", + "@mui/material": "7.0.2", + "@ObeoNetwork/gantt-task-react": "0.6.3", + "graphql": "16.8.1", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-i18next": "16.2.3", + "react-resizable-panels": "3.0.2", + "tss-react": "4.9.16" + } + }, + "pepper-web/node_modules/@eclipse-sirius/sirius-web-application": { + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-application/2026.3.0/beb7039adecb111eb559d8db6b1639df96787e98", + "integrity": "sha512-3iwb2GqQA5plhjuJa7ztuo1KS04vNC4zLWIkHAHTkkdtZoPrsbhLQOiTdZU49lTqTygXKRW8aIZt1IEFsULCBQ==", + "license": "EPL-2.0", + "peerDependencies": { + "@apollo/client": "3.10.4", + "@eclipse-sirius/sirius-components-browser": "*", + "@eclipse-sirius/sirius-components-charts": "*", + "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-datatree": "*", + "@eclipse-sirius/sirius-components-deck": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "*", + "@eclipse-sirius/sirius-components-forms": "*", + "@eclipse-sirius/sirius-components-gantt": "*", + "@eclipse-sirius/sirius-components-impactanalysis": "*", + "@eclipse-sirius/sirius-components-omnibox": "*", + "@eclipse-sirius/sirius-components-palette": "*", + "@eclipse-sirius/sirius-components-portals": "*", + "@eclipse-sirius/sirius-components-selection": "*", + "@eclipse-sirius/sirius-components-tables": "*", + "@eclipse-sirius/sirius-components-trees": "*", + "@eclipse-sirius/sirius-components-validation": "*", + "@eclipse-sirius/sirius-components-widget-reference": "*", + "@eclipse-sirius/sirius-components-widget-table": "*", + "@lexical/react": "0.8.1", + "@mui/icons-material": "7.0.2", + "@mui/material": "7.0.2", + "@mui/x-tree-view": "7.29.1", + "@ObeoNetwork/gantt-task-react": "0.6.3", + "@ObeoNetwork/react-trello": "2.4.11", + "@xyflow/react": "12.6.0", + "d3": "7.0.0", + "elkjs": "0.11.0", + "export-to-csv": "1.3.0", + "graphql": "16.8.1", + "html-to-image": "1.11.11", + "i18next-http-backend": "3.0.2", + "lexical": "0.8.1", + "material-react-table": "3.2.1", + "notistack": "3.0.1", + "pathfinding": "0.4.18", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-draggable": "4.4.6", + "react-grid-layout": "1.4.4", + "react-i18next": "16.2.3", + "react-resizable": "3.0.5", + "react-resizable-panels": "3.0.2", + "react-router-dom": "6.26.0", + "react-window": "2.2.2", + "svg-path-parser": "1.1.0", + "tss-react": "4.9.16" + } + }, + "pepper-web/node_modules/@eclipse-sirius/sirius-web-view-fork": { + "version": "2026.3.0", + "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-web-view-fork/2026.3.0/5038c5832e9f81141d679fe4a88a0e7a1bb116bf", + "integrity": "sha512-Y5QiiOjVk9VD8kaJkLGISf/IR/TU16wrikGd+5awJ3/CjFkrhNe2F/FCNYi2tBAlZnPdd+PHdDd9uX7mZ6gEug==", + "license": "EPL-2.0", + "peerDependencies": { + "@apollo/client": "3.10.4", + "@eclipse-sirius/sirius-components-browser": "*", + "@eclipse-sirius/sirius-components-charts": "*", + "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-datatree": "*", + "@eclipse-sirius/sirius-components-deck": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "*", + "@eclipse-sirius/sirius-components-forms": "*", + "@eclipse-sirius/sirius-components-gantt": "*", + "@eclipse-sirius/sirius-components-impactanalysis": "*", + "@eclipse-sirius/sirius-components-omnibox": "*", + "@eclipse-sirius/sirius-components-palette": "*", + "@eclipse-sirius/sirius-components-portals": "*", + "@eclipse-sirius/sirius-components-selection": "*", + "@eclipse-sirius/sirius-components-tables": "*", + "@eclipse-sirius/sirius-components-trees": "*", + "@eclipse-sirius/sirius-components-validation": "*", + "@eclipse-sirius/sirius-components-widget-reference": "*", + "@eclipse-sirius/sirius-components-widget-table": "*", + "@eclipse-sirius/sirius-web-application": "*", + "@lexical/react": "0.8.1", + "@mui/icons-material": "7.0.2", + "@mui/material": "7.0.2", + "@mui/x-tree-view": "7.29.1", + "@ObeoNetwork/gantt-task-react": "0.6.3", + "@ObeoNetwork/react-trello": "2.4.11", + "@xyflow/react": "12.6.0", + "d3": "7.0.0", + "elkjs": "0.11.0", + "export-to-csv": "1.3.0", + "graphql": "16.8.1", + "html-to-image": "1.11.11", + "i18next-http-backend": "3.0.2", + "lexical": "0.8.1", + "material-react-table": "3.2.1", + "notistack": "3.0.1", + "pathfinding": "0.4.18", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-draggable": "4.4.6", + "react-grid-layout": "1.4.4", + "react-i18next": "16.2.3", + "react-resizable": "3.0.5", + "react-resizable-panels": "3.0.2", + "react-router-dom": "6.26.0", + "react-window": "2.2.2", + "svg-path-parser": "1.1.0", + "tss-react": "4.9.16" + } + }, + "pepper-web/node_modules/@ObeoNetwork/gantt-task-react": { + "version": "0.6.3", + "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/gantt-task-react/0.6.3/06bb4553a180609d213dd4753fa5ef1e3335b710", + "integrity": "sha512-wHHCZS/IxMJKQt5qTysKMCsAxiIAiiJ8ihWpD6x7LZEEz2C6oOOymmy8BVER+Lcn5rcq1UE6bAVGGYmfnyUf0w==", + "license": "MIT", + "dependencies": { + "@floating-ui/dom": "1.1.1", + "@floating-ui/react": "0.19.0", + "date-fns": "2.29.3" + }, + "peerDependencies": { + "@mui/icons-material": "7.0.2", + "@mui/material": "7.0.2", + "@types/react": "18.3.3", + "@types/react-dom": "18.3.0", + "react": "18.3.1", + "react-dom": "18.3.1" + } } } } diff --git a/frontend/pepper-web/package.json b/frontend/pepper-web/package.json index 68daa92..e2c9233 100644 --- a/frontend/pepper-web/package.json +++ b/frontend/pepper-web/package.json @@ -13,29 +13,29 @@ "private": true, "dependencies": { "@apollo/client": "3.10.4", - "@eclipse-sirius/sirius-components-browser": "2026.1.0", - "@eclipse-sirius/sirius-components-charts": "2026.1.0", - "@eclipse-sirius/sirius-components-core": "2026.1.0", - "@eclipse-sirius/sirius-components-deck": "2026.1.0", - "@eclipse-sirius/sirius-components-diagrams": "2026.1.0", - "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.1.0", - "@eclipse-sirius/sirius-components-forms": "2026.1.0", - "@eclipse-sirius/sirius-components-gantt": "2026.1.0", - "@eclipse-sirius/sirius-components-omnibox": "2026.1.0", - "@eclipse-sirius/sirius-components-portals": "2026.1.0", - "@eclipse-sirius/sirius-components-selection": "2026.1.0", - "@eclipse-sirius/sirius-components-tables": "2026.1.0", - "@eclipse-sirius/sirius-components-trees": "2026.1.0", - "@eclipse-sirius/sirius-components-validation": "2026.1.0", - "@eclipse-sirius/sirius-components-widget-reference": "2026.1.0", - "@eclipse-sirius/sirius-components-widget-table": "2026.1.0", - "@eclipse-sirius/sirius-web-application": "2026.1.0", - "@eclipse-sirius/sirius-web-view-fork": "2026.1.0", + "@eclipse-sirius/sirius-components-browser": "2026.3.0", + "@eclipse-sirius/sirius-components-charts": "2026.3.0", + "@eclipse-sirius/sirius-components-core": "2026.3.0", + "@eclipse-sirius/sirius-components-deck": "2026.3.0", + "@eclipse-sirius/sirius-components-diagrams": "2026.3.0", + "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.0", + "@eclipse-sirius/sirius-components-forms": "2026.3.0", + "@eclipse-sirius/sirius-components-gantt": "2026.3.0", + "@eclipse-sirius/sirius-components-omnibox": "2026.3.0", + "@eclipse-sirius/sirius-components-portals": "2026.3.0", + "@eclipse-sirius/sirius-components-selection": "2026.3.0", + "@eclipse-sirius/sirius-components-tables": "2026.3.0", + "@eclipse-sirius/sirius-components-trees": "2026.3.0", + "@eclipse-sirius/sirius-components-validation": "2026.3.0", + "@eclipse-sirius/sirius-components-widget-reference": "2026.3.0", + "@eclipse-sirius/sirius-components-widget-table": "2026.3.0", + "@eclipse-sirius/sirius-web-application": "2026.3.0", + "@eclipse-sirius/sirius-web-view-fork": "2026.3.0", "@lexical/react": "0.8.1", "@mui/icons-material": "7.0.2", "@mui/material": "7.0.2", "@mui/x-tree-view": "7.29.1", - "@ObeoNetwork/gantt-task-react": "0.6.2", + "@ObeoNetwork/gantt-task-react": "0.6.3", "@ObeoNetwork/react-trello": "2.4.11", "@xyflow/react": "12.6.0", "d3": "7.0.0", diff --git a/frontend/pepper-web/src/nodes/EllipseNode.tsx b/frontend/pepper-web/src/nodes/EllipseNode.tsx index b565b75..20e83e1 100644 --- a/frontend/pepper-web/src/nodes/EllipseNode.tsx +++ b/frontend/pepper-web/src/nodes/EllipseNode.tsx @@ -74,8 +74,13 @@ export const EllipseNode: NodeComponentsMap['ellipseNode'] = memo( const theme = useTheme(); const { onDrop, onDragOver } = useDrop(); const { style: connectionFeedbackStyle } = useConnectorNodeStyle(id, data.nodeDescription.id); - const { style: dropFeedbackStyle } = useDropNodeStyle(data.isDropNodeTarget, data.isDropNodeCandidate, dragging); - const { style: connectionLineActiveNodeStlye } = useConnectionLineNodeStyle(data.connectionLinePositionOnNode); + const { style: dropFeedbackStyle } = useDropNodeStyle( + data.isDropNodeTarget, + data.isDragNodeSource, + data.isDropNodeCandidate, + dragging + ); + const { style: connectionLineActiveNodeStyle } = useConnectionLineNodeStyle(data.connectionLinePositionOnNode); const handleOnDrop = (event: React.DragEvent) => { onDrop(event, id); @@ -102,7 +107,7 @@ export const EllipseNode: NodeComponentsMap['ellipseNode'] = memo( ...ellipseNodeStyle(theme, data.style, !!selected, data.isHovered, data.faded), ...connectionFeedbackStyle, ...dropFeedbackStyle, - ...connectionLineActiveNodeStlye, + ...connectionLineActiveNodeStyle, }} data-svg="rect" onDragOver={onDragOver} diff --git a/frontend/pepper-web/src/nodes/EllipseNodeConverter.ts b/frontend/pepper-web/src/nodes/EllipseNodeConverter.ts index dc40618..707fd43 100644 --- a/frontend/pepper-web/src/nodes/EllipseNodeConverter.ts +++ b/frontend/pepper-web/src/nodes/EllipseNodeConverter.ts @@ -104,6 +104,7 @@ const toEllipseNode = ( isListChild: isListLayoutStrategy(gqlParentNode?.style.childrenLayoutStrategy), isDraggedNode: false, isDropNodeTarget: false, + isDragNodeSource: false, isDropNodeCandidate: false, isHovered: false, nodeAppearanceData: { @@ -118,6 +119,7 @@ const toEllipseNode = ( data.insideLabel = convertInsideLabel( insideLabel, + gqlDiagram.layoutData.labelLayoutData, data, `${style.borderSize}px ${style.borderStyle} ${style.borderColor}` ); diff --git a/frontend/pepper-web/src/nodes/EllipseNodeLayoutHandler.ts b/frontend/pepper-web/src/nodes/EllipseNodeLayoutHandler.ts index 3fd763e..df30a64 100644 --- a/frontend/pepper-web/src/nodes/EllipseNodeLayoutHandler.ts +++ b/frontend/pepper-web/src/nodes/EllipseNodeLayoutHandler.ts @@ -69,7 +69,6 @@ export class EllipseNodeLayoutHandler implements INodeLayoutHandler { const nodeIndex = findNodeIndex(visibleNodes, node.id); const nodeElement = document.getElementById(`${node.id}-ellipseNode-${nodeIndex}`)?.children[0]; const borderWidth = nodeElement ? parseFloat(window.getComputedStyle(nodeElement).borderWidth) : 0; - const labelElement = document.getElementById(`${node.id}-label-${nodeIndex}`); const borderNodes = directChildren.filter((node) => node.data.isBorderNode); const directNodesChildren = directChildren.filter((child) => !child.data.isBorderNode); @@ -79,7 +78,7 @@ export class EllipseNodeLayoutHandler implements INodeLayoutHandler { const previousNode = (previousDiagram?.nodes ?? []).find((previouseNode) => previouseNode.id === child.id); const previousPosition = computePreviousPosition(previousNode, child); const createdNode = newlyAddedNodes.find((n) => n.id === child.id); - const headerHeightFootprint = labelElement ? getHeaderHeightFootprint(labelElement, null, null) : 0; + const headerHeightFootprint = getHeaderHeightFootprint(node.data.insideLabel, 'TOP', borderWidth); if (!!createdNode) { child.position = createdNode.position; @@ -115,7 +114,7 @@ export class EllipseNodeLayoutHandler implements INodeLayoutHandler { const directChildrenAwareNodeWidth = childrenContentBox.x + childrenContentBox.width; const northBorderNodeFootprintWidth = getNorthBorderNodeFootprintWidth(visibleNodes, borderNodes, previousDiagram); const southBorderNodeFootprintWidth = getSouthBorderNodeFootprintWidth(visibleNodes, borderNodes, previousDiagram); - const labelOnlyWidth = getInsideLabelWidthConstraint(node.data.insideLabel, labelElement); + const labelOnlyWidth = getInsideLabelWidthConstraint(node.data.insideLabel); const nodeMinComputeWidth = Math.max( From d470a3586a0804e7224d2627e695e10b079945f9 Mon Sep 17 00:00:00 2001 From: Nicolas Couvert Date: Tue, 31 Mar 2026 09:40:02 +0200 Subject: [PATCH 3/3] Bump version to 2026.3.0 --- CHANGELOG.adoc | 2 +- backend/pepper-parent/pom.xml | 2 +- backend/pom.xml | 2 +- frontend/package-lock.json | 12 ++++++------ frontend/package.json | 2 +- frontend/pepper-web/package.json | 5 ++++- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index cc3cd11..83aa957 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,6 +1,6 @@ = Changelog -== v2026.1.0 +== v2026.3.0 === Dependency update diff --git a/backend/pepper-parent/pom.xml b/backend/pepper-parent/pom.xml index df3445b..730b797 100644 --- a/backend/pepper-parent/pom.xml +++ b/backend/pepper-parent/pom.xml @@ -32,7 +32,7 @@ 17 2026.3.0 7.4.14-SNAPSHOT - 2026.1.0 + 2026.3.0 diff --git a/backend/pom.xml b/backend/pom.xml index 2790414..5d733ae 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -18,7 +18,7 @@ pepper pepper-container - 2026.1.0 + 2026.3.0 Pepper Pepper for project management diff --git a/frontend/package-lock.json b/frontend/package-lock.json index fabc229..541d5d7 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ObeoNetwork/pepper", - "version": "2026.1.0", + "version": "2026.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ObeoNetwork/pepper", - "version": "2026.1.0", + "version": "2026.3.0", "license": "EPL-2.0", "workspaces": [ "pepper-web" @@ -419,7 +419,6 @@ "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-datatree/2026.3.0/13a39c116418b8019c7cf191e1e154800943dac5", "integrity": "sha512-9aIUDtwKNd0IQR/stm8siC6dUkyF/nEviyNf9x0DApJRNPTDOxrIuY/W/cmO+5FHB6u5Yv1qOZ4hEwohXEi5fg==", "license": "EPL-2.0", - "peer": true, "peerDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", @@ -535,7 +534,6 @@ "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-impactanalysis/2026.3.0/ba712a3dc3aef0db2671000f286fdacda8982cf3", "integrity": "sha512-xbijXtnsZ6D/OdHoxbbl6q9IyZfevTj8M1WEEtL2OklSWwcuXpvflyOTIxJ9gsgyBvM03Vd7rfnKVoh7UfX0yg==", "license": "EPL-2.0", - "peer": true, "peerDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", @@ -573,7 +571,6 @@ "resolved": "https://npm.pkg.github.com/download/@eclipse-sirius/sirius-components-palette/2026.3.0/2cc3f9d679ba77c05436e808183b2015bae958b9", "integrity": "sha512-pgWNGyzYUJREsTJ2n3TWry80gJPyuvMbNgBU0NsC1E2ltSBkLK61T2qiIxOMk0k2N9g6zjrRLgvGovsvQIpXyg==", "license": "EPL-2.0", - "peer": true, "peerDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", @@ -7733,19 +7730,22 @@ }, "pepper-web": { "name": "@ObeoNetwork/pepper", - "version": "2026.1.0", + "version": "2026.3.0", "license": "EPL-2.0", "dependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-browser": "2026.3.0", "@eclipse-sirius/sirius-components-charts": "2026.3.0", "@eclipse-sirius/sirius-components-core": "2026.3.0", + "@eclipse-sirius/sirius-components-datatree": "2026.3.0", "@eclipse-sirius/sirius-components-deck": "2026.3.0", "@eclipse-sirius/sirius-components-diagrams": "2026.3.0", "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.0", "@eclipse-sirius/sirius-components-forms": "2026.3.0", "@eclipse-sirius/sirius-components-gantt": "2026.3.0", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.3.0", "@eclipse-sirius/sirius-components-omnibox": "2026.3.0", + "@eclipse-sirius/sirius-components-palette": "2026.3.0", "@eclipse-sirius/sirius-components-portals": "2026.3.0", "@eclipse-sirius/sirius-components-selection": "2026.3.0", "@eclipse-sirius/sirius-components-tables": "2026.3.0", diff --git a/frontend/package.json b/frontend/package.json index fb14f36..5df38c9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@ObeoNetwork/pepper", - "version": "2026.1.0", + "version": "2026.3.0", "author": "CEA LIST", "license": "EPL-2.0", "repository": { diff --git a/frontend/pepper-web/package.json b/frontend/pepper-web/package.json index e2c9233..8971b03 100644 --- a/frontend/pepper-web/package.json +++ b/frontend/pepper-web/package.json @@ -1,7 +1,7 @@ { "name": "@ObeoNetwork/pepper", "author": "CEA LIST", - "version": "2026.1.0", + "version": "2026.3.0", "license": "EPL-2.0", "repository": { "type": "git", @@ -17,10 +17,13 @@ "@eclipse-sirius/sirius-components-charts": "2026.3.0", "@eclipse-sirius/sirius-components-core": "2026.3.0", "@eclipse-sirius/sirius-components-deck": "2026.3.0", + "@eclipse-sirius/sirius-components-datatree": "2026.3.0", "@eclipse-sirius/sirius-components-diagrams": "2026.3.0", "@eclipse-sirius/sirius-components-formdescriptioneditors": "2026.3.0", "@eclipse-sirius/sirius-components-forms": "2026.3.0", + "@eclipse-sirius/sirius-components-impactanalysis": "2026.3.0", "@eclipse-sirius/sirius-components-gantt": "2026.3.0", + "@eclipse-sirius/sirius-components-palette": "2026.3.0", "@eclipse-sirius/sirius-components-omnibox": "2026.3.0", "@eclipse-sirius/sirius-components-portals": "2026.3.0", "@eclipse-sirius/sirius-components-selection": "2026.3.0",