Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions aws-toolkit-vscode.code-workspace
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
{
"folders": [
{
"path": "."
},
{
"path": "packages/toolkit"
},
{
"path": "packages/core"
},
{
"path": "packages/amazonq"
}
],
"settings": {
"typescript.tsdk": "node_modules/typescript/lib"
}
}
"folders": [
{
"path": ".",
},
{
"path": "packages/toolkit",
},
{
"path": "packages/core",
},
{
"path": "packages/amazonq",
},
],
"settings": {
"typescript.tsdk": "node_modules/typescript/lib",
"workbench.colorCustomizations": {
"activityBar.background": "#0E350E",
"titleBar.activeBackground": "#134A14",
"titleBar.activeForeground": "#F3FCF3",
},
},
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions packages/amazonq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,48 @@
"category": "%AWS.amazonq.title%",
"enablement": "aws.codewhisperer.connected"
},
{
"command": "aws.amazonq.notifications.clear",
"title": "DEBUG Notifications: Clear notifications",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.notifications.reset",
"title": "DEBUG Notifications: Reset notifications",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications"
},
{
"command": "aws.amazonq.notifications.startup1",
"title": "DEBUG Notifications: Send text changelog startup",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.notifications.startup2",
"title": "DEBUG Notifications: Send direct link startup",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.notifications.emergency1",
"title": "DEBUG Notifications: Send workaround emergency",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.notifications.emergency2",
"title": "DEBUG Notifications: Send update and reload emergency",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.notifications.emergency3",
"title": "DEBUG Notifications: Send critical emergency",
"category": "%AWS.amazonq.title%",
"enablement": "aws.amazonq.notifications.debug"
},
{
"command": "aws.amazonq.security.scan",
"title": "%AWS.command.amazonq.security.scan%",
Expand Down
12 changes: 7 additions & 5 deletions packages/core/src/notifications/activation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
*/

import * as vscode from 'vscode'
import { DevSettings } from '../shared/settings'
import { NotificationsController } from './controller'
import { NotificationsNode } from './panelNode'
import { RuleEngine, getRuleContext } from './rules'
import globals from '../shared/extensionGlobals'
import { AuthState } from './types'
import { setContext } from '../shared/vscode/setContext'
import { isAmazonQ } from '../shared/extensionUtilities'
import { getLogger } from '../shared/logger/logger'

/** Time in MS to poll for emergency notifications */
const emergencyPollTime = 1000 * 10 * 60
const emergencyPollTime = 1000 * 6

/**
* Activate the in-IDE notifications module and begin receiving notifications.
Expand All @@ -28,13 +29,14 @@ export async function activate(
authStateFn: () => Promise<AuthState>
) {
// TODO: Currently gated behind feature-flag.
if (!DevSettings.instance.get('notifications', false)) {
return
}
// if (!DevSettings.instance.get('notifications', false)) {
// return
// }

const panelNode = NotificationsNode.instance
panelNode.registerView(context)

await setContext(isAmazonQ() ? 'aws.amazonq.notifications' : 'aws.toolkit.notifications', true)
const controller = new NotificationsController(panelNode)
const engine = new RuleEngine(await getRuleContext(context, initialState))

Expand Down
Loading
Loading