Update required text and remove "Select Python..."

iterative · Apr 27, 2023 · 11b8ea0 · 11b8ea0
1 parent a05091b
commit 11b8ea0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 97 deletions.
diff --git a/webview/src/setup/components/App.test.tsx b/webview/src/setup/components/App.test.tsx
@@ -495,7 +495,7 @@ describe('App', () => {
       })
 
       const envDetails = screen.getByTestId('dvc-env-details')
-      const command = `1.0.0 (required >= ${MIN_CLI_VERSION} and < ${MAX_CLI_VERSION}.0.0)`
+      const command = `1.0.0 (${MIN_CLI_VERSION} <= required < ${MAX_CLI_VERSION}.0.0)`
 
       expect(within(envDetails).getByText('Version')).toBeInTheDocument()
       expect(within(envDetails).getByText(command)).toBeInTheDocument()
@@ -520,7 +520,7 @@ describe('App', () => {
         shareLiveToStudio: false
       })
       const envDetails = screen.getByTestId('dvc-env-details')
-      const command = `Not found (required >= ${MIN_CLI_VERSION} and < ${MAX_CLI_VERSION}.0.0)`
+      const command = `Not found (${MIN_CLI_VERSION} <= required < ${MAX_CLI_VERSION}.0.0)`
 
       expect(within(envDetails).getByText('Version')).toBeInTheDocument()
       expect(within(envDetails).getByText(command)).toBeInTheDocument()
@@ -552,7 +552,7 @@ describe('App', () => {
       expect(within(envDetails).getByText(command)).toBeInTheDocument()
     })
 
