Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stricter ESLint configuration for code quality, consistency & cleaner merges #2343

Merged
merged 40 commits into from
Mar 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
702246b
ESLint: enforce prefer-const where possible
ybnd May 8, 2023
95d3ff6
ESLint: fix prefer-const violations
ybnd May 8, 2023
f1a8920
ESLint: enforce no-case-declarations
ybnd May 8, 2023
0f1ebfb
ESLint: fix no-case-declaration violations
ybnd May 8, 2023
ad42050
ESLint: enforce no-extra-boolean-cast
ybnd May 8, 2023
6f0c1e0
ESLint: fix no-extra-boolean-cast violations
ybnd May 8, 2023
80c9dae
ESLint: enforce ban-types
ybnd May 8, 2023
74e9e5f
ESLint: fix ban-types violations
ybnd May 8, 2023
fa2c22d
ESLint: enforce Angular HTML no-negated-async
ybnd Jun 27, 2023
741c600
ESLint: fix no-negated-async violations
ybnd Jun 27, 2023
3ce98cd
ESLint: enforce Angular HTML eqeqeq
ybnd Jun 27, 2023
8a650a2
ESlint: fix eqeqeq violations
ybnd Jun 27, 2023
218ce83
ESLint: enforce low-impact recommended RxJs rules
ybnd May 19, 2023
1b717e1
ESLint: fix RxJs rule violations (pt. 1)
ybnd May 19, 2023
b505cbc
ESLint: enforce indentation
ybnd Jun 27, 2023
0690a20
ESLint: fix indentation
ybnd Jun 27, 2023
725dbc3
ESLint: enforce dangling commas
ybnd May 20, 2023
917c36d
ESLint: fix dangling commas
ybnd Jun 27, 2023
fa404ff
ESLint: enforce import formatting
ybnd May 20, 2023
a11be65
ESlint: fix imports
ybnd Jun 27, 2023
436a4d7
ESLint: enforce object-curly-spacing
ybnd Jun 27, 2023
0633460
ESLint: fix object-curly-spacing
ybnd Jun 27, 2023
2cad56c
Fix tests
ybnd Jun 28, 2023
07259ca
ESLint/TypeScript: enforce no-implicit-any-catch
ybnd Jun 28, 2023
c0f43bc
ESLint: fix rxjs/no-implicit-any-catch
ybnd Jun 28, 2023
c0f9042
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Jul 7, 2023
544306a
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Dec 12, 2023
47875dd
Fix stray lint issue
ybnd Dec 13, 2023
4a87c9a
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Dec 19, 2023
ca1d810
Autofix lint issues
ybnd Dec 19, 2023
968c233
Manual lint fixes
ybnd Dec 19, 2023
5af4f89
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Jan 9, 2024
6ff2170
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Jan 12, 2024
dbf7fd6
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Mar 6, 2024
2b540cd
Autofix lint issues
ybnd Mar 6, 2024
3b48d9a
Manually fix lint issues
ybnd Mar 6, 2024
ebbbd64
Fix tests
ybnd Mar 6, 2024
5edc689
Fix null/undefined incosistencies
ybnd Mar 6, 2024
86885f7
Merge remote-tracking branch 'origin/main' into more-eslint
ybnd Mar 7, 2024
33d5253
Only log errors for DspaceRestService.get
ybnd Mar 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Manually fix lint issues
ybnd committed Mar 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 3b48d9a26d46e881dc5f589680f7e9579ef85c23
Original file line number Diff line number Diff line change
@@ -261,8 +261,7 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
const servicesToUse = this.ldnService.notifyServiceInboundPatterns;

