Issue #3205269: After resetting an override to default, override form still loads the previous override

src/Form/DashboardLayoutBuilderForm.php

@@ -2,7 +2,9 @@
 
 namespace Drupal\dashboards\Form;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\user\UserDataInterface;
@@ -128,16 +130,33 @@ class DashboardLayoutBuilderForm extends EntityForm {
    *   Form state.
    */
   public function resetToDefault(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\dashboards\Entity\Dashboard $dashboard */
+    $dashboard = $this->sectionStorage->getContextValue(Dashboard::CONTEXT_TYPE);
+
+    // Delete the userdata containing the dashboard override.
     $this->userData->delete(
       'dashboards',
       $this->account->id(),
-      $this->sectionStorage->getContextValue(Dashboard::CONTEXT_TYPE)->id()
-    );
-    $form_state->setRedirectUrl(
-      Url::fromRoute('entity.dashboard.canonical', [
-        'dashboard' => $this->sectionStorage->getContextValue(Dashboard::CONTEXT_TYPE)->id(),
-      ])
+      $dashboard->id()
     );
+
+    // Delete the tempstore so the override form is reloaded as well.
+    $this->layoutTempstoreRepository->delete($this->sectionStorage);
+
+    // Create a new trusted redirect response.
+    $response = new TrustedRedirectResponse(Url::fromRoute('entity.dashboard.canonical', [
+      'dashboard' => $dashboard->id(),
+    ])->toString());
+
+    // Set cacheable metadata.
+    $metadata = $response->getCacheableMetadata();
+    $metadata->setCacheTags($dashboard->getCacheTags());
+    $metadata->setCacheContexts($dashboard->getCacheContexts());
+    // Also invalidate the cache.
+    Cache::invalidateTags($dashboard->getCacheTags());
+
+    // Set the response so we're redirected back to the dashboard.
+    $form_state->setResponse($response);
   }
 
   /**