Merge pull request #1718 from booklore-app/develop

Merge develop into master for release

Author: acx10

booklore-ui/src/app/features/book/components/book-browser/book-card/book-card.component.scss

@@ -234,3 +234,7 @@
 ::ng-deep .custom-button-padding .p-button {
   padding-block: 0.25rem !important;
 }
+
+::ng-deep .book-details-dialog .p-dialog-header {
+  padding: 1rem 1.25rem !important;
+}

booklore-ui/src/app/features/book/components/book-browser/book-card/book-card.component.ts

@@ -495,11 +495,16 @@ export class BookCardComponent implements OnInit, OnChanges, OnDestroy {
       });
     } else {
       this.dialogService.open(BookMetadataCenterComponent, {
-        width: '85%',
+        width: '90%',
         data: {bookId: book.id},
         modal: true,
-        dismissableMask: true,
-        showHeader: false
+        dismissableMask: false,
+        showHeader: true,
+        closable: true,
+        closeOnEscape: true,
+        maximizable: true,
+        header: 'Book Details',
+        styleClass: 'book-details-dialog'
       });
     }
   }

booklore-ui/src/app/features/book/components/book-browser/book-filter/book-filter.component.ts

@@ -89,11 +89,11 @@ function getRatingRangeFilters10(rating?: number): { id: string; name: string; s
   return idx ? [{id: idx.id, name: idx.label, sortIndex: idx.sortIndex}] : [];
 }
 
-function extractPublishedYearFilter(book: Book): { id: number; name: string }[] {
+function extractPublishedYearFilter(book: Book): { id: string; name: string }[] {
   const date = book.metadata?.publishedDate;
   if (!date) return [];
   const year = new Date(date).getFullYear();
-  return [{id: year, name: year.toString()}];
+  return [{id: year.toString(), name: year.toString()}];
 }
 
 function getShelfStatusFilter(book: Book): { id: string; name: string }[] {

booklore-ui/src/app/features/book/components/book-browser/filter-label.helper.ts

@@ -14,7 +14,7 @@ export class FilterLabelHelper {
     publisher: 'Publisher',
     readStatus: 'Read Status',
     personalRating: 'Personal Rating',
-    publishedYear: 'Year Published',
+    publishedDate: 'Year Published',
     matchScore: 'Metadata Match Score',
     language: 'Language',
     bookType: 'Book Type',

booklore-ui/src/app/features/book/components/book-browser/filters/SidebarFilter.ts

@@ -93,13 +93,11 @@ export class SideBarFilter implements BookFilter {
                 return filterValues.some(range => isRatingInRange(book.metadata?.hardcoverRating, range));
               case 'personalRating':
                 return filterValues.some(range => isRatingInRange10(book.metadata?.personalRating, range));
-              case 'publishedYear':
+              case 'publishedDate':
                 const bookYear = book.metadata?.publishedDate
-                  ? new Date(book.metadata.publishedDate).getFullYear().toString()
+                  ? new Date(book.metadata.publishedDate).getFullYear()
                   : null;
-                return bookYear ? filterValues.includes(bookYear) : false;
-              case 'publishedDate':
-                return filterValues.includes(new Date(book.metadata?.publishedDate || '').getFullYear());
+                return bookYear ? filterValues.some(val => val == bookYear || val == bookYear.toString()) : false;
               case 'fileSize':
                 return filterValues.some(range => isFileSizeInRange(book.fileSizeKb, range));
               case 'shelfStatus':

booklore-ui/src/app/features/metadata/component/book-metadata-center/metadata-viewer/metadata-viewer.component.ts

@@ -587,7 +587,7 @@ export class MetadataViewerComponent implements OnInit, OnChanges {
   goToPublishedYear(publishedDate: string): void {
     const year = this.extractYear(publishedDate);
     if (year) {
-      this.handleMetadataClick('publishedYear', year);
+      this.handleMetadataClick('publishedDate', year);
     }
   }
 

dev.docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   backend:
-    image: gradle:9-jdk25-alpine
+    image: gradle:8-jdk21-alpine
     command: sh -c "cd /booklore-api && ./gradlew bootRun"
     ports:
       - "${BACKEND_PORT:-8080}:8080"