From a796ae9f0c7372fff1feb2790deb4a4cca4234a9 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 31 Dec 2024 01:51:19 +0000 Subject: [PATCH 1/2] Switch to studio.datachain.ai --- README.md | 4 ++-- extension/resources/walkthrough/more-resources.md | 2 +- extension/src/setup/webview/contract.ts | 2 +- extension/src/test/suite/experiments/index.test.ts | 6 +++--- extension/src/test/suite/experiments/util.ts | 2 +- extension/src/test/suite/setup/index.test.ts | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 63d97fae39..ee8e486ecb 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,8 @@ more information. https://marketplace.visualstudio.com/items?itemName=ms-python.python [studio.token]: https://dvc.org/doc/user-guide/project-structure/configuration#studio -[dvc studio]: https://studio.dvc.ai -[studio]: https://studio.dvc.ai +[dvc studio]: https://studio.datachain.ai +[studio]: https://studio.datachain.ai [workspace level]: https://code.visualstudio.com/docs/getstarted/settings#_workspace-settings [python.envFile]: diff --git a/extension/resources/walkthrough/more-resources.md b/extension/resources/walkthrough/more-resources.md index 13518bb9ac..2382cbda01 100644 --- a/extension/resources/walkthrough/more-resources.md +++ b/extension/resources/walkthrough/more-resources.md @@ -34,4 +34,4 @@ [blog]: https://dvc.org/blog [community]: https://dvc.org/community [dvc github repository]: https://github.com/iterative/dvc -[dvc studio]: https://studio.dvc.ai/ +[dvc studio]: https://studio.datachain.ai/ diff --git a/extension/src/setup/webview/contract.ts b/extension/src/setup/webview/contract.ts index 0c33ea2d1c..4581863f37 100644 --- a/extension/src/setup/webview/contract.ts +++ b/extension/src/setup/webview/contract.ts @@ -43,4 +43,4 @@ export const DEFAULT_SECTION_COLLAPSED = { export type SectionCollapsed = typeof DEFAULT_SECTION_COLLAPSED -export const DEFAULT_STUDIO_URL = 'https://studio.dvc.ai' +export const DEFAULT_STUDIO_URL = 'https://studio.datachain.ai' diff --git a/extension/src/test/suite/experiments/index.test.ts b/extension/src/test/suite/experiments/index.test.ts index 6484b0500c..bac44dc95c 100644 --- a/extension/src/test/suite/experiments/index.test.ts +++ b/extension/src/test/suite/experiments/index.test.ts @@ -770,7 +770,7 @@ suite('Experiments Test Suite', () => { mockExpPush.callsFake(() => { resolve(undefined) return Promise.resolve( - "Experiment major-lamb is up to date on Git remote 'origin'.\nView your experiments at \nhttps://studio.dvc.ai/user/mattseddon/projects/vscode-dvc-demo-ynm6t3jxdx" + "Experiment major-lamb is up to date on Git remote 'origin'.\nView your experiments at \nhttps://studio.datachain.ai/user/mattseddon/projects/vscode-dvc-demo-ynm6t3jxdx" ) }) ) @@ -805,7 +805,7 @@ suite('Experiments Test Suite', () => { expect(mockReport).to.be.calledWithExactly({ increment: 75, message: - "Experiment major-lamb is up to date on Git remote 'origin'.\nView your experiments in [DVC Studio](https://studio.dvc.ai/user/mattseddon/projects/vscode-dvc-demo-ynm6t3jxdx)" + "Experiment major-lamb is up to date on Git remote 'origin'.\nView your experiments in [DVC Studio](https://studio.datachain.ai/user/mattseddon/projects/vscode-dvc-demo-ynm6t3jxdx)" }) messageSpy.restore() @@ -851,7 +851,7 @@ suite('Experiments Test Suite', () => { await writeToClipboardCalled const link = - 'https://studio.dvc.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' + + 'https://studio.datachain.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' + '?showOnlySelected=1' + '&experimentReferences=4fb124aebddb2adf1545030907687fa9a4c80e70' diff --git a/extension/src/test/suite/experiments/util.ts b/extension/src/test/suite/experiments/util.ts index f75da33e50..de6b238ada 100644 --- a/extension/src/test/suite/experiments/util.ts +++ b/extension/src/test/suite/experiments/util.ts @@ -36,7 +36,7 @@ export const DEFAULT_EXPERIMENTS_OUTPUT = { } export const mockBaseStudioUrl = - 'https://studio.dvc.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' + 'https://studio.datachain.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' export const buildExperiments = ({ availableNbCommits = { main: 5 }, diff --git a/extension/src/test/suite/setup/index.test.ts b/extension/src/test/suite/setup/index.test.ts index f7a7082d0a..5788d94155 100644 --- a/extension/src/test/suite/setup/index.test.ts +++ b/extension/src/test/suite/setup/index.test.ts @@ -885,9 +885,9 @@ suite('Setup Test Suite', () => { const mockUriHandlerDispose = stub() const mockStudioRes = { device_code: 'Yi-NPd9ggvNUDBcam5bP8iivbtLhnqVgM_lSSbilqNw', - token_uri: 'https://studio.dvc.ai/api/device-login/token', + token_uri: 'https://studio.datachain.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.dvc.ai/auth/device-login' + verification_uri: 'https://studio.datachain.ai/auth/device-login' } const mockCallbackUrl = 'url-to-vscode' @@ -1013,9 +1013,9 @@ suite('Setup Test Suite', () => { json: () => Promise.resolve({ device_code: 'Yi-NPd9ggvNUDBcam5bP8iivbtLhnqVgM_lSSbilqNw', - token_uri: 'https://studio.dvc.ai/api/device-login/token', + token_uri: 'https://studio.datachain.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.dvc.ai/auth/device-login' + verification_uri: 'https://studio.datachain.ai/auth/device-login' }) } as Fetch.Response) const openUrlEvent = new Promise(resolve => @@ -1071,9 +1071,9 @@ suite('Setup Test Suite', () => { json: () => Promise.resolve({ device_code: 'Yi-NPd9ggvNUDBcam5bP8iivbtLhnqVgM_lSSbilqNw', - token_uri: 'https://studio.dvc.ai/api/device-login/token', + token_uri: 'https://studio.datachain.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.dvc.ai/auth/device-login' + verification_uri: 'https://studio.datachain.ai/auth/device-login' }) } as Fetch.Response) From 9e66d9217bcf8c83215aca6ebf26bc8b2b1daf57 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 31 Dec 2024 02:02:19 +0000 Subject: [PATCH 2/2] Update index.ts --- extension/src/experiments/commands/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/src/experiments/commands/index.ts b/extension/src/experiments/commands/index.ts index bad26baf5f..19ca4b9a47 100644 --- a/extension/src/experiments/commands/index.ts +++ b/extension/src/experiments/commands/index.ts @@ -63,7 +63,7 @@ const promptToAddStudioToken = async () => { } const convertUrlTextToLink = (stdout: string) => { - const experimentAtRegex = /\sat\s+(https:\/\/studio\.dvc\.ai\/.*$)/ + const experimentAtRegex = /\sat\s+(https:\/\/studio\.datachain\.ai\/.*$)/ const match = stdout.match(experimentAtRegex) if (!(match?.[0] && match?.[1])) { return stdout