Disable /transform & /dev commands for sagemaker users

Author: ahusseinali

packages/amazonq/.changes/next-release/Bug Fix-cbd8faed-6375-40e7-9f82-0e402e8fc0ad.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Disable /transform and /dev commands for sagemaker users as they're not supported"
+}

packages/core/src/amazonq/index.ts

@@ -42,11 +42,12 @@ import { FeatureContext } from '../shared'
 export function createMynahUI(
     ideApi: any,
     amazonQEnabled: boolean,
-    featureConfigsSerialized: [string, FeatureContext][]
+    featureConfigsSerialized: [string, FeatureContext][],
+    disabledCommands?: string[]
 ) {
     if (typeof window !== 'undefined') {
         const mynahUI = require('./webview/ui/main')
-        return mynahUI.createMynahUI(ideApi, amazonQEnabled, featureConfigsSerialized)
+        return mynahUI.createMynahUI(ideApi, amazonQEnabled, featureConfigsSerialized, disabledCommands)
     }
     throw new Error('Not implemented for node')
 }

packages/core/src/amazonq/webview/generators/webViewContent.ts

@@ -6,7 +6,7 @@
 import path from 'path'
 import { Uri, Webview } from 'vscode'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
-import { FeatureConfigProvider, FeatureContext, globals } from '../../../shared'
+import { FeatureConfigProvider, FeatureContext, globals, isSageMaker } from '../../../shared'
 
 export class WebViewContentGenerator {
     private async generateFeatureConfigsData(): Promise<string> {
@@ -77,14 +77,16 @@ export class WebViewContentGenerator {
         // Fetch featureConfigs and use it within the script
         const featureConfigsString = await this.generateFeatureConfigsData()
 
+        const disabledCommandsString = isSageMaker() ? `['/dev', '/transform']` : '[]'
+
         return `
         <script type="text/javascript" src="${javascriptEntrypoint.toString()}" defer onload="init()"></script>
         ${cssLinks}
         <script type="text/javascript">
             const init = () => {
                 createMynahUI(acquireVsCodeApi(), ${
                     (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'
-                },${featureConfigsString});
+                },${featureConfigsString},${disabledCommandsString});
             }
         </script>
         `

packages/core/src/amazonq/webview/ui/main.ts

@@ -31,7 +31,8 @@ import { tryNewMap } from '../../util/functionUtils'
 export const createMynahUI = (
     ideApi: any,
     amazonQEnabled: boolean,
-    featureConfigsSerialized: [string, FeatureContext][]
+    featureConfigsSerialized: [string, FeatureContext][],
+    disabledCommands?: string[]
 ) => {
     // eslint-disable-next-line prefer-const
     let mynahUI: MynahUI
@@ -77,6 +78,7 @@ export const createMynahUI = (
     let tabDataGenerator = new TabDataGenerator({
         isFeatureDevEnabled,
         isGumbyEnabled,
+        disabledCommands,
     })
 
     // eslint-disable-next-line prefer-const
@@ -118,11 +120,13 @@ export const createMynahUI = (
                 tabsStorage,
                 isFeatureDevEnabled,
                 isGumbyEnabled,
+                disabledCommands,
             })
 
             tabDataGenerator = new TabDataGenerator({
                 isFeatureDevEnabled,
                 isGumbyEnabled,
+                disabledCommands,
             })
 
             featureConfigs = tryNewMap(featureConfigsSerialized)

packages/core/src/amazonq/webview/ui/messages/controller.ts

@@ -15,6 +15,7 @@ export interface MessageControllerProps {
     tabsStorage: TabsStorage
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
+    disabledCommands?: string[]
 }
 
 export class MessageController {
@@ -30,6 +31,7 @@ export class MessageController {
         this.tabDataGenerator = new TabDataGenerator({
             isFeatureDevEnabled: props.isFeatureDevEnabled,
             isGumbyEnabled: props.isGumbyEnabled,
+            disabledCommands: props.disabledCommands,
         })
     }
 

packages/core/src/amazonq/webview/ui/quickActions/generator.ts

@@ -9,22 +9,25 @@ import { TabType } from '../storages/tabsStorage'
 export interface QuickActionGeneratorProps {
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
+    disableCommands?: string[]
 }
 
 export class QuickActionGenerator {
     public isFeatureDevEnabled: boolean
     private isGumbyEnabled: boolean
+    private disabledCommands: string[]
 
     constructor(props: QuickActionGeneratorProps) {
         this.isFeatureDevEnabled = props.isFeatureDevEnabled
         this.isGumbyEnabled = props.isGumbyEnabled
+        this.disabledCommands = props.disableCommands ?? []
     }
 
     public generateForTab(tabType: TabType): QuickActionCommandGroup[] {
         const quickActionCommands = [
             {
                 commands: [
-                    ...(this.isFeatureDevEnabled
+                    ...(this.isFeatureDevEnabled && !this.disabledCommands.includes('/dev')
                         ? [
                               {
                                   command: '/dev',
@@ -33,7 +36,7 @@ export class QuickActionGenerator {
                               },
                           ]
                         : []),
-                    ...(this.isGumbyEnabled
+                    ...(this.isGumbyEnabled && !this.disabledCommands.includes('/transform')
                         ? [
                               {
                                   command: '/transform',
@@ -55,7 +58,7 @@ export class QuickActionGenerator {
                     },
                 ],
             },
-        ]
+        ].filter((section) => section.commands.length > 0)
 
         const commandUnavailability: Record<
             TabType,

packages/core/src/amazonq/webview/ui/quickActions/handler.ts

@@ -15,6 +15,7 @@ export interface QuickActionsHandlerProps {
     tabsStorage: TabsStorage
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
+    disabledCommands?: string[]
 }
 
 export class QuickActionHandler {
@@ -32,6 +33,7 @@ export class QuickActionHandler {
         this.tabDataGenerator = new TabDataGenerator({
             isFeatureDevEnabled: props.isFeatureDevEnabled,
             isGumbyEnabled: props.isGumbyEnabled,
+            disabledCommands: props.disabledCommands,
         })
         this.isFeatureDevEnabled = props.isFeatureDevEnabled
         this.isGumbyEnabled = props.isGumbyEnabled

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -12,6 +12,7 @@ import { TabTypeDataMap } from './constants'
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
+    disabledCommands?: string[]
 }
 
 export class TabDataGenerator {
@@ -23,6 +24,7 @@ export class TabDataGenerator {
         this.quickActionsGenerator = new QuickActionGenerator({
             isFeatureDevEnabled: props.isFeatureDevEnabled,
             isGumbyEnabled: props.isGumbyEnabled,
+            disableCommands: props.disabledCommands,
         })
     }