Skip to content
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

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Conversation

gcoutable
Copy link
Member

Pull request template

General purpose

What is the main goal of this pull request?

  • Bug fixes
  • New features
  • Documentation
  • Cleanup
  • Tests
  • Build / releng

Project management

  • Has the pull request been added to the relevant project and milestone? (Only if you know that your work is part of a specific iteration such as the current one)
  • Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
  • Have the relevant issues been added to the pull request?
  • Have the relevant labels been added to the issues? (area:, difficulty:, type:)
  • Have the relevant issues been added to the same project and milestone as the pull request?
  • Has the CHANGELOG.adoc been updated to reference the relevant issues?
  • Have the relevant API breaks been described in the CHANGELOG.adoc? (Including changes in the GraphQL API)
  • In case of a change with a visual impact, are there any screenshots in the CHANGELOG.adoc? For example in doc/screenshots/2022.5.0-my-new-feature.png

Architectural decision records (ADR)

  • Does the title of the commit contributing the ADR start with [doc]?
  • Are the ADRs mentioned in the relevant section of the CHANGELOG.adoc?

Dependencies

  • Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc?
  • Are the new dependencies justified in the CHANGELOG.adoc?

Frontend

This section is not relevant if your contribution does not come with changes to the frontend.

General purpose

  • Is the code properly tested? (Plain old JavaScript tests for business code and tests based on React Testing Library for the components)

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).

  • Variables have a proper type
  • Functions’ arguments have a proper type
  • Functions’ return type are specified
  • Hooks are properly typed:
    • useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
    • useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
    • useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
    • useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
    • useState<STATE_TYPE>(…)
  • All components have a proper typing for their props
  • No useless optional chaining with ?. (if the GraphQL API specifies that a field cannot be null, do not treat it has potentially null for example)
  • Nullable values have a proper type (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

  • Are all the event handlers tested?
  • Are the event processor tested?
  • Is the business code (services) tested?
  • Are diagram layout changes tested?

Architecture

  • Are data structure classes properly separated from behavioral classes?
  • Are all the relevant fields final?
  • Is any data structure mutable? If so, please write a comment indicating why
  • Are behavioral classes either stateless or side effect free?

Review

How to test this PR?

Please describe here the various use cases to test this pull request

  • Has the Kiwi TCMS test suite been updated with tests for this contribution?

@gcoutable gcoutable added this to the 2024.11.0 milestone Sep 17, 2024
@gcoutable gcoutable linked an issue Sep 17, 2024 that may be closed by this pull request
@gcoutable gcoutable force-pushed the gco/enh/add-command-palette branch 3 times, most recently from afb9817 to b7668b6 Compare September 24, 2024 09:45
@gcoutable gcoutable marked this pull request as ready for review September 24, 2024 09:45
@gcoutable gcoutable force-pushed the gco/enh/add-command-palette branch 2 times, most recently from b585571 to 6c226a3 Compare September 24, 2024 12:49
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.
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment on lines 43 to 46
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
</dependency>
Copy link
Member

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

Copy link
Member Author

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;
Copy link
Member

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.

Copy link
Member Author

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, ""));
Copy link
Member

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"

Copy link
Member Author

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!
Copy link
Member

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment on lines 55 to 56
"picomatch": "4.0.2",
"mini-svg-data-uri": "1.4.4",
Copy link
Member

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

Copy link
Member Author

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

Copy link
Member Author

@gcoutable gcoutable Oct 2, 2024

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>
Copy link
Member

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

Copy link
Member Author

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>
Copy link
Member

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

Copy link
Member Author

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",
Copy link
Member

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

Copy link
Member Author

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"
Copy link
Member

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.

Copy link
Member Author

@gcoutable gcoutable Oct 2, 2024

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.

@gcoutable gcoutable force-pushed the gco/enh/add-command-palette branch 7 times, most recently from 801e64c to c2ddb0d Compare October 4, 2024 14:28
Copy link
Member

@sbegaudeau sbegaudeau left a 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 see EditingContext, IEditingContext and IEMFEditingContext before IEditingContextEventProcessor. 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

Comment on lines 90 to 91
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);
Copy link
Member

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);
  }
}

@sbegaudeau
Copy link
Member

@gcoutable Unless I encounter some bug, I'll finish the review and ensure that it gets merged

Copy link
Member

@sbegaudeau sbegaudeau left a 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);
Copy link
Member

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": "*",
Copy link
Member

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>
Copy link
Member

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) => {
Copy link
Member

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.

Copy link
Member

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>
Copy link
Member

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

gcoutable and others added 2 commits October 14, 2024 13:56
Bug: #3982
Signed-off-by: Stéphane Bégaudeau <[email protected]>
Signed-off-by: Guillaume Coutable <[email protected]>
@sbegaudeau sbegaudeau merged commit 9e07dee into master Oct 14, 2024
4 checks passed
@sbegaudeau sbegaudeau deleted the gco/enh/add-command-palette branch October 14, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for a command palette
2 participants