Fix dvc details version incorrectly showing "Not Found" (#3787)

* Try to fix DVC Details version showng "Not Found"

* Add test

* Fix typo

* Add cliVerson var to setup

* Delete no longer needed test lines

Author: julieg18

extension/src/cli/dvc/discovery.ts

@@ -105,6 +105,7 @@ const warnUser = (
 type CanRunCli = {
   isAvailable: boolean
   isCompatible: boolean | undefined
+  version: string | undefined
 }
 
 export const isCliCompatible = (
@@ -146,7 +147,8 @@ const processVersionDetails = (
   warnUser(setup, cliCompatible, version)
   return {
     isAvailable,
-    isCompatible
+    isCompatible,
+    version
   }
 }
 
@@ -171,7 +173,7 @@ const tryGlobalFallbackVersion = async (
     setup.unsetPythonBinPath()
   }
 
-  return { isAvailable, isCompatible }
+  return { isAvailable, isCompatible, version }
 }
 
 const extensionCanAutoRunCli = async (

extension/src/interfaces.ts

@@ -17,7 +17,10 @@ export interface IExtensionSetup {
 
   setAvailable: (available: boolean) => void
   getAvailable: () => boolean
-  setCliCompatible: (compatible: boolean | undefined) => void
+  setCliCompatibleAndVersion: (
+    compatible: boolean | undefined,
+    version: string | undefined
+  ) => void
   setRoots: () => Promise<void>
   unsetPythonBinPath: () => void
 }

extension/src/setup/index.ts

@@ -86,6 +86,7 @@ export class Setup
 
   private cliAccessible = false
   private cliCompatible: boolean | undefined
+  private cliVersion: string | undefined
 
   private dotFolderWatcher?: Disposer
 
@@ -225,8 +226,12 @@ export class Setup
     return available
   }
 
-  public setCliCompatible(compatible: boolean | undefined) {
+  public setCliCompatibleAndVersion(
+    compatible: boolean | undefined,
+    version: string | undefined
+  ) {
     this.cliCompatible = compatible
+    this.cliVersion = version
     void this.updateIsStudioConnected()
     const incompatible = compatible === undefined ? undefined : !compatible
     void setContextValue(ContextKey.CLI_INCOMPATIBLE, incompatible)
@@ -369,7 +374,7 @@ export class Setup
     return this.sendDataToWebview()
   }
 
-  public async getDvcCliDetails(): Promise<DvcCliDetails> {
+  public getDvcCliDetails(): DvcCliDetails {
     const dvcPath = this.config.getCliPath()
     const pythonBinPath = this.config.getPythonBinPath()
     const cwd = getFirstWorkspaceFolder()
@@ -380,7 +385,7 @@ export class Setup
 
     return {
       command,
-      version: cwd ? await this.getCliVersion(cwd) : undefined
+      version: this.cliVersion
     }
   }
 
@@ -407,12 +412,10 @@ export class Setup
 
     const pythonBinPath = await findPythonBinForInstall()
 
-    const dvcCliDetails = await this.getDvcCliDetails()
-
     this.webviewMessages.sendWebviewMessage({
       canGitInitialize,
       cliCompatible: this.getCliCompatible(),
-      dvcCliDetails,
+      dvcCliDetails: this.getDvcCliDetails(),
       hasData,
       isPythonExtensionUsed:
         !this.isDVCBeingUsedGlobally() && isPythonExtensionUsed,

extension/src/setup/runner.test.ts

@@ -74,7 +74,7 @@ const mockedInitialize = jest.fn()
 const mockedIsPythonExtensionUsed = jest.fn()
 const mockedResetMembers = jest.fn()
 const mockedSetAvailable = jest.fn()
-const mockedSetCliCompatible = jest.fn()
+const mockedSetCliCompatibleAndVersion = jest.fn()
 const mockedSetRoots = jest.fn()
 const mockedShowSetup = jest.fn()
 const mockedShouldWarnUserIfCLIUnavailable = jest.fn()
@@ -280,7 +280,7 @@ describe('run', () => {
     isPythonExtensionUsed: mockedIsPythonExtensionUsed,
     resetMembers: mockedResetMembers,
     setAvailable: mockedSetAvailable,
-    setCliCompatible: mockedSetCliCompatible,
+    setCliCompatibleAndVersion: mockedSetCliCompatibleAndVersion,
     setRoots: mockedSetRoots,
     shouldWarnUserIfCLIUnavailable: mockedShouldWarnUserIfCLIUnavailable,
     showSetup: mockedShowSetup,
@@ -617,7 +617,7 @@ describe('runWithRecheck', () => {
     isPythonExtensionUsed: mockedIsPythonExtensionUsed,
     resetMembers: mockedResetMembers,
     setAvailable: mockedSetAvailable,
-    setCliCompatible: mockedSetCliCompatible,
+    setCliCompatibleAndVersion: mockedSetCliCompatibleAndVersion,
     setRoots: mockedSetRoots,
     shouldWarnUserIfCLIUnavailable: mockedShouldWarnUserIfCLIUnavailable,
     showSetup: mockedShowSetup,

extension/src/setup/runner.ts

@@ -179,12 +179,12 @@ export const checkAvailable = async (
   setup: IExtensionSetup,
   dvcRootOrFirstFolder: string
 ) => {
-  const { isAvailable, isCompatible } = await extensionCanRunCli(
+  const { isAvailable, version, isCompatible } = await extensionCanRunCli(
     setup,
     dvcRootOrFirstFolder
   )
 
-  setup.setCliCompatible(isCompatible)
+  setup.setCliCompatibleAndVersion(isCompatible, version)
   setup.setAvailable(isAvailable)
 
   if (setup.hasRoots() && isAvailable) {

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

@@ -215,10 +215,9 @@ suite('Setup Test Suite', () => {
 
       await config.isReady()
 
-      setup.setCliCompatible(undefined)
+      setup.setCliCompatibleAndVersion(undefined, undefined)
       setup.setAvailable(false)
       await setup.setRoots()
-      stub(setup, 'getCliVersion').resolves(undefined)
 
       messageSpy.restore()
       const mockSendMessage = stub(BaseWebview.prototype, 'show')
@@ -257,7 +256,7 @@ suite('Setup Test Suite', () => {
 
       await config.isReady()
 
-      setup.setCliCompatible(true)
+      setup.setCliCompatibleAndVersion(true, MIN_CLI_VERSION)
       setup.setAvailable(true)
       await setup.setRoots()
 
@@ -304,7 +303,7 @@ suite('Setup Test Suite', () => {
 
       await config.isReady()
 
-      setup.setCliCompatible(true)
+      setup.setCliCompatibleAndVersion(true, MIN_CLI_VERSION)
       setup.setAvailable(true)
       await setup.setRoots()
 
@@ -354,7 +353,7 @@ suite('Setup Test Suite', () => {
 
       await config.isReady()
 
-      setup.setCliCompatible(true)
+      setup.setCliCompatibleAndVersion(true, MIN_CLI_VERSION)
       setup.setAvailable(true)
       await setup.setRoots()
 
@@ -579,7 +578,6 @@ suite('Setup Test Suite', () => {
       mockRunSetup.restore()
       stub(config, 'isPythonExtensionUsed').returns(false)
       stub(config, 'getPythonBinPath').resolves(join('python'))
-      stub(setup, 'getDvcCliDetails').resolves(undefined)
 
       mockVersion.resetBehavior()
       mockVersion
@@ -639,7 +637,6 @@ suite('Setup Test Suite', () => {
       mockExecuteCommand.restore()
       mockRunSetup.restore()
       stub(config, 'isPythonExtensionUsed').returns(true)
-      stub(setup, 'getDvcCliDetails').resolves(undefined)
 
       mockVersion.resetBehavior()
       mockVersion.rejects(new Error('no CLI here'))
@@ -759,7 +756,6 @@ suite('Setup Test Suite', () => {
       const mockUpdate = stub()
 
       stub(workspace, 'getConfiguration').returns({
-        get: stub(),
         update: mockUpdate
       } as unknown as WorkspaceConfiguration)