[3649] Restore support for Related elements view icons

Bug: #3649 Signed-off-by: Stéphane Bégaudeau <[email protected]>
eclipse-sirius · Jun 25, 2024 · 0f86ef8 · pcdavid · Jun 27, 2024 · 0f86ef8
1 parent 0d89655
commit 0f86ef8
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 22 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -64,6 +64,7 @@ More existing APIs will be migrated to this new common pattern.
 - https://github.com/eclipse-sirius/sirius-web/issues/3624[#3624] [diagram] Fix an issue where the header separator does not fill the entire width of the node
 - https://github.com/eclipse-sirius/sirius-web/issues/3531[#3531] [diagram] Fix unnecessary edges label re render
 - https://github.com/eclipse-sirius/sirius-web/issues/3650[#3650] [diagram] Fix potential NPE in DiagramNavigator and Node toString method 
+- https://github.com/eclipse-sirius/sirius-web/issues/3649[#3649] [sirius-web] Restore support for Related elements view icons
 
 === New Features
 

diff --git a/...g/eclipse/sirius/web/application/views/explorer/services/ExplorerDescriptionProvider.java b/...g/eclipse/sirius/web/application/views/explorer/services/ExplorerDescriptionProvider.java
@@ -37,7 +37,6 @@
 import org.eclipse.sirius.components.trees.TreeItem;
 import org.eclipse.sirius.components.trees.description.TreeDescription;
 import org.eclipse.sirius.components.trees.renderer.TreeRenderer;
-import org.eclipse.sirius.web.application.images.ImageConstants;
 import org.eclipse.sirius.web.application.views.explorer.services.api.IDeleteTreeItemHandler;
 import org.eclipse.sirius.web.application.views.explorer.services.api.IExplorerChildrenProvider;
 import org.eclipse.sirius.web.application.views.explorer.services.api.IExplorerElementsProvider;
@@ -222,7 +221,7 @@ private List<String> getImageURL(VariableManager variableManager) {
                     .flatMap(Optional::stream)
                     .toList();
         } else if (self instanceof Resource) {
-            imageURL = List.of(ImageConstants.RESOURCE_SVG);
+            imageURL = List.of("/explorer/Resource.svg");
         }
         return imageURL;
     }

diff --git a/...es/services/ExplorerImagePathService.java → ...er/services/ExplorerImagePathService.java b/...es/services/ExplorerImagePathService.java → ...er/services/ExplorerImagePathService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2024 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.application.images.services;
+package org.eclipse.sirius.web.application.views.explorer.services;
 
 import java.util.List;
 
@@ -26,6 +26,6 @@
 public class ExplorerImagePathService implements IImagePathService {
     @Override
     public List<String> getPaths() {
-        return List.of("/icons/svg");
+        return List.of("/explorer");
     }
 }
diff --git a/...sirius/web/application/views/relatedelements/services/CurrentTreeDescriptionProvider.java b/...sirius/web/application/views/relatedelements/services/CurrentTreeDescriptionProvider.java
@@ -63,11 +63,11 @@ public class CurrentTreeDescriptionProvider implements ICurrentTreeDescriptionPr
 
     private static final String TITLE = "Current";
 
-    private static final String WIDGET_ICON_URL = "/icons/svg/arrow_downward_black_24dp.svg";
+    private static final String WIDGET_ICON_URL = "/related-elements/arrow_downward_black_24dp.svg";
 
-    private static final String FOLDER_ICON_URL = "/icons/svg/folder_black_24dp.svg";
+    private static final String FOLDER_ICON_URL = "/related-elements/folder_black_24dp.svg";
 
-    private static final String CHILDREN_CATEGORY_ICON_URL = "/icons/svg/subdirectory_arrow_right_black_24dp.svg";
+    private static final String CHILDREN_CATEGORY_ICON_URL = "/related-elements/subdirectory_arrow_right_black_24dp.svg";
 
     private static final String CATEGORY_KIND = "siriusWeb://category";
 

diff --git a/...irius/web/application/views/relatedelements/services/IncomingTreeDescriptionProvider.java b/...irius/web/application/views/relatedelements/services/IncomingTreeDescriptionProvider.java
@@ -53,9 +53,9 @@ public class IncomingTreeDescriptionProvider implements IIncomingTreeDescription
 
     private static final String TITLE = "Incoming";
 
-    private static final String WIDGET_ICON_URL = "/images/west_black_24dp.svg";
+    private static final String WIDGET_ICON_URL = "/related-elements/west_black_24dp.svg";
 
