From 8505c3c74060b152c23611dd69bb361cf4a5560e Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Mon, 15 Jul 2024 21:11:09 -0700 Subject: [PATCH 1/2] rename iterative.ai to dvc.ai in Studio domain --- README.md | 6 +++--- extension/resources/walkthrough/more-resources.md | 2 +- extension/src/experiments/commands/index.ts | 2 +- extension/src/setup/webview/contract.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 94c042981d..63d97fae39 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Management]. For deeper learning, try our [free course]! [More resources]. [experiments]: https://dvc.org/doc/start/experiments [data management]: https://dvc.org/doc/start/data-management -[free course]: https://learn.iterative.ai/ +[free course]: https://learn.dvc.ai/ [more resources]: https://github.com/iterative/vscode-dvc/blob/main/extension/resources/walkthrough/more-resources.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.iterative.ai -[studio]: https://studio.iterative.ai +[dvc studio]: https://studio.dvc.ai +[studio]: https://studio.dvc.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 c017498a3d..13518bb9ac 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.iterative.ai/ +[dvc studio]: https://studio.dvc.ai/ diff --git a/extension/src/experiments/commands/index.ts b/extension/src/experiments/commands/index.ts index 9f7291fb6b..bad26baf5f 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\.iterative\.ai\/.*$)/ + const experimentAtRegex = /\sat\s+(https:\/\/studio\.dvc\.ai\/.*$)/ const match = stdout.match(experimentAtRegex) if (!(match?.[0] && match?.[1])) { return stdout diff --git a/extension/src/setup/webview/contract.ts b/extension/src/setup/webview/contract.ts index d6aefcabc5..0c33ea2d1c 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.iterative.ai' +export const DEFAULT_STUDIO_URL = 'https://studio.dvc.ai' From 1bbccf7aa87b342af7cc601c071e609cae48a417 Mon Sep 17 00:00:00 2001 From: Matt Seddon Date: Tue, 16 Jul 2024 16:04:46 +1000 Subject: [PATCH 2/2] update dangling references --- 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 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extension/src/test/suite/experiments/index.test.ts b/extension/src/test/suite/experiments/index.test.ts index e67b129b26..6484b0500c 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.iterative.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.dvc.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.iterative.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.dvc.ai/user/mattseddon/projects/vscode-dvc-demo-ynm6t3jxdx)" }) messageSpy.restore() @@ -851,7 +851,7 @@ suite('Experiments Test Suite', () => { await writeToClipboardCalled const link = - 'https://studio.iterative.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' + + 'https://studio.dvc.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 e2e9a61ec3..f75da33e50 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.iterative.ai/user/olivaw/projects/vscode-dvc-demo-ynm6t3jxdx' + 'https://studio.dvc.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 c3b9582fd4..f7a7082d0a 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.iterative.ai/api/device-login/token', + token_uri: 'https://studio.dvc.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.iterative.ai/auth/device-login' + verification_uri: 'https://studio.dvc.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.iterative.ai/api/device-login/token', + token_uri: 'https://studio.dvc.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.iterative.ai/auth/device-login' + verification_uri: 'https://studio.dvc.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.iterative.ai/api/device-login/token', + token_uri: 'https://studio.dvc.ai/api/device-login/token', user_code: '40DWMKNA', - verification_uri: 'https://studio.iterative.ai/auth/device-login' + verification_uri: 'https://studio.dvc.ai/auth/device-login' }) } as Fetch.Response)