-
Notifications
You must be signed in to change notification settings - Fork 52
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
[3982] Add support for command palette #4011
Conversation
afb9817
to
b7668b6
Compare
b585571
to
6c226a3
Compare
6c226a3
to
aa444ef
Compare
CHANGELOG.adoc
Outdated
@@ -31,7 +31,8 @@ Both `IInput` and `IDomainEvent` implement `ICause` and will thus be used to ind | |||
- https://github.com/eclipse-sirius/sirius-web/issues/3972[#3972] [diagram] The `InsideLabelStyle#displayHeaderSeparator` has been renamed to `headerSeparatorDisplayMode` and is no longer a boolean but an enum with three possible values: NEVER, ALWAYS, and IF-CHILDREN. | |||
Previously, the value false was equivalent to NEVER, and true to IF-CHILDREN. | |||
The new option ALWAYS allows the separator to be displayed in every case. | |||
- https://github.com/eclipse-sirius/sirius-web/issues/3678[#3678] [core] Remove `IRepresentationMetadataSearchService#findByRepresentation`, use `IRepresentationMetadataSearchService#findByRepresentationId` instead. | |||
- https://github.com/eclipse-sirius/sirius-web/issues/3678[#3678] [core] Remove `IRepresentationMetadataSearchService#findByRepresentation`, use `IRepresentationMetadataSearchService#findByRepresentationId` instead. | |||
- https://github.com/eclipse-sirius/sirius-web/issues/3982[#3982] [sirius-web] The edit project view needs to declare the `OmniboxProvider` to benefit from the command palette. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is that a breaking change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
<dependency> | ||
<groupId>com.graphql-java</groupId> | ||
<artifactId>graphql-java</artifactId> | ||
</dependency> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why? The collaborative part is supposed to be independent from that unless I'm mistaken
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
@@ -10,7 +10,7 @@ | |||
* Contributors: | |||
* Obeo - initial API and implementation | |||
*******************************************************************************/ | |||
package org.eclipse.sirius.web.application.dto; | |||
package org.eclipse.sirius.components.collaborative.dto; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not in org.eclipse.sirius.components.core.graphql.dto
? This does not seem to be used in sirius-components-collaborative
and thus the dependency to graphql-java
seems useless here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved in org.eclipse.sirius.components.core.graphql.dto
var label = this.objectService.getLabel(object); | ||
var kind = this.objectService.getKind(object); | ||
var iconURL = this.objectService.getImagePath(object); | ||
omniboxCommands.add(new OmniboxCommand(UUID.fromString(id), label, kind, iconURL, "")); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- The id of the object will not be an UUID in various use cases
- Add a description indicating that the element will be selected something like "Click to select the object"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
} | ||
input OmniboxContextEntry { | ||
id: ID! | ||
label: String! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The label can be removed, it will be useful on the client, not the backend
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
"picomatch": "4.0.2", | ||
"mini-svg-data-uri": "1.4.4", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These shouldn't be necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know, I will try again without
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
npm install
worked without these (as it should) ...
<dependency> | ||
<groupId>org.eclipse.sirius</groupId> | ||
<artifactId>sirius-components-core-graphql</artifactId> | ||
<version>2024.9.1</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't forget to update it to 2024.9.3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
<dependency> | ||
<groupId>org.eclipse.sirius</groupId> | ||
<artifactId>sirius-components-core-graphql</artifactId> | ||
<version>2024.9.1</version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't forget to update it to 2024.9.3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -52,6 +53,7 @@ | |||
"xstate": "4.32.1" | |||
}, | |||
"devDependencies": { | |||
"@rollup/plugin-image": "2.1.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be necessary for this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will try again without, but maybe this change (or other dependency changes in this PR) should have been done in a previous PR.
What I mean is, sometimes, the team does not generate package-lock.json well, so the next dev who does it correctly, have to make the change that should have been done in a previous PR.
@@ -469,7 +469,7 @@ exports[`should render a readOnly list from widget properties 1`] = ` | |||
class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeSmall css-18jhh0s-cell css-dsuxgy-MuiTableCell-root" | |||
> | |||
<p | |||
class="MuiTypography-root MuiTypography-body1 css-qh6f2j-style css-1gqyz35-MuiTypography-root" | |||
class="MuiTypography-root MuiTypography-body1 css-qh6f2j-style css-1gqyz35-MuiTypography-root" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are those changes necessary? Similar question for the next file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had an error on test execution with the previous version (with two spaces).
It should not have been modified previously, why two spaces?
So, yes, those changes are necessary.
801e64c
to
c2ddb0d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given the state of what you have shown last week, I'll need the following user experience improvements to consider merging this PR:
- The position of the palette should not change when results are received from the server
- The size of the results parts should have a maximum size allowing the display of tens results max, after that it should offer a scrollbar
- The results should be order by size for the moment (the backend should do it on the search results). The shortest results should come first. If I search for
EditingContext
I want to seeEditingContext
,IEditingContext
andIEMFEditingContext
beforeIEditingContextEventProcessor
. That's a very naive way to rank results but it's better than nothing - Was the button in the header available? I don't remember seeing it
- Update the current placeholder in the palette to indicate to type enter to execute the command
- Remove the icon indicator that you have used. Instead make the enter button have a disable color when everything is synchronized and the action color when the users can press enter to have some results
- Either make the name of the context in the command palette nice or remove it because the difference in size of the fonts does not look good
var queryBasedObjectsInput = new QueryBasedObjectsInput(UUID.randomUUID(), "aql:editingContext.allContents()->select(e | e.name.contains('" + getOmniboxCommandsInput.query() + "'))", Map.of()); | ||
var objectsPayload = this.queryService.execute(editingContext, queryBasedObjectsInput); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't use the name use the label, countless of objects do not have a name. Just remove that and use:
var results = new ArrayList<Notifier>();
var iterator = editingDomain.getResourceSet().getAllContents();
while (iterator.hasNext()) {
Notifier notifier = iterator.next();
var adapter = editingDomain.getAdapterFactory().adapt(notifier, IItemLabelProvider);
if (adapter instanceof IItemLabelProvider itemLabelProvider && itemLabelProvider.getLabel(notifier).contains(query)) {
results.add(notifier);
}
}
a7cad24
to
b705110
Compare
b705110
to
20b51f1
Compare
20b51f1
to
2407865
Compare
@gcoutable Unless I encounter some bug, I'll finish the review and ensure that it gets merged |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've not completed the review yet but with one or two minor improvements, it's starting to look really nice and useful
var input = new GetOmniboxCommandsInput(UUID.randomUUID(), query); | ||
|
||
if (!omniboxContextEntries.isEmpty()) { | ||
var omniboxContextEntry = omniboxContextEntries.get(0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should consider the one with the editing context type but that's a detail for now.
"publish:local": "yalc push" | ||
}, | ||
"peerDependencies": { | ||
"@eclipse-sirius/sirius-components-core": "*", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the peerDependencies
of sirius-components-core
should be here and all the peerDependencies
from here should be in packages that depends on sirius-components-omnibox
}, | ||
}} | ||
/> | ||
</FormControl> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's better but not exactly what I had in mind, I'll see if I can update it quickly
}, | ||
})); | ||
|
||
export const OmniboxButton = ({ size = 'small' }: OmniboxButtonProps) => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The button is still not visible in the user interface, end users cannot discover this feature otherwise.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
onClick={() => handleOnActionClick(action)} | ||
onKeyDown={handleListItemKeyDown}> | ||
<ListItemIcon>{action.icon}</ListItemIcon> | ||
<ListItemText>{action.label}</ListItemText> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The text should be on one line without any wrap and with an ellipsis
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
2407865
to
1e18dbd
Compare
2a75f85
to
bed4b9e
Compare
Bug: #3982 Signed-off-by: Stéphane Bégaudeau <[email protected]> Signed-off-by: Guillaume Coutable <[email protected]>
Signed-off-by: Stéphane Bégaudeau <[email protected]>
bed4b9e
to
322fd77
Compare
Pull request template
General purpose
What is the main goal of this pull request?
Project management
priority:
andpr:
labels been added to the pull request? (In case of doubt, start with the labelspriority: low
andpr: to review later
)area:
,difficulty:
,type:
)CHANGELOG.adoc
been updated to reference the relevant issues?CHANGELOG.adoc
? (Including changes in the GraphQL API)CHANGELOG.adoc
? For example indoc/screenshots/2022.5.0-my-new-feature.png
Architectural decision records (ADR)
[doc]
?CHANGELOG.adoc
?Dependencies
CHANGELOG.adoc
?CHANGELOG.adoc
?Frontend
This section is not relevant if your contribution does not come with changes to the frontend.
General purpose
Typing
We need to improve the typing of our code, as such, we require every contribution to come with proper TypeScript typing for both changes contributing new files and those modifying existing files.
Please ensure that the following statements are true for each file created or modified (this may require you to improve code outside of your contribution).
useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
useState<STATE_TYPE>(…)
?.
(if the GraphQL API specifies that a field cannot benull
, do not treat it has potentiallynull
for example)let diagram: Diagram | null = null;
)Backend
This section is not relevant if your contribution does not come with changes to the backend.
General purpose
Architecture
Review
How to test this PR?
Please describe here the various use cases to test this pull request