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

Polish for Release (#2357)

Browse source
This commit is contained in:
Joe Milazzo 2023-10-28 10:12:39 -05:00 • committed by GitHub
parent b0eb60e894
commit 05bcc3e88e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
UI/Web/src/app/_interceptors/error.interceptor.ts
View file

@ -106,15 +106,17 @@ export class ErrorInterceptor implements HttpInterceptor {
console.error('500 error: ', error);
}
this.toast(err.message);
} else if (error.hasOwnProperty('message') && error.message.trim() !== '') {
return;
}
if (error.hasOwnProperty('message') && error.message.trim() !== '') {
if (error.message !== 'User is not authenticated' && error.message !== 'errors.user-not-auth') {
console.error('500 error: ', error);
}
return;
}
else {
this.toast('errors.unknown-crit');
console.error('500 error:', error);
}
this.toast('errors.unknown-crit');
console.error('500 error:', error);
}
private handleAuthError(error: any) {

2
UI/Web/src/app/admin/invite-user/invite-user.component.html
View file

@ -5,7 +5,7 @@
<button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="close()"></button>
</div>
<div class="modal-body scrollable-modal">
<p [innerHTML]="t('description') | safeHtml"></p>
<p *ngIf="!invited" [innerHTML]="t('description') | safeHtml"></p>
<form [formGroup]="inviteForm" *ngIf="emailLink === ''">
<div class="row g-0">

8
UI/Web/src/app/admin/invite-user/invite-user.component.ts
View file

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import {ChangeDetectorRef, Component, inject, OnInit} from '@angular/core';
import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { ToastrService } from 'ngx-toastr';
@ -33,6 +33,9 @@ export class InviteUserComponent implements OnInit {
selectedLibraries: Array<number> = [];
selectedRestriction: AgeRestriction = {ageRating: AgeRating.NotApplicable, includeUnknowns: false};
emailLink: string = '';
invited: boolean = false;
private readonly cdRef = inject(ChangeDetectorRef);
makeLink: (val: string) => string = (val: string) => {return this.emailLink};
@ -51,7 +54,6 @@ export class InviteUserComponent implements OnInit {
}
invite() {
this.isSending = true;
const email = this.inviteForm.get('email')?.value.trim();
this.accountService.inviteUser({
@ -62,10 +64,12 @@ export class InviteUserComponent implements OnInit {
}).subscribe((data: InviteUserResponse) => {
this.emailLink = data.emailLink;
this.isSending = false;
this.invited = true;
if (data.emailSent) {
this.toastr.info(translate('toasts.email-sent', {email: email}));
this.modal.close(true);
}
this.cdRef.markForCheck();
}, err => {
this.isSending = false;
this.toastr.error(err)

16
UI/Web/src/app/admin/manage-settings/manage-settings.component.html
View file

@ -24,7 +24,7 @@
</div>
<div class="row g-0 mb-2">
<div class="col-md-8 col-sm-12 pe-2">
<div class="col-md-8 col-sm-12 pe-md-2">
<label for="settings-ipaddresses" class="form-label">{{t('ip-address-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="ipAddressesTooltip" role="button" tabindex="0"></i>
<ng-template #ipAddressesTooltip>{{t('ip-address-tooltip')}}</ng-template>
<span class="visually-hidden" id="settings-ipaddresses-help">
@ -42,7 +42,7 @@
</div>
</div>
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12">
<label for="settings-port" class="form-label">{{t('port-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="portTooltip" role="button" tabindex="0"></i>
<ng-template #portTooltip>{{t('port-tooltip')}}</ng-template>
<span class="visually-hidden" id="settings-port-help">
@ -53,7 +53,7 @@
</div>
<div class="row g-0 mb-2">
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12 pe-md-2">
<label for="backup-tasks" class="form-label">{{t('backup-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="backupTasksTooltip" role="button" tabindex="0"></i>
<ng-template #backupTasksTooltip>{{t('backup-tooltip')}}.</ng-template>
<span class="visually-hidden" id="backup-tasks-help">
@ -75,7 +75,7 @@
</ng-container>
</div>
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12 pe-md-2">
<label for="log-tasks" class="form-label">{{t('log-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="logTasksTooltip" role="button" tabindex="0"></i>
<ng-template #logTasksTooltip>{{t('log-tooltip')}}</ng-template>
<span class="visually-hidden" id="log-tasks-help">
@ -103,7 +103,7 @@
<span class="visually-hidden" id="logging-level-port-help">
<ng-container [ngTemplateOutlet]="loggingLevelTooltip"></ng-container>
</span>
<select id="logging-level-port" aria-describedby="logging-level-port-help" class="form-select" formControlName="loggingLevel"
<select id="logging-level-port" aria-describedby="logging-level-port-help" class="form-select" formControlName="loggingLevel"
[class.is-invalid]="settingsForm.get('loggingLevel')?.invalid && settingsForm.get('loggingLevel')?.touched">
<option *ngFor="let level of logLevels" [value]="level">{{level | titlecase}}</option>
</select>
@ -111,7 +111,7 @@
</div>
<div class="row g-0 mb-2 mt-3">
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12 pe-md-2">
<label for="cache-size" class="form-label">{{t('cache-size-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="cacheSizeTooltip" role="button" tabindex="0"></i>
<ng-template #cacheSizeTooltip>{{t('cache-size-tooltip')}}</ng-template>
<span class="visually-hidden" id="cache-size-help">
@ -129,7 +129,7 @@
</p>
</ng-container>
</div>
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12 pe-md-2">
<label for="on-deck-progress-days" class="form-label">{{t('on-deck-last-progress-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="onDeckProgressDaysTooltip" role="button" tabindex="0"></i>
<ng-template #onDeckProgressDaysTooltip>{{t('on-deck-last-progress-tooltip')}}</ng-template>
<span class="visually-hidden" id="on-deck-progress-days-help">
@ -147,7 +147,7 @@
</p>
</ng-container>
</div>
<div class="col-md-4 col-sm-12 pe-2">
<div class="col-md-4 col-sm-12">
<label for="on-deck-update-days" class="form-label">{{t('on-deck-last-chapter-add-label')}}</label><i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="onDeckUpdateDaysTooltip" role="button" tabindex="0"></i>
<ng-template #onDeckUpdateDaysTooltip>{{t('on-deck-last-chapter-add-tooltip')}}</ng-template>
<span class="visually-hidden" id="on-deck-update-days-help">

4
UI/Web/src/app/shared/_services/filter-utilities.service.ts
View file

@ -93,7 +93,7 @@ export class FilterUtilitiesService {
encodeSortOptions(sortOptions: SortOptions) {
return `sortField=${sortOptions.sortField}&isAscending=${sortOptions.isAscending}`;
return `sortField=${sortOptions.sortField},isAscending=${sortOptions.isAscending}`;
}
encodeFilterStatements(statements: Array<FilterStatement>) {
@ -195,7 +195,7 @@ export class FilterUtilitiesService {
}
decodeSortOptions(encodedSortOptions: string): SortOptions | null {
const parts = decodeURIComponent(encodedSortOptions).split('&');
const parts = decodeURIComponent(encodedSortOptions).split(',');
const sortFieldPart = parts.find(part => part.startsWith('sortField='));
const isAscendingPart = parts.find(part => part.startsWith('isAscending='));