-    it('should show user an example command with a "Configure" button if dvc is installed without the python extension', () => {
+    it('should show user an example command with a "Configure" button if dvc is installed', () => {
       renderApp({
         canGitInitialize: false,
         cliCompatible: true,
@@ -576,59 +576,15 @@ describe('App', () => {
       expect(within(envDetails).getByText('Command')).toBeInTheDocument()
 
       const configureButton = within(envDetails).getByText('Configure')
-      const selectButton = within(envDetails).queryByText(
-        'Select Python Interpreter'
-      )
 
       expect(configureButton).toBeInTheDocument()
-      expect(selectButton).not.toBeInTheDocument()
 
       fireEvent.click(configureButton)
 
       expect(mockPostMessage).toHaveBeenCalledWith({
         type: MessageFromWebviewType.SETUP_WORKSPACE
       })
     })
-
-    it('should show user an example command with "Configure" and "Select Python Interpreter" buttons if dvc is installed with the python extension', () => {
-      renderApp({
-        canGitInitialize: false,
-        cliCompatible: true,
-        dvcCliDetails: {
-          command: 'python -m dvc',
-          version: '1.0.0'
-        },
-        hasData: true,
-        isPythonExtensionInstalled: true,
-        isStudioConnected: true,
-        needsGitCommit: false,
-        needsGitInitialized: false,
-        projectInitialized: true,
-        pythonBinPath: 'python',
-        sectionCollapsed: undefined,
-        shareLiveToStudio: false
-      })
-
-      const envDetails = screen.getByTestId('dvc-env-details')
-
-      expect(within(envDetails).getByText('Command')).toBeInTheDocument()
-
-      const configureButton = within(envDetails).getByText('Configure')
-      const selectButton = within(envDetails).getByText(
-        'Select Python Interpreter'
-      )
-
-      expect(configureButton).toBeInTheDocument()
-      expect(selectButton).toBeInTheDocument()
-
-      mockPostMessage.mockClear()
-
-      fireEvent.click(selectButton)
-
-      expect(mockPostMessage).toHaveBeenCalledWith({
-        type: MessageFromWebviewType.SELECT_PYTHON_INTERPRETER
-      })
-    })
   })
 
   describe('Experiments', () => {

diff --git a/webview/src/setup/components/App.tsx b/webview/src/setup/components/App.tsx
@@ -34,8 +34,6 @@ export const App: React.FC = () => {
   const [pythonBinPath, setPythonBinPath] = useState<string | undefined>(
     undefined
   )
-  const [isPythonExtensionInstalled, setIsPythonExtensionInstalled] =
-    useState<boolean>(false)
   const [hasData, setHasData] = useState<boolean | undefined>(false)
   const [sectionCollapsed, setSectionCollapsed] = useState(
     DEFAULT_SECTION_COLLAPSED
@@ -51,7 +49,6 @@ export const App: React.FC = () => {
         setCliCompatible(data.data.cliCompatible)
         setHasData(data.data.hasData)
         setDvcCliDetails(data.data.dvcCliDetails)
-        setIsPythonExtensionInstalled(data.data.isPythonExtensionInstalled)
         setNeedsGitInitialized(data.data.needsGitInitialized)
         setNeedsGitCommit(data.data.needsGitCommit)
         setProjectInitialized(data.data.projectInitialized)
@@ -67,7 +64,6 @@ export const App: React.FC = () => {
         setCliCompatible,
         setHasData,
         setDvcCliDetails,
-        setIsPythonExtensionInstalled,
         setNeedsGitInitialized,
         setNeedsGitCommit,
         setProjectInitialized,
@@ -99,7 +95,6 @@ export const App: React.FC = () => {
           canGitInitialize={canGitInitialize}
           cliCompatible={cliCompatible}
           dvcCliDetails={dvcCliDetails}
-          isPythonExtensionInstalled={isPythonExtensionInstalled}
           needsGitInitialized={needsGitInitialized}
           projectInitialized={projectInitialized}
           pythonBinPath={pythonBinPath}

diff --git a/webview/src/setup/components/dvc/Dvc.tsx b/webview/src/setup/components/dvc/Dvc.tsx
@@ -20,7 +20,6 @@ export type DvcProps = {
   canGitInitialize: boolean | undefined
   cliCompatible: boolean | undefined
   dvcCliDetails: DvcCliDetails | undefined
-  isPythonExtensionInstalled: boolean
   needsGitInitialized: boolean | undefined
   projectInitialized: boolean
   pythonBinPath: string | undefined
@@ -32,19 +31,13 @@ export const Dvc: React.FC<DvcProps> = ({
   canGitInitialize,
   cliCompatible,
   dvcCliDetails,
-  isPythonExtensionInstalled,
   needsGitInitialized,
   projectInitialized,
   pythonBinPath,
   setSectionCollapsed,
   isExperimentsAvailable
 }) => {
-  const children = dvcCliDetails && (
-    <DvcEnvDetails
-      {...dvcCliDetails}
-      isPythonExtensionInstalled={isPythonExtensionInstalled}
-    />
-  )
+  const children = dvcCliDetails && <DvcEnvDetails {...dvcCliDetails} />
 
   if (cliCompatible === false) {
     return (

diff --git a/webview/src/setup/components/dvc/DvcEnvCommandRow.tsx b/webview/src/setup/components/dvc/DvcEnvCommandRow.tsx
@@ -1,16 +1,14 @@
 import React from 'react'
 import { DvcEnvInfoRow } from './DvcEnvInfoRow'
 import styles from './styles.module.scss'
-import { selectPythonInterpreter, setupWorkspace } from '../messages'
+import { setupWorkspace } from '../messages'
 
 interface DvcEnvCommandRowProps {
   command: string
-  isPythonExtensionInstalled: boolean
 }
 
 export const DvcEnvCommandRow: React.FC<DvcEnvCommandRowProps> = ({
-  command,
-  isPythonExtensionInstalled
+  command
 }) => {
   const commandText = command || 'Not found'
   const commandValue = (
@@ -20,17 +18,6 @@ export const DvcEnvCommandRow: React.FC<DvcEnvCommandRowProps> = ({
         <button className={styles.buttonAsLink} onClick={setupWorkspace}>
           Configure
         </button>
-        {isPythonExtensionInstalled && (
-          <>
-            <span className={styles.separator} />
-            <button
-              className={styles.buttonAsLink}
-              onClick={selectPythonInterpreter}
-            >
-              Select Python Interpreter
-            </button>
-          </>
-        )}
       </span>
     </>
   )

diff --git a/webview/src/setup/components/dvc/DvcEnvDetails.tsx b/webview/src/setup/components/dvc/DvcEnvDetails.tsx
@@ -5,28 +5,18 @@ import { DvcEnvInfoRow } from './DvcEnvInfoRow'
 import styles from './styles.module.scss'
 import { DvcEnvCommandRow } from './DvcEnvCommandRow'
 
-interface DvcEnvDetailsProps extends DvcCliDetails {
-  isPythonExtensionInstalled: boolean
-}
-
-export const DvcEnvDetails: React.FC<DvcEnvDetailsProps> = ({
+export const DvcEnvDetails: React.FC<DvcCliDetails> = ({
   command,
-  version,
-  isPythonExtensionInstalled
+  version
 }) => {
   const versionText = `${
     version || 'Not found'
-  } (required >= ${MIN_CLI_VERSION} and < ${MAX_CLI_VERSION}.0.0)`
+  } (${MIN_CLI_VERSION} <= required < ${MAX_CLI_VERSION}.0.0)`
 
   return (
     <table data-testid="dvc-env-details" className={styles.envDetails}>
       <tbody>
-        {version && (
-          <DvcEnvCommandRow
-            command={command}
-            isPythonExtensionInstalled={isPythonExtensionInstalled}
-          />
-        )}
+        {version && <DvcEnvCommandRow command={command} />}
         <DvcEnvInfoRow title="Version" text={versionText} />
       </tbody>
     </table>

diff --git a/webview/src/setup/components/dvc/styles.module.scss b/webview/src/setup/components/dvc/styles.module.scss
@@ -24,14 +24,6 @@
   flex-direction: column;
 }
 
-.separator {
-  margin: 0 5px;
-
-  &::before {
-    content: '|';
-  }
-}
-
 .buttonAsLink {
   @extend %buttonAsLink;