Disable homeview's Easy Deploy View until ready

.prettierignore

@@ -2,6 +2,11 @@ vendor
 
 # VSCode Extension
 extensions/vscode/out
+test/sample-content
 
 # webdriver.io service
 test/vscode-ui/.wdio-vscode-service
+extensions/vscode/dist
+extensions/vscode/node_modules
+extensions/vscode/webviews/homeView/node_modules
+extensions/vscode/webviews/homeView/dist

extensions/vscode/package.json

@@ -185,7 +185,7 @@
         "category": "Posit Publisher"
       },
       {
-        "command": "posit.publisher.homeView.selectConfigForDeployment",
+        "command": "posit.publisher.homeView.showSelectConfigForDeployment",
         "title": "Select Active Configuration For Deployment",
         "category": "Posit Publisher"
       },
@@ -460,7 +460,7 @@
       ],
       "webview/context": [
         {
-          "command": "posit.publisher.homeView.selectConfigForDeployment",
+          "command": "posit.publisher.homeView.showSelectConfigForDeployment",
           "when": "webviewId == 'posit.publisher.homeView' && webviewSection == 'even-easier-deploy-more-menu-matching-configs'"
         },
         {

extensions/vscode/src/api/resources/Configurations.ts

@@ -20,7 +20,7 @@ export class Configurations {
   // 200 - success
   // 404 - not found
   // 500 - internal server error
-  get(configName: string, params?: { dir?: string }) {
+  get(configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(configName);
     return this.client.get<Configuration | ConfigurationError>(
       `/configurations/${encodedName}`,
@@ -31,7 +31,7 @@ export class Configurations {
   // Returns:
   // 200 - success
   // 500 - internal server error
-  getAll(params?: { dir?: string; entrypoint?: string; recursive?: boolean }) {
+  getAll(params: { dir: string; entrypoint?: string; recursive?: boolean }) {
     return this.client.get<Array<Configuration | ConfigurationError>>(
       "/configurations",
       { params },
@@ -45,7 +45,7 @@ export class Configurations {
   createOrUpdate(
     configName: string,
     cfg: ConfigurationDetails,
-    params?: { dir?: string },
+    params: { dir: string },
   ) {
     const encodedName = encodeURIComponent(configName);
     return this.client.put<Configuration>(
@@ -59,7 +59,7 @@ export class Configurations {
   // 204 - success (no response)
   // 404 - not found
   // 500 - internal server error
-  delete(configName: string, params?: { dir?: string }) {
+  delete(configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(configName);
     return this.client.delete(`configurations/${encodedName}`, { params });
   }
@@ -70,8 +70,8 @@ export class Configurations {
   // 400 - bad request
   // 500 - internal server error
   inspect(
+    params: { dir: string; entrypoint?: string; recursive?: boolean },
     python?: string,
-    params?: { dir?: string; entrypoint?: string; recursive?: boolean },
   ) {
     return this.client.post<ConfigurationInspectionResult[]>(
       "/inspect",

extensions/vscode/src/api/resources/ContentRecords.ts

@@ -18,7 +18,7 @@ export class ContentRecords {
   // Returns:
   // 200 - success
   // 500 - internal server error
-  getAll(params?: { dir?: string; entrypoints?: string; recursive?: boolean }) {
+  getAll(params: { dir: string; entrypoints?: string; recursive?: boolean }) {
     return this.client.get<Array<AllContentRecordTypes>>("/deployments", {
       params,
     });
@@ -28,7 +28,7 @@ export class ContentRecords {
   // 200 - success
   // 404 - not found
   // 500 - internal server error
-  get(id: string, params?: { dir?: string }) {
+  get(id: string, params: { dir: string }) {
     const encodedId = encodeURIComponent(id);
     return this.client.get<AllContentRecordTypes>(`deployments/${encodedId}`, {
       params,
@@ -42,10 +42,10 @@ export class ContentRecords {
   // 500 - internal server error
   // Errors returned through event stream
   createNew(
+    params: { dir: string },
     accountName?: string,
     configName?: string,
     saveName?: string,
-    params?: { dir?: string },
   ) {
     const data = {
       account: accountName,
@@ -61,10 +61,10 @@ export class ContentRecords {
   // 500 - internal server error
   // Errors returned through event stream
   publish(
+    params: { dir: string },
     targetName: string,
     accountName: string,
     configName: string = "default",
-    params?: { dir?: string },
   ) {
     const data = {
       account: accountName,
@@ -82,7 +82,7 @@ export class ContentRecords {
   // 204 - no content
   // 404 - not found
   // 500 - internal server error
-  delete(saveName: string, params?: { dir?: string }) {
+  delete(saveName: string, params: { dir: string }) {
     const encodedSaveName = encodeURIComponent(saveName);
     return this.client.delete(`deployments/${encodedSaveName}`, { params });
   }
@@ -91,7 +91,7 @@ export class ContentRecords {
   // 204 - no content
   // 404 - contentRecord or config file not found
   // 500 - internal server error
-  patch(deploymentName: string, configName: string, params?: { dir?: string }) {
+  patch(deploymentName: string, configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(deploymentName);
     return this.client.patch<ContentRecord>(
       `deployments/${encodedName}`,

extensions/vscode/src/api/resources/Files.ts

@@ -25,7 +25,7 @@ export class Files {
   // 404 - configuration does not exist
   // 422 - configuration files list contains invalid patterns
   // 500 - internal server error
-  getByConfiguration(configName: string, params?: { dir?: string }) {
+  getByConfiguration(configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(configName);
     return this.client.get<ContentRecordFile>(
       `/configurations/${encodedName}/files`,
@@ -37,7 +37,7 @@ export class Files {
     configName: string,
     path: string,
     action: FileAction,
-    params?: { dir?: string },
+    params: { dir: string },
   ) {
     const encodedName = encodeURIComponent(configName);
     const body = {

extensions/vscode/src/api/resources/Packages.ts

@@ -19,7 +19,7 @@ export class Packages {
   // 409 - conflict (Python is not configured)
   // 422 - package file is invalid
   // 500 - internal server error
-  getPythonPackages(configName: string, params?: { dir?: string }) {
+  getPythonPackages(configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(configName);
     return this.client.get<PythonPackagesResponse>(
       `/configurations/${encodedName}/packages/python`,
@@ -33,7 +33,7 @@ export class Packages {
   // 409 - conflict (R is not configured)
   // 422 - package file is invalid
   // 500 - internal server error
-  getRPackages(configName: string, params?: { dir?: string }) {
+  getRPackages(configName: string, params: { dir: string }) {
     const encodedName = encodeURIComponent(configName);
     return this.client.get<GetRPackagesResponse>(
       `/configurations/${encodedName}/packages/r`,
@@ -46,9 +46,9 @@ export class Packages {
   // 400 - bad request
   // 500 - internal server error
   createPythonRequirementsFile(
+    params: { dir: string },
     python?: string,
     saveName?: string,
-    params?: { dir?: string },
   ) {
     return this.client.post<void>(
       "packages/python/scan",
@@ -61,7 +61,7 @@ export class Packages {
   // 200 - success
   // 400 - bad request
   // 500 - internal server error
-  createRRequirementsFile(saveName?: string, params?: { dir?: string }) {
+  createRRequirementsFile(params: { dir: string }, saveName?: string) {
     return this.client.post<void>("packages/r/scan", { saveName }, { params });
   }
 }

extensions/vscode/src/bus.ts

@@ -19,24 +19,25 @@ export const bus = Omnibus.builder()
   .build();
 
 // Setup message logging
-bus.on("activeContentRecordChanged", (msg) => {
-  console.debug(
-    `\nbus trace: activeContentRecordChanged: ${JSON.stringify(msg)}\n`,
-  );
-});
-bus.on("activeConfigChanged", (msg) => {
+bus.on(
+  "activeContentRecordChanged",
+  (msg: ContentRecord | PreContentRecord | undefined) => {
+    console.debug(
+      `\nbus trace: activeContentRecordChanged: ${JSON.stringify(msg)}\n`,
+    );
+  },
+);
+bus.on("activeConfigChanged", (msg: Configuration | undefined) => {
   console.debug(`\nbus trace: activeConfigChanged: ${JSON.stringify(msg)}\n`);
 });
-bus.on("requestActiveConfig", (msg) => {
-  console.debug(`\nbus trace: requestActiveConfig: ${JSON.stringify(msg)}`);
+bus.on("requestActiveConfig", () => {
+  console.debug(`\nbus trace: requestActiveConfig`);
 });
-bus.on("requestActiveContentRecord", (msg) => {
-  console.debug(
-    `\nbus trace: requestActiveContentRecord: ${JSON.stringify(msg)}`,
-  );
+bus.on("requestActiveContentRecord", () => {
+  console.debug(`\nbus trace: requestActiveContentRecord`);
 });
-bus.on("refreshCredentials", (msg) => {
-  console.debug(`\nbus trace: refreshCredentials: ${JSON.stringify(msg)}`);
+bus.on("refreshCredentials", () => {
+  console.debug(`\nbus trace: refreshCredentials`);
 });
 
 export const useBus = () => {

extensions/vscode/src/constants.ts

@@ -1,11 +1,11 @@
 // Copyright (C) 2024 by Posit Software, PBC.
 
-export const POSIT_FOLDER = ".posit";
-export const PUBLISH_FOLDER = ".posit/publish";
-export const PUBLISH_DEPLOYMENTS_FOLDER = ".posit/publish/deployments";
+export const POSIT_FOLDER = "**/.posit";
+export const PUBLISH_FOLDER = "**/.posit/publish";
+export const PUBLISH_DEPLOYMENTS_FOLDER = "**/.posit/publish/deployments";
 
-export const CONFIGURATIONS_PATTERN = ".posit/publish/*.toml";
-export const DEPLOYMENTS_PATTERN = ".posit/publish/deployments/*.toml";
+export const CONFIGURATIONS_PATTERN = "**/.posit/publish/*.toml";
+export const DEPLOYMENTS_PATTERN = "**/.posit/publish/deployments/*.toml";
 
 export const DEFAULT_PYTHON_PACKAGE_FILE = "requirements.txt";
 export const DEFAULT_R_PACKAGE_FILE = "renv.lock";
@@ -85,8 +85,8 @@ const rPackagesCommands = {
 
 const homeViewCommands = {
   Refresh: "posit.publisher.homeView.refresh",
-  SelectConfigForDeployment:
-    "posit.publisher.homeView.selectConfigForDeployment",
+  ShowSelectConfigForDeployment:
+    "posit.publisher.homeView.showSelectConfigForDeployment",
   CreateConfigForDeployment:
     "posit.publisher.homeView.createConfigForDeployment",
   SelectDeployment: "posit.publisher.homeView.selectDeployment",
@@ -110,7 +110,7 @@ const helpAndFeedbackCommands = {
 } as const;
 
 export const LocalState = {
-  LastSelectionState: "posit.publisher.homeView.lastSelectionState.v2",
+  LastSelectionState: "posit.publisher.homeView.lastDeploymentSelectedState",
 };
 
 export const Commands = {

extensions/vscode/src/entrypointTracker.ts

@@ -34,10 +34,13 @@ async function isDocumentEntrypoint(document: TextDocument): Promise<boolean> {
     const api = await useApi();
     const python = await getPythonInterpreterPath();
 
-    const response = await api.configurations.inspect(python, {
-      dir: dir,
-      entrypoint: uriUtils.basename(document.uri),
-    });
+    const response = await api.configurations.inspect(
+      {
+        dir: dir,
+        entrypoint: uriUtils.basename(document.uri),
+      },
+      python,
+    );
 
     return hasKnownContentType(response.data);
   } catch (error: unknown) {

extensions/vscode/src/multiStepInputs/newConfig.ts

@@ -39,7 +39,10 @@ export async function newConfig(title: string, viewId?: string) {
     async (resolve, reject) => {
       try {
         const python = await getPythonInterpreterPath();
-        const inspectResponse = await api.configurations.inspect(python);
+        const inspectResponse = await api.configurations.inspect(
+          { dir: ".", recursive: true },
+          python,
+        );
         inspectionResults = inspectResponse.data;
         inspectionResults.forEach((result, i) => {
           const config = result.configuration;
@@ -48,6 +51,7 @@ export async function newConfig(title: string, viewId?: string) {
               iconPath: new ThemeIcon("file"),
               label: config.entrypoint,
               description: `(${contentTypeStrings[config.type]})`,
+              detail: `${result.projectDir}/`,
               index: i,
             });
           }
@@ -239,10 +243,15 @@ export async function newConfig(title: string, viewId?: string) {
       return;
     }
     selectedInspectionResult.configuration.title = state.data.title;
-    const configName = await untitledConfigurationName();
+    const configName = await untitledConfigurationName(
+      selectedInspectionResult.projectDir,
+    );
     const createResponse = await api.configurations.createOrUpdate(
       configName,
       selectedInspectionResult.configuration,
+      {
+        dir: selectedInspectionResult.projectDir,
+      },
     );
     newConfig = createResponse.data;
     const fileUri = Uri.file(newConfig.configurationPath);