fix: EPG viewer showing single row on some screen sizes

Author: sparkison

app/Http/Controllers/Api/EpgApiController.php

@@ -254,6 +254,10 @@ public function getDataForPlaylist(string $uuid, Request $request)
                 if (! $channelNo && ($playlist->auto_channel_increment || $idChannelBy === PlaylistChannelId::Number)) {
                     $channelNo = ++$channelNumber;
                 }
+
+                // Ensure we always have a unique identifier for the channel
+                // Use database ID as fallback if channel number is not set
+                $channelKey = $channelNo ?: $channel->id;
                 if ($epgData) {
                     $epgId = $epgData->epg_id;
                     $epgIds[] = $epgId;
@@ -283,10 +287,10 @@ public function getDataForPlaylist(string $uuid, Request $request)
 
                     // Add the playlist channel info to the EPG channel map
                     $epgChannelMap[$epgId][$epgData->channel_id][] = [
-                        'playlist_channel_id' => $channelNo,
+                        'playlist_channel_id' => $channelKey,
                         'display_name' => $channel->title_custom ?? $channel->title,
                         'title' => $channel->name_custom ?? $channel->name,
-                        'channel_number' => $channel->channel,
+                        'channel_number' => $channelNo,
                         'group' => $channel->group ?? $channel->group_internal,
                         'logo' => $logo ?? '',
                     ];
@@ -303,11 +307,11 @@ public function getDataForPlaylist(string $uuid, Request $request)
 
                     // Keep track of which channels need a dummy EPG program
                     $dummyEpgChannels[] = [
-                        'playlist_channel_id' => $channelNo,
+                        'playlist_channel_id' => $channelKey,
                         'display_name' => $channel->title_custom ?? $channel->title,
                         'title' => $channel->name_custom ?? $channel->name,
                         'icon' => $icon,
-                        'channel_number' => $channel->channel,
+                        'channel_number' => $channelNo,
                         'group' => $channel->group ?? $channel->group_internal,
                         'include_category' => $playlist->dummy_epg_category,
                     ];
@@ -364,8 +368,8 @@ public function getDataForPlaylist(string $uuid, Request $request)
                 if ($logoProxyEnabled) {
                     $icon = LogoProxyController::generateProxyUrl($icon, internal: true);
                 }
-                $playlistChannelData[$channelNo] = [
-                    'id' => $channelNo,
+                $playlistChannelData[$channelKey] = [
+                    'id' => $channelKey,
                     'database_id' => $channel->id, // Add the actual database ID for editing
                     'url' => $url,
                     'format' => $channel->is_vod
@@ -374,7 +378,7 @@ public function getDataForPlaylist(string $uuid, Request $request)
                     'tvg_id' => $tvgId,
                     'display_name' => $channel->title_custom ?? $channel->title,
                     'title' => $channel->name_custom ?? $channel->name,
-                    'channel_number' => $channel->channel,
+                    'channel_number' => $channelNo,
                     'group' => $channel->group ?? $channel->group_internal,
                     'icon' => $icon,
                     'has_epg' => $epgData !== null,