AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A collection of bug fixes (#3820)

Browse source 
Co-authored-by: Joseph Milazzo <joseph.v.milazzo@gmail.com>
This commit is contained in:
Fesaa 2025-06-04 09:45:10 +02:00 • committed by GitHub
parent 6288d89651
commit 193e9b1da9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 268 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html
View file

@ -83,7 +83,7 @@
}
<div class="col-auto ms-2 d-none d-md-block">
<div class="col-auto ms-2">
<div class="card-actions btn-actions" [ngbTooltip]="t('more-alt')">
<app-card-actionables [entity]="readingList" [inputActions]="actions" [labelBy]="readingList.title" iconClass="fa-ellipsis-h" btnClass="btn"></app-card-actionables>
</div>

15
UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts
View file

@ -58,6 +58,7 @@ import {DefaultValuePipe} from "../../../_pipes/default-value.pipe";
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
import {DetailsTabComponent} from "../../../_single-module/details-tab/details-tab.component";
import {IHasCast} from "../../../_models/common/i-has-cast";
import {User} from "../../../_models/user";
enum TabID {
Storyline = 'storyline-tab',
@ -251,7 +252,8 @@ export class ReadingListDetailComponent implements OnInit {
if (user) {
this.isAdmin = this.accountService.hasAdminRole(user);
this.actions = this.actionFactoryService.getReadingListActions(this.handleReadingListActionCallback.bind(this))
this.actions = this.actionFactoryService
.getReadingListActions(this.handleReadingListActionCallback.bind(this), this.shouldRenderReadingListAction.bind(this))
.filter(action => this.readingListService.actionListFilter(action, readingList, this.isAdmin));
this.isOwnedReadingList = this.actions.filter(a => a.action === Action.Edit).length > 0;
this.cdRef.markForCheck();
@ -307,6 +309,17 @@ export class ReadingListDetailComponent implements OnInit {
}
}
shouldRenderReadingListAction(action: ActionItem<ReadingList>, entity: ReadingList, user: User) {
switch (action.action) {
case Action.Promote:
return !entity.promoted;
case Action.UnPromote:
return entity.promoted;
default:
return true;
}
}
editReadingList(readingList: ReadingList) {
this.actionService.editReadingList(readingList, (readingList: ReadingList) => {
// Reload information around list

2
UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.html
View file

@ -21,7 +21,7 @@
[trackByIdentity]="trackByIdentity"
>
<ng-template #cardItem let-item let-position="idx" >
<app-card-item [title]="item.title" [entity]="item" [actions]="actions[item.id]"
<app-card-item [title]="item.title" [entity]="item" [actions]="actions[item.id]" [actionEntity]="item"
[suppressLibraryLink]="true" [imageUrl]="imageService.getReadingListCoverImage(item.id)"
[linkUrl]="'/lists/' + item.id"
[count]="item.itemCount"

20
UI/Web/src/app/reading-list/_components/reading-lists/reading-lists.component.ts
View file

@ -24,6 +24,7 @@ import {Title} from "@angular/platform-browser";
import {WikiLink} from "../../../_models/wiki";
import {BulkSelectionService} from "../../../cards/bulk-selection.service";
import {BulkOperationsComponent} from "../../../cards/bulk-operations/bulk-operations.component";
import {User} from "../../../_models/user";
@Component({
selector: 'app-reading-lists',
@ -37,7 +38,7 @@ export class ReadingListsComponent implements OnInit {
protected readonly bulkSelectionService = inject(BulkSelectionService);
protected readonly actionService = inject(ActionService);
lists: ReadingList[] = [];
loadingLists = false;
@ -69,10 +70,8 @@ export class ReadingListsComponent implements OnInit {
}
getActions(readingList: ReadingList) {
const d = this.actionFactoryService.getReadingListActions(this.handleReadingListActionCallback.bind(this))
.filter(action => this.readingListService.actionListFilter(action, readingList, this.isAdmin || this.hasPromote));
return this.actionFactoryService.getReadingListActions(this.handleReadingListActionCallback.bind(this))
return this.actionFactoryService
.getReadingListActions(this.handleReadingListActionCallback.bind(this), this.shouldRenderReadingListAction.bind(this))
.filter(action => this.readingListService.actionListFilter(action, readingList, this.isAdmin || this.hasPromote));
}
@ -172,4 +171,15 @@ export class ReadingListsComponent implements OnInit {
break;
}
}
shouldRenderReadingListAction(action: ActionItem<ReadingList>, entity: ReadingList, user: User) {
switch (action.action) {
case Action.Promote:
return !entity.promoted;
case Action.UnPromote:
return entity.promoted;
default:
return true;
}
}
}