-    private static final String INCOMING_REFERENCE_ICON_URL = "/images/west_black_24dp.svg";
+    private static final String INCOMING_REFERENCE_ICON_URL = "/related-elements/west_black_24dp.svg";
 
     private static final String INCOMING_REFERENCES_KIND = "siriusWeb://category/incoming-references";
 

diff --git a/...irius/web/application/views/relatedelements/services/OutgoingTreeDescriptionProvider.java b/...irius/web/application/views/relatedelements/services/OutgoingTreeDescriptionProvider.java
@@ -56,9 +56,9 @@ public class OutgoingTreeDescriptionProvider implements IOutgoingTreeDescription
 
     private static final String TITLE = "Outgoing";
 
-    private static final String WIDGET_ICON_URL = "/icons/svg/east_black_24dp.svg";
+    private static final String WIDGET_ICON_URL = "/related-elements/east_black_24dp.svg";
 
-    private static final String OUTGOING_REFERENCE_ICON_URL = "/icons/svg/east_black_24dp.svg";
+    private static final String OUTGOING_REFERENCE_ICON_URL = "/related-elements/east_black_24dp.svg";
 
     private static final String OUTGOING_REFERENCE_KIND = "siriusWeb://category/outgoing-references";
 

diff --git a/...eb/application/images/ImageConstants.java → ...ices/RelatedElementsImagePathService.java b/...eb/application/images/ImageConstants.java → ...ices/RelatedElementsImagePathService.java
@@ -10,19 +10,22 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.application.images;
+package org.eclipse.sirius.web.application.views.relatedelements.services;
+
+import java.util.List;
+
+import org.eclipse.sirius.components.core.api.IImagePathService;
+import org.springframework.stereotype.Service;
 
 /**
- * Utility class containing constants for the images of Sirius Web.
+ * Used to allow access to the images of the related elements view.
  *
  * @author sbegaudeau
  */
-public final class ImageConstants {
-    public static final String IMAGES_ROOT_FOLDER = "/icons/svg";
-
-    public static final String RESOURCE_SVG = IMAGES_ROOT_FOLDER + "/Resource.svg";
-
-    private ImageConstants() {
-        // Prevent instantiation
+@Service
+public class RelatedElementsImagePathService implements IImagePathService {
+    @Override
+    public List<String> getPaths() {
+        return List.of("/related-elements");
     }
 }
diff --git a/...src/main/resources/icons/svg/Resource.svg → .../src/main/resources/explorer/Resource.svg b/...src/main/resources/icons/svg/Resource.svg → .../src/main/resources/explorer/Resource.svg
diff --git a/...s/icons/svg/arrow_downward_black_24dp.svg → ...ed-elements/arrow_downward_black_24dp.svg b/...s/icons/svg/arrow_downward_black_24dp.svg → ...ed-elements/arrow_downward_black_24dp.svg
diff --git a/...n/resources/icons/svg/east_black_24dp.svg → ...rces/related-elements/east_black_24dp.svg b/...n/resources/icons/svg/east_black_24dp.svg → ...rces/related-elements/east_black_24dp.svg
diff --git a/...resources/icons/svg/folder_black_24dp.svg → ...es/related-elements/folder_black_24dp.svg b/...resources/icons/svg/folder_black_24dp.svg → ...es/related-elements/folder_black_24dp.svg
diff --git a/...g/subdirectory_arrow_right_black_24dp.svg → ...s/subdirectory_arrow_right_black_24dp.svg b/...g/subdirectory_arrow_right_black_24dp.svg → ...s/subdirectory_arrow_right_black_24dp.svg
diff --git a/...n/resources/icons/svg/west_black_24dp.svg → ...rces/related-elements/west_black_24dp.svg b/...n/resources/icons/svg/west_black_24dp.svg → ...rces/related-elements/west_black_24dp.svg
diff --git a/...rg/eclipse/sirius/web/application/controllers/images/ImageControllerIntegrationTests.java b/...rg/eclipse/sirius/web/application/controllers/images/ImageControllerIntegrationTests.java
@@ -109,7 +109,7 @@ public void givenProjectWhenItsImagesAreRequestedThenTheImagesAreReturned() {
     public void givenTheURLOfAnImageWhichExistsWhenItsContentIsRequestedThenTheImageIsReturned() {
         this.givenCommittedTransaction.commit();
 
-        var uri = "http://localhost:" + port + "/api/images/icons/svg/Resource.svg";
+        var uri = "http://localhost:" + port + "/api/images/explorer/Resource.svg";
 
         HttpEntity<String> entity = new HttpEntity<>(null, new HttpHeaders());
         var response = new TestRestTemplate().exchange(uri, HttpMethod.GET, entity, Resource.class);