From d3677969a2707b7dd3aa2212a2d56897fd10aa7a Mon Sep 17 00:00:00 2001
From: Jamie White <jamie@jgwhite.co.uk>
Date: Sat, 28 Aug 2021 00:38:02 +0200
Subject: [PATCH] ui/project: force refresh after settings change

This is rather inelegant but the [RouterService.refresh] method is
not yet available to us.

[RouterService.refresh]: https://github.com/emberjs/rfcs/pull/631
---
 .../app-form/project-repository-settings.ts          | 12 ++++++++++++
 ui/app/services/poll-model.ts                        |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/ui/app/components/app-form/project-repository-settings.ts b/ui/app/components/app-form/project-repository-settings.ts
index f16eac4ed12..400cf7e320d 100644
--- a/ui/app/components/app-form/project-repository-settings.ts
+++ b/ui/app/components/app-form/project-repository-settings.ts
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import RouterService from '@ember/routing/router-service';
@@ -8,6 +9,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { Project, Job } from 'waypoint-pb';
 import parseUrl from 'parse-url';
+import { later } from '@ember/runloop';
 
 const FORMAT = {
   HCL: 0,
@@ -223,6 +225,16 @@ export default class AppFormProjectRepositorySettings extends Component<ProjectS
     try {
       await this.api.upsertProject(this.project, this.authCase);
       this.flashMessages.success('Settings saved');
+
+      // Refresh project route to get the latest state of the InitOp (if any)
+      this.router.refresh('workspace.projects.project');
+
+      if (!Ember.testing) {
+        // Optimistically refresh again a few seconds later, by which time
+        // the InitOp is likely to have completed
+        later(this.router, 'refresh', 'workspace.projects.project', 3000);
+      }
+
       this.router.transitionTo('workspace.projects.project', this.project.name);
     } catch (err) {
       this.flashMessages.error('Failed to save Settings', { content: err.message, sticky: true });
diff --git a/ui/app/services/poll-model.ts b/ui/app/services/poll-model.ts
index 195ce3b4c05..81acf5bd303 100644
--- a/ui/app/services/poll-model.ts
+++ b/ui/app/services/poll-model.ts
@@ -35,6 +35,10 @@ export default class PollModelService extends Service {
     taskFor(this.poll).cancelAll();
   }
 
+  expedite(): void {
+    this.route?.refresh();
+  }
+
   @task({
     restartable: true,
     maxConcurrency: 1,