AQL is not interpreted correctly in style customizations for image workspacePath

[Gelio]

• I have checked that this bug has not yet been reported by someone else
• I have checked that this bug appears on Chrome
• I have specified the version :

• other: 0.5.3

• I have specified my environment :

• Ubuntu 20.04 LTS

Screenshots

Some of my style customizations in the odesign file use AQL. An example style customization:

getDataPinIconPath is defined in my metamodel's Services.

It works well in Sirius Desktop:

But there are no images shown in Sirius Web:

The image path that Sirius Web wants to load is:

http://localhost:3000/api/images/eu.balticlsc.model.CAL.edit/icons/computed-data-pin/'%20+%20self.declared.getDataPinIconPath()

whereas it should be:

http://localhost:3000/api/images/eu.balticlsc.model.CAL.edit/icons/computed-data-pin/single-data-single-token.png

Steps to reproduce

1. Add a metamodel style customization using AQL for the workspacePath of an image of a node

Expected behavior

The image is loaded correctly using the same logic as in Sirius Desktop.

Actual behavior

The image is not loaded due to a malformed URL.

[pcdavid]

It looks like in:

https://github.com/eclipse-sirius/sirius-components/blob/41554cd0ebe94107ad218c4f33272731a6b2bf48/backend/sirius-web-compatibility/src/main/java/org/eclipse/sirius/web/compat/diagrams/WorkspaceImageDescriptionConverter.java#L53

we should interpret the value as an AQL expression instead of using it raw. See

https://github.com/pcdavid/org.eclipse.sirius/blob/4ab9498fdb13d1463063800459480eb08ea1a144/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/EAttributeCustomizationQuery.java#L49

for the reference behavior in Sirius Desktop.

[pcdavid]

@Gelio can you try your use case with

        // @formatter:off
        String workspacePath = this.eAttributeCustomizationProvider.getEAttributeCustomization(this.workspaceImageDescription, WORKSPACE_PATH)
                .map(EAttributeCustomization::getValue)
                .flatMap(expression -> this.interpreter.evaluateExpression(this.variableManager.getVariables(), expression).asString())
                .orElse(this.workspaceImageDescription.getWorkspacePath());
        // @formatter:on

in org.eclipse.sirius.web.compat.diagrams.WorkspaceImageDescriptionConverter.convert()?

[Gelio]

@pcdavid Sorry, I don't have my own fork of sirius-components set up to be consumed in Sirius Web. I am only using the public version of sirius-components. I don't have the bandwidth right now to set up a fork to test it out

[pcdavid]

@Gelio the fix mentioned in my earlier comment should now be available starting from version 2021.12.6. Could you confirm if it fixes the issue for you?

[Gelio]

There were some pretty heavy changes since the last time I updated my fork of sirius-web. I have just spent 1.5h trying to apply those 20 commits, but I probably messed something up, as I missed the changes from some of the commits. I don't have the bandwidth right now to redo the process.

[Gelio]

I had a bit more time today and applied the patch correctly this time.

I confirm that the problem is solved:

Thanks!

[pcdavid]

Good news, thanks for your feedback!