Skip to content

fix(amazonq): @workspace command shown in all tab types #5089

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

Merged
merged 2 commits into from
Nov 15, 2024
Merged

fix(amazonq): @workspace command shown in all tab types #5089

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
609dfba
fix(amazonq): @workspace command shown in all tab types
avi-alpert Nov 14, 2024
5f963e4
Update bugfix-0150eb94-2d05-40f5-8473-b2ee1fd6bf09.json
avi-alpert Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-0150eb94-2d05-40f5-8473-b2ee1fd6bf09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Amazon Q chat: @workspace command shown in all tab types"
}
11 changes: 11 additions & 0 deletions plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
import { QuickActionCommandGroup } from "@aws/mynah-ui-chat"

type MessageCommand =
| 'chat-prompt'
Expand Down Expand Up @@ -47,3 +48,13 @@ type MessageCommand =
| 'store-code-result-message-id'

export type ExtensionMessage = Record<string, any> & { command: MessageCommand }

export const workspaceCommand: QuickActionCommandGroup = {
groupName: 'Mention code',
commands: [
{
command: '@workspace',
description: '(BETA) Reference all code in workspace.',
},
],
}
19 changes: 7 additions & 12 deletions plugins/amazonq/mynah-ui/src/mynah-ui/ui/tabs/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { ChatItemType, MynahUIDataModel } from '@aws/mynah-ui-chat'
import { ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/mynah-ui-chat'
import { TabType } from '../storages/tabsStorage'
import { FollowUpGenerator } from '../followUps/generator'
import { QuickActionGenerator } from '../quickActions/generator'
import { workspaceCommand } from '../commands'

export interface TabDataGeneratorProps {
isFeatureDevEnabled: boolean
Expand Down Expand Up @@ -60,6 +61,10 @@ I can help you upgrade your Java 8 and 11 codebases to Java 17.
],
])

private tabContextCommand: Map<TabType, QuickActionCommandGroup[]> = new Map([
['cwc', [workspaceCommand]],
])

constructor(props: TabDataGeneratorProps) {
this.followUpsGenerator = new FollowUpGenerator()
this.quickActionsGenerator = new QuickActionGenerator({
Expand All @@ -75,17 +80,7 @@ I can help you upgrade your Java 8 and 11 codebases to Java 17.
'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
promptInputPlaceholder: this.tabInputPlaceholder.get(tabType),
contextCommands: [
{
groupName: 'Mention code',
commands: [
{
command: '@workspace',
description: '(BETA) Reference all code in workspace.',
},
],
},
],
contextCommands: this.tabContextCommand.get(tabType),
chatItems: needWelcomeMessages
? [
{
Expand Down
Loading