servicesToUse.forEach((patternObj: NotifyServicePattern) => {
let patternFormGroup;
patternFormGroup = this.initializeInboundPatternFormGroup();
const patternFormGroup = this.initializeInboundPatternFormGroup();
const newPatternObjWithLabel = Object.assign(new NotifyServicePattern(), {
...patternObj,
patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternObj?.pattern + '.label'),
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ describe('FiltersComponent', () => {
fixture.detectChanges();
}));

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

const isAllSelected = (values: {}): boolean => {
const isAllSelected = (values: any): boolean => {
let allSelected = true;
let allFilters = FiltersComponent.FILTERS;
for (let i = 0; allSelected && i < allFilters.length; i++) {
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ export class FiltersComponent {
return undefined;
}

static toQueryString(filters: Object): string {
static toQueryString(filters: { [key: string]: any }): string {
let params = '';
let first = true;
for (const key in filters) {
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<section class="comcol-page-browse-section">
<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:{
field: 'browse.metadata.' + browseId | translate,
startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
<span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
</button>
<!--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>
<div class="d-flex flex-row">
2 changes: 1 addition & 1 deletion src/app/core/data/processes/process-data.service.spec.ts
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ import {
describe('ProcessDataService', () => {
let testScheduler;

const mockTimer = (fn: () => {}, interval: number) => {
const mockTimer = (fn: () => any, interval: number) => {
fn();
return 555;
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/internal/Observable';
import { Observable } from 'rxjs';

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

import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
Original file line number Diff line number Diff line change
@@ -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 }">
<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>
<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"
[dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
<ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<!--
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}">
</ng-container>
<span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ng-container *ngIf="data?.length > 0 && displayOptions">
<div
[ngClass]="{'align-items-center': data.length == 1}"
[ngClass]="{'align-items-center': data.length === 1}"
class="alert d-flex flex-row sections-gap {{
displayOptions.alertType
}}"
Original file line number Diff line number Diff line change
@@ -196,7 +196,7 @@ <h4 class="border-bottom pb-2">
<i class="fas fa-trash-alt"></i>
</button>
</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"
ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
container="body"
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@
<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-pagination *ngIf="!(isTargetsLoading() | async)"
<ds-pagination *ngIf="(isTargetsLoading() | async) === false"
[paginationOptions]="paginationConfig"
[collectionSize]="(totalElements$ | async)"
[hideGear]="false"
[retainScrollPosition]="false"
(paginationChange)="getSuggestionTargets()">

<ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
<ng-container *ngIf="!(isTargetsProcessing() | async)">
<div *ngIf="!(targets$|async) || (targets$|async)?.length == 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
<ng-container *ngIf="(isTargetsProcessing() | async) === false">
<div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
{{'suggestion.noTargets' | translate}}
</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">
<thead>
<tr class="text-center">
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ export const SuggestionTargetActionTypes = {
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'),
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'),
};

@@ -126,6 +127,13 @@ export class RefreshUserSuggestionsAction implements Action {
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.
* Called by the ??? effect.
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ import { SuggestionsService } from '../suggestions.service';
import {
AddTargetAction,
AddUserSuggestionsAction,
RefreshUserSuggestionsErrorAction,
RetrieveAllTargetsErrorAction,
RetrieveTargetsBySourceAction,
SuggestionTargetActionTypes,
@@ -46,8 +47,8 @@ export class SuggestionTargetsEffects {
map((targets: PaginatedList<SuggestionTarget>) =>
new AddTargetAction(targets.page, targets.totalPages, targets.currentPage, targets.totalElements),
),
catchError((error: Error) => {
if (error) {
catchError((error: unknown) => {
if (error instanceof Error) {
console.error(error.message);
}
return of(new RetrieveAllTargetsErrorAction());
@@ -78,10 +79,20 @@ export class SuggestionTargetsEffects {
return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
.pipe(
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());
}),
);
})),
);
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ <h2 class="flex-grow-1">

</ds-pagination>

<div *ngIf="processesRD?.payload?.totalElements == 0">
<div *ngIf="processesRD?.payload?.totalElements === 0">
<p>{{'process.overview.table.empty' | translate}}</p>
</div>
</ng-container>
2 changes: 1 addition & 1 deletion src/app/shared/auth-nav-menu/auth-nav-menu.component.html
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@

<ng-template #mobileButtons>
<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>
</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">
Original file line number Diff line number Diff line change
@@ -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">
{{ 'item.qa.withdrawn.modal.header' | translate }}
<button type="button" class="close" (click)="onModalClose()" aria-label="Close">
Original file line number Diff line number Diff line change
@@ -152,8 +152,12 @@ export class LogInPasswordComponent implements OnInit {
}),
);

this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(shareReplay(1));
this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(shareReplay(1));
this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(
shareReplay({ refCount: false, bufferSize: 1 }),
);
this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(
shareReplay({ refCount: false, bufferSize: 1 }),
);
this.canShowDivider$ =
combineLatest([this.canRegister$, this.canForgot$])
.pipe(
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
@author Kim Shepherd
-->
<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>
</ng-container>
<ng-container *ngIf="data?.potentialDuplicates.length > 0">
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
[scrollWindow]="false"
>
<button
*ngIf="(filterServices(ldnPattern.pattern) | async)?.length == 0"
*ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
class="dropdown-item collection-item text-truncate w-100"
>
{{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
@@ -58,7 +58,7 @@
</button>
<button
*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"
(click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
>
2 changes: 1 addition & 1 deletion src/app/suggestions-page/suggestions-page.component.html
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ <h1>
<i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
</div>
<ds-loading *ngIf="(processing$ | async)"></ds-loading>
<ds-pagination *ngIf="!(processing$ | async)"
<ds-pagination *ngIf="(processing$ | async) === false"
[paginationOptions]="paginationOptions"
[sortOptions]="paginationSortConfig"
[collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
52 changes: 27 additions & 25 deletions src/environments/environment.test.ts
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ export const environment: BuildConfig = {
timer: 5,
},
duplicateDetection: {
alwaysShowSection: false
alwaysShowSection: false,
},
typeBind: {
field: 'dc.type',
@@ -152,22 +152,24 @@ export const environment: BuildConfig = {
{
value: 600,
style: 'text-success',
icon: 'fa-circle-check'
icon: 'fa-circle-check',
},
{
value: 500,
style: 'text-info',
icon: 'fa-gear'
icon: 'fa-gear',
},
{
value: 400,
style: 'text-warning',
icon: 'fa-circle-question'
icon: 'fa-circle-question',
},
{
value: 'default',
style: 'text-muted',
icon: 'fa-circle-xmark'
icon: 'fa-circle-xmark',
},
],
},
},
},
@@ -247,9 +249,9 @@ export const environment: BuildConfig = {
sortField: 'dc.date.accessioned',
},
topLevelCommunityList: {
pageSize: 5
pageSize: 5,
},
showDiscoverFilters: false
showDiscoverFilters: false,
},
item: {
edit: {
@@ -332,17 +334,17 @@ export const environment: BuildConfig = {
{
filter: 'subject',
vocabulary: 'srsc',
enabled: true
}
enabled: true,
},
],

suggestion: [],

search: {
advancedFilters: {
enabled: false,
filter: ['title', 'author', 'subject', 'entityType']
}
filter: ['title', 'author', 'subject', 'entityType'],
},
},

notifyMetrics: [
@@ -353,34 +355,34 @@ export const environment: BuildConfig = {
color: '#B8DAFF',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
textColor: '#fff',
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',
@@ -389,34 +391,34 @@ export const environment: BuildConfig = {
color: '#D4EDDA',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.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',
title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
textColor: '#fff',
config: 'NOTIFY.outgoing.involvedItems',
description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description'
description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
},
]
}
]
],
},
],
};
4 changes: 2 additions & 2 deletions src/themes/dspace/app/header/header.component.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<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"/>
</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>
</nav>
</div>
@@ -24,7 +24,7 @@

<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()"
[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>
</button>
</div>