Fixes

chrisqm-dev · chrisqm-dev · commit 33bbce9efb96 · 2025-11-25T14:16:46.000-05:00
diff --git a/packages/core/src/awsService/cloudformation/ui/diffWebviewProvider.ts b/packages/core/src/awsService/cloudformation/ui/diffWebviewProvider.ts
@@ -9,6 +9,7 @@ import { DiffViewHelper } from './diffViewHelper'
 import { commandKey } from '../utils'
 import { StackViewCoordinator } from './stackViewCoordinator'
 import { showWarningConfirmation } from './message'
+import { ChangeSetStatus } from '@aws-sdk/client-cloudformation'
 
 const webviewCommandOpenDiff = 'openDiff'
 
@@ -153,7 +154,9 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
                 <body>
                     <p>No changes detected for stack: ${this.stackName}</p>
                     ${
-                        this.changeSetName
+                        this.changeSetName &&
+                        (this.changeSetStatus === ChangeSetStatus.CREATE_COMPLETE ||
+                            this.changeSetStatus === ChangeSetStatus.FAILED)
                             ? `
                     <div class="deletion-button" style="margin: 10px 0; text-align: left; display: inline-block;">
                         ${deletionButton}
@@ -381,11 +384,14 @@ export class DiffWebviewProvider implements WebviewViewProvider, Disposable {
         `
 
         const deploymentButtons =
-            this.changeSetName && this.enableDeployments
+            this.changeSetName &&
+            this.enableDeployments &&
+            (this.changeSetStatus === ChangeSetStatus.CREATE_COMPLETE ||
+                this.changeSetStatus === ChangeSetStatus.FAILED)
                 ? `
             <div class="deployment-actions" style="margin: 10px 0; text-align: left; display: inline-block;">
                 ${
-                    this.changeSetStatus === 'CREATE_COMPLETE'
+                    this.changeSetStatus === ChangeSetStatus.CREATE_COMPLETE
                         ? `
                 <button id="confirmDeploy" onclick="confirmDeploy()" style="
                     background-color: var(--vscode-button-background);
diff --git a/packages/core/src/test/awsService/cloudformation/ui/diffWebviewProvider.test.ts b/packages/core/src/test/awsService/cloudformation/ui/diffWebviewProvider.test.ts
@@ -339,14 +339,8 @@ describe('DiffWebviewProvider', function () {
         })
 
         it('should not show deploy button when changeset is not CREATE_COMPLETE', function () {
-            const changes: StackChange[] = [
-                {
-                    resourceChange: {
-                        action: 'Add',
-                        logicalResourceId: 'TestResource',
-                    },
-                },
-            ]
+            // changes are not available if a changeset is not created
+            const changes: StackChange[] = []
 
             void provider.updateData(
                 'test-stack',
@@ -407,6 +401,53 @@ describe('DiffWebviewProvider', function () {
             assert.ok(!mockWebview.webview.html.includes('Deploy Changes'))
             assert.ok(!mockWebview.webview.html.includes('deployment-actions'))
         })
+
+        it('should not show deployment buttons when changeset status is DELETE_PENDING', function () {
+            const changes: StackChange[] = [
+                {
+                    resourceChange: {
+                        action: 'Add',
+                        logicalResourceId: 'TestResource',
+                    },
+                },
+            ]
+
+            void provider.updateData(
+                'test-stack',
+                changes,
+                'test-changeset',
+                true,
+                undefined,
+                undefined,
+                'DELETE_PENDING'
+            )
+            const mockWebview = createMockWebview()
+            provider.resolveWebviewView(mockWebview as any)
+
+            assert.ok(!mockWebview.webview.html.includes('Deploy Changes'))
+            assert.ok(!mockWebview.webview.html.includes('Delete Changeset'))
+            assert.ok(!mockWebview.webview.html.includes('deployment-actions'))
+        })
+
+        it('should not show deployment buttons when changeset status is CREATE_PENDING', function () {
+            const changes: StackChange[] = []
+
+            void provider.updateData(
+                'test-stack',
+                changes,
+                'test-changeset',
+                true,
+                undefined,
+                undefined,
+                'CREATE_PENDING'
+            )
+            const mockWebview = createMockWebview()
+            provider.resolveWebviewView(mockWebview as any)
+
+            assert.ok(!mockWebview.webview.html.includes('Deploy Changes'))
+            assert.ok(!mockWebview.webview.html.includes('Delete Changeset'))
+            assert.ok(!mockWebview.webview.html.includes('deployment-actions'))
+        })
     })
 
     describe('pagination', function () {
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-91b7177a-6dff-4062-bde6-21e3ba6efdf4.json b/packages/toolkit/.changes/next-release/Bug Fix-91b7177a-6dff-4062-bde6-21e3ba6efdf4.json
@@ -1,4 +1,4 @@
 {
 	"type": "Bug Fix",
-	"description": "hide deployment button when change set is not deployable, add delete button when change set has no changes"
+	"description": "CloudFormation: hide deployment button when change set is not deployable, add delete button when change set has no changes"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "Bug Fix",`
`3`		`- "description": "hide deployment button when change set is not deployable, add delete button when change set has no changes"`
	`3`	`+ "description": "CloudFormation: hide deployment button when change set is not deployable, add delete button when change set has no changes"`
`4`	`4`	`}`