[3693] Fix getReferenceOptions on ReferenceWidget converter switch

Bug: #3693
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>

Author: AxelRICHARD

CHANGELOG.adoc

@@ -69,6 +69,7 @@ More existing APIs will be migrated to this new common pattern.
 - https://github.com/eclipse-sirius/sirius-web/issues/3630[#3630] [sirius-web] Restore support for the deletion of dangling representations
 - https://github.com/eclipse-sirius/sirius-web/issues/3666[#3666] [core] Enable EMF's intrinsicIDToEObjectMap for JSON resources to support languages which use modeled identifiers (e.g. SysMLv2).
 - https://github.com/eclipse-sirius/sirius-web/issues/3664[#3664] [core] The Default.svg image is no longer displayed with the new architecture.
+- https://github.com/eclipse-sirius/sirius-web/issues/3693[#3693] [view] Fix the computation of the candidates for the ReferenceWidget.
 
 === New Features
 

packages/view/backend/sirius-components-view-emf-widget-reference/src/main/java/org/eclipse/sirius/components/view/emf/widget/reference/ReferenceWidgetDescriptionConverterSwitch.java

@@ -51,11 +51,11 @@
 import org.eclipse.sirius.components.view.emf.OperationInterpreter;
 import org.eclipse.sirius.components.view.emf.form.IFormIdProvider;
 import org.eclipse.sirius.components.view.form.FormElementDescription;
-import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent;
-import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle;
 import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription;
 import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescriptionStyle;
 import org.eclipse.sirius.components.view.widget.reference.util.ReferenceSwitch;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetComponent;
+import org.eclipse.sirius.components.widget.reference.ReferenceWidgetStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -201,24 +201,22 @@ private List<?> getReferenceValue(ReferenceWidgetDescription referenceDescriptio
     }
 
     private List<?> getReferenceOptions(ReferenceWidgetDescription referenceDescription, VariableManager variableManager) {
-        var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class);
         EObject owner = this.getReferenceOwner(variableManager, referenceDescription.getReferenceOwnerExpression());
         String referenceName = this.getStringValueProvider(referenceDescription.getReferenceNameExpression()).apply(variableManager);
-        if (optionalEObject.isPresent() && owner != null && owner.eClass().getEStructuralFeature(referenceName) instanceof EReference eReference) {
-            EObject eObject = optionalEObject.get();
-            Object adapter = this.adapterFactory.adapt(eObject, IItemPropertySource.class);
+        if (owner != null && owner.eClass().getEStructuralFeature(referenceName) instanceof EReference eReference) {
+            Object adapter = this.adapterFactory.adapt(owner, IItemPropertySource.class);
             if (adapter instanceof IItemPropertySource itemPropertySource) {
-                IItemPropertyDescriptor descriptor = itemPropertySource.getPropertyDescriptor(eObject, eReference);
+                IItemPropertyDescriptor descriptor = itemPropertySource.getPropertyDescriptor(owner, eReference);
                 List<?> referenceOptions;
                 if (descriptor != null) {
-                    referenceOptions = descriptor.getChoiceOfValues(eObject).stream()
+                    referenceOptions = descriptor.getChoiceOfValues(owner).stream()
                             .filter(Objects::nonNull)
                             .toList();
                 } else {
-                    referenceOptions = Arrays.asList(ItemPropertyDescriptor.getReachableObjectsOfType(eObject, eReference.getEReferenceType()).toArray());
+                    referenceOptions = Arrays.asList(ItemPropertyDescriptor.getReachableObjectsOfType(owner, eReference.getEReferenceType()).toArray());
                 }
                 return referenceOptions.stream()
-                        .filter(option -> !this.isOptionAncestorAndContainmentReference((EObject) option, eObject, eReference))
+                        .filter(option -> !this.isOptionAncestorAndContainmentReference((EObject) option, owner, eReference))
                         .toList();
             }
         }

packages/view/backend/sirius-components-view-emf-widget-reference/src/test/java/org/eclipse/sirius/components/view/emf/widget/reference/architecture/ReferenceWidgetDescriptionConverterSwitchTest.java

@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.components.view.emf.widget.reference.architecture;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.util.EcoreAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.sirius.components.core.api.IEditService;
+import org.eclipse.sirius.components.core.api.IFeedbackMessageService;
+import org.eclipse.sirius.components.core.api.IObjectService;
+import org.eclipse.sirius.components.emf.services.api.IEMFKindService;
+import org.eclipse.sirius.components.forms.description.AbstractWidgetDescription;
+import org.eclipse.sirius.components.interpreter.AQLInterpreter;
+import org.eclipse.sirius.components.representations.VariableManager;
+import org.eclipse.sirius.components.view.emf.form.IFormIdProvider;
+import org.eclipse.sirius.components.view.emf.widget.reference.ReferenceWidgetDescriptionConverterSwitch;
+import org.eclipse.sirius.components.view.widget.reference.ReferenceFactory;
+import org.eclipse.sirius.components.view.widget.reference.ReferenceWidgetDescription;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Converts a View-based ReferenceWidgetDescription into its API equivalent.
+ *
+ * @author pcdavid
+ */
+public class ReferenceWidgetDescriptionConverterSwitchTest {
+
+    @Test
+    public void testReferenceOptions() {
+        var interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE));
+        var objectService = new IObjectService.NoOp();
+        var editService = new IEditService.NoOp();
+        var emfKindService = new IEMFKindService.NoOp();
+        var feedbackMessageService = new IFeedbackMessageService.NoOp();
+        var composedAdapterFactory = new ComposedAdapterFactory();
+        composedAdapterFactory.addAdapterFactory(new EcoreAdapterFactory());
+        composedAdapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+        var widgetIdProvider = new IFormIdProvider.NoOp();
+        var converterSwitch = new ReferenceWidgetDescriptionConverterSwitch(interpreter, objectService, editService, emfKindService, feedbackMessageService, composedAdapterFactory, widgetIdProvider);
+
+        EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
+        EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+        EOperation eOperation = EcoreFactory.eINSTANCE.createEOperation();
+        ePackage.getEClassifiers().add(eClass);
+        eClass.getEOperations().add(eOperation);
+
+        VariableManager variableManager = new VariableManager();
+        variableManager.put("self", ePackage);
+
+        ReferenceWidgetDescription referenceWidgetDescription = ReferenceFactory.eINSTANCE.createReferenceWidgetDescription();
+        referenceWidgetDescription.setName("TEST");
+        referenceWidgetDescription.setLabelExpression("TEST");
+        referenceWidgetDescription.setReferenceNameExpression("eOperations");
+        referenceWidgetDescription.setReferenceOwnerExpression("aql:self.eClassifiers->first()");
+        Optional<AbstractWidgetDescription> widgetDescription = converterSwitch.caseReferenceWidgetDescription(referenceWidgetDescription);
+        assertTrue(widgetDescription.isPresent());
+        AbstractWidgetDescription abstractWidgetDescription = widgetDescription.get();
+        assertInstanceOf(org.eclipse.sirius.components.widget.reference.ReferenceWidgetDescription.class, abstractWidgetDescription);
+        List<?> options = ((org.eclipse.sirius.components.widget.reference.ReferenceWidgetDescription) abstractWidgetDescription).getOptionsProvider().apply(variableManager);
+        assertNotNull(options);
+        assertFalse(options.isEmpty());
+        assertEquals(eOperation, options.get(0));
+    }
+}