when deploying, update titles when linking to existing projects (#1317)

Author: mythmon

src/deploy.ts

@@ -180,7 +180,6 @@ export async function deploy(
 
   deployTarget ??= await promptDeployTarget(effects, apiClient, config, currentUser);
 
-  const previousProjectId = deployConfig?.projectId;
   let targetDescription: string;
   let buildFilePaths: string[] | null = null;
   let doBuild = force === "build";
@@ -254,8 +253,7 @@ export async function deploy(
     // Check last deployed state. If it's not the same project, ask the user if
     // they want to continue anyways. In non-interactive mode just cancel.
     targetDescription = `${deployTarget.project.title} (@${deployTarget.workspace.login}/${deployTarget.project.slug})`;
-    const previousProjectId = deployConfig.projectId;
-    if (previousProjectId && previousProjectId !== deployTarget.project.id) {
+    if (deployConfig.projectId && deployConfig.projectId !== deployTarget.project.id) {
       clack.log.warn(
         `The \`projectId\` in your deploy.json does not match. Continuing will overwrite ${bold(targetDescription)}.`
       );
@@ -274,7 +272,7 @@ export async function deploy(
       } else {
         throw new CliError("Cancelling deploy due to misconfiguration.");
       }
-    } else if (previousProjectId) {
+    } else if (deployConfig.projectId) {
       clack.log.info(`Deploying to ${bold(targetDescription)}.`);
     } else {
       clack.log.warn(
@@ -296,6 +294,10 @@ export async function deploy(
         throw new CliError("Running non-interactively, cancelling due to conflictg");
       }
     }
+
+    if (deployTarget.project.title !== config.title) {
+      projectUpdates.title = config.title;
+    }
   }
 
   if (message === undefined) {
@@ -451,7 +453,7 @@ export async function deploy(
   if (!deployInfo) throw new CliError("Deploy failed to process on server");
 
   // Update project title if necessary
-  if (previousProjectId && previousProjectId === deployTarget.project.id && typeof projectUpdates?.title === "string") {
+  if (typeof projectUpdates?.title === "string") {
     await apiClient.postEditProject(deployTarget.project.id, projectUpdates as PostEditProjectRequest);
   }
   clack.outro(`Deployed project now visible at ${link(deployInfo.url)}`);

test/deploy-test.ts

@@ -227,6 +227,41 @@ describe("deploy", () => {
     effects.close();
   });
 
+  it("updates title if needed when deploy config doesn't exist but the project does", async () => {
+    const deployId = "deploy456";
+    const oldTitle = `${TEST_CONFIG.title!} old`;
+    getCurrentObservableApi()
+      .handleGetCurrentUser()
+      .handleGetWorkspaceProjects({
+        workspaceLogin: DEPLOY_CONFIG.workspaceLogin,
+        projects: [{id: DEPLOY_CONFIG.projectId, slug: DEPLOY_CONFIG.projectSlug, title: oldTitle}]
+      })
+      .handlePostDeploy({projectId: DEPLOY_CONFIG.projectId, deployId})
+      .expectFileUpload({deployId, path: "index.html"})
+      .expectFileUpload({deployId, path: "_observablehq/theme-air,near-midnight.css"})
+      .expectFileUpload({deployId, path: "_observablehq/client.js"})
+      .expectFileUpload({deployId, path: "_observablehq/runtime.js"})
+      .expectFileUpload({deployId, path: "_observablehq/stdlib.js"})
+      .handlePostDeployUploaded({deployId})
+      .handleGetDeploy({deployId})
+      .handleUpdateProject({projectId: DEPLOY_CONFIG.projectId, title: TEST_CONFIG.title!})
+      .start();
+
+    const effects = new MockDeployEffects({
+      deployConfig: null,
+      fixedInputStatTime: new Date("2024-03-09"),
+      fixedOutputStatTime: new Date("2024-03-10")
+    });
+    effects.clack.inputs.push(
+      DEPLOY_CONFIG.projectSlug, // which project do you want to use?
+      true, // Do you want to continue? (and overwrite the project)
+      "change project title" // "what changed?"
+    );
+    await deploy(TEST_OPTIONS, effects);
+
+    effects.close();
+  });
+
   it("does not prompt for a message when one is supplied on the command line", async () => {
     const deployConfig = DEPLOY_CONFIG;
     const deployId = "deploy456";