fix a bug in project start modal which is exasperated by new autostart

- a lot of code changes, but the check for needing to wait or
  not before showing in show_modal was slightly wrong

Author: williamstein

src/packages/frontend/project/project-start-warning.ts

@@ -24,15 +24,23 @@ const explicitly_started: { [project_id: string]: number } = {};
 
 export function is_running_or_starting(project_id: string): boolean {
   const t = explicitly_started[project_id];
-  if (t != null && Date.now() - t <= 15000) return true;
+  if (t != null && Date.now() - t <= 15000) {
+    return true;
+  }
 
   const project_map = redux.getStore("projects")?.get("project_map");
-  if (!project_map) return false;
+  if (!project_map) {
+    return false;
+  }
   const state = project_map.getIn([project_id, "state", "state"]);
-  if (state == null || state == "running" || state == "starting") return true;
+  if (state == null || state == "running" || state == "starting") {
+    return true;
+  }
 
   const x = project_map?.get(project_id)?.get("action_request");
-  if (x == null) return false;
+  if (x == null) {
+    return false;
+  }
   const action = x.get("action");
   const finished = x.get("finished");
   const time = new Date(x.get("time"));
@@ -46,14 +54,23 @@ export async function ensure_project_running(
   project_id: string,
   what: string,
 ): Promise<boolean> {
+  const intl = await getIntl();
+  const project_actions = redux.getProjectActions(project_id);
+  await project_actions.wait_until_no_modals();
   if (is_running_or_starting(project_id)) {
     return true;
   }
-  const project_actions = redux.getProjectActions(project_id);
-  await project_actions.wait_until_no_modals();
 
   let result: string = "";
 
+  const project_title = redux.getStore("projects").get_title(project_id);
+  const title = intl.formatMessage(dialogs.project_start_warning_title);
+  const content = intl.formatMessage(dialogs.project_start_warning_content, {
+    project_title,
+    title,
+    what,
+  });
+
   const interval = setInterval(() => {
     if (result != "") {
       clearInterval(interval);
@@ -65,15 +82,6 @@ export async function ensure_project_running(
     }
   }, 1000);
 
-  const intl = await getIntl();
-  const project_title = redux.getStore("projects").get_title(project_id);
-  const title = intl.formatMessage(dialogs.project_start_warning_title);
-  const content = intl.formatMessage(dialogs.project_start_warning_content, {
-    project_title,
-    title,
-    what,
-  });
-
   result = await project_actions.show_modal({ title, content });
   if (result == "ok") {
     explicitly_started[project_id] = Date.now();

src/packages/frontend/project_actions.ts

@@ -1380,9 +1380,8 @@ export class ProjectActions extends Actions<ProjectStoreState> {
     const computeServerAssociations =
       webapp_client.project_client.computeServers(this.project_id);
     const sidePath = chatFile(path);
-    const currentId = await computeServerAssociations.getServerIdForPath(
-      sidePath,
-    );
+    const currentId =
+      await computeServerAssociations.getServerIdForPath(sidePath);
     if (currentId != null) {
       // already set
       return;
@@ -2238,8 +2237,8 @@ export class ProjectActions extends Actions<ProjectStoreState> {
             dest_compute_server_id: opts.dest_compute_server_id,
           }
         : opts.src_compute_server_id
-        ? { compute_server_id: opts.src_compute_server_id }
-        : undefined),
+          ? { compute_server_id: opts.src_compute_server_id }
+          : undefined),
     });
 
     if (opts.only_contents) {
@@ -3441,9 +3440,7 @@ export class ProjectActions extends Actions<ProjectStoreState> {
     title: string;
     content: string;
   }): Promise<"ok" | "cancel"> {
-    if (this.modal != null) {
-      await this.wait_until_no_modals();
-    }
+    await this.wait_until_no_modals();
     let response: "ok" | "cancel" = "cancel";
     const modal = fromJS({
       title,
@@ -3452,17 +3449,25 @@ export class ProjectActions extends Actions<ProjectStoreState> {
       onCancel: () => (response = "cancel"),
     }) as any;
     this.modal = modal;
-    this.setState({
-      modal,
-    });
+    this.setState({ modal });
     await this.wait_until_no_modals();
     return response;
   }
 
   public async wait_until_no_modals(): Promise<void> {
-    if (this.modal == null) return;
-    await this.get_store()?.async_wait({
-      until: (s) => !s.get("modal") && this.modal == null,
+    const store = this.get_store();
+    if (store == null) {
+      return;
+    }
+    const noModal = () => {
+      return this.modal == null && !store.get("modal");
+    };
+
+    if (noModal()) {
+      return;
+    }
+    await store.async_wait({
+      until: noModal,
       timeout: 99999,
     });
   }