@brightspot/ui 6.4.3-pr.366.2026.10.5 → 6.5.0

package/src/legacy/tool-ui/src/rtc/Socket.ts

@@ -7,10 +7,14 @@ export default class Socket {
   private _requests: {
     message: { type: string; [key: string]: unknown }
     callback?: (data?: unknown) => void
-    wait?: boolean
   }[]
   private _sending = false
   private _sessionId?: string
+
+  // Kept when _sessionId is cleared, for sendFinal. Navigating away aborts the event stream, and the error
+  // that follows resets the connection, so by the time the page reports that it is going the live session is
+  // already gone and the tab would have no way left to say it had left.
+  private _closingSessionId?: string
   private _onConnect: () => void = () => {}
   private _onReceive: (data: JSONObject) => void | (() => void) = () => {}
   private _ensureConnectionInterval?: number
@@ -29,10 +33,9 @@ export default class Socket {
   send(
     message: { type: string; [key: string]: unknown },
     callback?: (data?: unknown) => void,
-    wait?: boolean,
   ) {
     if (message) {
-      this._requests.push({ message, callback, wait })
+      this._requests.push({ message, callback })
 
       if (!this._sending) {
         this._sending = true
@@ -60,7 +63,7 @@ export default class Socket {
       return
     }
 
-    const { message, callback, wait } = request
+    const { message, callback } = request
 
     // Query string only used for logging.
     const body = new URLSearchParams()
@@ -94,11 +97,24 @@ export default class Socket {
       .finally(() => {
         this._processRequests()
       })
+  }
 
-    if (wait) {
-      const start = +Date.now()
-      while (Date.now() - start < 500) {}
+  // Sends a message while the page is going away. A normal request is cancelled as the page unloads, so the
+  // server never hears that this tab left and keeps whatever it had locked. A beacon is handed to the browser
+  // to deliver on its own, after the page is gone.
+  sendFinal(message: { type: string; [key: string]: unknown }) {
+    const sessionId = this._sessionId || this._closingSessionId
+
+    if (!message || !sessionId || !navigator.sendBeacon) {
+      return false
     }
+
+    const body = new URLSearchParams()
+
+    body.append('sessionId', sessionId)
+    body.append('message', JSON.stringify(message))
+
+    return navigator.sendBeacon(this._url, body)
   }
 
   // Connects to the server for receiving messages.
@@ -139,6 +155,7 @@ export default class Socket {
       if (data._first) {
         if (typeof data.sessionId === 'string') {
           this._sessionId = data.sessionId
+          this._closingSessionId = data.sessionId
         }
 
         if (this._receiver) {

package/src/legacy/tool-ui/src/rtc/index.ts

@@ -37,7 +37,7 @@ if (window.DISABLE_RTC || !document.documentElement.dataset.userId) {
   const BROADCAST = 'broadcast'
   const CALLBACK = 'callback'
   const CONNECT = 'connect'
-  const DISCONNECT = 'connect'
+  const DISCONNECT = 'disconnect'
   const EXECUTE = 'execute'
   const RESTORE = 'restore'
 
@@ -220,7 +220,20 @@ if (window.DISABLE_RTC || !document.documentElement.dataset.userId) {
     ) {
       rtc.restore(state, data, callback)
 
-      window.addEventListener('unload', () => {
+      // pagehide, not unload: a request started from unload is cancelled as the page goes away, so the tab
+      // was rarely able to say it had left and kept hold of its locks.
+      let sent = false
+
+      window.addEventListener('pagehide', (event) => {
+        // A page entering the back/forward cache is not leaving, and may well come back. Disconnecting here
+        // would drop the locks of someone who then navigates straight back, and would use up the one
+        // disconnect this tab gets to send when it really does go.
+        if (event.persisted || sent) {
+          return
+        }
+
+        sent = true
+
         const message = {
           type: 'disconnect',
           className: state,
@@ -228,7 +241,7 @@ if (window.DISABLE_RTC || !document.documentElement.dataset.userId) {
         }
 
         if (socket) {
-          socket.send(message, callback, true)
+          socket.sendFinal(message)
         } else {
           // Send the action to the leader at [LS].
           channel.postMessage({ type: DISCONNECT, message })

package/src/legacy/tool-ui/src/v5.ts

@@ -1192,10 +1192,13 @@ const renderCETitle = (title: HTMLElement) => {
       }
     }
 
-    // If status name is empty, default to either "New" or "Published"
+    // If status name is empty, default to either "New", "Published" or "Saved"
     if (!newStatus.innerText || newStatus.innerText == '') {
       if (editPage.classList.contains('is-notNew')) {
-        newStatus.innerText = window.BRIGHTSPOT?.ui.workflow.published
+        // Save-only types (no `is-publish`) are never published.
+        newStatus.innerText = editPage.classList.contains('is-publish')
+          ? window.BRIGHTSPOT?.ui.workflow.published
+          : window.BRIGHTSPOT?.ui.workflow.saved ?? 'Saved'
       }
       if (editPage.classList.contains('is-new')) {
         newStatus.innerText = window.BRIGHTSPOT?.ui.tooltips.new