Skip to content

Commit f3018da

Browse files
authored
feat: workspace open settings (#1055)
* feat: prompt to open user settings for local ws indexing * chore: updated packages * fix: fixed buttons not shown * fix: fixed buttons not shown * fix: fixed MynahUI dependency * chore: fixed unit tests
1 parent a0ca8e0 commit f3018da

File tree

29 files changed

+5712
-2017
lines changed

29 files changed

+5712
-2017
lines changed

app/aws-lsp-antlr4-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"webpack": "webpack"
1313
},
1414
"dependencies": {
15-
"@aws/language-server-runtimes": "^0.2.72",
15+
"@aws/language-server-runtimes": "^0.2.73",
1616
"@aws/lsp-antlr4": "*",
1717
"antlr4-c3": "^3.4.1",
1818
"antlr4ng": "^3.0.4"

app/aws-lsp-codewhisperer-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test": "node scripts/test-runner.js"
1414
},
1515
"dependencies": {
16-
"@aws/language-server-runtimes": "^0.2.72",
16+
"@aws/language-server-runtimes": "^0.2.73",
1717
"@aws/lsp-codewhisperer": "*",
1818
"copyfiles": "^2.4.1",
1919
"cross-env": "^7.0.3",

app/aws-lsp-identity-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.72",
10+
"@aws/language-server-runtimes": "^0.2.73",
1111
"@aws/lsp-identity": "^0.0.1"
1212
}
1313
}

app/aws-lsp-json-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"webpack": "webpack"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.72",
14+
"@aws/language-server-runtimes": "^0.2.73",
1515
"@aws/lsp-json": "*"
1616
},
1717
"devDependencies": {

app/aws-lsp-notification-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.72",
10+
"@aws/language-server-runtimes": "^0.2.73",
1111
"@aws/lsp-notification": "^0.0.1"
1212
}
1313
}

app/aws-lsp-yaml-json-webworker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"serve:webpack": "NODE_ENV=development webpack serve"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.72",
14+
"@aws/language-server-runtimes": "^0.2.73",
1515
"@aws/lsp-json": "*",
1616
"@aws/lsp-yaml": "*"
1717
},

app/aws-lsp-yaml-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"webpack": "webpack"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.72",
14+
"@aws/language-server-runtimes": "^0.2.73",
1515
"@aws/lsp-yaml": "*"
1616
},
1717
"devDependencies": {

app/hello-world-lsp-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@aws/hello-world-lsp": "^0.0.1",
18-
"@aws/language-server-runtimes": "^0.2.71"
18+
"@aws/language-server-runtimes": "^0.2.73"
1919
},
2020
"devDependencies": {
2121
"@types/chai": "^4.3.5",

chat-client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"package": "webpack"
2222
},
2323
"dependencies": {
24-
"@aws/chat-client-ui-types": "^0.1.27",
25-
"@aws/language-server-runtimes-types": "^0.1.22",
24+
"@aws/chat-client-ui-types": "^0.1.28",
25+
"@aws/language-server-runtimes-types": "^0.1.23",
2626
"@aws/mynah-ui": "^4.31.0-beta.6"
2727
},
2828
"devDependencies": {

chat-client/src/client/chat.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
UiResultMessage,
3232
CHAT_PROMPT_OPTION_ACKNOWLEDGED,
3333
STOP_CHAT_RESPONSE,
34+
OPEN_SETTINGS,
3435
} from '@aws/chat-client-ui-types'
3536
import {
3637
BUTTON_CLICK_REQUEST_METHOD,
@@ -351,6 +352,9 @@ export const createChat = (
351352
sendButtonClickEvent: params => {
352353
sendMessageToClient({ command: BUTTON_CLICK_REQUEST_METHOD, params: params })
353354
},
355+
onOpenSettings: (settingKey: string) => {
356+
sendMessageToClient({ command: OPEN_SETTINGS, params: { settingKey } })
357+
},
354358
}
355359

356360
const messager = new Messager(chatApi)

chat-client/src/client/messager.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export interface OutboundChatApi {
9393
promptInputOptionChange(params: PromptInputOptionChangeParams): void
9494
stopChatResponse(tabId: string): void
9595
sendButtonClickEvent(params: ButtonClickParams): void
96+
onOpenSettings(settingKey: string): void
9697
}
9798

9899
export class Messager {
@@ -231,4 +232,8 @@ export class Messager {
231232
onButtonClick = (params: ButtonClickParams): void => {
232233
this.chatApi.sendButtonClickEvent(params)
233234
}
235+
236+
onOpenSettings = (settingKey: string): void => {
237+
this.chatApi.onOpenSettings(settingKey)
238+
}
234239
}

chat-client/src/client/mynahUi.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ describe('MynahUI', () => {
5757
promptInputOptionChange: sinon.stub(),
5858
stopChatResponse: sinon.stub(),
5959
sendButtonClickEvent: sinon.stub(),
60+
onOpenSettings: sinon.stub(),
6061
}
6162

6263
messager = new Messager(outboundChatApi)

chat-client/src/client/mynahUi.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
InfoLinkClickParams,
2727
LinkClickParams,
2828
ListConversationsResult,
29+
OPEN_WORKSPACE_INDEX_SETTINGS_BUTTON_ID,
2930
OpenTabParams,
3031
SourceLinkClickParams,
3132
} from '@aws/language-server-runtimes-types'
@@ -325,6 +326,8 @@ export const createMynahUi = (
325326
Object.keys(mynahUi.getAllTabs()).forEach(storeTabKey => {
326327
mynahUi.updateStore(storeTabKey, { promptInputStickyCard: null })
327328
})
329+
} else if (action.id === OPEN_WORKSPACE_INDEX_SETTINGS_BUTTON_ID) {
330+
messager.onOpenSettings('amazonQ.workspaceIndex')
328331
} else {
329332
const payload: ButtonClickParams = {
330333
tabId,

client/vscode/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@
345345
"devDependencies": {
346346
"@aws-sdk/credential-providers": "^3.731.1",
347347
"@aws-sdk/types": "^3.734.0",
348-
"@aws/chat-client-ui-types": "^0.1.27",
349-
"@aws/language-server-runtimes": "^0.2.72",
348+
"@aws/chat-client-ui-types": "^0.1.28",
349+
"@aws/language-server-runtimes": "^0.2.73",
350350
"@types/uuid": "^9.0.8",
351351
"@types/vscode": "^1.98.0",
352352
"jose": "^5.2.4",

0 commit comments

Comments
 (0)