Manually fix lint issues

This commit is contained in:
Yury Bondarenko
2024-03-06 10:45:59 +01:00
parent 2b540cd91c
commit 3b48d9a26d
24 changed files with 82 additions and 58 deletions

View File

@@ -261,8 +261,7 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
const servicesToUse = this.ldnService.notifyServiceInboundPatterns; const servicesToUse = this.ldnService.notifyServiceInboundPatterns;
servicesToUse.forEach((patternObj: NotifyServicePattern) => { servicesToUse.forEach((patternObj: NotifyServicePattern) => {
let patternFormGroup; const patternFormGroup = this.initializeInboundPatternFormGroup();
patternFormGroup = this.initializeInboundPatternFormGroup();
const newPatternObjWithLabel = Object.assign(new NotifyServicePattern(), { const newPatternObjWithLabel = Object.assign(new NotifyServicePattern(), {
...patternObj, ...patternObj,
patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternObj?.pattern + '.label'), patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternObj?.pattern + '.label'),

View File

@@ -45,7 +45,7 @@ describe('FiltersComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
})); }));
const isOneSelected = (values: {}): boolean => { const isOneSelected = (values: any): boolean => {
let oneSelected = false; let oneSelected = false;
let allFilters = FiltersComponent.FILTERS; let allFilters = FiltersComponent.FILTERS;
for (let i = 0; !oneSelected && i < allFilters.length; i++) { for (let i = 0; !oneSelected && i < allFilters.length; i++) {
@@ -58,7 +58,7 @@ describe('FiltersComponent', () => {
return oneSelected; return oneSelected;
}; };
const isAllSelected = (values: {}): boolean => { const isAllSelected = (values: any): boolean => {
let allSelected = true; let allSelected = true;
let allFilters = FiltersComponent.FILTERS; let allFilters = FiltersComponent.FILTERS;
for (let i = 0; allSelected && i < allFilters.length; i++) { for (let i = 0; allSelected && i < allFilters.length; i++) {

View File

@@ -111,7 +111,7 @@ export class FiltersComponent {
return undefined; return undefined;
} }
static toQueryString(filters: Object): string { static toQueryString(filters: { [key: string]: any }): string {
let params = ''; let params = '';
let first = true; let first = true;
for (const key in filters) { for (const key in filters) {

View File

@@ -1,6 +1,6 @@
<section class="comcol-page-browse-section"> <section class="comcol-page-browse-section">
<div class="browse-by-metadata w-100"> <div class="browse-by-metadata w-100">
<ds-themed-browse-by *ngIf="!(loading$ | async)" class="col-xs-12 w-100" <ds-themed-browse-by *ngIf="(loading$ | async) === false" class="col-xs-12 w-100"
title="{{'browse.title' | translate:{ title="{{'browse.title' | translate:{
field: 'browse.metadata.' + browseId | translate, field: 'browse.metadata.' + browseId | translate,
startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '', startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',

View File

@@ -33,7 +33,7 @@
<span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span> <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
</button> </button>
<!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder--> <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
<span *ngIf="!(hasChild(null, node) | async)" aria-hidden="true" class="btn btn-default invisible"> <span *ngIf="(hasChild(null, node) | async) === false" aria-hidden="true" class="btn btn-default invisible">
<span class="fa fa-chevron-right"></span> <span class="fa fa-chevron-right"></span>
</span> </span>
<div class="d-flex flex-row"> <div class="d-flex flex-row">

View File

@@ -41,7 +41,7 @@ import {
describe('ProcessDataService', () => { describe('ProcessDataService', () => {
let testScheduler; let testScheduler;
const mockTimer = (fn: () => {}, interval: number) => { const mockTimer = (fn: () => any, interval: number) => {
fn(); fn();
return 555; return 555;
}; };

View File

@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/internal/Observable'; import { Observable } from 'rxjs';
import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';

View File

@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/internal/Observable'; import { Observable } from 'rxjs';
import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';

View File

@@ -3,7 +3,7 @@
[ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }"> [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
<div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex flex-column" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell"> <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex flex-column" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
<div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div> <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
<textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && !(isAuthorityControlled() | async)" [(ngModel)]="mdValue.newValue.value" <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && (isAuthorityControlled() | async) === false" [(ngModel)]="mdValue.newValue.value"
[attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate" [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
[dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea> [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
<ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)" <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"

View File

@@ -3,7 +3,7 @@
<!-- <!--
Choose a template. Priority: markdown, link, browse link. Choose a template. Priority: markdown, link, browse link.
--> -->
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (img != null ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple))); <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (img !== null ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple)));
context: {value: mdValue.value, img}"> context: {value: mdValue.value, img}">
</ng-container> </ng-container>
<span class="separator" *ngIf="!last" [innerHTML]="separator"></span> <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>

View File

@@ -1,6 +1,6 @@
<ng-container *ngIf="data?.length > 0 && displayOptions"> <ng-container *ngIf="data?.length > 0 && displayOptions">
<div <div
[ngClass]="{'align-items-center': data.length == 1}" [ngClass]="{'align-items-center': data.length === 1}"
class="alert d-flex flex-row sections-gap {{ class="alert d-flex flex-row sections-gap {{
displayOptions.alertType displayOptions.alertType
}}" }}"

View File

@@ -196,7 +196,7 @@
<i class="fas fa-trash-alt"></i> <i class="fas fa-trash-alt"></i>
</button> </button>
</div> </div>
<div *ngIf="!(isAdmin$ | async)" class="btn-group button-width"> <div *ngIf="(isAdmin$ | async) === false" class="btn-group button-width">
<button class="btn btn-outline-danger btn-sm button-width" <button class="btn btn-outline-danger btn-sm button-width"
ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}" ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
container="body" container="body"

View File

@@ -4,7 +4,7 @@
<h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1> <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1>
<ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading> <ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading>
<ds-pagination *ngIf="!(isTargetsLoading() | async)" <ds-pagination *ngIf="(isTargetsLoading() | async) === false"
[paginationOptions]="paginationConfig" [paginationOptions]="paginationConfig"
[collectionSize]="(totalElements$ | async)" [collectionSize]="(totalElements$ | async)"
[hideGear]="false" [hideGear]="false"
@@ -12,11 +12,11 @@
(paginationChange)="getSuggestionTargets()"> (paginationChange)="getSuggestionTargets()">
<ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading> <ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
<ng-container *ngIf="!(isTargetsProcessing() | async)"> <ng-container *ngIf="(isTargetsProcessing() | async) === false">
<div *ngIf="!(targets$|async) || (targets$|async)?.length == 0" class="alert alert-info w-100 mb-2 mt-2" role="alert"> <div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
{{'suggestion.noTargets' | translate}} {{'suggestion.noTargets' | translate}}
</div> </div>
<div *ngIf="(targets$|async) && (targets$|async)?.length != 0" class="table-responsive mt-2"> <div *ngIf="(targets$|async)?.length !== 0" class="table-responsive mt-2">
<table id="epeople" class="table table-striped table-hover table-bordered"> <table id="epeople" class="table table-striped table-hover table-bordered">
<thead> <thead>
<tr class="text-center"> <tr class="text-center">

View File

@@ -19,6 +19,7 @@ export const SuggestionTargetActionTypes = {
RETRIEVE_TARGETS_BY_SOURCE_ERROR: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE_ERROR'), RETRIEVE_TARGETS_BY_SOURCE_ERROR: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE_ERROR'),
ADD_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/ADD_USER_SUGGESTIONS'), ADD_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/ADD_USER_SUGGESTIONS'),
REFRESH_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS'), REFRESH_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS'),
REFRESH_USER_SUGGESTIONS_ERROR: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS_ERROR'),
MARK_USER_SUGGESTIONS_AS_VISITED: type('dspace/integration/openaire/suggestions/target/MARK_USER_SUGGESTIONS_AS_VISITED'), MARK_USER_SUGGESTIONS_AS_VISITED: type('dspace/integration/openaire/suggestions/target/MARK_USER_SUGGESTIONS_AS_VISITED'),
}; };
@@ -126,6 +127,13 @@ export class RefreshUserSuggestionsAction implements Action {
type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS; type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS;
} }
/**
* NgRx action to signify an error while handling {@link RefreshUserSuggestionsAction}
*/
export class RefreshUserSuggestionsErrorAction implements Action {
type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS_ERROR;
}
/** /**
* An ngrx action to Mark User Suggestions As Visited. * An ngrx action to Mark User Suggestions As Visited.
* Called by the ??? effect. * Called by the ??? effect.

View File

@@ -21,6 +21,7 @@ import { SuggestionsService } from '../suggestions.service';
import { import {
AddTargetAction, AddTargetAction,
AddUserSuggestionsAction, AddUserSuggestionsAction,
RefreshUserSuggestionsErrorAction,
RetrieveAllTargetsErrorAction, RetrieveAllTargetsErrorAction,
RetrieveTargetsBySourceAction, RetrieveTargetsBySourceAction,
SuggestionTargetActionTypes, SuggestionTargetActionTypes,
@@ -46,8 +47,8 @@ export class SuggestionTargetsEffects {
map((targets: PaginatedList<SuggestionTarget>) => map((targets: PaginatedList<SuggestionTarget>) =>
new AddTargetAction(targets.page, targets.totalPages, targets.currentPage, targets.totalElements), new AddTargetAction(targets.page, targets.totalPages, targets.currentPage, targets.totalElements),
), ),
catchError((error: Error) => { catchError((error: unknown) => {
if (error) { if (error instanceof Error) {
console.error(error.message); console.error(error.message);
} }
return of(new RetrieveAllTargetsErrorAction()); return of(new RetrieveAllTargetsErrorAction());
@@ -78,10 +79,20 @@ export class SuggestionTargetsEffects {
return this.suggestionsService.retrieveCurrentUserSuggestions(userId) return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
.pipe( .pipe(
map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)), map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
catchError((errors: unknown) => of(errors)), catchError((error: unknown) => {
if (error instanceof Error) {
console.error(error.message);
}
return of(new RefreshUserSuggestionsErrorAction());
}),
); );
}), }),
catchError((errors: unknown) => of(errors)), catchError((error: unknown) => {
if (error instanceof Error) {
console.error(error.message);
}
return of(new RefreshUserSuggestionsErrorAction());
}),
); );
})), })),
); );

View File

@@ -57,7 +57,7 @@
</ds-pagination> </ds-pagination>
<div *ngIf="processesRD?.payload?.totalElements == 0"> <div *ngIf="processesRD?.payload?.totalElements === 0">
<p>{{'process.overview.table.empty' | translate}}</p> <p>{{'process.overview.table.empty' | translate}}</p>
</div> </div>
</ng-container> </ng-container>

View File

@@ -39,7 +39,7 @@
<ng-template #mobileButtons> <ng-template #mobileButtons>
<div data-test="auth-nav"> <div data-test="auth-nav">
<a *ngIf="!(isAuthenticated | async)" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button"> <a *ngIf="(isAuthenticated | async) === false" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
{{ 'nav.login' | translate }}<span class="sr-only">(current)</span> {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
</a> </a>
<a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1"> <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">

View File

@@ -1,4 +1,4 @@
<div *ngIf="!(this.submitted$ | async); else waiting"> <div *ngIf="(this.submitted$ | async) === false; else waiting">
<div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header"> <div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header">
{{ 'item.qa.withdrawn.modal.header' | translate }} {{ 'item.qa.withdrawn.modal.header' | translate }}
<button type="button" class="close" (click)="onModalClose()" aria-label="Close"> <button type="button" class="close" (click)="onModalClose()" aria-label="Close">

View File

@@ -152,8 +152,12 @@ export class LogInPasswordComponent implements OnInit {
}), }),
); );
this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(shareReplay(1)); this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(
this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(shareReplay(1)); shareReplay({ refCount: false, bufferSize: 1 }),
);
this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(
shareReplay({ refCount: false, bufferSize: 1 }),
);
this.canShowDivider$ = this.canShowDivider$ =
combineLatest([this.canRegister$, this.canForgot$]) combineLatest([this.canRegister$, this.canForgot$])
.pipe( .pipe(

View File

@@ -3,7 +3,7 @@ Template for the detect duplicates submission section component
@author Kim Shepherd @author Kim Shepherd
--> -->
<div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data"> <div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
<ng-container *ngIf="data?.potentialDuplicates.length == 0"> <ng-container *ngIf="data?.potentialDuplicates.length === 0">
<div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div> <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
</ng-container> </ng-container>
<ng-container *ngIf="data?.potentialDuplicates.length > 0"> <ng-container *ngIf="data?.potentialDuplicates.length > 0">

View File

@@ -44,7 +44,7 @@
[scrollWindow]="false" [scrollWindow]="false"
> >
<button <button
*ngIf="(filterServices(ldnPattern.pattern) | async)?.length == 0" *ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
class="dropdown-item collection-item text-truncate w-100" class="dropdown-item collection-item text-truncate w-100"
> >
{{'submission.section.section-coar-notify.dropdown.no-data' | translate}} {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
@@ -58,7 +58,7 @@
</button> </button>
<button <button
*ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async" *ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async"
[ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id == serviceOption.id}" [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
class="dropdown-item collection-item text-truncate w-100" class="dropdown-item collection-item text-truncate w-100"
(click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)" (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
> >

View File

@@ -22,7 +22,7 @@
<i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i> <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
</div> </div>
<ds-loading *ngIf="(processing$ | async)"></ds-loading> <ds-loading *ngIf="(processing$ | async)"></ds-loading>
<ds-pagination *ngIf="!(processing$ | async)" <ds-pagination *ngIf="(processing$ | async) === false"
[paginationOptions]="paginationOptions" [paginationOptions]="paginationOptions"
[sortOptions]="paginationSortConfig" [sortOptions]="paginationSortConfig"
[collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false" [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"

View File

@@ -123,7 +123,7 @@ export const environment: BuildConfig = {
timer: 5, timer: 5,
}, },
duplicateDetection: { duplicateDetection: {
alwaysShowSection: false alwaysShowSection: false,
}, },
typeBind: { typeBind: {
field: 'dc.type', field: 'dc.type',
@@ -152,22 +152,24 @@ export const environment: BuildConfig = {
{ {
value: 600, value: 600,
style: 'text-success', style: 'text-success',
icon: 'fa-circle-check' icon: 'fa-circle-check',
}, },
{ {
value: 500, value: 500,
style: 'text-info', style: 'text-info',
icon: 'fa-gear' icon: 'fa-gear',
}, },
{ {
value: 400, value: 400,
style: 'text-warning', style: 'text-warning',
icon: 'fa-circle-question' icon: 'fa-circle-question',
}, },
{ {
value: 'default', value: 'default',
style: 'text-muted', style: 'text-muted',
icon: 'fa-circle-xmark' icon: 'fa-circle-xmark',
},
],
}, },
}, },
}, },
@@ -247,9 +249,9 @@ export const environment: BuildConfig = {
sortField: 'dc.date.accessioned', sortField: 'dc.date.accessioned',
}, },
topLevelCommunityList: { topLevelCommunityList: {
pageSize: 5 pageSize: 5,
}, },
showDiscoverFilters: false showDiscoverFilters: false,
}, },
item: { item: {
edit: { edit: {
@@ -332,8 +334,8 @@ export const environment: BuildConfig = {
{ {
filter: 'subject', filter: 'subject',
vocabulary: 'srsc', vocabulary: 'srsc',
enabled: true enabled: true,
} },
], ],
suggestion: [], suggestion: [],
@@ -341,8 +343,8 @@ export const environment: BuildConfig = {
search: { search: {
advancedFilters: { advancedFilters: {
enabled: false, enabled: false,
filter: ['title', 'author', 'subject', 'entityType'] filter: ['title', 'author', 'subject', 'entityType'],
} },
}, },
notifyMetrics: [ notifyMetrics: [
@@ -353,34 +355,34 @@ export const environment: BuildConfig = {
color: '#B8DAFF', color: '#B8DAFF',
title: 'admin-notify-dashboard.NOTIFY.incoming.accepted', title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
config: 'NOTIFY.incoming.accepted', config: 'NOTIFY.incoming.accepted',
description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description' description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description',
}, },
{ {
color: '#D4EDDA', color: '#D4EDDA',
title: 'admin-notify-dashboard.NOTIFY.incoming.processed', title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
config: 'NOTIFY.incoming.processed', config: 'NOTIFY.incoming.processed',
description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description' description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description',
}, },
{ {
color: '#FDBBC7', color: '#FDBBC7',
title: 'admin-notify-dashboard.NOTIFY.incoming.failure', title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
config: 'NOTIFY.incoming.failure', config: 'NOTIFY.incoming.failure',
description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description' description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description',
}, },
{ {
color: '#FDBBC7', color: '#FDBBC7',
title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted', title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
config: 'NOTIFY.incoming.untrusted', config: 'NOTIFY.incoming.untrusted',
description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description' description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description',
}, },
{ {
color: '#43515F', color: '#43515F',
title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems', title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
textColor: '#fff', textColor: '#fff',
config: 'NOTIFY.incoming.involvedItems', config: 'NOTIFY.incoming.involvedItems',
description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description' description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description',
}, },
] ],
}, },
{ {
title: 'admin-notify-dashboard.generated-ldn', title: 'admin-notify-dashboard.generated-ldn',
@@ -389,34 +391,34 @@ export const environment: BuildConfig = {
color: '#D4EDDA', color: '#D4EDDA',
title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered', title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
config: 'NOTIFY.outgoing.delivered', config: 'NOTIFY.outgoing.delivered',
description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description' description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description',
}, },
{ {
color: '#B8DAFF', color: '#B8DAFF',
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued', title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
config: 'NOTIFY.outgoing.queued', config: 'NOTIFY.outgoing.queued',
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description' description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description',
}, },
{ {
color: '#FDEEBB', color: '#FDEEBB',
title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry', title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
config: 'NOTIFY.outgoing.queued_for_retry', config: 'NOTIFY.outgoing.queued_for_retry',
description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description' description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description',
}, },
{ {
color: '#FDBBC7', color: '#FDBBC7',
title: 'admin-notify-dashboard.NOTIFY.outgoing.failure', title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
config: 'NOTIFY.outgoing.failure', config: 'NOTIFY.outgoing.failure',
description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description' description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description',
}, },
{ {
color: '#43515F', color: '#43515F',
title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems', title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
textColor: '#fff', textColor: '#fff',
config: 'NOTIFY.outgoing.involvedItems', config: 'NOTIFY.outgoing.involvedItems',
description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description' description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
}, },
] ],
} },
] ],
}; };

View File

@@ -8,7 +8,7 @@
<a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate"> <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
<img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/> <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
</a> </a>
<nav *ngIf="!(isMobile$ | async)" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate"> <nav *ngIf="(isMobile$ | async) === false" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
<ds-themed-navbar></ds-themed-navbar> <ds-themed-navbar></ds-themed-navbar>
</nav> </nav>
</div> </div>
@@ -24,7 +24,7 @@
<div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)"> <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
<button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()" <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
[attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="!(isNavBarCollapsed$ | async)"> [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) === false">
<span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span> <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
</button> </button>
</div> </div>