fix добавление трека

PlaylistShared.Pwa/Components/Common/TrackCoverWithPlay.razor

@@ -7,7 +7,7 @@
     
     <MudImage Src="@CoverUrl.FormatCoverUrl(Width, Height)" Height="@Height" Width="@Width" Class="rounded" Style="display: block;" />
     
-    @if (_isHovered || IsCurrentTrackPlaying)
+    @if (CanPlay && (_isHovered || IsCurrentTrackPlaying))
     {
         <MudItem class="play-overlay"
                   style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.6); display: flex; align-items: center; justify-content: center; border-radius: 4px;">
@@ -26,6 +26,7 @@
     [Parameter] public int Height { get; set; } = 50;
     [Parameter] public int Width { get; set; } = 50;
     [Parameter] public string PlaylistShareToken { get; set; } = string.Empty;
+    [Parameter] public bool CanPlay { get; set; } = false;
 
     private bool IsCurrentTrackPlaying => AudioPlayerService.IsPlaying && AudioPlayerService.CurrentTrackId == TrackId;
 

PlaylistShared.Pwa/Components/Common/TrackItem.razor

@@ -9,6 +9,7 @@
                             TrackId="@Track.TrackId"
                             TrackTitle="@Track.Title"
                             PlaylistShareToken="@PlaylistShareToken"
+                            CanPlay="@CanPlay"
                             Width="40" Height="40" />
     </MudItem>
 
@@ -31,4 +32,5 @@
 @code {
     [Parameter] public YandexTrack Track { get; set; } = null!;
     [Parameter] public string PlaylistShareToken { get; set; } = string.Empty;
+    [Parameter] public bool CanPlay { get; set; } = true;
 }

PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor

@@ -5,46 +5,48 @@
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 
-<MudStack AlignItems="AlignItems.Stretch">
+<MudStack Style="height: 100%; overflow: hidden;">
-    <MudTextField @bind-Value="_searchQuery"
+    <MudItem>
-                    @bind-Value:after="SearchTracks"
+        <MudTextField @bind-Value="_searchQuery"
-                    Variant="Variant.Outlined"
+                      @bind-Value:after="SearchTracks"
-                    FullWidth
+                      Variant="Variant.Outlined"
-                    Label="Название или ссылка на трек Яндекс.Музыки"
+                      FullWidth
-                    Disabled="@_isSearching"
+                      Label="Название или ссылка на трек Яндекс.Музыки"
-                    Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary"
+                      Disabled="@_isSearching"
-                    />
+                      Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
 
-    <MudToggleGroup T="TrackSearchType"
+        <MudToggleGroup T="TrackSearchType"
-                    @bind-Value="_searchType"
+                        @bind-Value="_searchType"
-                    @bind-Value:after="SearchTracks"
+                        @bind-Value:after="SearchTracks"
-                    Size="Size.Small"
+                        Size="Size.Small"
-                    Color="Color.Primary"
+                        Color="Color.Primary"
-                    Disabled="@(_isSearching)"
+                        Disabled="@(_isSearching)">
-                    >
+            <MudToggleItem Value="TrackSearchType.All" Text="Все" />
-        <MudToggleItem Value="TrackSearchType.All" Text="Все" />
+            <MudToggleItem Value="TrackSearchType.Track" Text="Трек" />
-        <MudToggleItem Value="TrackSearchType.Track" Text="Трек" />
+            <MudToggleItem Value="TrackSearchType.Album" Text="Альбом" />
-        <MudToggleItem Value="TrackSearchType.Album" Text="Альбом" />
+            <MudToggleItem Value="TrackSearchType.Artist" Text="Исполнитель" />
-        <MudToggleItem Value="TrackSearchType.Artist" Text="Исполнитель" />
+        </MudToggleGroup>
-    </MudToggleGroup>
+    </MudItem>
 
     <MudTable Items="@_searchResults"
-                Virtualize="@true"
+              Virtualize
-                Height="400px"
+              Hover
-                Hover="true"
+              Elevation="0"
-                Breakpoint="Breakpoint.Sm"
+              Class="d-flex flex-grow-1 flex-column"
-                Loading="@_isSearching">
+              Style="min-height: 0;"
+              Breakpoint="Breakpoint.Sm"
+              Loading="@_isSearching">
         <RowTemplate>
