Merge master into feature/serverlessland

aws-toolkit-automation · web-flow · commit e63ca978aa0c · 2025-01-22T14:29:17.000+01:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json b/packages/amazonq/.changes/next-release/Bug Fix-a49b3835-40c5-4878-ac0c-c4c613f1bf97.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Notifications: 'Dismiss' command visible in command palette."
+}
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -198,7 +198,7 @@
                 {
                     "id": "aws.amazonq.notifications",
                     "name": "%AWS.notifications.title%",
-                    "when": "!isCloud9 && !aws.isSageMaker && aws.amazonq.notifications.show"
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.amazonq.notifications.show"
                 },
                 {
                     "type": "webview",
@@ -496,7 +496,7 @@
                 "command": "_aws.amazonq.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
                 "category": "%AWS.amazonq.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "enablement": "view == aws.amazonq.notifications",
                 "icon": "$(remove-close)"
             },
             {
diff --git a/packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json b/packages/toolkit/.changes/next-release/Bug Fix-f7aec5a8-a21c-4539-9ed4-820dd9887598.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Notifications: 'Dismiss' command visible in command palette."
+}
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -732,7 +732,7 @@
                 {
                     "id": "aws.toolkit.notifications",
                     "name": "%AWS.notifications.title%",
-                    "when": "!isCloud9 && !aws.isSageMaker && aws.toolkit.notifications.show"
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.toolkit.notifications.show"
                 },
                 {
                     "id": "aws.amazonq.codewhisperer",
@@ -2231,7 +2231,7 @@
                 "command": "_aws.toolkit.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
                 "category": "%AWS.title%",
-                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "enablement": "view == aws.toolkit.notifications",
                 "icon": "$(remove-close)"
             },
             {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Notifications: 'Dismiss' command visible in command palette."
 +}
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@`
`198`	`198`	`{`
`199`	`199`	`"id": "aws.amazonq.notifications",`
`200`	`200`	`"name": "%AWS.notifications.title%",`
`201`		`- "when": "!isCloud9 && !aws.isSageMaker && aws.amazonq.notifications.show"`
	`201`	`+ "when": "!(isCloud9 \|\| aws.isSageMaker) && aws.amazonq.notifications.show"`
`202`	`202`	`},`
`203`	`203`	`{`
`204`	`204`	`"type": "webview",`
`@@ -496,7 +496,7 @@`
`496`	`496`	`"command": "_aws.amazonq.notifications.dismiss",`
`497`	`497`	`"title": "%AWS.generic.dismiss%",`
`498`	`498`	`"category": "%AWS.amazonq.title%",`
`499`		`- "enablement": "isCloud9 \|\| !aws.isWebExtHost",`
	`499`	`+ "enablement": "view == aws.amazonq.notifications",`
`500`	`500`	`"icon": "$(remove-close)"`
`501`	`501`	`},`
`502`	`502`	`{`
Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@`
`732`	`732`	`{`
`733`	`733`	`"id": "aws.toolkit.notifications",`
`734`	`734`	`"name": "%AWS.notifications.title%",`
`735`		`- "when": "!isCloud9 && !aws.isSageMaker && aws.toolkit.notifications.show"`
	`735`	`+ "when": "!(isCloud9 \|\| aws.isSageMaker) && aws.toolkit.notifications.show"`
`736`	`736`	`},`
`737`	`737`	`{`
`738`	`738`	`"id": "aws.amazonq.codewhisperer",`
`@@ -2231,7 +2231,7 @@`
`2231`	`2231`	`"command": "_aws.toolkit.notifications.dismiss",`
`2232`	`2232`	`"title": "%AWS.generic.dismiss%",`
`2233`	`2233`	`"category": "%AWS.title%",`
`2234`		`- "enablement": "isCloud9 \|\| !aws.isWebExtHost",`
	`2234`	`+ "enablement": "view == aws.toolkit.notifications",`
`2235`	`2235`	`"icon": "$(remove-close)"`
`2236`	`2236`	`},`
`2237`	`2237`	`{`