From 5f164daa1d76dc5a623db160a8cc6f14ee071c4c Mon Sep 17 00:00:00 2001 From: julieg18 Date: Tue, 30 May 2023 17:55:17 -0500 Subject: [PATCH 1/2] Add "(pip)" to setup install button --- webview/src/setup/components/App.test.tsx | 4 ++-- webview/src/setup/components/dvc/CliUnavailable.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webview/src/setup/components/App.test.tsx b/webview/src/setup/components/App.test.tsx index 44b232dddc..736977890d 100644 --- a/webview/src/setup/components/App.test.tsx +++ b/webview/src/setup/components/App.test.tsx @@ -165,7 +165,7 @@ describe('App', () => { `DVC & DVCLive can be auto-installed as packages with ${defaultInterpreter}` ) ).toBeInTheDocument() - expect(screen.getByText('Install')).toBeInTheDocument() + expect(screen.getByText('Install (pip)')).toBeInTheDocument() }) it('should let the user find another Python interpreter to install DVC when the Python extension is not installed', () => { @@ -215,7 +215,7 @@ describe('App', () => { pythonBinPath: 'python' }) - const button = screen.getByText('Install') + const button = screen.getByText('Install (pip)') fireEvent.click(button) expect(mockPostMessage).toHaveBeenCalledWith({ diff --git a/webview/src/setup/components/dvc/CliUnavailable.tsx b/webview/src/setup/components/dvc/CliUnavailable.tsx index 22c7c02880..6692faeb37 100644 --- a/webview/src/setup/components/dvc/CliUnavailable.tsx +++ b/webview/src/setup/components/dvc/CliUnavailable.tsx @@ -18,7 +18,7 @@ export const CliUnavailable: React.FC = ({ children }) => { DVC & DVCLive can be auto-installed as packages with {pythonBinPath}

-
From 010157c280629fa98c68d2cabb98615b1b4209b3 Mon Sep 17 00:00:00 2001 From: julieg18 Date: Tue, 30 May 2023 18:05:21 -0500 Subject: [PATCH 2/2] Fix typo --- webview/src/stories/Setup.stories.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webview/src/stories/Setup.stories.tsx b/webview/src/stories/Setup.stories.tsx index a6fa890aa5..f36a2de201 100644 --- a/webview/src/stories/Setup.stories.tsx +++ b/webview/src/stories/Setup.stories.tsx @@ -98,8 +98,8 @@ CompletedConnected.args = getUpdatedArgs({ shareLiveToStudio: true }) -export const NoCLIPythonNotFound = Template.bind({}) -NoCLIPythonNotFound.args = getUpdatedArgs({ +export const CLIPythonNotFound = Template.bind({}) +CLIPythonNotFound.args = getUpdatedArgs({ cliCompatible: undefined, dvcCliDetails: { command: 'dvc', @@ -109,8 +109,8 @@ NoCLIPythonNotFound.args = getUpdatedArgs({ pythonBinPath: undefined }) -export const NoCLIPythonFound = Template.bind({}) -NoCLIPythonFound.args = getUpdatedArgs({ +export const CLIPythonFound = Template.bind({}) +CLIPythonFound.args = getUpdatedArgs({ cliCompatible: undefined, dvcCliDetails: { command: '/opt/homebrew/Caskroom/miniforge/base/bin/python -m dvc',