-            <MudTd Style="width: 100%;">
+            <MudTd Class="pa-1" Style="width: 100%;">
                 <TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
             </MudTd>
-            <MudTd>
+            <MudTd Class="pa-1">
-                <MudToggleIconButton Toggled="_addingTrackIds.Contains(context.TrackId)"
+                <MudToggleIconButton Toggled="@ExistingTrackIds.Contains(context.TrackId)"
-                                        Icon="@Icons.Material.Filled.AddCircle"
+                                     Icon="@Icons.Material.Filled.AddCircle"
-                                        Color="@Color.Primary"
+                                     Color="@Color.Primary"
-                                        ToggledIcon="@Icons.Material.Filled.RemoveCircle"
+                                     ToggledIcon="@Icons.Material.Filled.RemoveCircle"
-                                        ToggledColor="@Color.Error"
+                                     ToggledColor="@Color.Error"
-                                        ToggledChanged="() => ToggleTrack(context)" />
+                                     ToggledChanged="() => ToggleTrack(context)" />
             </MudTd>
         </RowTemplate>
     </MudTable>
@@ -54,13 +56,13 @@
     [Parameter] public string ShareToken { get; set; } = string.Empty;
     [Parameter] public EventCallback OnTrackAdded { get; set; }
     [Parameter] public EventCallback OnTrackRemoved { get; set; }
+    [Parameter] public HashSet<string> ExistingTrackIds { get; set; } = new();
 
     private string _searchQuery = "";
     private bool _isSearching = false;
     private bool _isFirstSearch = true;
     private TrackSearchType _searchType = TrackSearchType.All;
     private List<YandexTrack> _searchResults = new();
