Pre-Shakeout (#1429)

* Fixed zindex on some buttons due to a bug being fixed by bootstrap. Tweaked some styles from new bootstrap design.

* Fixed a bug where scan series, when generating cover images wouldn't emit cover updates to the UI.

* Fixed an issue where opening directory picker to change bookmark directory then clicking Share without chaning directory, would show the field as empty.

* Updating workflow

* Reverting version

Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>

.github/workflows/sonar-scan.yml

@@ -18,10 +18,9 @@ jobs:
             fetch-depth: 0
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          include-prerelease: True
+            dotnet-version: 6.0.x
-          dotnet-version: '6.0'
 
       - name: Install dependencies
         run: dotnet restore
@@ -47,10 +46,9 @@ jobs:
             fetch-depth: 0
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          include-prerelease: True
+            dotnet-version: 6.0.x
-          dotnet-version: '6.0'
 
       - name: Install dependencies
         run: dotnet restore
@@ -106,10 +104,9 @@ jobs:
           fetch-depth: 0
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-            include-prerelease: True
+            dotnet-version: 6.0.x
-            dotnet-version: '6.0'
 
       - name: Install dependencies
         run: dotnet restore
@@ -118,10 +115,11 @@ jobs:
         run: dotnet build --configuration Release --no-restore
 
       - name: Bump versions
-        uses: ThomasEg/dotnet-bump-version@patch-1
+        uses: SiqiLu/dotnet-bump-version@2.0.0
         with:
           version_files: Kavita.Common/Kavita.Common.csproj
           github_token: ${{ secrets.REPO_GHA_PAT }}
+          version_mask: "0.0.0.1"
 
   develop:
     name: Build Nightly Docker if Develop push
@@ -193,10 +191,9 @@ jobs:
         run: echo "${{steps.get-version.outputs.assembly-version}}"
 
       - name: Compile dotnet app
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          include-prerelease: True
+            dotnet-version: 6.0.x
-          dotnet-version: '6.0'
       - run: ./monorepo-build.sh
 
       - name: Login to Docker Hub
@@ -307,10 +304,9 @@ jobs:
         id: parse-version
 
       - name: Compile dotnet app
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          include-prerelease: True
+            dotnet-version: 6.0.x
-          dotnet-version: '6.0'
       - run: ./monorepo-build.sh
 
       - name: Login to Docker Hub

API/Services/MetadataService.cs

@@ -316,11 +316,8 @@ public class MetadataService : IMetadataService
 
         await RemoveAbandonedMetadataKeys();
 
-        if (_unitOfWork.HasChanges() && await _unitOfWork.CommitAsync())
+        await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series), false);
-        {
+        await FlushEvents();
-            await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series), false);
-            await FlushEvents();
-        }
 
         _logger.LogInformation("[MetadataService] Updated metadata for {SeriesName} in {ElapsedMilliseconds} milliseconds", series.Name, sw.ElapsedMilliseconds);
     }
@@ -328,6 +325,7 @@ public class MetadataService : IMetadataService
     private async Task FlushEvents()
     {
         // Send all events out now that entities are saved
+        _logger.LogDebug("Dispatching {Count} update events", _updateEvents.Count);
         foreach (var updateEvent in _updateEvents)
         {
             await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, updateEvent, false);

Kavita.Common/Kavita.Common.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <Company>kavitareader.com</Company>
         <Product>Kavita</Product>
-        <AssemblyVersion>0.5.5.0</AssemblyVersion>
+        <AssemblyVersion>0.5.4.21</AssemblyVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 

UI/Web/src/app/admin/manage-settings/manage-settings.component.ts

@@ -90,7 +90,7 @@ export class ManageSettingsComponent implements OnInit {
     modalRef.componentInstance.startingFolder = existingDirectory || '';
     modalRef.componentInstance.helpUrl = '';
     modalRef.closed.subscribe((closeResult: DirectoryPickerResult) => {
-      if (closeResult.success) {
+      if (closeResult.success && closeResult.folderPath !== '') {
         this.settingsForm.get(formControl)?.setValue(closeResult.folderPath);
         this.settingsForm.markAsDirty();
       }

UI/Web/src/theme/components/_accordion.scss

@@ -21,6 +21,7 @@
     &:not(.collapsed) {
         color: var(--accordion-header-text-color); 
         background-color: var(--accordion-body-bg-color);
+        box-shadow: var(--accordion-body-box-shadow);
     }
 
     &.collapsed {

UI/Web/src/theme/components/_dropdown.scss

@@ -14,7 +14,3 @@
         }
     }
 }
-
-.dropdown {
-    z-index: 1055 !important; // ngb v12 bug: https://github.com/ng-bootstrap/ng-bootstrap/issues/2686
-}

UI/Web/src/theme/themes/dark.scss

@@ -162,6 +162,7 @@
     --accordion-button-focus-border-color: unset;
     --accordion-button-focus-box-shadow: unset;
     --accordion-active-body-bg-color: #292929;
+    --accordion-body-box-shadow: none;
 
     /* Breadcrumb */
     --breadcrumb-bg-color: #292d32;

UI/Web/src/theme/themes/light.scss

@@ -164,6 +164,7 @@
     --accordion-button-focus-border-color: unset;
     --accordion-button-focus-box-shadow: unset;
     --accordion-active-body-bg-color: #292929;
+    --accordion-body-box-shadow: none;
 
     /* Breadcrumb */
     --breadcrumb-bg-color: #292d32;