Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Development to main for release #404

Merged
merged 13 commits into from
Jul 1, 2024
Merged

Merge Development to main for release #404

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
56572d7
Da 377 webview resets bug fix (#386)
lokesh-couchbase May 23, 2024
81e1f36
DA-380 Add KV Type document filtering (#385)
lokesh-couchbase May 23, 2024
76b0efc
DA-442 add named parameter support (#387)
lokesh-couchbase May 28, 2024
c801a21
DA-450 basic workbench keyword recommendation (#389)
lokesh-couchbase May 29, 2024
4c02da3
bump package version
lokesh-couchbase May 29, 2024
15a3398
Da 451 release bug fix (#391)
lokesh-couchbase May 29, 2024
ecc2487
DA-459 add n1ql file support (#394)
lokesh-couchbase Jun 5, 2024
e60f755
Merge Branch Main into development (#396)
lokesh-couchbase Jun 12, 2024
818cb5b
bump version and remove unwanted line in code
lokesh-couchbase Jun 12, 2024
83236a2
resolve merge conflicts
lokesh-couchbase Jun 12, 2024
04d3397
resolve merge conflicts
lokesh-couchbase Jun 12, 2024
5ca51b7
Add UI Support for DynamoDB to Couchbase (#403)
prajwal-pai77 Jul 1, 2024
4697ffe
merge main to development
prajwal-pai77 Jul 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: windows-specific
shell: pwsh
if: matrix.platform == 'win32'
run: choco install openssl.light --version=1.1.1 && choco install cmake --global && npm install --global cmake-js node-gyp && echo CMAKE_JS_LIB - $CMAKE_JS_LIB
run: choco install openssl.light --version=1.1.1 && choco install cmake --global && npm install --global cmake-js node-gyp && echo CMAKE_JS_LIB - $CMAKE_JS_LIB
- name: mac-specific
shell: bash
if: matrix.platform == 'darwin'
Expand Down
1,319 changes: 1,315 additions & 4 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 28 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-couchbase",
"displayName": "Couchbase",
"description": "",
"version": "2.0.3",
"version": "2.0.5",
"engines": {
"vscode": "^1.63.1"
},
Expand Down Expand Up @@ -91,6 +91,8 @@
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@aws-sdk/client-dynamodb": "^3.602.0",
"@aws-sdk/credential-providers": "^3.600.0",
"@chatscope/chat-ui-kit-styles": "^1.4.0",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
Expand Down Expand Up @@ -569,6 +571,11 @@
"title": "MongoDB Migrate",
"category": "Couchbase"
},
{
"command": "vscode-couchbase.tools.dynamodbMigrate",
"title": "DynamoDB Migrate",
"category": "Couchbase"
},
{
"command": "vscode-couchbase.tools.dataImport",
"title": "Data Import",
Expand Down Expand Up @@ -694,44 +701,44 @@
"command": "vscode-couchbase.runQuery",
"key": "ctrl+shift+e",
"mac": "cmd+shift+e",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster"
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster"
}
],
"menus": {
"editor/title": [
{
"command": "vscode-couchbase.runQuery",
"category": "Couchbase",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster",
"group": "navigation@1"
},
{
"title": "Query Context",
"command": "vscode-couchbase.queryContext",
"category": "Couchbase",
"group": "navigation@2",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster"
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster"
},
{
"title": "Show Favorite Queries",
"command": "vscode-couchbase.showFavoriteQueries",
"category": "Couchbase",
"group": "navigation@3",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster"
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster"
},
{
"title": "Mark Favorite Query",
"command": "vscode-couchbase.markFavoriteQuery",
"category": "Couchbase",
"group": "navigation@4",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster"
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster"
},
{
"title": "Show Named Parameters",
"command": "vscode-couchbase.showNamedParameters",
"category": "Couchbase",
"group": "navigation@3",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster"
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster"
},
{
"title": "Refresh Cluster Overview",
Expand All @@ -758,7 +765,7 @@
"editor/context": [
{
"command": "vscode-couchbase.runQuery",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/) && !isKVCluster",
"when": "(editorLangId == sqlpp || resourceFilename =~ /.sqlpp$/ || editorLangId == n1ql || resourceFilename =~ /.n1ql$/) && !isKVCluster",
"group": "navigation@1"
}
],
Expand Down Expand Up @@ -898,6 +905,10 @@
"command": "vscode-couchbase.tools.mdbMigrate",
"when": "false"
},
{
"command": "vscode-couchbase.tools.dynamodbMigrate",
"when": "false"
},
{
"command": "vscode-couchbase.tools.dataImport",
"when": "false"
Expand Down Expand Up @@ -1078,19 +1089,23 @@
"vscode-couchbase.toolsMenu": [
{
"command": "vscode-couchbase.tools.dataExport",
"group": "navigation"
"group": "secondary"
},
{
"command": "vscode-couchbase.tools.mdbMigrate",
"group": "navigation"
"group": "tertiary"
},
{
"command": "vscode-couchbase.tools.dynamodbMigrate",
"group": "tertiary"
},
{
"command": "vscode-couchbase.tools.dataImport",
"group": "navigation"
"group": "secondary"
},
{
"command": "vscode-couchbase.tools.DDLExport",
"group": "navigation"
"group": "secondary"
}
],
"vscode-couchbase.filterDocumentsMenu": [
Expand Down Expand Up @@ -1185,4 +1200,4 @@
}
]
}
}
}
1 change: 1 addition & 0 deletions src/commands/extensionCommands/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export namespace Commands {
export const checkAndCreatePrimaryIndex: string = "vscode-couchbase.checkAndCreatePrimaryIndex";
export const dataExport: string = "vscode-couchbase.tools.dataExport";
export const mdbMigrate: string = "vscode-couchbase.tools.mdbMigrate";
export const dynamodbMigrate: string = "vscode-couchbase.tools.dynamodbMigrate";
export const dataImport: string = "vscode-couchbase.tools.dataImport";
export const ddlExport: string = "vscode-couchbase.tools.DDLExport";
export const couchbaseIqViewsCommand: string = "couchbase-iq";
Expand Down
10 changes: 10 additions & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import { SecretService } from "./util/secretService";
import { kvTypeFilterDocuments } from "./commands/documents/documentFilters/kvTypeFilterDocuments";
import { fetchNamedParameters } from "./pages/namedParameters/namedParameters";
import { sqlppComlpletions, sqlppNamedParametersCompletions, sqlppSchemaComlpletions } from "./commands/sqlpp/sqlppCompletions";
import { dynamodbMigrate } from "./pages/Tools/DynamoDbMigrate/dynamoDbMigrate";

export function activate(context: vscode.ExtensionContext) {
Global.setState(context.globalState);
Expand Down Expand Up @@ -586,6 +587,15 @@ export function activate(context: vscode.ExtensionContext) {
)
);

subscriptions.push(
vscode.commands.registerCommand(
Commands.dynamodbMigrate,
async () => {
await dynamodbMigrate(context);
}
)
);

subscriptions.push(
vscode.commands.registerCommand(
Commands.dataImport,
Expand Down
12 changes: 6 additions & 6 deletions src/handlers/handleCLIDownloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_amd64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_amd64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.MACOS_64
)
Expand Down Expand Up @@ -141,7 +141,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_arm64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_arm64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.MACOS_ARM
)
Expand Down Expand Up @@ -174,7 +174,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.WINDOWS_64
)
Expand Down Expand Up @@ -207,7 +207,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.WINDOWS_ARM
)
Expand Down Expand Up @@ -240,7 +240,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_amd64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_amd64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.LINUX_64
)
Expand All @@ -265,7 +265,7 @@ class DependenciesDownloader {
map.set(
this.TOOL_MDB_MIGRATE,
this.getToolSpec(
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_arm64.zip",
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_arm64.zip",
this.TOOL_MDB_MIGRATE,
OSUtil.LINUX_ARM
)
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/versionConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const config = {
SHELL_KEY: "shell",
CBIMPORT_EXPORT_KEY: "cbimport_export",
TOOLS_VERSION: "7.2",
CBMIGRATE_VERSION: "1",
CBMIGRATE_VERSION: "2",
SHELL_VERSION: "1",
CBIMPORT_EXPORT_VERSION: "7.6",
};
Loading
Loading