-    private HashSet<string> _addingTrackIds = new();
 
     private async Task SearchTracks()
     {
@@ -124,7 +126,7 @@
 
     private async Task ToggleTrack(YandexTrack track)
     {
-        if (_addingTrackIds.Contains(track.TrackId))
+        if (ExistingTrackIds.Contains(track.TrackId))
         {
             await RemoveTrack(track);
         }
@@ -136,67 +138,19 @@
 
     private async Task RemoveTrack(YandexTrack track)
     {
-        if (!_addingTrackIds.Remove(track.TrackId)) return;
+        if (!ExistingTrackIds.Remove(track.TrackId)) return;
 
 
         try
         {
             await RemoveTrackById(track.TrackId);
             await OnTrackRemoved.InvokeAsync();
-            Snackbar.Add($"Трек \"{track.Title}\" удален", Severity.Success);
+            Snackbar.Add($"Трек \"{track.Title}\" удален", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
         }
         catch (Exception ex)
         {
-            Snackbar.Add($"Ошибка добавления: {ex.Message}", Severity.Error);
+            Snackbar.Add($"{ex.Message}", Severity.Error);
-            _addingTrackIds.Add(track.TrackId);
+            ExistingTrackIds.Add(track.TrackId);
-        }
-        finally
-        {
-            StateHasChanged();
-        }
-    }
-
-    private async Task AddTrack(YandexTrack track)
-    {
-        if (_addingTrackIds.Contains(track.TrackId)) return;
-        _addingTrackIds.Add(track.TrackId);
-
-        try
-        {
-            await AddTrackById(track.TrackId);
-            await OnTrackAdded.InvokeAsync();
-            Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success);
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Ошибка добавления: {ex.Message}", Severity.Error);
-            _addingTrackIds.Remove(track.TrackId);
-        }
-        finally
-        {
-            StateHasChanged();
-        }
-    }
-
-    private async Task AddTrackById(string trackId)
-    {
-        try
-        {
-            var request = new UpdateTrackListRequest { TrackIds = new List<string> { trackId } };
-            var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/add-tracks", request);
-            if (response.IsSuccessStatusCode)
-            {
-                await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
-            }
-            else
-            {
-                var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
-                Snackbar.Add(error?.Error?.Message ?? "Ошибка добавления трека", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
         }
         finally
         {
@@ -206,23 +160,34 @@
 
     private async Task RemoveTrackById(string trackId)
     {
+        var request = new UpdateTrackListRequest { TrackIds = new List<string> { trackId } };
+        var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
+        if (response.IsSuccessStatusCode)
+        {
+            await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
+        }
+        else
+        {
+            var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
+            throw new Exception(error?.Error?.Message ?? "Ошибка удаления трека");
+        }
+    }
+
+    private async Task AddTrack(YandexTrack track)
+    {
+        if (ExistingTrackIds.Contains(track.TrackId)) return;
+        ExistingTrackIds.Add(track.TrackId);
+
         try
         {
-            var request = new UpdateTrackListRequest { TrackIds = new List<string> { trackId } };
+            await AddTrackById(track.TrackId);
-            var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
+            await OnTrackAdded.InvokeAsync();
-            if (response.IsSuccessStatusCode)
+            Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
-            {
-                await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
-            }
-            else
-            {
-                var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
-                Snackbar.Add(error?.Error?.Message ?? "Ошибка удаления трека", Severity.Error);
-            }
         }
         catch (Exception ex)
         {
-            Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
+            Snackbar.Add($"{ex.Message}", Severity.Error);
+            ExistingTrackIds.Remove(track.TrackId);
         }
         finally
         {
@@ -230,6 +195,21 @@
         }
     }
 
+    private async Task AddTrackById(string trackId)
+    {
+        var request = new UpdateTrackListRequest { TrackIds = new List<string> { trackId } };
+        var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/add-tracks", request);
+        if (response.IsSuccessStatusCode)
+        {
+            await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
+        }
+        else
+        {
+            var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
+            throw new Exception(error?.Error?.Message ?? "Ошибка добавления трека");
+        }
+    }
+
     private static (TrackSearchType Type, string Id) ParseYandexMusicUrl(Uri uri)
     {
         var segments = uri.AbsolutePath.Split('/', StringSplitOptions.RemoveEmptyEntries);

PlaylistShared.Pwa/Components/SharedPlaylist/PlaylistHeader.razor

@@ -40,7 +40,6 @@
                                Size="Size.Medium" />
             }
         </MudStack>
-        <MudText Typo="Typo.body2" Color="Color.Secondary">Владелец: @Playlist?.Creator?.UserName</MudText>
     </MudStack>
 </MudStack>
 

PlaylistShared.Pwa/Components/SharedPlaylist/TracksTable.razor

@@ -1,115 +0,0 @@
-@using PlaylistShared.Pwa.Components.Common
-@using PlaylistShared.Shared.DTO
-@using PlaylistShared.Shared.SharedPlaylist
-@inject HttpClient Http
-@inject ISnackbar Snackbar
-@inject IDialogService DialogService
-
-<MudTable Items="@_tracks" Hover="true" Breakpoint="Breakpoint.Sm" Loading="@_loading">
-    <RowTemplate>
-        <MudTd Style="width: 100%;">
-            <TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
-        </MudTd>
-        @if (CanRemove)
-        {
-            <MudTd>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="() => RemoveTrack(context)" />
-            </MudTd>
-        }
-    </RowTemplate>
-</MudTable>
-
-@code {
-    [Parameter] public string ShareToken { get; set; } = string.Empty;
-    [Parameter] public bool CanPlay { get; set; }
-    [Parameter] public bool CanRemove { get; set; }
-    [Parameter] public bool IsPlaying { get; set; }
-    [Parameter] public EventCallback<string> OnPlayTrack { get; set; }
-
-    public async Task Reload()
-    {
-        await LoadTracks();
-    }
-
-    private List<TrackDisplay> _tracks = new();
-    private bool _loading = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTracks();
-    }
-
-    private async Task LoadTracks()
-    {
-        _loading = true;
-        try
-        {
-            var response = await Http.GetFromJsonAsync<ApiResponse<YandexPlaylistData>>($"/api/sharedplaylist/{ShareToken}/tracks");
-            if (response?.Success == true && response.Data != null)
-            {
-                _tracks = response.Data.Tracks.Select((t, idx) => new TrackDisplay
-                {
-                    TrackId = t.TrackId,
-                    Title = t.Title,
-                    Artists = t.Artists,
-                    DurationMs = t.DurationMs,
-                    CoverUri = t.CoverUri,
-                    Index = idx + 1
-                }).ToList();
-            }
-            else
-            {
-                Snackbar.Add(response?.Error?.Message ?? "Не удалось загрузить треки", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Ошибка загрузки треков: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _loading = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task RemoveTrack(TrackDisplay track)
-    {
-        var confirmed = await DialogService.ShowMessageBoxAsync(
-            "Подтверждение удаления",
-            $"Вы уверены, что хотите удалить трек \"{track.Title}\"?",
-            yesText: "Удалить", cancelText: "Отмена");
-
-        if (confirmed != true) return;
-
-        try
-        {
-            var request = new UpdateTrackListRequest { TrackIds = new List<string> { track.TrackId } };
-            var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
-            if (response.IsSuccessStatusCode)
-            {
-                Snackbar.Add("Трек удалён", Severity.Success);
-                await LoadTracks();
-            }
-            else
-            {
-                var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
-                Snackbar.Add(error?.Error?.Message ?? "Ошибка удаления", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
-        }
-    }
-
-    private async Task PlayTrack(string trackId)
-    {
-        await OnPlayTrack.InvokeAsync(trackId);
-    }
-
-    private class TrackDisplay : YandexTrack
-    {
-        public int Index { get; set; }
-    }
-}

PlaylistShared.Pwa/Layout/MainLayout.razor

@@ -21,13 +21,14 @@
         <NavMenu />
     </MudDrawer>
     
-    <MudMainContent Class="pt-16 pa-4" Style="display: flex; flex-direction: column; min-height: 100vh;">
+    <MudMainContent Class="pt-16 d-flex flex-column" Style="height: 100vh;">
-        <div style="flex: 1;">
+        <MudItem Class="flex-grow-1 overflow-y-auto">
             @Body
-        </div>
+        </MudItem>
-        <div style="width: 100%; margin-top: 16px;">
+
+        <MudItem>
             <AudioPlayer />
-        </div>
+        </MudItem>
     </MudMainContent>
 </MudLayout>
 

PlaylistShared.Pwa/Pages/SharedPlaylistView.razor

@@ -1,4 +1,5 @@
 @page "/shared/{token}"
+@using PlaylistShared.Pwa.Components.Common
 @using PlaylistShared.Pwa.Components.SharedPlaylist
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Shared.Enums
@@ -10,7 +11,7 @@
 @inject AuthenticationStateProvider AuthProvider
 @inject IDialogService DialogService
 
-<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="mt-8">
+<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pa-4" Style="height: 100%;">
     @if (_loading)
     {
         <MudProgressCircular Indeterminate />
@@ -21,37 +22,55 @@
     }
     else
     {
-        <MudSplitPanel>
+        <MudSplitPanel Class="flex-grow-1" Style="height: 100%;">
             <FirstPanel>
-                <MudCard>
+                <MudCard Class="d-flex flex-column" Style="height: 100%;">
-                    <!-- Заголовок с обложкой -->
                     <MudCardHeader>
                         <CardHeaderContent>
                             <PlaylistHeader Playlist="@_playlist" />
                         </CardHeaderContent>
                     </MudCardHeader>
 
-                    <MudCardContent>
+                    <MudCardContent Class="flex-grow-1 d-flex flex-column" Style="overflow: hidden;">
-                        <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="_tracksLoading" Size="Size.Medium" />
+                        <MudItem>                              
-                        <TracksTable @ref="_tracksTableRef"
+                            <MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="@_tracksLoading" Size="Size.Medium" />
-                                     ShareToken="@Token"
+                        </MudItem>
-                                     CanPlay="@_canPlay"
+
-                                     CanRemove="@_canRemove"
+                        <MudTable Items="@_tracks"
-                                     />
+                                  Virtualize
+                                  Hover
+                                  Elevation="0"
+                                  Class="d-flex flex-grow-1 flex-column"
+                                  Style="min-height: 0;"
+                                  Breakpoint="Breakpoint.Sm"
+                                  Loading="@_tracksLoading">
+                            <RowTemplate>
+                                <MudTd Class="pa-1" Style="width: 100%;">
+                                    <TrackItem Track="@context" PlaylistShareToken="@Token" CanPlay="@_canPlay" />
+                                </MudTd>
+                                @if (_canRemove)
+                                {
+                                    <MudTd Class="pa-1">
+                                        <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="() => RemoveTrack(context)" />
+                                    </MudTd>
+                                }
+                            </RowTemplate>
+                        </MudTable>
                     </MudCardContent>
                 </MudCard>
             </FirstPanel>
             <SecondPanel>
                 @if (_canAdd)
                 {
-                    <MudCard>
+                    <MudCard Class="d-flex flex-column" Style="height: 100%;">
                         <MudCardHeader>
                             <CardHeaderContent>
                                 <MudText Typo="Typo.h5" Color="Color.Primary">Добавление треков</MudText>
                             </CardHeaderContent>
                         </MudCardHeader>
-                        <MudCardContent>
+
-                            <AddTrackSection ShareToken="@Token" OnTrackAdded="LoadTracks" OnTrackRemoved="LoadTracks" />
+                        <MudCardContent Class="flex-grow-1 d-flex flex-column" Style="overflow: hidden;">
+                            <AddTrackSection ShareToken="@Token" OnTrackAdded="LoadTracks" OnTrackRemoved="LoadTracks" ExistingTrackIds="_existingTrackIds" />
                         </MudCardContent>
                     </MudCard>
                 }
@@ -64,7 +83,9 @@
 @code {
     [Parameter] public string Token { get; set; }
 
-    private TracksTable? _tracksTableRef;
+    private HashSet<string> _existingTrackIds = new();
+    private bool _firstLoadExistingTrackIds;
+    private List<YandexTrack> _tracks = new();
 
     private SharedPlaylistDto? _playlist;
     private bool _loading = true;
@@ -90,6 +111,7 @@
         _isAuthenticated = authState.User.Identity?.IsAuthenticated == true;
         _currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
         await LoadPlaylist();
+        await LoadTracks();
     }
 
     private async Task ConfigurePermissions()
@@ -141,7 +163,6 @@
                 _playlist = response.Data;
 
                 await ConfigurePermissions();
-                //await LoadTracks();
             }
             else
             {
@@ -162,14 +183,61 @@
     private async Task LoadTracks()
     {
         if (_playlist == null) return;
-        if (_tracksTableRef == null) return;
 
         _tracksLoading = true;
-        StateHasChanged();
 
-        await _tracksTableRef.Reload();
+        try
+        {
+            var response = await Http.GetFromJsonAsync<ApiResponse<YandexPlaylistData>>($"/api/sharedplaylist/{Token}/tracks");
+            if (response?.Success == true && response.Data != null)
+            {
+                _tracks = response.Data.Tracks;
+                _existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
+            }
+            else
+            {
+                Snackbar.Add(response?.Error?.Message ?? "Не удалось загрузить треки", Severity.Error);
+            }
 
-        _tracksLoading = false;
+        }
-        StateHasChanged();
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Ошибка загрузки треков: {ex.Message}", Severity.Error);
+        }
+        finally
+        {
+            _tracksLoading = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task RemoveTrack(YandexTrack track)
+    {
+        var confirmed = await DialogService.ShowMessageBoxAsync(
+            "Подтверждение удаления",
+            $"Вы уверены, что хотите удалить трек \"{track.Title}\"?",
+            yesText: "Удалить", cancelText: "Отмена");
+
+        if (confirmed != true) return;
+
+        try
+        {
+            var request = new UpdateTrackListRequest { TrackIds = new List<string> { track.TrackId } };
+            var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{Token}/remove-tracks", request);
+            if (response.IsSuccessStatusCode)
+            {
+                Snackbar.Add("Трек удалён", Severity.Success);
+                await LoadTracks();
+            }
+            else
+            {
+                var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
+                Snackbar.Add(error?.Error?.Message ?? "Ошибка удаления", Severity.Error);
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
+        }
     }
 }