Merge branch 'main' into flow-application-docs-restructure

Resolve conflict by keeping state.adoc deleted as intended by this branch.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: peholmst

articles/building-apps/server-push/callbacks.adoc

@@ -2,20 +2,19 @@
 title: Callbacks
 page-title: How to use server push with callbacks | Vaadin
 description: How to use server push with callbacks.
-meta-description: Learn how to  use server push with callbacks when building the UI layer of your Vaadin application.
+meta-description: Learn how to use server push with callbacks when building the UI layer of your Vaadin application.
 order: 20
-section-nav: badge-flow
 ---
 
 
-= Implementing Callbacks [badge-flow]#Flow#
+= Implementing Callbacks
 
 When building the user interface with Vaadin Flow, the easiest way of allowing a background job to update the user interface is through callbacks. This is explained in more detail in the <</building-apps/business-logic/background-jobs/interaction/callbacks#,Callbacks>> documentation page.
 
-Whenever you implement a callback, you have remember that the callback is called by the background thread. This means that any updates to the user interface must happen inside a call to `UI.access()`.
+Whenever you implement a callback, remember that the callback is called by the background thread. This means that any updates to the user interface must happen inside a call to `UI.access()`.
 
 [NOTE]
-The examples on this page only work with push enabled. For information about how to do that, see the <<.#enabling-push-flow,Server Push>> documentation page.
+The examples on this page only work with push enabled. For information about how to do that, see the <<index.adoc#,Server Push>> documentation page.
 
 For every callback, you should create a private method in your user interface. The method is called inside `UI.access()`, so you can safely update the user interface inside it.
 

articles/building-apps/server-push/futures.adoc

@@ -1,14 +1,13 @@
 ---
 title: Futures
-page-title:  How to use server push with CompletableFuture | Vaadin
+page-title: How to use server push with CompletableFuture | Vaadin
 description: How to use server push with CompletableFuture.
 meta-description: Learn how to use server push with CompletableFuture when building the UI layer of your Vaadin application.
 order: 30
-section-nav: badge-flow
 ---
 
 
-= Consuming Futures [badge-flow]#Flow#
+= Consuming Futures
 
 Some background jobs may use `CompletableFuture` to inform the user interface of results and errors. This is covered in the <</building-apps/business-logic/background-jobs/interaction/futures#,Returning Futures>> documentation page.
 
