More Polish (#2686)

Kareadita · Feb 3, 2024 · 0b0e858 · 0b0e858
1 parent 2ef266c
commit 0b0e858
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 8 deletions.
diff --git a/API/API.csproj b/API/API.csproj
@@ -68,7 +68,6 @@
     <PackageReference Include="Hangfire" Version="1.8.9" />
     <PackageReference Include="Hangfire.InMemory" Version="0.7.0" />
     <PackageReference Include="Hangfire.MaximumConcurrentExecutions" Version="1.1.0" />
-    <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
     <PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
@@ -102,7 +101,7 @@
     </PackageReference>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
     <PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
     <PackageReference Include="VersOne.Epub" Version="3.3.1" />

diff --git a/API/Controllers/ScrobblingController.cs b/API/Controllers/ScrobblingController.cs
@@ -44,7 +44,7 @@ public ScrobblingController(IUnitOfWork unitOfWork, IScrobblingService scrobblin
     /// </summary>
     /// <returns></returns>
     [HttpGet("anilist-token")]
-    public async Task<ActionResult> GetAniListToken()
+    public async Task<ActionResult<string>> GetAniListToken()
     {
         var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
         if (user == null) return Unauthorized();

diff --git a/API/Services/Plus/LicenseService.cs b/API/Services/Plus/LicenseService.cs
@@ -174,6 +174,8 @@ public async Task<bool> HasActiveLicense(bool forceCheck = false)
         catch (Exception ex)
         {
             logger.LogError(ex, "There was an issue connecting to Kavita+");
+            await provider.FlushAsync();
+            await provider.SetAsync(CacheKey, false, _licenseCacheTimeout);
         }
 
         return false;

diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html
@@ -4,7 +4,13 @@
       <ng-container title>
         <h2 class="title text-break">
           <app-card-actionables (actionHandler)="performAction($event)" [actions]="seriesActions" [labelBy]="series.name" iconClass="fa-ellipsis-v"></app-card-actionables>
-          <span>{{series.name}}</span>
+          <span>{{series.name}}
+            @if(isLoadingExtra || isLoading) {
+              <div class="spinner-border spinner-border-sm text-primary" role="status">
+                <span class="visually-hidden">loading...</span>
+              </div>
+            }
+          </span>
         </h2>
       </ng-container>
       <ng-container subtitle *ngIf="series.localizedName !== series.name">

diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
@@ -200,6 +200,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
   isAdmin = false;
   hasDownloadingRole = false;
   isLoading = true;
+  isLoadingExtra = false;
   showBook = true;
 
   currentlyReadingChapter: Chapter | undefined = undefined;
@@ -708,7 +709,11 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
 
 
   loadPlusMetadata(seriesId: number, libraryType: LibraryType) {
+    this.isLoadingExtra = true;
+    this.cdRef.markForCheck();
     this.metadataService.getSeriesMetadataFromPlus(seriesId, libraryType).subscribe(data => {
+      this.isLoadingExtra = false;
+      this.cdRef.markForCheck();
       if (data === null) return;
 
       // Reviews

diff --git a/UI/Web/src/app/shared/loading/loading.component.ts b/UI/Web/src/app/shared/loading/loading.component.ts
@@ -19,6 +19,4 @@ export class LoadingComponent {
    * Uses absolute positioning to ensure it loads over content
    */
   @Input() absolute: boolean = false;
-
-  constructor() { }
 }
diff --git a/openapi.json b/openapi.json
@@ -7,7 +7,7 @@
       "name": "GPL-3.0",
       "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
     },
-    "version": "0.7.13.17"
+    "version": "0.7.13.18"
   },
   "servers": [
     {
@@ -7238,7 +7238,24 @@
         "summary": "Get the current user's AniList token",
         "responses": {
           "200": {
-            "description": "Success"
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
           }
         }
       }