fix config resolution for content tree

Author: clavery

packages/b2c-vs-extension/src/content-tree/content-config.ts

@@ -4,44 +4,35 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 
-import {findDwJson, resolveConfig} from '@salesforce/b2c-tooling-sdk/config';
 import type {B2CInstance} from '@salesforce/b2c-tooling-sdk/instance';
 import type {Library} from '@salesforce/b2c-tooling-sdk/operations/content';
-import * as fs from 'fs';
-import * as vscode from 'vscode';
+import type {B2CExtensionConfig} from '../config-provider.js';
 
 export interface BrowsedLibrary {
   id: string;
   isSiteLibrary: boolean;
 }
 
 export class ContentConfigProvider {
-  private instance: B2CInstance | null = null;
-  private configError: string | null = null;
-  private resolved = false;
   private libraries: BrowsedLibrary[] = [];
   private libraryCache = new Map<string, Library>();
-  private contentLibrary: string | undefined;
+
+  constructor(private readonly configProvider: B2CExtensionConfig) {
+    configProvider.onDidReset(() => {
+      this.libraryCache.clear();
+    });
+  }
 
   getInstance(): B2CInstance | null {
-    if (!this.resolved) {
-      this.resolve();
-    }
-    return this.instance;
+    return this.configProvider.getInstance();
   }
 
   getConfigError(): string | null {
-    if (!this.resolved) {
-      this.resolve();
-    }
-    return this.configError;
+    return this.configProvider.getConfigError();
   }
 
   getContentLibrary(): string | undefined {
-    if (!this.resolved) {
-      this.resolve();
-    }
-    return this.contentLibrary;
+    return this.configProvider.getConfig()?.values.contentLibrary;
   }
 
   getLibraries(): BrowsedLibrary[] {
@@ -76,36 +67,6 @@ export class ContentConfigProvider {
   }
 
   reset(): void {
-    this.instance = null;
-    this.configError = null;
-    this.resolved = false;
     this.libraryCache.clear();
   }
-
-  private resolve(): void {
-    this.resolved = true;
-    try {
-      let workingDirectory = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? process.cwd();
-      if (!workingDirectory || workingDirectory === '/' || !fs.existsSync(workingDirectory)) {
-        workingDirectory = '';
-      }
-      const dwPath = workingDirectory ? findDwJson(workingDirectory) : undefined;
-      const config = dwPath ? resolveConfig({}, {configPath: dwPath}) : resolveConfig({}, {workingDirectory});
-
-      this.contentLibrary = config.values.contentLibrary;
-
-      if (!config.hasB2CInstanceConfig()) {
-        this.configError = 'No B2C Commerce instance configured.';
-        this.instance = null;
-        return;
-      }
-
-      this.instance = config.createB2CInstance();
-      this.configError = null;
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      this.configError = message;
-      this.instance = null;
-    }
-  }
 }

packages/b2c-vs-extension/src/content-tree/index.ts

@@ -5,21 +5,22 @@
  */
 
 import * as vscode from 'vscode';
+import type {B2CExtensionConfig} from '../config-provider.js';
 import {ContentConfigProvider} from './content-config.js';
 import {CONTENT_SCHEME, ContentFileSystemProvider} from './content-fs-provider.js';
 import {ContentTreeDataProvider} from './content-tree-provider.js';
 import {registerContentCommands} from './content-commands.js';
 
-export function registerContentTree(context: vscode.ExtensionContext): void {
-  const configProvider = new ContentConfigProvider();
-  const fsProvider = new ContentFileSystemProvider(configProvider);
+export function registerContentTree(context: vscode.ExtensionContext, configProvider: B2CExtensionConfig): void {
+  const contentConfig = new ContentConfigProvider(configProvider);
+  const fsProvider = new ContentFileSystemProvider(contentConfig);
 
   const fsRegistration = vscode.workspace.registerFileSystemProvider(CONTENT_SCHEME, fsProvider, {
     isCaseSensitive: true,
     isReadonly: false,
   });
 
-  const treeProvider = new ContentTreeDataProvider(configProvider);
+  const treeProvider = new ContentTreeDataProvider(contentConfig);
 
   const treeView = vscode.window.createTreeView('b2cContentExplorer', {
     treeDataProvider: treeProvider,
@@ -32,7 +33,7 @@ export function registerContentTree(context: vscode.ExtensionContext): void {
     treeView.description = filter ? `filter: ${filter}` : undefined;
   });
 
-  const commandDisposables = registerContentCommands(context, configProvider, treeProvider, fsProvider);
+  const commandDisposables = registerContentCommands(context, contentConfig, treeProvider, fsProvider);
 
   context.subscriptions.push(fsRegistration, treeView, ...commandDisposables);
 }

packages/b2c-vs-extension/src/extension.ts

@@ -1166,7 +1166,7 @@ async function activateInner(context: vscode.ExtensionContext, log: vscode.Outpu
   );
 
   registerWebDavTree(context, configProvider);
-  registerContentTree(context);
+  registerContentTree(context, configProvider);
 
   context.subscriptions.push(
     disposable,