Use is Python extension installed for setup (#4467)

Author: mattseddon

extension/src/setup/index.ts

@@ -430,6 +430,7 @@ export class Setup
       hasData,
       isAboveLatestTestedVersion: isAboveLatestTestedVersion(this.cliVersion),
       isPythonEnvironmentGlobal,
+      isPythonExtensionInstalled: this.config.isPythonExtensionInstalled(),
       isPythonExtensionUsed,
       isStudioConnected: this.studioIsConnected,
       needsGitCommit,

extension/src/setup/webview/contract.ts

@@ -13,6 +13,7 @@ export type SetupData = {
   dvcCliDetails: DvcCliDetails | undefined
   hasData: boolean | undefined
   isPythonEnvironmentGlobal: boolean | undefined
+  isPythonExtensionInstalled: boolean
   isPythonExtensionUsed: boolean
   isStudioConnected: boolean
   needsGitCommit: boolean

extension/src/test/suite/setup/index.test.ts

@@ -375,6 +375,7 @@ suite('Setup Test Suite', () => {
         hasData: false,
         isAboveLatestTestedVersion: undefined,
         isPythonEnvironmentGlobal: false,
+        isPythonExtensionInstalled: false,
         isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,
@@ -420,6 +421,7 @@ suite('Setup Test Suite', () => {
         hasData: false,
         isAboveLatestTestedVersion: false,
         isPythonEnvironmentGlobal: false,
+        isPythonExtensionInstalled: false,
         isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,
@@ -473,6 +475,7 @@ suite('Setup Test Suite', () => {
         hasData: false,
         isAboveLatestTestedVersion: false,
         isPythonEnvironmentGlobal: false,
+        isPythonExtensionInstalled: false,
         isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: false,
@@ -526,6 +529,7 @@ suite('Setup Test Suite', () => {
         hasData: false,
         isAboveLatestTestedVersion: false,
         isPythonEnvironmentGlobal: false,
+        isPythonExtensionInstalled: false,
         isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,

webview/src/setup/components/App.test.tsx

@@ -32,6 +32,7 @@ const DEFAULT_DATA = {
   hasData: false,
   isAboveLatestTestedVersion: false,
   isPythonEnvironmentGlobal: false,
+  isPythonExtensionInstalled: false,
   isPythonExtensionUsed: false,
   isStudioConnected: false,
   needsGitCommit: false,

webview/src/setup/components/App.tsx

@@ -20,6 +20,7 @@ import {
   updateDvcCliDetails,
   updateIsAboveLatestTestedVersion,
   updateIsPythonEnvironmentGlobal,
+  updateIsPythonExtensionInstalled,
   updateIsPythonExtensionUsed,
   updateNeedsGitInitialized,
   updateProjectInitialized,
@@ -84,6 +85,11 @@ export const feedStore = (
           updateIsPythonEnvironmentGlobal(data.data.isPythonEnvironmentGlobal)
         )
         continue
+      case 'isPythonExtensionInstalled':
+        dispatch(
+          updateIsPythonExtensionInstalled(data.data.isPythonExtensionInstalled)
+        )
+        continue
       case 'isPythonExtensionUsed':
         dispatch(updateIsPythonExtensionUsed(data.data.isPythonExtensionUsed))
         continue

webview/src/setup/components/dvc/CliUnavailable.tsx

@@ -13,8 +13,11 @@ import { Warning } from '../../../shared/components/icons'
 import { ShowExtension } from '../remotes/ShowExtension'
 
 export const CliUnavailable: React.FC<PropsWithChildren> = ({ children }) => {
-  const { pythonBinPath, isPythonExtensionUsed, isPythonEnvironmentGlobal } =
-    useSelector((state: SetupState) => state.dvc)
+  const {
+    pythonBinPath,
+    isPythonExtensionInstalled,
+    isPythonEnvironmentGlobal
+  } = useSelector((state: SetupState) => state.dvc)
   const canInstall = !!pythonBinPath
   const installationSentence = (
     <>
@@ -58,13 +61,13 @@ export const CliUnavailable: React.FC<PropsWithChildren> = ({ children }) => {
           text="Install (pip)"
         />
         <Button
-          disabled={!isPythonExtensionUsed}
+          disabled={!isPythonExtensionInstalled}
           onClick={updatePythonEnvironment}
           text="Set Env"
         />
         <Button onClick={setupWorkspace} text="Locate DVC" />
       </div>
-      {isPythonExtensionUsed || (
+      {isPythonExtensionInstalled || (
         <ShowExtension
           className={styles.pythonExtInfo}
           id="ms-python.python"

webview/src/setup/state/dvcSlice.ts

@@ -16,6 +16,7 @@ export const dvcInitialState: DvcState = {
   dvcCliDetails: undefined,
   isAboveLatestTestedVersion: undefined,
   isPythonEnvironmentGlobal: undefined,
+  isPythonExtensionInstalled: false,
   isPythonExtensionUsed: false,
   needsGitInitialized: false,
   projectInitialized: false,
@@ -54,6 +55,12 @@ export const dvcSlice = createSlice({
     ) => {
       state.isPythonEnvironmentGlobal = action.payload
     },
+    updateIsPythonExtensionInstalled: (
+      state,
+      action: PayloadAction<boolean>
+    ) => {
+      state.isPythonExtensionInstalled = action.payload
+    },
     updateIsPythonExtensionUsed: (state, action: PayloadAction<boolean>) => {
       state.isPythonExtensionUsed = action.payload
     },
@@ -78,6 +85,7 @@ export const {
   updateDvcCliDetails,
   updateIsAboveLatestTestedVersion,
   updateIsPythonEnvironmentGlobal,
+  updateIsPythonExtensionInstalled,
   updateIsPythonExtensionUsed,
   updateNeedsGitInitialized,
   updateProjectInitialized,

webview/src/stories/Setup.stories.tsx

@@ -18,6 +18,7 @@ const DEFAULT_DATA: SetupData = {
   hasData: false,
   isAboveLatestTestedVersion: false,
   isPythonEnvironmentGlobal: false,
+  isPythonExtensionInstalled: true,
   isPythonExtensionUsed: true,
   isStudioConnected: true,
   needsGitCommit: false,
@@ -105,7 +106,7 @@ CLIPythonNotFound.args = getUpdatedArgs({
     command: 'dvc',
     version: undefined
   },
-  isPythonExtensionUsed: false,
+  isPythonExtensionInstalled: false,
   pythonBinPath: undefined
 })