Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-05-24 00:52:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Order Fix (#2333)

Browse Source 
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: Havokdan <havokdan@yahoo.com.br>
This commit is contained in:
Joe Milazzo 2023-10-20 06:34:10 -05:00 committed by GitHub
parent eecf311af9
commit dafef2e182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/API.csproj
View File

@ -100,7 +100,7 @@
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.11" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
<PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="VersOne.Epub" Version="3.3.1" />

5
API/Services/StreamService.cs
View File

@ -127,7 +127,7 @@ public class StreamService : IStreamService
throw new KavitaException(await _localizationService.Translate(userId, "dashboard-stream-doesnt-exist"));
if (stream.Order == dto.ToPosition) return;
var list = user!.DashboardStreams.ToList();
var list = user!.DashboardStreams.OrderBy(s => s.Order).ToList();
OrderableHelper.ReorderItems(list, stream.Id, dto.ToPosition);
user.DashboardStreams = list;
@ -262,9 +262,10 @@ public class StreamService : IStreamService
AppUserIncludes.SideNavStreams);
var stream = user?.SideNavStreams.FirstOrDefault(d => d.Id == dto.Id);
if (stream == null) throw new KavitaException(await _localizationService.Translate(userId, "sidenav-stream-doesnt-exist"));
if (stream.Order == dto.ToPosition) return;
var list = user!.SideNavStreams.ToList();
var list = user!.SideNavStreams.OrderBy(s => s.Order).ToList();
OrderableHelper.ReorderItems(list, stream.Id, dto.ToPosition);
user.SideNavStreams = list;

1
UI/Web/src/app/sidenav/_components/customize-sidenav-streams/customize-sidenav-streams.component.ts
View File

@ -222,6 +222,7 @@ export class CustomizeSidenavStreamsComponent implements OnDestroy {
orderUpdated(event: IndexUpdateEvent) {
this.sideNavService.updateSideNavStreamPosition(event.item.name, event.item.id, event.fromPosition, event.toPosition).subscribe(() => {
this.sideNavService.getSideNavStreams(false).subscribe((data) => {
this.items = [...data];

2
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
},
"version": "0.7.8.14"
"version": "0.7.8.15"
},
"servers": [
{