From 377e27b305bcc000ce28972775c9d60c14dd4567 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 12 May 2023 09:25:47 +0200 Subject: [PATCH] [CST-9636] Fix lint --- .../bulk-access-browse.component.spec.ts | 8 ++-- .../browse/bulk-access-browse.component.ts | 6 +-- .../bulk-access/bulk-access.component.spec.ts | 40 +++++++++---------- .../bulk-access/bulk-access.component.ts | 6 +-- .../bulk-access-settings.component.spec.ts | 36 ++++++++--------- .../bulk-access-settings.component.ts | 2 +- ...ntrol-select-bitstreams-modal.component.ts | 2 +- .../themed-object-list.component.ts | 18 ++++----- src/assets/i18n/en.json5 | 2 +- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts index c8379b06ee..87b2a8d568 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts @@ -69,10 +69,10 @@ describe('BulkAccessBrowseComponent', () => { it('should have an initial remote data with a paginated list as value', () => { const list = buildPaginatedList(new PageInfo({ - "elementsPerPage": 5, - "totalElements": 2, - "totalPages": 1, - "currentPage": 1 + 'elementsPerPage': 5, + 'totalElements': 2, + 'totalPages': 1, + 'currentPage': 1 }), [selected1, selected2]) ; const rd = createSuccessfulRemoteDataObject(list); diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts index eff5942d4e..e806e729c8 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts @@ -69,7 +69,7 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy { distinctUntilChanged(), map((list: SelectableListState) => this.generatePaginatedListBySelectedElements(list)) ).subscribe(this.objectsSelected$) - ) + ); } pageNext() { @@ -87,7 +87,7 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy { private calculatePageCount(pageSize, totalCount = 0) { // we suppose that if we have 0 items we want 1 empty page return totalCount < pageSize ? 1 : Math.ceil(totalCount / pageSize); - }; + } /** * Generate The RemoteData object containing the list of the selected elements @@ -114,6 +114,6 @@ export class BulkAccessBrowseComponent implements OnInit, OnDestroy { this.subs .filter((sub) => hasValue(sub)) .forEach((sub) => sub.unsubscribe()); - this.selectableListService.deselectAll(this.listId) + this.selectableListService.deselectAll(this.listId); } } diff --git a/src/app/access-control/bulk-access/bulk-access.component.spec.ts b/src/app/access-control/bulk-access/bulk-access.component.spec.ts index 8a64d01df4..ccbdabb7a6 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.spec.ts +++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts @@ -24,38 +24,38 @@ fdescribe('BulkAccessComponent', () => { const bulkAccessControlServiceMock = jasmine.createSpyObj('bulkAccessControlService', ['createPayloadFile', 'executeScript']); const mockFormState = { - "bitstream": [], - "item": [ + 'bitstream': [], + 'item': [ { - "name": "embargo", - "startDate": { - "year": 2026, - "month": 5, - "day": 31 + 'name': 'embargo', + 'startDate': { + 'year': 2026, + 'month': 5, + 'day': 31 }, - "endDate": null + 'endDate': null } ], - "state": { - "item": { - "toggleStatus": true, - "accessMode": "replace" + 'state': { + 'item': { + 'toggleStatus': true, + 'accessMode': 'replace' }, - "bitstream": { - "toggleStatus": false, - "accessMode": "", - "changesLimit": "", - "selectedBitstreams": [] + 'bitstream': { + 'toggleStatus': false, + 'accessMode': '', + 'changesLimit': '', + 'selectedBitstreams': [] } } }; const mockFile = { - "uuids": [ + 'uuids': [ '1234', '5678' ], - "file": { } - } + 'file': { } + }; const mockSettings: any = jasmine.createSpyObj('AccessControlFormContainerComponent', { getValue: jasmine.createSpy('getValue'), diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts index b928f3da4a..074dbc7f55 100644 --- a/src/app/access-control/bulk-access/bulk-access.component.ts +++ b/src/app/access-control/bulk-access/bulk-access.component.ts @@ -26,7 +26,7 @@ export class BulkAccessComponent implements OnInit { /** * The selection list id */ - listId: string = 'bulk-access-list'; + listId = 'bulk-access-list'; /** * The list of the objects already selected @@ -58,7 +58,7 @@ export class BulkAccessComponent implements OnInit { distinctUntilChanged(), map((list: SelectableListState) => this.generateIdListBySelectedElements(list)) ).subscribe(this.objectsSelected$) - ) + ); } canExport(): boolean { @@ -70,7 +70,7 @@ export class BulkAccessComponent implements OnInit { * This will also reset the state of the child components (bitstream and item access) */ reset(): void { - this.settings.reset() + this.settings.reset(); } /** diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts index 306d4eebde..229f7eeb11 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts @@ -8,28 +8,28 @@ describe('BulkAccessSettingsComponent', () => { let component: BulkAccessSettingsComponent; let fixture: ComponentFixture; const mockFormState = { - "bitstream": [], - "item": [ + 'bitstream': [], + 'item': [ { - "name": "embargo", - "startDate": { - "year": 2026, - "month": 5, - "day": 31 + 'name': 'embargo', + 'startDate': { + 'year': 2026, + 'month': 5, + 'day': 31 }, - "endDate": null + 'endDate': null } ], - "state": { - "item": { - "toggleStatus": true, - "accessMode": "replace" + 'state': { + 'item': { + 'toggleStatus': true, + 'accessMode': 'replace' }, - "bitstream": { - "toggleStatus": false, - "accessMode": "", - "changesLimit": "", - "selectedBitstreams": [] + 'bitstream': { + 'toggleStatus': false, + 'accessMode': '', + 'changesLimit': '', + 'selectedBitstreams': [] } } }; @@ -68,7 +68,7 @@ describe('BulkAccessSettingsComponent', () => { it('should return the correct form value', () => { const expectedValue = mockFormState; - (component.controlForm as any).getFormValue.and.returnValue(mockFormState) + (component.controlForm as any).getFormValue.and.returnValue(mockFormState); const actualValue = component.getValue(); expect(actualValue).toEqual(expectedValue); }); diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts index 978fc41ed8..eecc016245 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts @@ -28,7 +28,7 @@ export class BulkAccessSettingsComponent { * This will also reset the state of the child components (bitstream and item access) */ reset() { - this.controlForm.reset() + this.controlForm.reset(); } } diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts index 171b1d59c1..617803a0c4 100644 --- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts +++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts @@ -13,7 +13,7 @@ import { TranslateService } from '@ngx-translate/core'; import { hasValue } from '../../empty.util'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams' +export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams'; @Component({ selector: 'ds-item-access-control-select-bitstreams-modal', diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts index 9448ed5939..04a95de1cb 100644 --- a/src/app/shared/object-list/themed-object-list.component.ts +++ b/src/app/shared/object-list/themed-object-list.component.ts @@ -1,13 +1,13 @@ -import {Component, EventEmitter, Input, Output} from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ObjectListComponent } from './object-list.component'; import { ThemedComponent } from '../theme-support/themed.component'; -import {PaginationComponentOptions} from '../pagination/pagination-component-options.model'; -import {SortDirection, SortOptions} from '../../core/cache/models/sort-options.model'; -import {CollectionElementLinkType} from '../object-collection/collection-element-link.type'; -import {Context} from '../../core/shared/context.model'; -import {RemoteData} from '../../core/data/remote-data'; -import {PaginatedList} from '../../core/data/paginated-list.model'; -import {ListableObject} from '../object-collection/shared/listable-object.model'; +import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; +import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; +import { CollectionElementLinkType } from '../object-collection/collection-element-link.type'; +import { Context } from '../../core/shared/context.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { ListableObject } from '../object-collection/shared/listable-object.model'; /** * Themed wrapper for ObjectListComponent @@ -53,7 +53,7 @@ export class ThemedObjectListComponent extends ThemedComponent