Merge branch 'master' into fix/notebook-bugs-v2

package.json

@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/AltimateAI/vscode-dbt-power-user/issues"
   },
-  "version": "0.48.1",
+  "version": "0.48.3",
   "engines": {
     "vscode": "^1.81.0"
   },

src/dbt_client/dbtCloudIntegration.ts

@@ -994,15 +994,6 @@ export class DBTCloudProjectIntegration
           stderr,
         );
       }
-      const lookupValue = (lookupString: string) => {
-        const regexString = `${lookupString}\\s*(.*)`;
-        const regexp = new RegExp(regexString, "gm");
-        const matches = regexp.exec(stdout);
-        if (matches?.length === 2) {
-          return matches[1];
-        }
-        throw new Error(`Could not find any entries for ${lookupString}`);
-      };
       const lookupEntries = (lookupString: string) => {
         const regexString = `${lookupString}\\s*\\[(.*)\\]`;
         const regexp = new RegExp(regexString, "gm");
@@ -1022,12 +1013,11 @@ export class DBTCloudProjectIntegration
       this.macroPaths = lookupEntries("Macro paths").map((p) =>
         join(this.projectRoot.fsPath, p),
       );
-      this.projectName = lookupValue("Project name");
       this.packagesInstallPath = join(this.projectRoot.fsPath, "dbt_packages");
     } catch (error) {
       this.terminal.warn(
         "DbtCloudIntegrationInitializePathsExceptionError",
-        "adapter type throws error, ignoring",
+        "dbt environment show not returning required info, ignoring",
         true,
         error,
       );
@@ -1037,6 +1027,20 @@ export class DBTCloudProjectIntegration
       this.macroPaths = [join(this.projectRoot.fsPath, "macros")];
       this.packagesInstallPath = join(this.projectRoot.fsPath, "dbt_packages");
     }
+
+    try {
+      const projectConfig = DBTProject.readAndParseProjectConfig(
+        this.projectRoot,
+      );
+      this.projectName = projectConfig.name;
+    } catch (error) {
+      this.terminal.warn(
+        "DbtCloudIntegrationProjectNameFromConfigExceptionError",
+        "project name could not be read from dbt_project.yml, ignoring",
+        true,
+        error,
+      );
+    }
   }
 
   private async findAdapterType() {
@@ -1192,6 +1196,8 @@ export class DBTCloudProjectIntegration
 
   async applyDeferConfig(): Promise<void> {}
 
+  async applySelectedTarget(): Promise<void> {}
+
   throwDiagnosticsErrorIfAvailable(): void {
     this.throwBridgeErrorIfAvailable();
   }

src/dbt_client/dbtCoreIntegration.ts

@@ -1199,6 +1199,12 @@ export class DBTCoreProjectIntegration
       (python) =>
         python!`project.set_defer_config(${deferToProduction}, ${manifestPath}, ${favorState})`,
     );
+    await this.refreshProjectConfig();
+    await this.rebuildManifest();
+  }
+
+  async applySelectedTarget(): Promise<void> {
+    await this.refreshProjectConfig();
     await this.rebuildManifest();
   }
 

src/dbt_client/dbtIntegration.ts

@@ -390,6 +390,7 @@ export interface DBTProjectIntegration extends Disposable {
     args: HealthcheckArgs,
   ): Promise<ProjectHealthcheck>;
   applyDeferConfig(): Promise<void>;
+  applySelectedTarget(): Promise<void>;
   getAllDiagnostic(): Diagnostic[];
   throwDiagnosticsErrorIfAvailable(): void;
   getPythonBridgeStatus(): boolean;

src/manifest/dbtProject.ts

@@ -12,6 +12,7 @@ import {
   EventEmitter,
   FileSystemWatcher,
   languages,
+  ProgressLocation,
   Range,
   RelativePattern,
   Uri,
@@ -219,7 +220,17 @@ export class DBTProject implements Disposable {
   }
 
   async setSelectedTarget(targetName: string) {
-    await this.dbtProjectIntegration.setSelectedTarget(targetName);
+    await window.withProgress(
+      {
+        location: ProgressLocation.Notification,
+        title: "Changing target...",
+        cancellable: false,
+      },
+      async () => {
+        await this.dbtProjectIntegration.setSelectedTarget(targetName);
+        await this.dbtProjectIntegration.applySelectedTarget();
+      },
+    );
   }
 
   getDBTProjectFilePath() {