Revert "Fix back navigation after POST form submission (#1014)"

This reverts commit c207f5b.
hotwired · Nov 13, 2023 · 2655842 · 2655842
1 parent 60de74a
commit 2655842
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/core/drive/visit.js b/src/core/drive/visit.js
@@ -154,10 +154,10 @@ export class Visit {
     }
   }
 
-  async issueRequest() {
+  issueRequest() {
     if (this.hasPreloadedResponse()) {
       this.simulateRequest()
-    } else if (!this.request && await this.shouldIssueRequest()) {
+    } else if (this.shouldIssueRequest() && !this.request) {
       this.request = new FetchRequest(this, FetchMethod.get, this.location)
       this.request.perform()
     }
@@ -231,14 +231,14 @@ export class Visit {
     }
   }
 
-  async hasCachedSnapshot() {
-    return (await this.getCachedSnapshot()) != null
+  hasCachedSnapshot() {
+    return this.getCachedSnapshot() != null
   }
 
   async loadCachedSnapshot() {
     const snapshot = await this.getCachedSnapshot()
     if (snapshot) {
-      const isPreview = await this.shouldIssueRequest()
+      const isPreview = this.shouldIssueRequest()
       this.render(async () => {
         this.cacheSnapshot()
         if (this.isSamePage) {
@@ -391,11 +391,11 @@ export class Visit {
     return typeof this.response == "object"
   }
 
-  async shouldIssueRequest() {
+  shouldIssueRequest() {
     if (this.isSamePage) {
       return false
-    } else if (this.action === "restore") {
-      return !(await this.hasCachedSnapshot())
+    } else if (this.action == "restore") {
+      return !this.hasCachedSnapshot()
     } else {
       return this.willRender
     }

diff --git a/src/core/native/browser_adapter.js b/src/core/native/browser_adapter.js
@@ -27,7 +27,11 @@ export class BrowserAdapter {
 
   visitRequestStarted(visit) {
     this.progressBar.setValue(0)
-    this.showVisitProgressBarAfterDelay()
+    if (visit.hasCachedSnapshot() || visit.action != "restore") {
+      this.showVisitProgressBarAfterDelay()
+    } else {
+      this.showProgressBar()
+    }
   }
 
   visitRequestCompleted(visit) {

diff --git a/src/tests/functional/navigation_tests.js b/src/tests/functional/navigation_tests.js
@@ -195,13 +195,7 @@ test("following a POST form clears cache", async ({ page }) => {
   await page.click("#form-post-submit")
   await nextBeat() // 301 redirect response
   await nextBeat() // 200 response
-
-  assert.equal(await page.textContent("h1"), "One")
-
   await page.goBack()
-  await nextBeat()
-
-  assert.equal(await page.textContent("h1"), "Navigation")
   assert.notOk(await hasSelector(page, "some-cached-element"))
 })