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.

Sign up for GitHub

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

Jump to bottom

fix(KTO-441): option to display the ID instead of the description as … #1221

Merged
merged 1 commit into from
Jul 26, 2024
Merged

fix(KTO-441): option to display the ID instead of the description as … #1221

merged 1 commit into from
Jul 26, 2024

Conversation

tplevko
Copy link
Contributor

@tplevko tplevko commented Jul 1, 2024

…step label

fixes https://issues.redhat.com/browse/KTO-441

The option was added to the settings page:

Screenshot from 2024-07-01 09-52-10

The ID is used either when selected, or in case the "description" is selected, but not yet specified in the node form.

@tplevko tplevko force-pushed the KTO-441 branch 4 times, most recently from c6f877c to 76507ba Compare July 2, 2024 07:43
@tplevko tplevko marked this pull request as ready for review July 22, 2024 08:19
lordrip
lordrip reviewed Jul 22, 2024
View reviewed changes
Copy link
Member

@lordrip lordrip left a comment

Choose a reason for hiding this comment

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

Thanks @tplevko for taking care of this, unfortunately, in order to make it work in VSCode, we need to provide a settings adapter that handles VSCode settings as well. Is it ok for you to hold this PR for a bit until we create that first?

@tplevko
Copy link
Contributor Author

tplevko commented Jul 23, 2024

Thanks @tplevko for taking care of this, unfortunately, in order to make it work in VSCode, we need to provide a settings adapter that handles VSCode settings as well. Is it ok for you to hold this PR for a bit until we create that first?

sure, let's wait for the VSCode settings adapter

@lordrip lordrip added canvas/visualization Canvas-related issues ui/ux This issue is about improving the UI / UX labels Jul 23, 2024
@lordrip lordrip added this to the 2.2.0 milestone Jul 23, 2024
lordrip added a commit to lordrip/kaoto that referenced this pull request Jul 24, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
4094d28 
At the moment, the Kaoto settings are passed individually to VSCode,
meaning that in case we want to add new settings, we need to pass
individual parameters to the `KaotoEditorApp` class.

This commit provides a SettingsAdapter so every new setting will be
added directly to the adapter.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO#1221
@lordrip lordrip mentioned this pull request Jul 24, 2024
Merged
lordrip added a commit to lordrip/kaoto that referenced this pull request Jul 24, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
da4cd4b 
At the moment, the Kaoto settings are passed individually to VSCode,
meaning that in case we want to add new settings, we need to pass
individual parameters to the `KaotoEditorApp` class.

This commit provides a SettingsAdapter so every new setting will be
added directly to the adapter.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO#1221
@lordrip
Copy link
Member

lordrip commented Jul 24, 2024

@tplevko, after merging #1264, we would need to introduce an intermediate PR just adding the new nodeLabel setting without using it, this way we can merge that one and then merge the VSCode part from it.

lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 24, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
91b4fa7 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
@lordrip lordrip mentioned this pull request Jul 24, 2024
Merged
lordrip added a commit to lordrip/kaoto that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
4737412 
At the moment, the Kaoto settings are passed individually to VSCode,
meaning that in case we want to add new settings, we need to pass
individual parameters to the `KaotoEditorApp` class.

This commit provides a SettingsAdapter so every new setting will be
added directly to the adapter.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO#1221
lordrip added a commit that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
89fa84b 
At the moment, the Kaoto settings are passed individually to VSCode,
meaning that in case we want to add new settings, we need to pass
individual parameters to the `KaotoEditorApp` class.

This commit provides a SettingsAdapter so every new setting will be
added directly to the adapter.

relates: https://issues.redhat.com/browse/KTO-441
relates: #1221
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
a25194a 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
d991ee9 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
36139c3 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 25, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
292c14f 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
@lordrip
Copy link
Member

lordrip commented Jul 25, 2024

@tplevko, I think we can rebase this PR and merge it, as VSCode is in a middle ground and we still have things to polish before making it available to the public.

@tplevko tplevko force-pushed the KTO-441 branch 5 times, most recently from f3d33a7 to 88ab60a Compare July 26, 2024 07:36
lordrip
lordrip reviewed Jul 26, 2024
View reviewed changes
packages/ui/src/models/settings/settings.model.ts
@@ -9,6 +10,7 @@ export interface AbstractSettingsAdapter {

export class SettingsModel implements ISettingsModel {
catalogUrl: string = '';
nodeLabel: string = 'description';
Copy link
Member

Choose a reason for hiding this comment

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

I think this should be an enum, we can take care of it at another time.

@lordrip lordrip merged commit e33d897 into KaotoIO:main Jul 26, 2024
9 checks passed
lordrip added a commit to lordrip/kaoto that referenced this pull request Jul 26, 2024
@lordrip
chore(Canvas): Use enum for NodeLabel setting
708cf42 
relates: https://issues.redhat.com/browse/KTO-441
follow up: KaotoIO#1221
@lordrip lordrip mentioned this pull request Jul 26, 2024
Merged
lordrip added a commit to lordrip/kaoto that referenced this pull request Jul 26, 2024
@lordrip
chore(Canvas): Use enum for NodeLabel setting
adfff40 
relates: https://issues.redhat.com/browse/KTO-441
follow up: KaotoIO#1221
lordrip added a commit that referenced this pull request Jul 26, 2024
@lordrip
chore(Canvas): Use enum for NodeLabel setting
a17228f 
relates: https://issues.redhat.com/browse/KTO-441
follow up: #1221
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 29, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
7b77c3b 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 29, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
0c1d878 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 29, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
8bad69c 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 29, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
0a9ee9c 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
5315559 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to KaotoIO/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(vscode): Provide SettingsAdapter for VSCode
2a9081a 
This commit adds a new `getVSCodeKaotoSettings` method to the
`VSCodeKaotoEditorChannelApi` class to build the Settings model.

It also deprecates the existing `getCatalogURL` method as the new way to
go is using the settings adapter from now on.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(settings): Wire up nodeLabel setting
ff8a7cf 
This commit wires up the `nodeLabel` setting so the user can choose what
label a node shows.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(settings): Wire up nodeLabel setting
4239427 
This commit wires up the `nodeLabel` setting so the user can choose what
label a node shows.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
@lordrip lordrip mentioned this pull request Jul 30, 2024
Merged
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(settings): Wire up nodeLabel setting
952b110 
This commit wires up the `nodeLabel` setting so the user can choose what
label a node shows.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to lordrip/vscode-kaoto that referenced this pull request Jul 30, 2024
@lordrip
feat(settings): Wire up nodeLabel setting
d8c0aa2 
This commit wires up the `nodeLabel` setting so the user can choose what
label a node shows.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
lordrip added a commit to KaotoIO/vscode-kaoto that referenced this pull request Jul 31, 2024
@lordrip
feat(settings): Wire up nodeLabel setting
0b22ebc 
This commit wires up the `nodeLabel` setting so the user can choose what
label a node shows.

relates: https://issues.redhat.com/browse/KTO-441
relates: KaotoIO/kaoto#1221
relates: KaotoIO/kaoto#1264
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lordrip lordrip lordrip approved these changes

Assignees

@tplevko tplevko

Labels
canvas/visualization Canvas-related issues ui/ux This issue is about improving the UI / UX
Projects
Kanban Board
Status: Done
Milestone
2.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@tplevko @lordrip