dont show progressUpdates

Author: David Hasani

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -411,14 +411,17 @@ export class GumbyController {
             const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
 
             telemetry.record({
+                // TODO: remove JavaSource/TargetVersionsAllowed when BI is updated to use source/target
                 codeTransformJavaSourceVersionsAllowed: JDKToTelemetryValue(
                     fromJDKVersion
                 ) as CodeTransformJavaSourceVersionsAllowed,
                 codeTransformJavaTargetVersionsAllowed: JDKToTelemetryValue(
                     toJDKVersion
                 ) as CodeTransformJavaTargetVersionsAllowed,
+                source: fromJDKVersion,
+                target: toJDKVersion,
                 codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
-                userChoice: 'Confirm-Language-Upgrade',
+                userChoice: 'Confirm-Java',
             })
 
             const projectName = path.basename(pathToProject)
@@ -446,7 +449,9 @@ export class GumbyController {
 
             telemetry.record({
                 codeTransformProjectId: pathToProject === undefined ? telemetryUndefined : getStringHash(pathToProject),
-                userChoice: 'Confirm-SQL-Conversion',
+                source: transformByQState.getSourceDB(),
+                target: transformByQState.getTargetDB(),
+                userChoice: 'Confirm-SQL',
             })
 
             const projectName = path.basename(pathToProject)

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -668,6 +668,10 @@ export async function pollTransformationStatusUntilPlanReady(jobId: string) {
             throw new PollJobError()
         }
     }
+    if (transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION) {
+        // for now, no plan shown with SQL conversions. later, we may add one
+        return
+    }
     let plan = undefined
     try {
         plan = await getTransformationPlan(jobId)

packages/core/src/codewhisperer/models/constants.ts

@@ -452,14 +452,14 @@ export const buildCodeStepMessage = 'Build uploaded code in secure build environ
 
 export const generatePlanStepMessage = 'Generate transformation plan'
 
-export const transformStepMessage = 'Transform your code to Java 17 using transformation plan'
+export const transformStepMessage = 'Transform your code to Java 17'
 
 export const filesUploadedMessage =
     'Files have been uploaded to Amazon Q, transformation job has been accepted and is preparing to start.'
 
 export const planningMessage = 'Amazon Q is analyzing your code in order to generate a transformation plan.'
 
-export const transformingMessage = 'Amazon Q is transforming your code. Details will appear soon.'
+export const transformingMessage = 'Amazon Q is transforming your code.'
 
 export const stoppingJobMessage = 'Stopping the transformation...'
 

packages/core/src/codewhisperer/models/model.ts

@@ -311,7 +311,7 @@ export enum JDKVersion {
 
 export enum DB {
     ORACLE = 'ORACLE',
-    RDS_POSTGRESQL = 'RDS_POSTGRESQL', // TO-DO: these should all match what source/target vendor look like in sct-rules.json
+    RDS_POSTGRESQL = 'RDS_POSTGRESQL',
     AURORA_POSTGRESQL = 'AURORA_POSTGRESQL',
     OTHER = 'OTHER',
 }

packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts

@@ -214,8 +214,9 @@ export async function uploadPayload(payloadFileName: string, uploadContext?: Upl
     }
     jobPlanProgress['uploadCode'] = StepProgress.Succeeded
     if (transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION) {
-        // if doing a SQL conversion, we don't build the code, so mark this step as succeeded immediately so that next step renders
+        // if doing a SQL conversion, we don't build the code or generate a plan, so mark these steps as succeeded immediately so that next step renders
         jobPlanProgress['buildCode'] = StepProgress.Succeeded
+        jobPlanProgress['generatePlan'] = StepProgress.Succeeded
     }
     updateJobHistory()
     return response.uploadId
@@ -626,7 +627,6 @@ export async function pollTransformationJob(jobId: string, validStates: string[]
                 transformationJobId: jobId,
             })
             status = response.transformationJob.status!
-            // if doing a SQL conversion, we don't build the code, so mark this step as succeeded immediately so that next step gets rendered
             if (CodeWhispererConstants.validStatesForBuildSucceeded.includes(status)) {
                 jobPlanProgress['buildCode'] = StepProgress.Succeeded
             }

packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts

@@ -269,16 +269,19 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                 return CodeWhispererConstants.filesUploadedMessage
             case 'PREPARING':
             case 'PREPARED':
-                // for SQL conversions, skip to planningMessage since we don't build the code
+                // for SQL conversions, skip to transformingMessage since we don't build the code
                 return transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION
-                    ? CodeWhispererConstants.planningMessage
+                    ? CodeWhispererConstants.transformingMessage
                     : CodeWhispererConstants.buildingCodeMessage.replace(
                           'JAVA_VERSION_HERE',
                           transformByQState.getSourceJDKVersion() ?? ''
                       )
             case 'PLANNING':
             case 'PLANNED':
-                return CodeWhispererConstants.planningMessage
+                // for SQL conversions, skip to transformingMessage since we don't generate a plan
+                return transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION
+                    ? CodeWhispererConstants.transformingMessage
+                    : CodeWhispererConstants.planningMessage
             case 'TRANSFORMING':
             case 'TRANSFORMED':
             case 'COMPLETED':
@@ -316,7 +319,12 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
         }
 
         let planSteps = transformByQState.getPlanSteps()
-        if (jobPlanProgress['generatePlan'] === StepProgress.Succeeded && transformByQState.isRunning()) {
+        // no plan for SQL conversions
+        if (
+            transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION &&
+            jobPlanProgress['generatePlan'] === StepProgress.Succeeded &&
+            transformByQState.isRunning()
+        ) {
             planSteps = await getTransformationSteps(transformByQState.getJobId(), false)
             transformByQState.setPlanSteps(planSteps)
         }
@@ -348,7 +356,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                       )
                     : ''
             const planMarkup =
-                activeStepId >= 2
+                activeStepId >= 2 && transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION // for SQL conversions, don't show generatePlan step
                     ? simpleStep(
                           this.getProgressIconMarkup(jobPlanProgress['generatePlan']),
                           CodeWhispererConstants.generatePlanStepMessage,