Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 3 additions & 14 deletions packages/amazonq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -524,22 +524,17 @@
"command": "aws.amazonq.walkthrough.show",
"group": "1_help@1"
},
{
"command": "aws.amazonq.exploreAgents",
"when": "!aws.isSageMaker",
"group": "1_help@2"
},
{
"command": "aws.amazonq.github",
"group": "1_help@3"
"group": "1_help@2"
},
{
"command": "aws.amazonq.aboutExtension",
"group": "1_help@4"
"group": "1_help@3"
},
{
"command": "aws.amazonq.viewLogs",
"group": "1_help@5"
"group": "1_help@4"
}
],
"aws.amazonq.submenu.securityIssueMoreActions": [
Expand Down Expand Up @@ -846,12 +841,6 @@
"title": "%AWS.amazonq.openChat%",
"category": "%AWS.amazonq.title%"
},
{
"command": "aws.amazonq.exploreAgents",
"title": "%AWS.amazonq.exploreAgents%",
"category": "%AWS.amazonq.title%",
"enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
},
{
"command": "aws.amazonq.walkthrough.show",
"title": "%AWS.amazonq.welcomeWalkthrough%"
Expand Down
45 changes: 0 additions & 45 deletions packages/amazonq/test/e2e/amazonq/explore.test.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/core/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@
"AWS.amazonq.security": "Code Issues",
"AWS.amazonq.login": "Login",
"AWS.amazonq.learnMore": "Learn More About Amazon Q",
"AWS.amazonq.exploreAgents": "Explore Agent Capabilities",
"AWS.amazonq.welcomeWalkthrough": "Welcome Walkthrough",
"AWS.amazonq.codewhisperer.title": "Amazon Q",
"AWS.amazonq.toggleCodeSuggestion": "Toggle Auto-Suggestions",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ export interface CodeReference {
export class Connector {
private readonly sendMessageToExtension
private readonly onWelcomeFollowUpClicked
private readonly onNewTab
private readonly handleCommand
private readonly sendStaticMessage

constructor(props: ConnectorProps) {
this.sendMessageToExtension = props.sendMessageToExtension
this.onWelcomeFollowUpClicked = props.onWelcomeFollowUpClicked
this.onNewTab = props.onNewTab
this.handleCommand = props.handleCommand
this.sendStaticMessage = props.sendStaticMessages
}
Expand All @@ -61,10 +59,7 @@ export class Connector {
}

handleMessageReceive = async (messageData: any): Promise<void> => {
if (messageData.command === 'showExploreAgentsView') {
this.onNewTab('agentWalkthrough')
return
} else if (messageData.command === 'review') {
if (messageData.command === 'review') {
// tabID does not exist when calling from QuickAction Menu bar
this.handleCommand({ command: '/review' }, '')
return
Expand Down
4 changes: 0 additions & 4 deletions packages/core/src/amazonq/webview/ui/connector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -596,10 +596,6 @@ export class Connector {
this.cwChatConnector.onCustomFormAction(tabId, action)
}
break
case 'agentWalkthrough': {
this.amazonqCommonsConnector.onCustomFormAction(tabId, action)
break
}
}
}
}
14 changes: 0 additions & 14 deletions packages/core/src/amazonq/webview/ui/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import { DiffTreeFileInfo } from './diffTree/types'
import { FeatureContext } from '../../../shared/featureConfig'
import { tryNewMap } from '../../util/functionUtils'
import { welcomeScreenTabData } from './walkthrough/welcome'
import { agentWalkthroughDataModel } from './walkthrough/agent'
import { createClickTelemetry, createOpenAgentTelemetry } from './telemetry/actions'
import { disclaimerAcknowledgeButtonId, disclaimerCard } from './texts/disclaimer'
import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
Expand Down Expand Up @@ -783,19 +782,6 @@ export class WebviewUIHandler {
this.postMessage(createClickTelemetry('amazonq-welcome-quick-start-button'))
return
}
case 'explore': {
const newTabId = this.mynahUI?.updateStore('', agentWalkthroughDataModel)
if (newTabId === undefined) {
this.mynahUI?.notify({
content: uiComponentsTexts.noMoreTabsTooltip,
type: NotificationType.WARNING,
})
return
}
this.tabsStorage.updateTabTypeFromUnknown(newTabId, 'agentWalkthrough')
this.postMessage(createClickTelemetry('amazonq-welcome-explore-button'))
return
}
default: {
this.connector?.onCustomFormAction(tabId, messageId, action, eventId)
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ export class QuickActionGenerator {
}

public generateForTab(tabType: TabType): QuickActionCommandGroup[] {
// agentWalkthrough is static and doesn't have any quick actions
if (tabType === 'agentWalkthrough') {
return []
}

// TODO: Update acc to UX
const quickActionCommands = [
{
Expand Down Expand Up @@ -101,7 +96,7 @@ export class QuickActionGenerator {
].filter((section) => section.commands.length > 0)

const commandUnavailability: Record<
Exclude<TabType, 'agentWalkthrough'>,
Exclude<TabType, []>,
{
description: string
unavailableItems: string[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

export type TabStatus = 'free' | 'busy' | 'dead'
const TabTypes = ['cwc', 'gumby', 'review', 'agentWalkthrough', 'welcome', 'unknown'] as const
const TabTypes = ['cwc', 'gumby', 'review', 'welcome', 'unknown'] as const
export type TabType = (typeof TabTypes)[number]
export function isTabType(value: string): value is TabType {
return (TabTypes as readonly string[]).includes(value)
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/amazonq/webview/ui/tabs/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const commonTabData: TabTypeData = {
contextCommands: [workspaceCommand],
}

export const TabTypeDataMap: Record<Exclude<TabType, 'agentWalkthrough' | 'welcome'>, TabTypeData> = {
export const TabTypeDataMap: Record<Exclude<TabType, 'welcome'>, TabTypeData> = {
unknown: commonTabData,
cwc: commonTabData,
gumby: {
Expand Down
7 changes: 1 addition & 6 deletions packages/core/src/amazonq/webview/ui/tabs/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { TabType } from '../storages/tabsStorage'
import { FollowUpGenerator } from '../followUps/generator'
import { QuickActionGenerator } from '../quickActions/generator'
import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
import { agentWalkthroughDataModel } from '../walkthrough/agent'
import { FeatureContext } from '../../../../shared/featureConfig'
import { RegionProfile } from '../../../../codewhisperer/models/model'

Expand Down Expand Up @@ -43,10 +42,6 @@ export class TabDataGenerator {
taskName?: string,
isSMUS?: boolean
): MynahUIDataModel {
if (tabType === 'agentWalkthrough') {
return agentWalkthroughDataModel
}

if (tabType === 'welcome') {
return {}
}
Expand Down Expand Up @@ -86,7 +81,7 @@ export class TabDataGenerator {
}

private getContextCommands(tabType: TabType): QuickActionCommandGroup[] | undefined {
if (tabType === 'agentWalkthrough' || tabType === 'welcome') {
if (tabType === 'welcome') {
return
}

Expand Down
Loading
Loading