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

Removed showing toasts when series are added to the server since cards will show automatically. Hide events widget unless you're an admin. Changed an API signature to match the data that's being sent back. (#979)

Browse source
This commit is contained in:
Joseph Milazzo 2022-01-22 07:56:07 -08:00 • committed by GitHub
parent 613a866277
commit 52ab01571b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
API/Controllers/SeriesController.cs
View file

@ -148,7 +148,7 @@ namespace API.Controllers
}
[HttpGet("chapter")]
public async Task<ActionResult<VolumeDto>> GetChapter(int chapterId)
public async Task<ActionResult<ChapterDto>> GetChapter(int chapterId)
{
return Ok(await _unitOfWork.ChapterRepository.GetChapterDtoAsync(chapterId));
}

4
UI/Web/src/app/_services/message-hub.service.ts
View file

@ -143,10 +143,6 @@ export class MessageHubService {
payload: resp.body
});
this.seriesAdded.emit(resp.body);
// Don't show the toast when user has reader open
if (this.isAdmin && this.router.url.match(/\d+\/manga|book\/\d+/gi) !== null) {
this.toastr.info('Series ' + (resp.body as SeriesAddedEvent).seriesName + ' added');
}
});
this.hubConnection.on(EVENTS.SeriesRemoved, resp => {

2
UI/Web/src/app/nav-events-toggle/nav-events-toggle.component.html
View file

@ -1,4 +1,4 @@
<ng-container>
<ng-container *ngIf="isAdmin">
<button type="button" class="btn btn-icon {{(progressEventsSource.getValue().length > 0 || updateAvailable) ? 'colored' : ''}}"
[ngbPopover]="popContent" title="Activity" placement="bottom" [popoverClass]="'nav-events'">

11
UI/Web/src/app/nav-events-toggle/nav-events-toggle.component.ts
View file

@ -5,6 +5,7 @@ import { takeUntil } from 'rxjs/operators';
import { UpdateNotificationModalComponent } from '../shared/update-notification/update-notification-modal.component';
import { ProgressEvent } from '../_models/events/scan-library-progress-event';
import { User } from '../_models/user';
import { AccountService } from '../_services/account.service';
import { LibraryService } from '../_services/library.service';
import { EVENTS, Message, MessageHubService } from '../_services/message-hub.service';
@ -28,6 +29,7 @@ const acceptedEvents = [EVENTS.ScanLibraryProgress, EVENTS.RefreshMetadataProgre
export class NavEventsToggleComponent implements OnInit, OnDestroy {
@Input() user!: User;
isAdmin: boolean = false;
private readonly onDestroy = new Subject<void>();
@ -41,7 +43,7 @@ export class NavEventsToggleComponent implements OnInit, OnDestroy {
updateBody: any;
private updateNotificationModalRef: NgbModalRef | null = null;
constructor(private messageHub: MessageHubService, private libraryService: LibraryService, private modalService: NgbModal) { }
constructor(private messageHub: MessageHubService, private libraryService: LibraryService, private modalService: NgbModal, private accountService: AccountService) { }
ngOnDestroy(): void {
this.onDestroy.next();
@ -58,6 +60,13 @@ export class NavEventsToggleComponent implements OnInit, OnDestroy {
this.updateBody = event.payload;
}
});
this.accountService.currentUser$.pipe(takeUntil(this.onDestroy)).subscribe(user => {
if (user) {
this.isAdmin = this.accountService.hasAdminRole(user);
} else {
this.isAdmin = false;
}
});
}