From 19c2f9c9e86a61978fa21a23de590cba8ddfe6b0 Mon Sep 17 00:00:00 2001
From: Wendelin <12148533+wendevlin@users.noreply.github.com>
Date: Thu, 31 Jul 2025 12:38:52 +0200
Subject: [PATCH] Revert "Use query params instead of path for media browser
 navigate ids" (#26333)

---
 .../media-browser/ha-panel-media-browser.ts   | 69 +++++++------------
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/src/panels/media-browser/ha-panel-media-browser.ts b/src/panels/media-browser/ha-panel-media-browser.ts
index c4f843b022..61704ef6da 100644
--- a/src/panels/media-browser/ha-panel-media-browser.ts
+++ b/src/panels/media-browser/ha-panel-media-browser.ts
@@ -44,38 +44,15 @@ import type { BarMediaPlayer } from "./ha-bar-media-player";
 import { showWebBrowserPlayMediaDialog } from "./show-media-player-dialog";
 
 const createMediaPanelUrl = (entityId: string, items: MediaPlayerItemId[]) => {
-  const path = `/media-browser/${entityId}`;
-  if (items.length <= 1) {
-    return path;
+  let path = `/media-browser/${entityId}`;
+  for (const item of items.slice(1)) {
+    path +=
+      "/" +
+      encodeURIComponent(`${item.media_content_type},${item.media_content_id}`);
   }
-  const navigateIds = items
-    .slice(1)
-    .map((item) =>
-      encodeURIComponent(`${item.media_content_type},${item.media_content_id}`)
-    );
-  const urlparams = new URLSearchParams();
-  urlparams.set("ids", navigateIds.join(","));
-  return path + "?" + urlparams.toString();
+  return path;
 };
 
-const decodeNavigateIds = (
-  navigateIdsEncoded: string[]
-): MediaPlayerItemId[] => [
-  {
-    media_content_id: undefined,
-    media_content_type: undefined,
-  },
-  ...navigateIdsEncoded.map((navigateId) => {
-    const decoded = decodeURIComponent(navigateId);
-    // Don't use split because media_content_id could contain commas
-    const delimiter = decoded.indexOf(",");
-    return {
-      media_content_type: decoded.substring(0, delimiter),
-      media_content_id: decoded.substring(delimiter + 1),
-    };
-  }),
-];
-
 @customElement("ha-panel-media-browser")
 class PanelMediaBrowser extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -233,19 +210,9 @@ class PanelMediaBrowser extends LitElement {
       return;
     }
 
-    const [routePlayer, ...paths] = this.route.path.substring(1).split("/");
-
-    const navigateIdsEncoded =
-      new URLSearchParams(location.search).get("ids")?.split(",") || [];
-
-    // Backwards compatibility with old URLs
-    if (navigateIdsEncoded.length === 0 && paths.length > 0) {
-      const navigateIds = decodeNavigateIds(paths);
-      navigate(createMediaPanelUrl(this._entityId, navigateIds), {
-        replace: true,
-      });
-      return;
-    }
+    const [routePlayer, ...navigateIdsEncoded] = this.route.path
+      .substring(1)
+      .split("/");
 
     if (routePlayer !== this._entityId) {
       // Detect if picked player doesn't exist (anymore)
@@ -268,7 +235,21 @@ class PanelMediaBrowser extends LitElement {
       this._entityId = routePlayer;
     }
 
-    this._navigateIds = decodeNavigateIds(navigateIdsEncoded);
+    this._navigateIds = [
+      {
+        media_content_type: undefined,
+        media_content_id: undefined,
+      },
+      ...navigateIdsEncoded.map((navigateId) => {
+        const decoded = decodeURIComponent(navigateId);
+        // Don't use split because media_content_id could contain commas
+        const delimiter = decoded.indexOf(",");
+        return {
+          media_content_type: decoded.substring(0, delimiter),
+          media_content_id: decoded.substring(delimiter + 1),
+        };
+      }),
+    ];
     this._currentItem = undefined;
   }
 
@@ -276,7 +257,6 @@ class PanelMediaBrowser extends LitElement {
     navigate(
       createMediaPanelUrl(this._entityId, this._navigateIds.slice(0, -1))
     );
-    this.requestUpdate("route");
   }
 
   private _mediaBrowsed(ev: { detail: HASSDomEvents["media-browsed"] }) {
@@ -288,7 +268,6 @@ class PanelMediaBrowser extends LitElement {
     navigate(createMediaPanelUrl(this._entityId, ev.detail.ids), {
       replace: ev.detail.replace,
     });
-    this.requestUpdate("route");
   }
 
   private async _mediaPicked(