Update the installation failure flow.

Jigsaw-Code · Apr 24, 2024 · 8907aac · 8907aac
1 parent 24fcdb6
commit 8907aac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/server_manager/web_app/app.ts b/server_manager/web_app/app.ts
@@ -22,6 +22,7 @@ import {DisplayDataAmount, displayDataAmountToBytes} from './data_formatting';
 import {filterOptions, getShortName} from './location_formatting';
 import {parseManualServerConfig} from './management_urls';
 import type {AppRoot, ServerListEntry} from './ui_components/app-root';
+import { FeedbackDetail } from './ui_components/outline-feedback-dialog';
 import type {DisplayAccessKey, ServerView} from './ui_components/outline-server-view';
 import * as digitalocean_api from '../cloud/digitalocean_api';
 import {HttpError} from '../cloud/gcp_api';
@@ -30,7 +31,6 @@ import * as digitalocean from '../model/digitalocean';
 import * as gcp from '../model/gcp';
 import type {CloudLocation} from '../model/location';
 import * as server_model from '../model/server';
-import { FeedbackDetail } from './ui_components/outline-feedback-dialog';
 
 
 // The Outline DigitalOcean team's referral code:
@@ -1152,7 +1152,7 @@ export class App {
       // Remove inaccessible manual server from local storage if it was just created.
       manualServer.forget();
       console.error('Manual server installed but unreachable.');
-      throw new Error('foobar');
+      throw new UnreachableServerError();
     }
   }
 

diff --git a/server_manager/web_app/ui_components/outline-contact-us-dialog.ts b/server_manager/web_app/ui_components/outline-contact-us-dialog.ts
@@ -204,6 +204,9 @@ export class OutlineContactUsDialog extends LitElement implements OutlineFeedbac
   }
 
   reset() {
+    if (this.installationFailed) {
+      this.close();
+    }
     this.isFormSubmitting = false;
     this.showIssueSelector = false;
     this.openTicketSelectionOptions.forEach(element => {
@@ -359,8 +362,13 @@ export class OutlineContactUsDialog extends LitElement implements OutlineFeedbac
     this.reset();
 
     this.installationFailed = showInstallationFailed;
-    console.log(prepopulatedMessage, showInstallationFailed);
-    // this.$.userFeedback.value = prepopulatedMessage || '';
+    if (this.installationFailed) {
+      // We go straight to the form and bypass the wizard in the case of a failed
+      // installation.
+      this.step = Step.FORM;
+      this.selectedIssueType = IssueType.GENERAL;
+      this.formValues.description = prepopulatedMessage;
+    }
 
     this.dialogRef.value?.open();
   }