@@ -24,7 +23,7 @@ private void onJobCompleted(String result) {
 ----
 
 [NOTE]
-The examples on this page only work with push enabled (see <<.#enabling-push-flow,Server Push>>).
+The examples on this page only work with push enabled (see <<index.adoc#,Server Push>>).
 
 A method for handling errors might look like this:
 

articles/building-apps/server-push/index.adoc

@@ -19,7 +19,7 @@ In Hilla views, push is always enabled when you subscribe to a _reactive endpoin
 Server push is not the same as Web Push, which is also supported by Vaadin Flow. For more information, see the <<{articles}/flow/configuration/webpush#,Web Push Notifications>> documentation page.
 
 
-== Enabling Push [badge-flow]#Flow#
+== Enabling Push
 
 Before you can use server push in Flow, you have to enable it. You do this by adding the `@Push` annotation to the application shell class, like this:
 
@@ -40,9 +40,23 @@ public class Application implements AppShellConfigurator {
 }
 ----
 
-// TODO Add link to page about the application shell, once is has been written (currently, the contents is scattered all over the documentation)
 
-// TODO Transport modes? Or is that something for the reference material.
+== Push Modes
+
+By default, Flow uses automatic pushing (`PushMode.AUTOMATIC`). This means that any pending changes are pushed to the browser after `UI.access()` finishes. This is the recommended mode for most applications.
+
+You can also configure Flow to use manual pushing (`PushMode.MANUAL`). With manual mode, you call `UI.push()` explicitly to send changes to the browser. This gives you more control over when changes are pushed, which is useful when you want to batch multiple updates together.
+
+For details on how to use `UI.access()` and `UI.push()`, see <<updates#,Pushing UI Updates>>.
+
+
+== Transport Options
+
+Server push can use several transports: WebSockets, long polling, or combined WebSockets+XHR. The default is WebSockets+XHR, which works well in most environments.
+
+You might need to change the transport if you're experiencing connectivity issues, for example when running behind certain proxies or corporate firewalls that block WebSocket connections. In such cases, long polling can be a more reliable alternative.
+
+For technical details about configuring transports, see <<{articles}/flow/advanced/server-push#,Server Push Configuration>>.
 
 
 == Topics

articles/building-apps/server-push/reactive.adoc

@@ -9,7 +9,7 @@ order: 40
 
 When building the user interface with either Vaadin Flow or Hilla, you can use reactive streams to allow a background job to update the user interface. This is covered in the <</building-apps/business-logic/background-jobs/interaction/reactive#,Producing Reactive Streams>> documentation page.
 
-//RUSSELL: This opening paragraph gives the feeling that the reader shouldn't read this page since it immediately sends them elsewhere. You need a sentence or two that says the point of continuing, maybe something about subscribing, handling errors, etc.
+This page covers subscribing to reactive streams, handling errors, and buffering high-frequency updates.
 
 
 == Types of Subscriptions

articles/building-apps/server-push/threads.adoc

@@ -4,11 +4,10 @@ page-title: How to use threads in a Vaadin Flow user interface
 description: How to use threads in a Vaadin Flow user interface.
 meta-description: Learn how to use use virtual threads in a Vaadin Flow user interface by reading this guide.
 order: 10
-section-nav: badge-flow
 ---
 
 
-= User Interface Threads [badge-flow]#Flow#
+= User Interface Threads
 
 Developers often use server push to update the user interface from background jobs (see <</building-apps/business-logic/background-jobs/interaction#,Background Jobs - UI Interaction>>). However, in Vaadin Flow, there are also cases where you may want to start a separate thread for use by the user interface itself. You might, for instance, want to show the server date and time in "real time".
 
@@ -17,7 +16,7 @@ If you have experience with Swing, you might be tempted to use a `Timer`, or to
 As a better strategy, use virtual threads, or Spring's `TaskExecutor` and `TaskScheduler`. These are explained in the following sections, with some examples.
 
 [NOTE]
-The examples on this page only work with push enabled. For information about how to do that, see the <<.#enabling-push-flow,Server Push>> documentation page.
+The examples on this page only work with push enabled. For information about how to do that, see the <<index.adoc#,Server Push>> documentation page.
 
 
 == Virtual Threads

articles/building-apps/server-push/updates.adoc

@@ -4,11 +4,10 @@ page-title: How to push updates to a Vaadin Flow user interface
 description: How to push updates to a Vaadin Flow user interface.
 meta-description: Learn how to push updates to a Vaadin Flow user interface by reading this guide.
 order: 1
-section-nav: badge-flow
 ---
 
 
-= Pushing UI Updates [badge-flow]#Flow#
+= Pushing UI Updates
 
 Whenever you're using server push in Vaadin Flow, you're triggering it from a thread other than the normal HTTP request thread. Making changes to a UI from another thread and pushing them to the browser requires locking the user session. Otherwise, the UI update performed from another thread could conflict with a regular event-driven update and cause either data corruption, race conditions or deadlocks.
 
@@ -22,7 +21,7 @@ ui.access(() -> {
 ----
 
 [NOTE]
-The examples on this page only work with push enabled. For information about how to do that, see the <<.#enabling-push-flow,Server Push>> documentation page.
+The examples on this page only work with push enabled. For information about how to do that, see the <<index.adoc#,Server Push>> documentation page.
 
 By default, Flow uses automatic pushing. This means that any pending changes are pushed to the browser after the command passed to `UI.access()` finishes. You can also configure Flow to use manual pushing. This would give you more control over when changes are pushed to the browser. For example, you can push multiple times inside a single call to `UI.access()`.
 
@@ -49,8 +48,6 @@ ui.access(() -> {
 
 == Getting the UI Instance
 
-// This assumes that the UI has been explained earlier, and what attach and detach means.
-
 Before you can call `access()`, you need to get the `UI` instance. You'd typically use `Component.getUI()` or `UI.getCurrent()` for this. However, both are problematic when it comes to server push.
 
 `Component.getUI()` is not thread-safe, which means you should only call it while the user session is locked. Therefore, you can't use it to call `access()`.
@@ -200,5 +197,3 @@ if (ui.getSession().hasLock()) {
     });
 }
 ----
-
-// TODO Consider showing an example of a UIRunner that takes a Runnable or Consumer, performs the check, and calls it directly or inside UI.access().