modify job status table to show transformation history; store diff patches locally; write history details to local log file

tgodara-aws · tgodara-aws · commit 11883b092727 · 2025-08-01T12:22:28.000-07:00
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -746,7 +746,7 @@
             },
             {
                 "command": "aws.amazonq.showHistoryInHub",
-                "title": "%AWS.command.q.transform.viewJobStatus%"
+                "title": "%AWS.command.q.transform.viewJobHistory%"
             },
             {
                 "command": "aws.amazonq.selectCustomization",
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -281,7 +281,7 @@
     "AWS.command.q.transform.rejectChanges": "Reject",
     "AWS.command.q.transform.stopJobInHub": "Stop job",
     "AWS.command.q.transform.viewJobProgress": "View job progress",
-    "AWS.command.q.transform.viewJobStatus": "View job status",
+    "AWS.command.q.transform.viewJobHistory": "View job history",
     "AWS.command.q.transform.showTransformationPlan": "View plan",
     "AWS.command.q.transform.showChangeSummary": "View summary",
     "AWS.command.threatComposer.createNew": "Create New Threat Composer File",
diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts
@@ -57,6 +57,7 @@ import {
 } from '../../../codewhisperer/service/transformByQ/transformFileHandler'
 import { getAuthType } from '../../../auth/utils'
 import fs from '../../../shared/fs/fs'
+import { setContext } from '../../../shared/vscode/setContext'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -188,6 +189,8 @@ export class GumbyController {
     }
 
     private async transformInitiated(message: any) {
+        this.messenger.sendViewHistoryMessage(message.tabID)
+
         // silently check for projects eligible for SQL conversion
         let embeddedSQLProjects: TransformationCandidateProject[] = []
         try {
@@ -383,6 +386,11 @@ export class GumbyController {
             case ButtonActions.VIEW_TRANSFORMATION_HUB:
                 await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB, CancelActionPositions.Chat)
                 break
+            case ButtonActions.VIEW_JOB_HISTORY:
+                await setContext('gumby.wasQCodeTransformationUsed', true)
+                await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB)
+                await vscode.commands.executeCommand(GumbyCommands.FOCUS_JOB_HISTORY, CancelActionPositions.Chat)
+                break
             case ButtonActions.VIEW_SUMMARY:
                 await vscode.commands.executeCommand('aws.amazonq.transformationHub.summary.reveal')
                 break
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts
@@ -377,6 +377,27 @@ export class Messenger {
         this.dispatcher.sendChatMessage(jobSubmittedMessage)
     }
 
+    public sendViewHistoryMessage(tabID: string) {
+        const buttons: ChatItemButton[] = []
+
+        buttons.push({
+            keepCardAfterClick: true,
+            text: 'Open job history',
+            id: ButtonActions.VIEW_JOB_HISTORY,
+            disabled: false,
+        })
+
+        const message = new ChatMessage(
+            {
+                message: 'View previous transformations run from the IDE',
+                messageType: 'ai-prompt',
+                buttons,
+            },
+            tabID
+        )
+        this.dispatcher.sendChatMessage(message)
+    }
+
     public sendMessage(prompt: string, tabID: string, type: 'prompt' | 'ai-prompt') {
         this.dispatcher.sendChatMessage(
             new ChatMessage(
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts
@@ -13,6 +13,7 @@ import DependencyVersions from '../../../models/dependencies'
 export enum ButtonActions {
     STOP_TRANSFORMATION_JOB = 'gumbyStopTransformationJob',
     VIEW_TRANSFORMATION_HUB = 'gumbyViewTransformationHub',
+    VIEW_JOB_HISTORY = 'gumbyViewJobHistory',
     VIEW_SUMMARY = 'gumbyViewSummary',
     CONFIRM_LANGUAGE_UPGRADE_TRANSFORMATION_FORM = 'gumbyLanguageUpgradeTransformFormConfirm',
     CONFIRM_SQL_CONVERSION_TRANSFORMATION_FORM = 'gumbySQLConversionTransformFormConfirm',
@@ -33,6 +34,7 @@ export enum GumbyCommands {
     CLEAR_CHAT = 'aws.awsq.clearchat',
     START_TRANSFORMATION_FLOW = 'aws.awsq.transform',
     FOCUS_TRANSFORMATION_HUB = 'aws.amazonq.showTransformationHub',
+    FOCUS_JOB_HISTORY = 'aws.amazonq.showHistoryInHub',
 }
 
 export default class MessengerUtils {
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -20,6 +20,7 @@ import {
     TransformationType,
     TransformationCandidateProject,
     RegionProfile,
+    sessionJobHistory,
 } from '../models/model'
 import {
     createZipManifest,
@@ -78,6 +79,7 @@ import { convertDateToTimestamp } from '../../shared/datetime'
 import { findStringInDirectory } from '../../shared/utilities/workspaceUtils'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import { AuthUtil } from '../util/authUtil'
+import { homedir } from 'os'
 
 export function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
@@ -739,6 +741,33 @@ export async function postTransformationJob() {
     if (transformByQState.isSucceeded() || transformByQState.isPartiallySucceeded()) {
         await vscode.commands.executeCommand('aws.amazonq.transformationHub.reviewChanges.startReview')
     }
+
+    // store job details and diff path locally (history)
+    // TODO: ideally when job is cancelled, should be stored as CANCELLED instead of FAILED (remove this if statement after bug is fixed)
+    if (!transformByQState.isCancelled()) {
+        const jobHistoryFilePath = path.join(homedir(), '.aws', 'transform', 'transformation-history.tsv')
+        // create transform folder if necessary
+        if (!fs.existsSync(jobHistoryFilePath)) {
+            fs.mkdirSync(path.dirname(jobHistoryFilePath), { recursive: true })
+            // create headers of new transformation history file
+            fs.writeFileSync(jobHistoryFilePath, 'date\tproject_name\tstatus\tduration\tdiff_path\tjob_id\n')
+        }
+        const latest = sessionJobHistory[transformByQState.getJobId()]
+        const jobDetails: string =
+            latest.startTime +
+            '\t' +
+            latest.projectName +
+            '\t' +
+            latest.status +
+            '\t' +
+            latest.duration +
+            '\t' +
+            transformByQState.getDiffPatchFilePath() +
+            '\t' +
+            transformByQState.getJobId() +
+            '\n'
+        fs.writeFileSync(jobHistoryFilePath, jobDetails, { flag: 'a' })
+    }
 }
 
 export async function transformationJobErrorHandler(error: any) {
diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts
@@ -730,6 +730,7 @@ export class TransformByQState {
     private planFilePath: string = ''
     private summaryFilePath: string = ''
     private preBuildLogFilePath: string = ''
+    private diffPatchFilePath: string = ''
 
     private resultArchiveFilePath: string = ''
     private projectCopyFilePath: string = ''
@@ -881,6 +882,10 @@ export class TransformByQState {
         return this.summaryFilePath
     }
 
+    public getDiffPatchFilePath() {
+        return this.diffPatchFilePath
+    }
+
     public getResultArchiveFilePath() {
         return this.resultArchiveFilePath
     }
@@ -1055,6 +1060,10 @@ export class TransformByQState {
         this.summaryFilePath = filePath
     }
 
+    public setDiffPatchFilePath(filePath: string) {
+        return (this.diffPatchFilePath = filePath)
+    }
+
     public setResultArchiveFilePath(filePath: string) {
         this.resultArchiveFilePath = filePath
     }
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts
@@ -24,6 +24,9 @@ import { startInterval } from '../../commands/startTransformByQ'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
 import { convertToTimeString } from '../../../shared/datetime'
 import { AuthUtil } from '../../util/authUtil'
+import fs from 'fs'
+import path from 'path'
+import { homedir } from 'os'
 
 export class TransformationHubViewProvider implements vscode.WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.transformationHub'
@@ -88,6 +91,48 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
     }
 
     private showJobHistory(): string {
+        const history: {
+            startTime: string
+            projectName: string
+            status: string
+            duration: string
+            diffPath: string
+            jobId: string
+        }[] = []
+        const jobHistoryFilePath = path.join(homedir(), '.aws', 'transform', 'transformation-history.tsv')
+        if (fs.existsSync(jobHistoryFilePath)) {
+            const historyFile = fs.readFileSync(jobHistoryFilePath, { encoding: 'utf8', flag: 'r' })
+            const jobs = historyFile.split('\n')
+            jobs.shift() // removes headers
+            if (jobs.length > 0) {
+                jobs.forEach((job) => {
+                    if (job) {
+                        const jobInfo = job.split('\t')
+                        const jobObject = {
+                            startTime: jobInfo[0],
+                            projectName: jobInfo[1],
+                            status: jobInfo[2],
+                            duration: jobInfo[3],
+                            diffPath: jobInfo[4],
+                            jobId: jobInfo[5],
+                        }
+                        history.push(jobObject)
+                    }
+                })
+            }
+        }
+        if (transformByQState.isRunning()) {
+            const current = sessionJobHistory[transformByQState.getJobId()]
+            history.push({
+                startTime: current.startTime,
+                projectName: current.projectName,
+                status: current.status,
+                duration: current.duration,
+                diffPath: transformByQState.getDiffPatchFilePath(),
+                jobId: transformByQState.getJobId(),
+            })
+        }
+        history.reverse() // to show in descending order, chronologically
         return `<!DOCTYPE html>
             <html lang="en">
             <head>
@@ -99,17 +144,26 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             </style>
             </head>
             <body>
-            <p><b>Transformation Status</b></p>
+            <p><b>Transformation History</b></p>
             ${
-                Object.keys(sessionJobHistory).length === 0
+                history.length === 0
                     ? `<p>${CodeWhispererConstants.nothingToShowMessage}</p>`
-                    : this.getTableMarkup(sessionJobHistory[transformByQState.getJobId()])
+                    : this.getTableMarkup(history)
             }
             </body>
             </html>`
     }
 
-    private getTableMarkup(job: { startTime: string; projectName: string; status: string; duration: string }) {
+    private getTableMarkup(
+        history: {
+            startTime: string
+            projectName: string
+            status: string
+            duration: string
+            diffPath: string
+            jobId: string
+        }[]
+    ) {
         return `
             <table border="1" style="border-collapse:collapse">
                 <thead>
@@ -118,17 +172,25 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
                         <th>Project</th>
                         <th>Status</th>
                         <th>Duration</th>
-                        <th>Id</th>
+                        <th>Diff Path</th>
+                        <th>Job Id</th>
                     </tr>
                 </thead>
                 <tbody>
-                <tr>
-                    <td>${job.startTime}</td>
-                    <td>${job.projectName}</td>
-                    <td>${job.status}</td>
-                    <td>${job.duration}</td>
-                    <td>${transformByQState.getJobId()}</td>
-                </tr>
+                ${history
+                    .map(
+                        (job) => `
+                    <tr>
+                        <td>${job.startTime}</td>
+                        <td>${job.projectName}</td>
+                        <td>${job.status}</td>
+                        <td>${job.duration}</td>
+                        <td><a href="vscode://file${job.diffPath}">${job.diffPath}</a></td>
+                        <td>${job.jobId}</td>
+                    </tr>
+                `
+                    )
+                    .join('')}
                 </tbody>
             </table>
         `
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
@@ -426,13 +426,29 @@ export class ProposedTransformationExplorer {
             let deserializeErrorMessage = undefined
             let pathContainingArchive = ''
             patchFiles = [] // reset patchFiles if there was a previous transformation
+
+            // create transform, project, and job folders if needed (to store diff patch)
+            const jobDiffPath = path.join(
+                os.homedir(),
+                '.aws',
+                'transform',
+                transformByQState.getProjectName(),
+                transformByQState.getJobId(),
+                'diff.patch'
+            )
+            if (!fs.existsSync(jobDiffPath)) {
+                fs.mkdirSync(path.dirname(jobDiffPath), { recursive: true })
+            }
+            transformByQState.setDiffPatchFilePath(jobDiffPath)
+
             try {
                 // Download and deserialize the zip
                 pathContainingArchive = path.dirname(pathToArchive)
                 const zip = new AdmZip(pathToArchive)
                 zip.extractAllTo(pathContainingArchive)
                 const files = fs.readdirSync(path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch))
                 singlePatchFile = path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch, files[0])
+                fs.copyFileSync(singlePatchFile, transformByQState.getDiffPatchFilePath()) // store diff patch locally
                 patchFiles.push(singlePatchFile)
                 diffModel.parseDiff(patchFiles[0], transformByQState.getProjectPath())
 

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@`
`746`	`746`	`},`
`747`	`747`	`{`
`748`	`748`	`"command": "aws.amazonq.showHistoryInHub",`
`749`		`- "title": "%AWS.command.q.transform.viewJobStatus%"`
	`749`	`+ "title": "%AWS.command.q.transform.viewJobHistory%"`
`750`	`750`	`},`
`751`	`751`	`{`
`752`	`752`	`"command": "aws.amazonq.selectCustomization",`