diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts index 7daeb6c43e..ba854aa158 100644 --- a/src/app/access-control/access-control.module.ts +++ b/src/app/access-control/access-control.module.ts @@ -1,9 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { - AbstractControl, - AbstractControl, -} from '@angular/forms'; +import { AbstractControl } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; import { 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 03b576317f..a400742f01 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 @@ -17,14 +17,10 @@ import { TranslateModule } from '@ngx-translate/core'; import { NgxPaginationModule } from 'ngx-pagination'; import { BehaviorSubject, - BehaviorSubject, - Subscription, Subscription, } from 'rxjs'; import { distinctUntilChanged, - distinctUntilChanged, - map, map, } from 'rxjs/operators'; @@ -34,24 +30,14 @@ import { } from '../../../core/data/paginated-list.model'; import { RemoteData } from '../../../core/data/remote-data'; import { PageInfo } from '../../../core/shared/page-info.model'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { hasValue } from '../../../shared/empty.util'; import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component'; -import { - SelectableListState, - SelectableListState, -} from '../../../shared/object-list/selectable-list/selectable-list.reducer'; -import { - SelectableListService, - SelectableListService, -} from '../../../shared/object-list/selectable-list/selectable-list.service'; +import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer'; +import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; 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 76e958e418..880e1f2472 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 @@ -1,7 +1,4 @@ -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 38863183cc..c636b72d56 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -30,26 +30,17 @@ import { of as observableOf, } from 'rxjs'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FindListOptions } from '../../core/data/find-list-options.model'; import { buildPaginatedList, PaginatedList, } from '../../core/data/paginated-list.model'; import { RemoteData } from '../../core/data/remote-data'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { RequestService } from '../../core/data/request.service'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - PaginationService, - PaginationService, -} from '../../core/pagination/pagination.service'; +import { PaginationService } from '../../core/pagination/pagination.service'; import { PageInfo } from '../../core/shared/page-info.model'; import { FormBuilderService } from '../../shared/form/builder/form-builder.service'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; @@ -158,7 +149,7 @@ describe('EPeopleRegistryComponent', () => { builderService = getMockFormBuilderService(); paginationService = new PaginationServiceStub(); - awaitTestBed.configureTestingModule({ + TestBed.configureTestingModule({ imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), EPeopleRegistryComponent], providers: [ diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index 3c899611ca..5466ed0152 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -17,10 +17,7 @@ import { Router, RouterModule, } from '@angular/router'; -import { - NgbModal, - NgbModal, -} from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, @@ -37,55 +34,26 @@ import { take, } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; -import { - FeatureID, - FeatureID, -} from '../../core/data/feature-authorization/feature-id'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { buildPaginatedList, PaginatedList, } from '../../core/data/paginated-list.model'; import { RemoteData } from '../../core/data/remote-data'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { RequestService } from '../../core/data/request.service'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - EpersonDtoModel, - EpersonDtoModel, -} from '../../core/eperson/models/eperson-dto.model'; -import { - PaginationService, - PaginationService, -} from '../../core/pagination/pagination.service'; -import { - NoContent, - NoContent, -} from '../../core/shared/NoContent.model'; +import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model'; +import { PaginationService } from '../../core/pagination/pagination.service'; +import { NoContent } from '../../core/shared/NoContent.model'; import { getAllSucceededRemoteData, - getAllSucceededRemoteData, - getFirstCompletedRemoteData, getFirstCompletedRemoteData, } from '../../core/shared/operators'; -import { - PageInfo, - PageInfo, -} from '../../core/shared/page-info.model'; -import { - ConfirmationModalComponent, - ConfirmationModalComponent, -} from '../../shared/confirmation-modal/confirmation-modal.component'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @@ -93,8 +61,6 @@ import { PaginationComponent } from '../../shared/pagination/pagination.componen import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { getEPersonEditRoute, - getEPersonEditRoute, - getEPersonsRoute, getEPersonsRoute, } from '../access-control-routing-paths'; import { EPersonFormComponent } from './eperson-form/eperson-form.component'; diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index bb07b3513c..7c03b9eab0 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts @@ -18,8 +18,6 @@ import { } from '@angular/platform-browser'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -33,31 +31,19 @@ import { } from 'rxjs'; import { AuthService } from '../../../core/auth/auth.service'; -import { - EpersonRegistrationService, - EpersonRegistrationService, -} from '../../../core/data/eperson-registration.service'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { - FindListOptions, - FindListOptions, -} from '../../../core/data/find-list-options.model'; +import { FindListOptions } from '../../../core/data/find-list-options.model'; import { buildPaginatedList, PaginatedList, } from '../../../core/data/paginated-list.model'; import { RemoteData } from '../../../core/data/remote-data'; -import { - RequestService, - RequestService, -} from '../../../core/data/request.service'; +import { RequestService } from '../../../core/data/request.service'; import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; import { GroupDataService } from '../../../core/eperson/group-data.service'; import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { - PaginationService, - PaginationService, -} from '../../../core/pagination/pagination.service'; +import { PaginationService } from '../../../core/pagination/pagination.service'; import { PageInfo } from '../../../core/shared/page-info.model'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormComponent } from '../../../shared/form/form.component'; @@ -67,38 +53,21 @@ import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { - ActivatedRouteStub, - ActivatedRouteStub, -} from '../../../shared/testing/active-router.stub'; +import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { AuthServiceStub } from '../../../shared/testing/auth-service.stub'; import { EPersonMock, - EPersonMock, - EPersonMock2, EPersonMock2, } from '../../../shared/testing/eperson.mock'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { - PaginationServiceStub, - PaginationServiceStub, -} from '../../../shared/testing/pagination-service.stub'; -import { - RouterStub, - RouterStub, -} from '../../../shared/testing/router.stub'; +import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; +import { RouterStub } from '../../../shared/testing/router.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe'; import { EPeopleRegistryComponent } from '../epeople-registry.component'; -import { - EPersonFormComponent, - EPersonFormComponent, -} from './eperson-form.component'; -import { - ValidateEmailNotTaken, - ValidateEmailNotTaken, -} from './validators/email-taken.validator'; +import { EPersonFormComponent } from './eperson-form.component'; +import { ValidateEmailNotTaken } from './validators/email-taken.validator'; describe('EPersonFormComponent', () => { let component: EPersonFormComponent; diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index d6cc13a84d..73c914ce0d 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -14,8 +14,6 @@ import { import { UntypedFormGroup } from '@angular/forms'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterLink, } from '@angular/router'; @@ -45,14 +43,8 @@ import { } from 'rxjs/operators'; import { AuthService } from '../../../core/auth/auth.service'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; -import { - EpersonRegistrationService, - EpersonRegistrationService, -} from '../../../core/data/eperson-registration.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { PaginatedList } from '../../../core/data/paginated-list.model'; @@ -70,14 +62,8 @@ import { getRemoteDataPayload, } from '../../../core/shared/operators'; import { PageInfo } from '../../../core/shared/page-info.model'; -import { - Registration, - Registration, -} from '../../../core/shared/registration.model'; -import { - TYPE_REQUEST_FORGOT, - TYPE_REQUEST_FORGOT, -} from '../../../register-email-form/register-email-form.component'; +import { Registration } from '../../../core/shared/registration.model'; +import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component'; import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component'; import { hasValue } from '../../../shared/empty.util'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; @@ -88,10 +74,7 @@ import { PaginationComponent } from '../../../shared/pagination/pagination.compo import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { getEPersonsRoute } from '../../access-control-routing-paths'; -import { - ValidateEmailNotTaken, - ValidateEmailNotTaken, -} from './validators/email-taken.validator'; +import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @Component({ selector: 'ds-eperson-form', diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts index 61e4625792..1f54b801c8 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts @@ -1,19 +1,14 @@ import { - Location, Location, NgIf, } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { - Router, - Router, -} from '@angular/router'; +import { Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { UiSwitchModule } from 'ngx-ui-switch'; import { take } from 'rxjs/operators'; @@ -21,8 +16,6 @@ import { take } from 'rxjs/operators'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { BATCH_IMPORT_SCRIPT_NAME, - BATCH_IMPORT_SCRIPT_NAME, - ScriptDataService, ScriptDataService, } from '../../core/data/processes/script-data.service'; import { RemoteData } from '../../core/data/remote-data'; @@ -30,19 +23,13 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths'; import { Process } from '../../process-page/processes/process.model'; -import { - ProcessParameter, - ProcessParameter, -} from '../../process-page/processes/process-parameter.model'; +import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; import { ImportBatchSelectorComponent } from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component'; import { isEmpty, isNotEmpty, } from '../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component'; @Component({ diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts index 1f4fd0bf5c..348793300a 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts +++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts @@ -60,6 +60,7 @@ describe('LdnServicesOverviewComponent', () => { { provide: NgbModal, useValue: { open: () => { + // }, }, }, diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts index 2859665d0e..bdab873717 100644 --- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts @@ -21,8 +21,6 @@ import { getMockFormService } from '../../../../shared/mocks/form-service.mock'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, - createFailedRemoteDataObject$, - createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts index 2e704f6a6c..a1ba387cfb 100644 --- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts @@ -3,27 +3,14 @@ import { Router } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - BitstreamFormatDataService, - BitstreamFormatDataService, -} from '../../../../core/data/bitstream-format-data.service'; +import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; import { RemoteData } from '../../../../core/data/remote-data'; -import { - BitstreamFormat, - BitstreamFormat, -} from '../../../../core/shared/bitstream-format.model'; +import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { - NotificationsService, - NotificationsService, -} from '../../../../shared/notifications/notifications.service'; -import { - getBitstreamFormatsModuleRoute, - getBitstreamFormatsModuleRoute, -} from '../../admin-registries-routing-paths'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths'; import { FormatFormComponent } from '../format-form/format-form.component'; /** diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 0f5eea4601..321d946907 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -4,11 +4,8 @@ import { NO_ERRORS_SCHEMA, } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; @@ -22,7 +19,6 @@ import { hot, } from 'jasmine-marbles'; import { - of as observableOf, of as observableOf, of, } from 'rxjs'; @@ -49,10 +45,7 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications- import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe'; -import { - BitstreamFormatsComponent, - BitstreamFormatsComponent, -} from './bitstream-formats.component'; +import { BitstreamFormatsComponent } from './bitstream-formats.component'; describe('BitstreamFormatsComponent', () => { let comp: BitstreamFormatsComponent; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 67b3072eff..72739507be 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -4,77 +4,41 @@ import { NgIf, } from '@angular/common'; import { - Component, Component, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { - Router, Router, RouterLink, } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, - combineLatest as observableCombineLatest, - Observable, Observable, } from 'rxjs'; import { map, - map, - mergeMap, mergeMap, switchMap, - switchMap, take, - take, - toArray, toArray, } from 'rxjs/operators'; -import { - BitstreamFormatDataService, - BitstreamFormatDataService, -} from '../../../core/data/bitstream-format-data.service'; +import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; -import { - PaginatedList, - PaginatedList, -} from '../../../core/data/paginated-list.model'; -import { - RemoteData, - RemoteData, -} from '../../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../../core/pagination/pagination.service'; -import { - BitstreamFormat, - BitstreamFormat, -} from '../../../core/shared/bitstream-format.model'; -import { - NoContent, - NoContent, -} from '../../../core/shared/NoContent.model'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginationService } from '../../../core/pagination/pagination.service'; +import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; +import { NoContent } from '../../../core/shared/NoContent.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../../shared/pagination/pagination-component-options.model'; +import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; /** * This component renders a list of bitstream formats diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts index 846d77dcb4..f932d83277 100644 --- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts @@ -10,7 +10,6 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -18,10 +17,7 @@ import { map } from 'rxjs/operators'; import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; import { RemoteData } from '../../../../core/data/remote-data'; import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths'; import { FormatFormComponent } from '../format-form/format-form.component'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts index 212931711d..470b3a5271 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts @@ -6,10 +6,7 @@ import { import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; import { AuthService } from '../../../../../core/auth/auth.service'; @@ -27,14 +24,8 @@ import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub'; import { FileServiceStub } from '../../../../../shared/testing/file-service.stub'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; -import { - TruncatableService, - TruncatableService, -} from '../../../../../shared/truncatable/truncatable.service'; -import { - CollectionAdminSearchResultGridElementComponent, - CollectionAdminSearchResultGridElementComponent, -} from './collection-admin-search-result-grid-element.component'; +import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; +import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component'; describe('CollectionAdminSearchResultGridElementComponent', () => { let component: CollectionAdminSearchResultGridElementComponent; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts index afe06927c9..172226dd07 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts @@ -1,23 +1,14 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { - getCollectionEditRoute, - getCollectionEditRoute, -} from '../../../../../collection-page/collection-page-routing-paths'; -import { - Collection, - Collection, -} from '../../../../../core/shared/collection.model'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; +import { Collection } from '../../../../../core/shared/collection.model'; import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component'; -import { - SearchResultGridElementComponent, - SearchResultGridElementComponent, -} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; +import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch) @Component({ diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts index f17d4b001e..6821025653 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts @@ -25,10 +25,7 @@ import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub'; import { FileServiceStub } from '../../../../../shared/testing/file-service.stub'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; -import { - TruncatableService, - TruncatableService, -} from '../../../../../shared/truncatable/truncatable.service'; +import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component'; describe('CommunityAdminSearchResultGridElementComponent', () => { diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts index 6fb51ff3ff..50be35229d 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts @@ -1,23 +1,14 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; -import { - getCommunityEditRoute, - getCommunityEditRoute, -} from '../../../../../community-page/community-page-routing-paths'; -import { - Community, - Community, -} from '../../../../../core/shared/community.model'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; +import { Community } from '../../../../../core/shared/community.model'; import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunitySearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'; -import { - SearchResultGridElementComponent, - SearchResultGridElementComponent, -} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; +import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch) @Component({ diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts index de9470ffa2..37afbf14fe 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts @@ -2,32 +2,14 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - getCollectionEditRoute, - getCollectionEditRoute, -} from '../../../../../collection-page/collection-page-routing-paths'; -import { - Collection, - Collection, -} from '../../../../../core/shared/collection.model'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { - CollectionSearchResult, - CollectionSearchResult, -} from '../../../../../shared/object-collection/shared/collection-search-result.model'; -import { - listableObjectComponent, - listableObjectComponent, -} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model'; +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch) @Component({ diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts index b955eedd58..5861f15c1f 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts @@ -2,32 +2,14 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - getCommunityEditRoute, - getCommunityEditRoute, -} from '../../../../../community-page/community-page-routing-paths'; -import { - Community, - Community, -} from '../../../../../core/shared/community.model'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths'; +import { Community } from '../../../../../core/shared/community.model'; +import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { - CommunitySearchResult, - CommunitySearchResult, -} from '../../../../../shared/object-collection/shared/community-search-result.model'; -import { - listableObjectComponent, - listableObjectComponent, -} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunitySearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch) @Component({ diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts index 117ced30ae..d77e86689a 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts @@ -1,16 +1,10 @@ import { Component } from '@angular/core'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { Context } from '../../../../../core/shared/context.model'; import { Item } from '../../../../../core/shared/item.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; -import { - listableObjectComponent, - listableObjectComponent, -} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component'; diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts index 2786236b09..ff9897ce9e 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts @@ -6,16 +6,12 @@ import { OnInit, } from '@angular/core'; import { - Router, Router, RouterLink, } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - isEmpty, - isEmpty, -} from '../../../shared/empty.util'; +import { isEmpty } from '../../../shared/empty.util'; import { MenuService } from '../../../shared/menu/menu.service'; import { MenuID } from '../../../shared/menu/menu-id.model'; import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model'; diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts index cee5d7b5c0..25892be291 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -10,56 +10,27 @@ import { tick, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { ActivatedRoute } from '@angular/router'; +import { RouterTestingModule } from '@angular/router/testing'; import { - ActivatedRoute, - ActivatedRoute, -} from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; -import { - NgbModal, NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { of as observableOf } from 'rxjs'; -import { - AuthService, - AuthService, -} from '../../core/auth/auth.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ScriptDataService } from '../../core/data/processes/script-data.service'; -import { - Item, - Item, -} from '../../core/shared/item.model'; +import { Item } from '../../core/shared/item.model'; import { MenuService } from '../../shared/menu/menu.service'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; -import { - createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject, -} from '../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { CSSVariableService } from '../../shared/sass-helper/css-variable.service'; -import { - AuthServiceStub, - AuthServiceStub, -} from '../../shared/testing/auth-service.stub'; +import { AuthServiceStub } from '../../shared/testing/auth-service.stub'; import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub'; -import createSpy = jasmine.createSpy; import { MenuServiceStub } from '../../shared/testing/menu-service.stub'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { AdminSidebarComponent } from './admin-sidebar.component'; diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts index 46ac650853..1b09d330c2 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts @@ -15,14 +15,9 @@ import { Router } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as combineLatestObservable, - combineLatest as combineLatestObservable, - Observable, Observable, } from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { bgColor } from '../../../shared/animations/bgColor'; import { rotate } from '../../../shared/animations/rotate'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts index 2b02ce792c..2e407f92db 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts @@ -43,7 +43,6 @@ import { getSearchResultFor } from '../../../../../shared/search/search-result-e import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component'; import { - SupervisionOrderListEntry, SupervisionOrderListEntry, SupervisionOrderStatusComponent, } from './supervision-order-status/supervision-order-status.component'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts index e9eb682839..4b0224a4a2 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.spec.ts @@ -13,18 +13,12 @@ import { AuthService } from '../../../../../core/auth/auth.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../../../core/shared/dspace-object.model'; +import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { Item } from '../../../../../core/shared/item.model'; import { ListableModule } from '../../../../../core/shared/listable.module'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { - SupervisionOrderDataService, - SupervisionOrderDataService, -} from '../../../../../core/supervision-order/supervision-order-data.service'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock'; import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts index 79fcc69939..271056c47e 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts @@ -10,18 +10,12 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - Observable, Observable, } from 'rxjs'; import { map, - map, - mergeMap, mergeMap, take, - take, - tap, tap, } from 'rxjs/operators'; @@ -33,19 +27,13 @@ import { RemoteData } from '../../../../../core/data/remote-data'; import { Context } from '../../../../../core/shared/context.model'; import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; -import { - Item, - Item, -} from '../../../../../core/shared/item.model'; +import { Item } from '../../../../../core/shared/item.model'; import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getRemoteDataPayload, } from '../../../../../core/shared/operators'; -import { - ViewMode, - ViewMode, -} from '../../../../../core/shared/view-mode.model'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model'; import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts index 819b51aaeb..23842e9b65 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts @@ -14,10 +14,7 @@ import { AuthService } from '../../../../../core/auth/auth.service'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../../../core/shared/dspace-object.model'; +import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; import { Item } from '../../../../../core/shared/item.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 20c7e5a4e9..5fc32c9808 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,10 +13,7 @@ import { StoreModule, } from '@ngrx/store'; -import { - NOTIFICATIONS_MODULE_PATH, - NOTIFICATIONS_MODULE_PATH, -} from './admin/admin-routing-paths'; +import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths'; import { storeModuleConfig } from './app.reducer'; import { ACCESS_CONTROL_MODULE_PATH, @@ -36,19 +33,13 @@ import { } from './app-routing-paths'; import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths'; import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths'; -import { - AuthBlockingGuard, - AuthBlockingGuard, -} from './core/auth/auth-blocking.guard'; +import { AuthBlockingGuard } from './core/auth/auth-blocking.guard'; import { AuthenticatedGuard } from './core/auth/authenticated.guard'; import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard'; import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard'; import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard'; import { ReloadGuard } from './core/reload/reload.guard'; -import { - ForgotPasswordCheckGuard, - ForgotPasswordCheckGuard, -} from './core/rest-property/forgot-password-check-guard.guard'; +import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard'; import { ServerCheckGuard } from './core/server-check/server-check.guard'; import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component'; import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8c5e3a6c2c..79a4fc7589 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -45,16 +45,10 @@ import { } from './core/services/window.service'; import { distinctNext } from './core/shared/distinct-next'; import { HostWindowResizeAction } from './shared/host-window.actions'; -import { - IdleModalComponent, - IdleModalComponent, -} from './shared/idle-modal/idle-modal.component'; +import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; import { CSSVariableService } from './shared/sass-helper/css-variable.service'; import { HostWindowState } from './shared/search/host-window.reducer'; -import { - ThemeService, - ThemeService, -} from './shared/theme-support/theme.service'; +import { ThemeService } from './shared/theme-support/theme.service'; @Component({ selector: 'ds-app', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9704394444..171ac382b4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -27,67 +27,36 @@ import { NgxMaskModule } from 'ngx-mask'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../config/app-config.interface'; -import { - StoreDevModules, - StoreDevModules, -} from '../config/store/devtools'; -import { - environment, - environment, -} from '../environments/environment'; -import { - EagerThemesModule, - EagerThemesModule, -} from '../themes/eager-themes.module'; +import { StoreDevModules } from '../config/store/devtools'; +import { environment } from '../environments/environment'; +import { EagerThemesModule } from '../themes/eager-themes.module'; import { AppComponent } from './app.component'; import { appEffects } from './app.effects'; import { appMetaReducers, - appMetaReducers, - debugMetaReducers, debugMetaReducers, } from './app.metareducers'; import { - appReducers, appReducers, AppState, - AppState, - storeModuleConfig, storeModuleConfig, } from './app.reducer'; import { AppRoutingModule } from './app-routing.module'; import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator'; -import { - AuthInterceptor, - AuthInterceptor, -} from './core/auth/auth.interceptor'; -import { - LocaleInterceptor, - LocaleInterceptor, -} from './core/locale/locale.interceptor'; -import { - LogInterceptor, - LogInterceptor, -} from './core/log/log.interceptor'; +import { AuthInterceptor } from './core/auth/auth.interceptor'; +import { LocaleInterceptor } from './core/locale/locale.interceptor'; +import { LogInterceptor } from './core/log/log.interceptor'; import { models, provideCore, } from './core/provide-core'; import { ClientCookieService } from './core/services/client-cookie.service'; import { ListableModule } from './core/shared/listable.module'; -import { - XsrfInterceptor, - XsrfInterceptor, -} from './core/xsrf/xsrf.interceptor'; +import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor'; import { NavbarModule } from './navbar/navbar.module'; -import { - RootModule, - RootModule, -} from './root.module'; +import { RootModule } from './root.module'; import { ThemedRootComponent } from './root/themed-root.component'; import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator'; import { METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP } from './shared/metadata-representation/metadata-representation.decorator'; diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts index 50cdfeffc8..ee329df16e 100644 --- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts +++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts @@ -1,8 +1,6 @@ import { AsyncPipe, isPlatformServer, - isPlatformServer, - Location, Location, } from '@angular/common'; import { @@ -30,24 +28,15 @@ import { import { getForbiddenRoute } from '../../app-routing-paths'; import { AuthService } from '../../core/auth/auth.service'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { RemoteData } from '../../core/data/remote-data'; import { SignpostingDataService } from '../../core/data/signposting-data.service'; -import { - SignpostingLink, - SignpostingLink, -} from '../../core/data/signposting-links.model'; +import { SignpostingLink } from '../../core/data/signposting-links.model'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { ServerResponseService } from '../../core/services/server-response.service'; -import { - redirectOn4xx, - redirectOn4xx, -} from '../../core/shared/authorized.operators'; +import { redirectOn4xx } from '../../core/shared/authorized.operators'; import { Bitstream } from '../../core/shared/bitstream.model'; import { FileService } from '../../core/shared/file.service'; import { getRemoteDataPayload } from '../../core/shared/operators'; diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts index 1c0e90690c..f4d285ac74 100644 --- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts +++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts @@ -4,21 +4,14 @@ import { } from '@angular/common'; import { ChangeDetectionStrategy, - ChangeDetectionStrategy, - ChangeDetectorRef, ChangeDetectorRef, Component, - Component, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterLink, } from '@angular/router'; @@ -44,48 +37,23 @@ import { } from 'rxjs'; import { filter, - filter, - map, map, switchMap, - switchMap, - tap, tap, } from 'rxjs/operators'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { BitstreamDataService } from '../../core/data/bitstream-data.service'; -import { - BitstreamFormatDataService, - BitstreamFormatDataService, -} from '../../core/data/bitstream-format-data.service'; -import { - PaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; +import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service'; +import { PaginatedList } from '../../core/data/paginated-list.model'; import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service'; -import { - RemoteData, - RemoteData, -} from '../../core/data/remote-data'; -import { - Bitstream, - Bitstream, -} from '../../core/shared/bitstream.model'; -import { - BitstreamFormat, - BitstreamFormat, -} from '../../core/shared/bitstream-format.model'; -import { - BitstreamFormatSupportLevel, - BitstreamFormatSupportLevel, -} from '../../core/shared/bitstream-format-support-level'; +import { RemoteData } from '../../core/data/remote-data'; +import { Bitstream } from '../../core/shared/bitstream.model'; +import { BitstreamFormat } from '../../core/shared/bitstream-format.model'; +import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level'; import { Bundle } from '../../core/shared/bundle.model'; import { Item } from '../../core/shared/item.model'; -import { - Metadata, - Metadata, -} from '../../core/shared/metadata.utils'; +import { Metadata } from '../../core/shared/metadata.utils'; import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, @@ -96,12 +64,8 @@ import { import { getEntityEditRoute } from '../../item-page/item-page-routing-paths'; import { hasValue, - hasValue, - hasValueOperator, hasValueOperator, isEmpty, - isEmpty, - isNotEmpty, isNotEmpty, } from '../../shared/empty.util'; import { ErrorComponent } from '../../shared/error/error.component'; @@ -110,10 +74,7 @@ import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-u import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model'; import { FormComponent } from '../../shared/form/form.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { FileSizePipe } from '../../shared/utils/file-size-pipe'; import { VarDirective } from '../../shared/utils/var.directive'; import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.component'; diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts index ae661cfe6f..2483335245 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.ts +++ b/src/app/breadcrumbs/breadcrumbs.component.ts @@ -8,10 +8,7 @@ import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - Observable, - Observable, -} from 'rxjs'; +import { Observable } from 'rxjs'; import { VarDirective } from '../shared/utils/var.directive'; import { Breadcrumb } from './breadcrumb/breadcrumb.model'; diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts index bb2a04f736..3382a46f58 100644 --- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -18,35 +18,22 @@ import { combineLatest as observableCombineLatest, Observable, } from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { BrowseService } from '../../core/browse/browse.service'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { RemoteData } from '../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../core/pagination/pagination.service'; +import { PaginationService } from '../../core/pagination/pagination.service'; import { Item } from '../../core/shared/item.model'; import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -54,21 +41,14 @@ import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-cont import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component'; import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { - isValidDate, - isValidDate, -} from '../../shared/date.util'; +import { isValidDate } from '../../shared/date.util'; import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { hasValue, isNotEmpty, } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../shared/pagination/pagination-component-options.model'; -import { StartsWithType } from '../../shared/starts-with/starts-with-decorator'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { StartsWithType } from '../../shared/starts-with/starts-with-type'; import { VarDirective } from '../../shared/utils/var.directive'; import { diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts index 8e43cedd32..64a57a6ed9 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts @@ -13,10 +13,7 @@ import { import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - cold, - cold, -} from 'jasmine-marbles'; +import { cold } from 'jasmine-marbles'; import { Observable, of as observableOf, @@ -30,10 +27,7 @@ import { SelectableListService } from 'src/app/shared/object-list/selectable-lis import { routeServiceStub } from 'src/app/shared/testing/route-service.stub'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../config/app-config.interface'; +import { APP_CONFIG } from '../../../config/app-config.interface'; import { BrowseService } from '../../core/browse/browse.service'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; import { SortDirection } from '../../core/cache/models/sort-options.model'; diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index a64234c270..c3bad2a923 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -4,84 +4,45 @@ import { } from '@angular/common'; import { Component, - Component, - Inject, Inject, Input, - Input, - OnChanges, OnChanges, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { - ActivatedRoute, ActivatedRoute, Params, - Params, - Router, Router, } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - combineLatest as observableCombineLatest, combineLatest as observableCombineLatest, Observable, - Observable, of as observableOf, - of as observableOf, - Subscription, Subscription, } from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { BrowseService } from '../../core/browse/browse.service'; import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; -import { - DSpaceObjectDataService, - DSpaceObjectDataService, -} from '../../core/data/dspace-object-data.service'; -import { - PaginatedList, - PaginatedList, -} from '../../core/data/paginated-list.model'; -import { - RemoteData, - RemoteData, -} from '../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../core/pagination/pagination.service'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { RemoteData } from '../../core/data/remote-data'; +import { PaginationService } from '../../core/pagination/pagination.service'; import { BrowseEntry } from '../../core/shared/browse-entry.model'; -import { - Context, - Context, -} from '../../core/shared/context.model'; +import { Context } from '../../core/shared/context.model'; import { Item } from '../../core/shared/item.model'; import { getFirstSucceededRemoteData } from '../../core/shared/operators'; import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; @@ -93,22 +54,13 @@ import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/co import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../shared/pagination/pagination-component-options.model'; -import { StartsWithType } from '../../shared/starts-with/starts-with-decorator'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { StartsWithType } from '../../shared/starts-with/starts-with-type'; import { VarDirective } from '../../shared/utils/var.directive'; -import { - BrowseByDataType, - BrowseByDataType, -} from '../browse-by-switcher/browse-by-data-type'; +import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; export const BBM_PAGINATION_ID = 'bbm'; diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts index 2d83984a97..aac4c9abec 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts @@ -2,14 +2,9 @@ import { Component } from '@angular/core'; import { Context } from '../../core/shared/context.model'; import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { - hasNoValue, - hasNoValue, -} from '../../shared/empty.util'; +import { hasNoValue } from '../../shared/empty.util'; import { DEFAULT_THEME, - DEFAULT_THEME, - resolveTheme, resolveTheme, } from '../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { BrowseByDateComponent } from '../browse-by-date/browse-by-date.component'; diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts index 559d630b82..f5349b5a65 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts @@ -1,15 +1,10 @@ import { Component, - Component, - SimpleChange, SimpleChange, } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; @@ -18,19 +13,10 @@ import { NonHierarchicalBrowseDefinition } from '../../core/shared/non-hierarchi import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model'; import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; -import { - ThemeService, - ThemeService, -} from '../../shared/theme-support/theme.service'; +import { ThemeService } from '../../shared/theme-support/theme.service'; import { BrowseByDataType } from './browse-by-data-type'; -import { - rendersBrowseBy, - rendersBrowseBy, -} from './browse-by-decorator'; -import { - BrowseBySwitcherComponent, - BrowseBySwitcherComponent, -} from './browse-by-switcher.component'; +import { rendersBrowseBy } from './browse-by-decorator'; +import { BrowseBySwitcherComponent } from './browse-by-switcher.component'; @rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType) @Component({ diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts index b016766430..39a90de83e 100644 --- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts +++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts @@ -4,51 +4,29 @@ import { } from '@angular/common'; import { Component, - Component, - Input, Input, OnChanges, - OnChanges, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Params, Params, RouterLink, } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { - BehaviorSubject, BehaviorSubject, Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { map } from 'rxjs/operators'; -import { - BrowseDefinition, - BrowseDefinition, -} from '../../core/shared/browse-definition.model'; +import { BrowseDefinition } from '../../core/shared/browse-definition.model'; import { Context } from '../../core/shared/context.model'; -import { - HierarchicalBrowseDefinition, - HierarchicalBrowseDefinition, -} from '../../core/shared/hierarchical-browse-definition.model'; -import { - VocabularyEntryDetail, - VocabularyEntryDetail, -} from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { - VocabularyOptions, - VocabularyOptions, -} from '../../core/submission/vocabularies/models/vocabulary-options.model'; +import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model'; +import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model'; import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -61,10 +39,7 @@ import { hasValue } from '../../shared/empty.util'; import { VocabularyTreeviewComponent } from '../../shared/form/vocabulary-treeview/vocabulary-treeview.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; -import { - BrowseByDataType, - BrowseByDataType, -} from '../browse-by-switcher/browse-by-data-type'; +import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; @Component({ selector: 'ds-browse-by-taxonomy', diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts index 49eb84971a..a184a44953 100644 --- a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts +++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts @@ -1,48 +1,30 @@ import { AsyncPipe, CommonModule, - CommonModule, } from '@angular/common'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { of as observableOf } from 'rxjs'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../config/app-config.interface'; -import { - environment, - environment, -} from '../../../environments/environment'; +import { APP_CONFIG } from '../../../config/app-config.interface'; +import { environment } from '../../../environments/environment'; import { BrowseService } from '../../core/browse/browse.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { ItemDataService } from '../../core/data/item-data.service'; import { PaginationService } from '../../core/pagination/pagination.service'; import { Community } from '../../core/shared/community.model'; -import { - Item, - Item, -} from '../../core/shared/item.model'; +import { Item } from '../../core/shared/item.model'; import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -54,10 +36,7 @@ import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-ed import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { - ActivatedRouteStub, - ActivatedRouteStub, -} from '../../shared/testing/active-router.stub'; +import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe'; import { VarDirective } from '../../shared/utils/var.directive'; @@ -121,7 +100,7 @@ describe('BrowseByTitleComponent', () => { ], schemas: [NO_ERRORS_SCHEMA], }) - .overrideComponent(BrowseByTitlePageComponent, { + .overrideComponent(BrowseByTitleComponent, { remove: { imports: [ ComcolPageHeaderComponent, ComcolPageLogoComponent, diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts index 1fd604f06d..38c4c1333c 100644 --- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -9,15 +9,10 @@ import { import { Params } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest } from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; @@ -29,10 +24,7 @@ import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-heade import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../shared/pagination/pagination-component-options.model'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { VarDirective } from '../../shared/utils/var.directive'; import { BrowseByMetadataComponent, diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts index ecda354ae4..fd65717344 100644 --- a/src/app/collection-page/collection-form/collection-form.component.ts +++ b/src/app/collection-page/collection-form/collection-form.component.ts @@ -21,16 +21,10 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - Observable, - Observable, -} from 'rxjs'; +import { Observable } from 'rxjs'; import { hasNoValue, - hasNoValue, - isNotNull, isNotNull, } from 'src/app/shared/empty.util'; @@ -41,10 +35,7 @@ import { EntityTypeDataService } from '../../core/data/entity-type-data.service' import { RequestService } from '../../core/data/request.service'; import { Collection } from '../../core/shared/collection.model'; import { ItemType } from '../../core/shared/item-relationships/item-type.model'; -import { - NONE_ENTITY_TYPE, - NONE_ENTITY_TYPE, -} from '../../core/shared/item-relationships/item-type.resource-type'; +import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; import { MetadataValue } from '../../core/shared/metadata.models'; import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators'; import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component'; @@ -55,8 +46,6 @@ import { UploaderComponent } from '../../shared/upload/uploader/uploader.compone import { VarDirective } from '../../shared/utils/var.directive'; import { collectionFormEntityTypeSelectionConfig, - collectionFormEntityTypeSelectionConfig, - collectionFormModels, collectionFormModels, } from './collection-form.models'; diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts index ea2535e705..416428b36c 100644 --- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts @@ -25,10 +25,7 @@ import { } from '../../core/cache/models/sort-options.model'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ItemDataService } from '../../core/data/item-data.service'; import { RemoteData } from '../../core/data/remote-data'; import { GroupDataService } from '../../core/eperson/group-data.service'; @@ -38,7 +35,6 @@ import { Collection } from '../../core/shared/collection.model'; import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; import { SearchService } from '../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { ErrorComponent } from '../../shared/error/error.component'; import { HostWindowService } from '../../shared/host-window.service'; @@ -61,10 +57,7 @@ import { ObjectSelectServiceStub } from '../../shared/testing/object-select-serv import { RouterStub } from '../../shared/testing/router.stub'; import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub'; import { SearchServiceStub } from '../../shared/testing/search-service.stub'; -import { - createPaginatedList, - createPaginatedList, -} from '../../shared/testing/utils.test'; +import { createPaginatedList } from '../../shared/testing/utils.test'; import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe'; import { VarDirective } from '../../shared/utils/var.directive'; import { CollectionItemMapperComponent } from './collection-item-mapper.component'; diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts index d74b050afe..8317037e58 100644 --- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts @@ -17,7 +17,6 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { BehaviorSubject, @@ -34,37 +33,17 @@ import { import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; -import { - CollectionDataService, - CollectionDataService, -} from '../../core/data/collection-data.service'; -import { - FeatureID, - FeatureID, -} from '../../core/data/feature-authorization/feature-id'; -import { - ItemDataService, - ItemDataService, -} from '../../core/data/item-data.service'; +import { CollectionDataService } from '../../core/data/collection-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { ItemDataService } from '../../core/data/item-data.service'; import { PaginatedList } from '../../core/data/paginated-list.model'; import { RemoteData } from '../../core/data/remote-data'; import { Collection } from '../../core/shared/collection.model'; -import { - DSpaceObject, - DSpaceObject, -} from '../../core/shared/dspace-object.model'; -import { - DSpaceObjectType, - DSpaceObjectType, -} from '../../core/shared/dspace-object-type.model'; -import { - NoContent, - NoContent, -} from '../../core/shared/NoContent.model'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model'; +import { NoContent } from '../../core/shared/NoContent.model'; import { getAllSucceededRemoteData, getFirstCompletedRemoteData, @@ -74,20 +53,13 @@ import { } from '../../core/shared/operators'; import { SearchService } from '../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { fadeIn, fadeInOut, } from '../../shared/animations/fade'; -import { - isNotEmpty, - isNotEmpty, -} from '../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { isNotEmpty } from '../../shared/empty.util'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component'; import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model'; import { ThemedSearchFormComponent } from '../../shared/search-form/themed-search-form.component'; diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts index 28bd5eb44e..c015213ee1 100644 --- a/src/app/collection-page/collection-page.component.ts +++ b/src/app/collection-page/collection-page.component.ts @@ -22,18 +22,12 @@ import { } from 'rxjs/operators'; import { AuthService } from '../core/auth/auth.service'; -import { - DSONameService, - DSONameService, -} from '../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../core/breadcrumbs/dso-name.service'; import { SortOptions } from '../core/cache/models/sort-options.model'; import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { RemoteData } from '../core/data/remote-data'; -import { - redirectOn4xx, - redirectOn4xx, -} from '../core/shared/authorized.operators'; +import { redirectOn4xx } from '../core/shared/authorized.operators'; import { Bitstream } from '../core/shared/bitstream.model'; import { Collection } from '../core/shared/collection.model'; import { getAllSucceededRemoteDataPayload } from '../core/shared/operators'; diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts index eb850d5ccb..061e9dc148 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts @@ -12,16 +12,10 @@ import { of as observableOf } from 'rxjs'; import { AuthService } from '../../core/auth/auth.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { - CollectionDataService, - CollectionDataService, -} from '../../core/data/collection-data.service'; +import { CollectionDataService } from '../../core/data/collection-data.service'; import { CommunityDataService } from '../../core/data/community-data.service'; import { RequestService } from '../../core/data/request.service'; -import { - RouteService, - RouteService, -} from '../../core/services/route.service'; +import { RouteService } from '../../core/services/route.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts index 54a5d108e5..a3594ef152 100644 --- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts +++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts @@ -4,19 +4,12 @@ import { Router } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { CommunityDataService } from '../../core/data/community-data.service'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { RequestService } from '../../core/data/request.service'; import { RouteService } from '../../core/services/route.service'; import { Collection } from '../../core/shared/collection.model'; import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component'; diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts index 7b9c4fa7bf..8a99397b91 100644 --- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts +++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts @@ -1,21 +1,12 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts index b4f55bb4ce..dbb5f8846f 100644 --- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts +++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts @@ -5,33 +5,18 @@ import { import { Component } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { - CollectionDataService, - CollectionDataService, -} from '../../core/data/collection-data.service'; -import { - Collection, - Collection, -} from '../../core/shared/collection.model'; -import { - DeleteComColPageComponent, - DeleteComColPageComponent, -} from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { CollectionDataService } from '../../core/data/collection-data.service'; +import { Collection } from '../../core/shared/collection.model'; +import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { VarDirective } from '../../shared/utils/var.directive'; /** diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts index 274a78c77d..a64a8a273d 100644 --- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts @@ -2,14 +2,10 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; -import { - ActivatedRoute, - ActivatedRoute, -} from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { of as observableOf, of, - of, } from 'rxjs'; import { Community } from '../../../core/shared/community.model'; @@ -45,22 +41,6 @@ describe('CollectionAccessControlComponent', () => { }, }, }; - let routeStub = { - parent: { - parent: { - data: { - pipe: () => { - return { - pipe: () => { - return of({}); - }, - }; - }, - }, - }, - }, - }; - beforeEach(async () => { await TestBed.configureTestingModule({ imports: [CollectionAccessControlComponent], diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts index da033b8796..8a02f0c1d4 100644 --- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts @@ -1,11 +1,8 @@ import { CommonModule } from '@angular/common'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { @@ -14,10 +11,7 @@ import { Router, } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; @@ -31,10 +25,10 @@ import { Collection } from '../../../core/shared/collection.model'; import { Item } from '../../../core/shared/item.model'; import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { createFailedRemoteDataObject$, +import { + createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject$ - , + createSuccessfulRemoteDataObject$, } from '../../../shared/remote-data.utils'; import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths'; import { CollectionMetadataComponent } from './collection-metadata.component'; diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts index dee9ebe6e5..98127d891c 100644 --- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts @@ -8,20 +8,15 @@ import { OnInit, } from '@angular/core'; import { - ActivatedRoute, ActivatedRoute, NavigationEnd, - NavigationEnd, - Router, Router, RouterLink, Scroll, - Scroll, } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { combineLatest as combineLatestObservable, @@ -29,8 +24,6 @@ import { } from 'rxjs'; import { map, - map, - switchMap, switchMap, } from 'rxjs/operators'; @@ -39,23 +32,15 @@ import { ItemTemplateDataService } from '../../../core/data/item-template-data.s import { RemoteData } from '../../../core/data/remote-data'; import { RequestService } from '../../../core/data/request.service'; import { Collection } from '../../../core/shared/collection.model'; -import { - Item, - Item, -} from '../../../core/shared/item.model'; +import { Item } from '../../../core/shared/item.model'; import { NoContent } from '../../../core/shared/NoContent.model'; import { getFirstCompletedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload, } from '../../../core/shared/operators'; import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component'; import { hasValue } from '../../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { VarDirective } from '../../../shared/utils/var.directive'; import { CollectionFormComponent } from '../../collection-form/collection-form.component'; import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths'; diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts index f6c4ad565e..76ab4079f2 100644 --- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts @@ -1,52 +1,30 @@ import { DebugElement, - DebugElement, - NO_ERRORS_SCHEMA, NO_ERRORS_SCHEMA, } from '@angular/core'; import { ComponentFixture, TestBed, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; -import { - NoopAnimationsModule, - NoopAnimationsModule, -} from '@angular/platform-browser/animations'; +import { By } from '@angular/platform-browser'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { RequestService } from '../../../core/data/request.service'; -import { - GroupDataService, - GroupDataService, -} from '../../../core/eperson/group-data.service'; -import { - Collection, - Collection, -} from '../../../core/shared/collection.model'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { Collection } from '../../../core/shared/collection.model'; import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { - CollectionRolesComponent, - CollectionRolesComponent, -} from './collection-roles.component'; +import { CollectionRolesComponent } from './collection-roles.component'; describe('CollectionRolesComponent', () => { diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts index bca290311d..3b51a8e9d9 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -2,10 +2,7 @@ import { AsyncPipe, NgIf, } from '@angular/common'; -import { - HttpClient, - HttpClient, -} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import { Component, Input, @@ -15,7 +12,6 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { BehaviorSubject, @@ -29,35 +25,20 @@ import { tap, } from 'rxjs/operators'; -import { - BitstreamDataService, - BitstreamDataService, -} from '../../../../core/data/bitstream-data.service'; -import { - CollectionDataService, - CollectionDataService, -} from '../../../../core/data/collection-data.service'; +import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; import { ProcessDataService } from '../../../../core/data/processes/process-data.service'; import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; import { RequestService } from '../../../../core/data/request.service'; -import { - Collection, - Collection, -} from '../../../../core/shared/collection.model'; +import { Collection } from '../../../../core/shared/collection.model'; import { ContentSource } from '../../../../core/shared/content-source.model'; -import { - ContentSourceSetSerializer, - ContentSourceSetSerializer, -} from '../../../../core/shared/content-source-set-serializer'; +import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, } from '../../../../core/shared/operators'; -import { - Process, - Process, -} from '../../../../process-page/processes/process.model'; +import { Process } from '../../../../process-page/processes/process.model'; import { ProcessStatus } from '../../../../process-page/processes/process-status.model'; import { hasValue } from '../../../../shared/empty.util'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts index 9cd24c057c..2d3de1c8a8 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -1,7 +1,6 @@ import { AsyncPipe, Location, - Location, NgIf, } from '@angular/common'; import { @@ -27,7 +26,6 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import cloneDeep from 'lodash/cloneDeep'; import { diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts index ae6fb9368d..3ef2b65df9 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts @@ -8,15 +8,9 @@ import { import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { of as observableOf } from 'rxjs'; -import { - CollectionDataService, - CollectionDataService, -} from '../../core/data/collection-data.service'; +import { CollectionDataService } from '../../core/data/collection-data.service'; import { EditCollectionPageComponent } from './edit-collection-page.component'; describe('EditCollectionPageComponent', () => { diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts index fc3d22bfd9..4508ba7342 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts @@ -7,8 +7,6 @@ import { import { Component } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterLink, RouterOutlet, @@ -16,10 +14,7 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { Collection } from '../../core/shared/collection.model'; -import { - EditComColPageComponent, - EditComColPageComponent, -} from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component'; +import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component'; import { getCollectionPageRoute } from '../collection-page-routing-paths'; /** diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts index 5fae4890c9..a148881db7 100644 --- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts +++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts @@ -1,22 +1,13 @@ import { CommonModule } from '@angular/common'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; @@ -30,10 +21,7 @@ import { import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { getCollectionEditRoute } from '../collection-page-routing-paths'; -import { - EditItemTemplatePageComponent, - EditItemTemplatePageComponent, -} from './edit-item-template-page.component'; +import { EditItemTemplatePageComponent } from './edit-item-template-page.component'; describe('EditItemTemplatePageComponent', () => { let comp: EditItemTemplatePageComponent; diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts index 0b0f04989e..cc96b46588 100644 --- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts +++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts @@ -7,26 +7,19 @@ import { OnInit, } from '@angular/core'; import { - ActivatedRoute, ActivatedRoute, RouterLink, } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { - first, first, map, - map, - switchMap, switchMap, } from 'rxjs/operators'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { - ItemTemplateDataService, - ItemTemplateDataService, -} from '../../core/data/item-template-data.service'; +import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; import { RemoteData } from '../../core/data/remote-data'; import { Collection } from '../../core/shared/collection.model'; import { Item } from '../../core/shared/item.model'; @@ -36,10 +29,7 @@ import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; -import { - getCollectionEditRoute, - getCollectionEditRoute, -} from '../collection-page-routing-paths'; +import { getCollectionEditRoute } from '../collection-page-routing-paths'; @Component({ selector: 'ds-edit-item-template-page', diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts index 3753c7d9e5..f997f5db9c 100644 --- a/src/app/community-list-page/community-list/community-list.component.spec.ts +++ b/src/app/community-list-page/community-list/community-list.component.spec.ts @@ -12,20 +12,14 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - RouterLinkWithHref, - RouterLinkWithHref, -} from '@angular/router'; +import { RouterLinkWithHref } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { - v4 as uuidv4, - v4 as uuidv4, -} from 'uuid'; +import { v4 as uuidv4 } from 'uuid'; import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { Collection } from '../../core/shared/collection.model'; diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts index f324c5a4c1..e0456ca700 100644 --- a/src/app/community-list-page/community-list/community-list.component.ts +++ b/src/app/community-list-page/community-list/community-list.component.ts @@ -1,7 +1,6 @@ import { CdkTreeModule, FlatTreeControl, - FlatTreeControl, } from '@angular/cdk/tree'; import { AsyncPipe, @@ -17,32 +16,18 @@ import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; -import { - FindListOptions, - FindListOptions, -} from '../../core/data/find-list-options.model'; +import { FindListOptions } from '../../core/data/find-list-options.model'; import { isEmpty } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { TruncatableComponent } from '../../shared/truncatable/truncatable.component'; import { TruncatablePartComponent } from '../../shared/truncatable/truncatable-part/truncatable-part.component'; -import { - CommunityListDatasource, - CommunityListDatasource, -} from '../community-list-datasource'; -import { - CommunityListService, - CommunityListService, -} from '../community-list-service'; +import { CommunityListDatasource } from '../community-list-datasource'; +import { CommunityListService } from '../community-list-service'; import { FlatNode } from '../flat-node.model'; /** diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts index 5d67a1ffe3..e9c5f9bf29 100644 --- a/src/app/community-page/community-form/community-form.component.ts +++ b/src/app/community-page/community-form/community-form.component.ts @@ -19,29 +19,13 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - environment, - environment, -} from '../../../environments/environment'; -import { - AuthService, - AuthService, -} from '../../core/auth/auth.service'; -import { - ObjectCacheService, - ObjectCacheService, -} from '../../core/cache/object-cache.service'; -import { - CommunityDataService, - CommunityDataService, -} from '../../core/data/community-data.service'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { environment } from '../../../environments/environment'; +import { AuthService } from '../../core/auth/auth.service'; +import { ObjectCacheService } from '../../core/cache/object-cache.service'; +import { CommunityDataService } from '../../core/data/community-data.service'; +import { RequestService } from '../../core/data/request.service'; import { Community } from '../../core/shared/community.model'; import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component'; import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts index af22a0b286..ce3d05aef9 100644 --- a/src/app/community-page/community-page.component.ts +++ b/src/app/community-page/community-page.component.ts @@ -3,17 +3,12 @@ import { NgIf, } from '@angular/common'; import { - ChangeDetectionStrategy, ChangeDetectionStrategy, Component, - Component, - OnInit, OnInit, } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterModule, RouterOutlet, @@ -21,26 +16,17 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { - filter, filter, map, - map, - mergeMap, mergeMap, } from 'rxjs/operators'; import { AuthService } from '../core/auth/auth.service'; -import { - DSONameService, - DSONameService, -} from '../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../core/breadcrumbs/dso-name.service'; import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { RemoteData } from '../core/data/remote-data'; -import { - redirectOn4xx, - redirectOn4xx, -} from '../core/shared/authorized.operators'; +import { redirectOn4xx } from '../core/shared/authorized.operators'; import { Bitstream } from '../core/shared/bitstream.model'; import { Community } from '../core/shared/community.model'; import { getAllSucceededRemoteDataPayload } from '../core/shared/operators'; diff --git a/src/app/community-page/create-community-page/create-community-page.component.spec.ts b/src/app/community-page/create-community-page/create-community-page.component.spec.ts index 1a5f2df0fa..062c0ea062 100644 --- a/src/app/community-page/create-community-page/create-community-page.component.spec.ts +++ b/src/app/community-page/create-community-page/create-community-page.component.spec.ts @@ -1,8 +1,5 @@ import { CommonModule } from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, @@ -16,10 +13,7 @@ import { of as observableOf } from 'rxjs'; import { AuthService } from '../../core/auth/auth.service'; import { CommunityDataService } from '../../core/data/community-data.service'; import { RequestService } from '../../core/data/request.service'; -import { - RouteService, - RouteService, -} from '../../core/services/route.service'; +import { RouteService } from '../../core/services/route.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts index 0a9e815074..acc5279a5c 100644 --- a/src/app/community-page/create-community-page/create-community-page.component.ts +++ b/src/app/community-page/create-community-page/create-community-page.component.ts @@ -7,18 +7,11 @@ import { Router } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { CommunityDataService } from '../../core/data/community-data.service'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { RequestService } from '../../core/data/request.service'; import { RouteService } from '../../core/services/route.service'; import { Community } from '../../core/shared/community.model'; import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component'; diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts index 86ccdc5972..f35e2d6bd2 100644 --- a/src/app/community-page/delete-community-page/delete-community-page.component.ts +++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts @@ -10,13 +10,9 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { CommunityDataService } from '../../core/data/community-data.service'; import { Community } from '../../core/shared/community.model'; import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component'; diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts index daa8544c08..28879ed7ab 100644 --- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts @@ -2,14 +2,10 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; -import { - ActivatedRoute, - ActivatedRoute, -} from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { of as observableOf, of, - of, } from 'rxjs'; import { Community } from '../../../core/shared/community.model'; @@ -20,21 +16,7 @@ import { CommunityAccessControlComponent } from './community-access-control.comp describe('CommunityAccessControlComponent', () => { let component: CommunityAccessControlComponent; let fixture: ComponentFixture; - let routeStub = { - parent: { - parent: { - data: { - pipe: () => { - return { - pipe: () => { - return of({}); - }, - }; - }, - }, - }, - }, - }; + const testCommunity = Object.assign(new Community(), { type: 'community', diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts index 669d99666d..a0e094e21d 100644 --- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts +++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts @@ -11,10 +11,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { RemoteData } from '../../../core/data/remote-data'; -import { - Community, - Community, -} from '../../../core/shared/community.model'; +import { Community } from '../../../core/shared/community.model'; import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component'; diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts index dda4585486..921bbf0cfd 100644 --- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts @@ -12,10 +12,7 @@ import { ActivatedRoute } from '@angular/router'; import { cold } from 'jasmine-marbles'; import { of as observableOf } from 'rxjs'; -import { - Collection, - Collection, -} from '../../../core/shared/collection.model'; +import { Collection } from '../../../core/shared/collection.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component'; diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts index ad0beb0aa0..541308c942 100644 --- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts @@ -12,10 +12,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { - Community, - Community, -} from '../../../core/shared/community.model'; +import { Community } from '../../../core/shared/community.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; import { CommunityCurateComponent } from './community-curate.component'; diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts index b914363bd8..b82beaa3f7 100644 --- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts @@ -1,19 +1,13 @@ import { CommonModule } from '@angular/common'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { CommunityDataService } from '../../../core/data/community-data.service'; diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts index 4bbf19df3b..f1e75b7e23 100644 --- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts +++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts @@ -7,15 +7,9 @@ import { TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - NoopAnimationsModule, - NoopAnimationsModule, -} from '@angular/platform-browser/animations'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; @@ -27,8 +21,6 @@ import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock' import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts index b9b9a76b61..f099f6fc2a 100644 --- a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts +++ b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts @@ -1,26 +1,14 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync, } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { CommunityDataService } from '../../core/data/community-data.service'; import { EditCommunityPageComponent } from './edit-community-page.component'; diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts index 8ceac14103..194976c3a8 100644 --- a/src/app/community-page/edit-community-page/edit-community-page.component.ts +++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts @@ -7,8 +7,6 @@ import { import { Component } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterLink, RouterOutlet, diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts index 6a324beb17..2935f25595 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts @@ -15,34 +15,20 @@ import { combineLatest as observableCombineLatest, Subscription, } from 'rxjs'; -import { - switchMap, - switchMap, -} from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../../../core/cache/models/sort-options.model'; -import { - CollectionDataService, - CollectionDataService, -} from '../../../../core/data/collection-data.service'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../../../core/pagination/pagination.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; import { Collection } from '../../../../core/shared/collection.model'; import { Community } from '../../../../core/shared/community.model'; import { fadeIn } from '../../../../shared/animations/fade'; -import { - hasValue, - hasValue, -} from '../../../../shared/empty.util'; +import { hasValue } from '../../../../shared/empty.util'; import { ErrorComponent } from '../../../../shared/error/error.component'; import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts index d014686427..2654585eda 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts @@ -24,16 +24,10 @@ import { Community } from '../../../../core/shared/community.model'; import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; -import { - HostWindowService, - HostWindowService, -} from '../../../../shared/host-window.service'; +import { HostWindowService } from '../../../../shared/host-window.service'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; -import { - createSuccessfulRemoteDataObject$, - createSuccessfulRemoteDataObject$, -} from '../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub'; diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts index 1d93479376..4f74eff601 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts @@ -15,33 +15,19 @@ import { combineLatest as observableCombineLatest, Subscription, } from 'rxjs'; -import { - switchMap, - switchMap, -} from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../../../core/cache/models/sort-options.model'; -import { - CommunityDataService, - CommunityDataService, -} from '../../../../core/data/community-data.service'; +import { CommunityDataService } from '../../../../core/data/community-data.service'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../../../core/pagination/pagination.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; import { Community } from '../../../../core/shared/community.model'; import { fadeIn } from '../../../../shared/animations/fade'; -import { - hasValue, - hasValue, -} from '../../../../shared/empty.util'; +import { hasValue } from '../../../../shared/empty.util'; import { ErrorComponent } from '../../../../shared/error/error.component'; import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component'; diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts index d84ca6ea8d..dd60d94070 100644 --- a/src/app/core/data/item-data.service.spec.ts +++ b/src/app/core/data/item-data.service.spec.ts @@ -6,7 +6,6 @@ import { } from 'jasmine-marbles'; import { of as observableOf } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; -import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub'; import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock'; import { getMockRequestService } from '../../shared/mocks/request.service.mock'; diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts index 147d6dec08..53d30bc6ee 100644 --- a/src/app/core/feedback/feedback-data.service.ts +++ b/src/app/core/feedback/feedback-data.service.ts @@ -4,32 +4,21 @@ import { Observable } from 'rxjs'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; -import { - RequestParam, - RequestParam, -} from '../cache/models/request-param.model'; +import { RequestParam } from '../cache/models/request-param.model'; import { ObjectCacheService } from '../cache/object-cache.service'; import { CreateData, - CreateData, - CreateDataImpl, CreateDataImpl, } from '../data/base/create-data'; import { IdentifiableDataService } from '../data/base/identifiable-data.service'; import { RemoteData } from '../data/remote-data'; -import { - RequestService, - RequestService, -} from '../data/request.service'; +import { RequestService } from '../data/request.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { getFirstSucceededRemoteData, getRemoteDataPayload, } from '../shared/operators'; -import { - Feedback, - Feedback, -} from './models/feedback.model'; +import { Feedback } from './models/feedback.model'; /** * Service for checking and managing the feedback diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts index c952147567..6df06ccad5 100644 --- a/src/app/core/submission/workspaceitem-data.service.ts +++ b/src/app/core/submission/workspaceitem-data.service.ts @@ -11,20 +11,11 @@ import { } from 'rxjs/operators'; import { hasValue } from '../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; -import { - RemoteDataBuildService, - RemoteDataBuildService, -} from '../cache/builders/remote-data-build.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { RequestParam } from '../cache/models/request-param.model'; -import { - ObjectCacheService, - ObjectCacheService, -} from '../cache/object-cache.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; import { CoreState } from '../core-state.model'; import { DeleteData, @@ -35,28 +26,16 @@ import { SearchData, SearchDataImpl, } from '../data/base/search-data'; -import { - DSOChangeAnalyzer, - DSOChangeAnalyzer, -} from '../data/dso-change-analyzer.service'; +import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service'; import { FindListOptions } from '../data/find-list-options.model'; import { PaginatedList } from '../data/paginated-list.model'; import { RemoteData } from '../data/remote-data'; import { PostRequest } from '../data/request.models'; -import { - RequestService, - RequestService, -} from '../data/request.service'; +import { RequestService } from '../data/request.service'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; -import { - HALEndpointService, - HALEndpointService, -} from '../shared/hal-endpoint.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; import { NoContent } from '../shared/NoContent.model'; -import { - WorkspaceItem, - WorkspaceItem, -} from './models/workspaceitem.model'; +import { WorkspaceItem } from './models/workspaceitem.model'; /** * A service that provides methods to make REST requests with workspaceitems endpoint. diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts index a113ebc1c1..0580193418 100644 --- a/src/app/curation-form/curation-form.component.ts +++ b/src/app/curation-form/curation-form.component.ts @@ -4,70 +4,45 @@ import { } from '@angular/common'; import { ChangeDetectorRef, - ChangeDetectorRef, - Component, Component, Input, - Input, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormControl, - UntypedFormControl, - UntypedFormGroup, UntypedFormGroup, } from '@angular/forms'; import { Router } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { Observable, Subscription, } from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { ConfigurationDataService } from '../core/data/configuration-data.service'; -import { - ScriptDataService, - ScriptDataService, -} from '../core/data/processes/script-data.service'; -import { - RemoteData, - RemoteData, -} from '../core/data/remote-data'; +import { ScriptDataService } from '../core/data/processes/script-data.service'; +import { RemoteData } from '../core/data/remote-data'; import { ConfigurationProperty } from '../core/shared/configuration-property.model'; import { getFirstCompletedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload, } from '../core/shared/operators'; import { getProcessDetailRoute } from '../process-page/process-page-routing.paths'; import { Process } from '../process-page/processes/process.model'; import { - hasValue, hasValue, isEmpty, - isEmpty, - isNotEmpty, isNotEmpty, } from '../shared/empty.util'; import { HandleService } from '../shared/handle.service'; -import { - NotificationsService, - NotificationsService, -} from '../shared/notifications/notifications.service'; +import { NotificationsService } from '../shared/notifications/notifications.service'; export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts index f462e501d5..23859828c3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts @@ -4,18 +4,13 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, of, - of, } from 'rxjs'; -import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { MetadataValue } from '../../../core/shared/metadata.models'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index e2f10d1603..a96b77be62 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -1,9 +1,7 @@ import { - CdkDragDrop, CdkDragDrop, CdkDropList, moveItemInArray, - moveItemInArray, } from '@angular/cdk/drag-drop'; import { AsyncPipe, @@ -19,7 +17,6 @@ import { BehaviorSubject, Observable, } from 'rxjs'; -import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts index 7c85787396..31edaeeef1 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts @@ -1,7 +1,5 @@ import { DebugElement, - DebugElement, - NO_ERRORS_SCHEMA, NO_ERRORS_SCHEMA, } from '@angular/core'; import { @@ -9,19 +7,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { By } from '@angular/platform-browser'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, of, - of, } from 'rxjs'; import { MetadataField } from 'src/app/core/metadata/metadata-field.model'; import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model'; @@ -35,50 +26,22 @@ import { NotificationsService } from 'src/app/shared/notifications/notifications import { createPaginatedList } from 'src/app/shared/testing/utils.test'; import { VocabularyServiceStub } from 'src/app/shared/testing/vocabulary-service.stub'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; -import { - ItemDataService, - ItemDataService, -} from '../../../core/data/item-data.service'; -import { - RelationshipDataService, - RelationshipDataService, -} from '../../../core/data/relationship-data.service'; -import { - Collection, - Collection, -} from '../../../core/shared/collection.model'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../core/shared/dspace-object.model'; -import { - Item, - Item, -} from '../../../core/shared/item.model'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { RelationshipDataService } from '../../../core/data/relationship-data.service'; +import { Collection } from '../../../core/shared/collection.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { Item } from '../../../core/shared/item.model'; import { MetadataValue, - MetadataValue, - VIRTUAL_METADATA_PREFIX, VIRTUAL_METADATA_PREFIX, } from '../../../core/shared/metadata.models'; -import { - ItemMetadataRepresentation, - ItemMetadataRepresentation, -} from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; +import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component'; -import { - createSuccessfulRemoteDataObject$, - createSuccessfulRemoteDataObject$, -} from '../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { VarDirective } from '../../../shared/utils/var.directive'; import { DsoEditMetadataChangeType, - DsoEditMetadataChangeType, - DsoEditMetadataValue, DsoEditMetadataValue, } from '../dso-edit-metadata-form'; import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts index 8457c59a6e..567572c4fa 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts @@ -1,10 +1,7 @@ import { ChangeDetectionStrategy, DebugElement, - DebugElement, Injectable, - Injectable, - NO_ERRORS_SCHEMA, NO_ERRORS_SCHEMA, } from '@angular/core'; import { @@ -13,10 +10,7 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { Operation } from 'fast-json-patch'; import { Observable } from 'rxjs'; diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 25fbd3abdb..87dfe2200c 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -30,8 +30,6 @@ import { of, Subscription, } from 'rxjs'; -import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { Observable } from 'rxjs/internal/Observable'; import { debounceTime, distinctUntilChanged, diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts index 419cbfebfe..ae3c67573e 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts @@ -11,12 +11,8 @@ import { Store } from '@ngrx/store'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { map, switchMap, @@ -28,10 +24,7 @@ import { LogOutAction } from '../../core/auth/auth.actions'; import { AuthService } from '../../core/auth/auth.service'; import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service'; import { isNotEmpty } from '../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component'; @Component({ diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts index d658e5472e..d32eefb333 100644 --- a/src/app/info/feedback/feedback-form/feedback-form.component.ts +++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts @@ -1,58 +1,37 @@ import { NgIf } from '@angular/common'; import { - Component, Component, Inject, - Inject, - OnInit, OnInit, } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, - UntypedFormBuilder, - Validators, Validators, } from '@angular/forms'; import { Router } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { take } from 'rxjs/operators'; import { getHomePageRoute } from '../../../app-routing-paths'; import { AuthService } from '../../../core/auth/auth.service'; -import { - RemoteData, - RemoteData, -} from '../../../core/data/remote-data'; +import { RemoteData } from '../../../core/data/remote-data'; import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { - FeedbackDataService, - FeedbackDataService, -} from '../../../core/feedback/feedback-data.service'; -import { - RouteService, - RouteService, -} from '../../../core/services/route.service'; +import { FeedbackDataService } from '../../../core/feedback/feedback-data.service'; +import { RouteService } from '../../../core/services/route.service'; import { NativeWindowRef, NativeWindowService, } from '../../../core/services/window.service'; -import { - NoContent, - NoContent, -} from '../../../core/shared/NoContent.model'; +import { NoContent } from '../../../core/shared/NoContent.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { URLCombiner } from '../../../core/url-combiner/url-combiner'; import { ErrorComponent } from '../../../shared/error/error.component'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; @Component({ selector: 'ds-feedback-form', diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts index 6a8838a55a..7bf774be78 100644 --- a/src/app/item-page/alerts/item-alerts.component.ts +++ b/src/app/item-page/alerts/item-alerts.component.ts @@ -4,8 +4,6 @@ import { } from '@angular/common'; import { Component, - Component, - Input, Input, } from '@angular/core'; import { RouterLink } from '@angular/router'; @@ -23,16 +21,10 @@ import { import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { - Item, - Item, -} from '../../core/shared/item.model'; +import { Item } from '../../core/shared/item.model'; import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; import { AlertComponent } from '../../shared/alert/alert.component'; -import { - AlertType, - AlertType, -} from '../../shared/alert/alert-type'; +import { AlertType } from '../../shared/alert/alert-type'; import { DsoWithdrawnReinstateModalService, REQUEST_REINSTATE, diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts index 17777957eb..e32239a577 100644 --- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts +++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts @@ -1,102 +1,62 @@ import { AsyncPipe, Location, - Location, NgIf, } from '@angular/common'; import { - Component, Component, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { ReactiveFormsModule, UntypedFormBuilder, - UntypedFormBuilder, - UntypedFormControl, UntypedFormControl, UntypedFormGroup, - UntypedFormGroup, - Validators, Validators, } from '@angular/forms'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, RouterLink, } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, - combineLatest as observableCombineLatest, - Observable, Observable, of as observableOf, - of as observableOf, - Subscription, Subscription, } from 'rxjs'; import { filter, - filter, - map, map, switchMap, - switchMap, - take, take, } from 'rxjs/operators'; import { getBitstreamDownloadRoute, - getBitstreamDownloadRoute, - getForbiddenRoute, getForbiddenRoute, } from '../../../app-routing-paths'; -import { - AuthService, - AuthService, -} from '../../../core/auth/auth.service'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; -import { - BitstreamDataService, - BitstreamDataService, -} from '../../../core/data/bitstream-data.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { ItemRequestDataService } from '../../../core/data/item-request-data.service'; -import { - EPerson, - EPerson, -} from '../../../core/eperson/models/eperson.model'; -import { - Bitstream, - Bitstream, -} from '../../../core/shared/bitstream.model'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { Bitstream } from '../../../core/shared/bitstream.model'; import { Item } from '../../../core/shared/item.model'; import { ItemRequest } from '../../../core/shared/item-request.model'; import { getFirstCompletedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload, } from '../../../core/shared/operators'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts index d0017e6ac6..6d869e39b9 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts @@ -3,10 +3,6 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, } from '@angular/core'; -import { - ChangeDetectionStrategy, - NO_ERRORS_SCHEMA, -} from '@angular/core'; import { ComponentFixture, fakeAsync, @@ -15,16 +11,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { - ActivatedRoute, ActivatedRoute, ActivatedRouteSnapshot, - ActivatedRouteSnapshot, - CanActivate, CanActivate, RouterModule, RouterStateSnapshot, - RouterStateSnapshot, - UrlTree, UrlTree, } from '@angular/router'; import { diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts index 552823aa3a..8a80d56344 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts @@ -6,22 +6,14 @@ import { } from '@angular/common'; import { ChangeDetectionStrategy, - ChangeDetectionStrategy, - Component, Component, Injector, - Injector, - OnInit, OnInit, } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - CanActivate, CanActivate, Route, - Route, - Router, Router, RouterLink, RouterOutlet, @@ -36,15 +28,10 @@ import { import { map } from 'rxjs/operators'; import { RemoteData } from '../../core/data/remote-data'; -import { - GenericConstructor, - GenericConstructor, -} from '../../core/shared/generic-constructor'; +import { GenericConstructor } from '../../core/shared/generic-constructor'; import { Item } from '../../core/shared/item.model'; import { fadeIn, - fadeIn, - fadeInOut, fadeInOut, } from '../../shared/animations/fade'; import { isNotEmpty } from '../../shared/empty.util'; diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts index 9f0bdaa763..923928ea47 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts @@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { NgbModule, - NgbModule, - NgbTooltipModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; @@ -17,10 +15,7 @@ import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; import { ItemVersionsModule } from '../versions/item-versions.module'; import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component'; import { EditItemPageComponent } from './edit-item-page.component'; -import { - ItemAccessControlComponent, - ItemAccessControlComponent, -} from './item-access-control/item-access-control.component'; +import { ItemAccessControlComponent } from './item-access-control/item-access-control.component'; import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component'; import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component'; diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts index da13102bc9..30d1fce2bc 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts @@ -28,22 +28,13 @@ import { } from 'rxjs/operators'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { - LinkService, - LinkService, -} from '../../../core/cache/builders/link.service'; +import { LinkService } from '../../../core/cache/builders/link.service'; import { buildPaginatedList, PaginatedList, } from '../../../core/data/paginated-list.model'; -import { - Bitstream, - Bitstream, -} from '../../../core/shared/bitstream.model'; -import { - Bundle, - Bundle, -} from '../../../core/shared/bundle.model'; +import { Bitstream } from '../../../core/shared/bitstream.model'; +import { Bundle } from '../../../core/shared/bundle.model'; import { Item } from '../../../core/shared/item.model'; import { getFirstSucceededRemoteDataPayload, @@ -52,8 +43,6 @@ import { import { AlertComponent } from '../../../shared/alert/alert.component'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../shared/empty.util'; import { NgForTrackByIdDirective } from '../../../shared/ng-for-track-by-id.directive'; diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts index 3890d1b8ed..d7f1d8135e 100644 --- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts +++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts @@ -17,10 +17,7 @@ import { import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { RemoteData } from '../../../core/data/remote-data'; -import { - Item, - Item, -} from '../../../core/shared/item.model'; +import { Item } from '../../../core/shared/item.model'; import { CurationFormComponent } from '../../../curation-form/curation-form.component'; import { hasValue } from '../../../shared/empty.util'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index 45c78fba46..0396f23b6d 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -11,7 +11,6 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute, Router, - Router, } from '@angular/router'; import { provideMockStore } from '@ngrx/store/testing'; import { REQUEST } from '@nguniversal/express-engine/tokens'; @@ -23,10 +22,7 @@ import { HardRedirectService } from 'src/app/core/services/hard-redirect.service import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; import { AuthRequestServiceStub } from 'src/app/shared/testing/auth-request-service.stub'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../../../config/app-config.interface'; +import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ConfigurationDataService } from '../../../../core/data/configuration-data.service'; import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; @@ -34,52 +30,25 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service'; import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { - PaginationService, - PaginationService, -} from '../../../../core/pagination/pagination.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; import { LinkHeadService } from '../../../../core/services/link-head.service'; -import { - ConfigurationProperty, - ConfigurationProperty, -} from '../../../../core/shared/configuration-property.model'; -import { - Item, - Item, -} from '../../../../core/shared/item.model'; +import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; +import { Item } from '../../../../core/shared/item.model'; import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { HostWindowService } from '../../../../shared/host-window.service'; -import { - RouterMock, - RouterMock, -} from '../../../../shared/mocks/router.mock'; -import { - SelectableListService, - SelectableListService, -} from '../../../../shared/object-list/selectable-list/selectable-list.service'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; +import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { PaginationComponent } from '../../../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; -import { - createSuccessfulRemoteDataObject$, - createSuccessfulRemoteDataObject$, -} from '../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub'; -import { - PaginationServiceStub, - PaginationServiceStub, -} from '../../../../shared/testing/pagination-service.stub'; +import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub'; -import { - createPaginatedList, - createPaginatedList, -} from '../../../../shared/testing/utils.test'; -import { - EditRelationshipListComponent, - EditRelationshipListComponent, -} from './edit-relationship-list.component'; +import { createPaginatedList } from '../../../../shared/testing/utils.test'; +import { EditRelationshipListComponent } from './edit-relationship-list.component'; let comp: EditRelationshipListComponent; let fixture: ComponentFixture; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index aa44b733dd..384e475c37 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -3,17 +3,12 @@ import { Component, NO_ERRORS_SCHEMA, } from '@angular/core'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { - NgbModal, NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; @@ -22,10 +17,7 @@ import { of as observableOf } from 'rxjs'; import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { - Item, - Item, -} from '../../../../core/shared/item.model'; +import { Item } from '../../../../core/shared/item.model'; import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock'; @@ -34,10 +26,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-dat import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { ThemeService } from '../../../../shared/theme-support/theme.service'; import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadata.component'; -import { - EditRelationshipComponent, - EditRelationshipComponent, -} from './edit-relationship.component'; +import { EditRelationshipComponent } from './edit-relationship.component'; let objectUpdatesService; const url = 'http://test-url.com/test-url'; diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index 6396f01a13..36df6a50f0 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -9,8 +9,6 @@ import { } from '@angular/core'; import { NgbModal, - NgbModal, - NgbModalRef, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -26,14 +24,8 @@ import { take, } from 'rxjs/operators'; -import { - FieldChangeType, - FieldChangeType, -} from '../../../../core/data/object-updates/field-change-type.model'; -import { - FieldUpdate, - FieldUpdate, -} from '../../../../core/data/object-updates/field-update.model'; +import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model'; +import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model'; import { DeleteRelationship, RelationshipIdentifiable, @@ -47,8 +39,6 @@ import { import { ViewMode } from '../../../../core/shared/view-mode.model'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../../shared/empty.util'; import { ListableObjectComponentLoaderComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component'; diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts index 16ad92143d..ea9b571cd6 100644 --- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -9,15 +9,12 @@ import { } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, @@ -59,10 +56,7 @@ import { } from '../../../core/shared/operators'; import { hasValue } from '../../../shared/empty.util'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { VarDirective } from '../../../shared/utils/var.directive'; import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component'; diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts index d5e3eff25a..286fc78909 100644 --- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts +++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts @@ -18,27 +18,13 @@ import { map, } from 'rxjs/operators'; -import { - ItemDataService, - ItemDataService, -} from '../../../core/data/item-data.service'; -import { - RemoteData, - RemoteData, -} from '../../../core/data/remote-data'; -import { - Item, - Item, -} from '../../../core/shared/item.model'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Item } from '../../../core/shared/item.model'; import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { getItemEditRoute, - getItemEditRoute, - getItemPageRoute, getItemPageRoute, } from '../../item-page-routing-paths'; import { findSuccessfulAccordingTo } from '../edit-item-operators'; diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts index 23963c0a20..8c319c6ad2 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts @@ -26,7 +26,6 @@ import { hasValue } from '../../../shared/empty.util'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MarkdownPipe as MarkdownPipe_1 } from '../../../shared/utils/markdown.pipe'; import { ImageField } from '../../simple/field-components/specific-field/image-field'; -import { ImageField } from '../../simple/field-components/specific-field/item-page-field.component'; /** * This component renders the configured 'values' into the ds-metadata-field-wrapper component. diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts index 60c88ce64a..fbeadee905 100644 --- a/src/app/item-page/media-viewer/media-viewer.component.ts +++ b/src/app/item-page/media-viewer/media-viewer.component.ts @@ -15,7 +15,6 @@ import { Observable, Subscription, } from 'rxjs'; -import { Subscription } from 'rxjs/internal/Subscription'; import { filter, take, diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts index 3826539488..41dac600b2 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts @@ -7,28 +7,16 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { By } from '@angular/platform-browser'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../../../config/app-config.interface'; +import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment'; -import { - BrowseDefinitionDataService, - BrowseDefinitionDataService, -} from '../../../../core/browse/browse-definition-data.service'; +import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { Item } from '../../../../core/shared/item.model'; import { MetadataMap, @@ -36,10 +24,7 @@ import { } from '../../../../core/shared/metadata.models'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { - BrowseDefinitionDataServiceStub, - BrowseDefinitionDataServiceStub, -} from '../../../../shared/testing/browse-definition-data-service.stub'; +import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub'; import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe'; import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component'; diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts index a73c42d8f4..d93cdeb3b9 100644 --- a/src/app/item-page/versions/item-versions.component.ts +++ b/src/app/item-page/versions/item-versions.component.ts @@ -14,21 +14,15 @@ import { import { FormsModule, UntypedFormBuilder, - UntypedFormBuilder, } from '@angular/forms'; import { - Router, Router, RouterLink, } from '@angular/router'; -import { - NgbModal, - NgbModal, -} from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { BehaviorSubject, @@ -47,24 +41,12 @@ import { } from 'rxjs/operators'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; -import { - FeatureID, - FeatureID, -} from '../../core/data/feature-authorization/feature-id'; -import { - ItemDataService, - ItemDataService, -} from '../../core/data/item-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { ItemDataService } from '../../core/data/item-data.service'; import { PaginatedList } from '../../core/data/paginated-list.model'; import { RemoteData } from '../../core/data/remote-data'; -import { - VersionDataService, - VersionDataService, -} from '../../core/data/version-data.service'; +import { VersionDataService } from '../../core/data/version-data.service'; import { VersionHistoryDataService } from '../../core/data/version-history-data.service'; import { PaginationService } from '../../core/pagination/pagination.service'; import { Item } from '../../core/shared/item.model'; @@ -87,10 +69,7 @@ import { hasValue, hasValueOperator, } from '../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../shared/pagination/pagination.component'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model'; @@ -103,10 +82,7 @@ import { } from '../item-page-routing-paths'; import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component'; import { ItemVersionsSharedService } from './item-versions-shared.service'; -import { - ItemVersionsSummaryModalComponent, - ItemVersionsSummaryModalComponent, -} from './item-versions-summary-modal/item-versions-summary-modal.component'; +import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; @Component({ selector: 'ds-item-versions', diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts index f7ff5744a5..76a61aa3f9 100644 --- a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts +++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts @@ -7,22 +7,11 @@ import { NO_ERRORS_SCHEMA, } from '@angular/core'; import { - ChangeDetectorRef, - ElementRef, - NO_ERRORS_SCHEMA, -} from '@angular/core'; -import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; -import { - ActivatedRoute, - ActivatedRoute, -} from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, @@ -48,10 +37,7 @@ import { createSuccessfulRemoteDataObject$, } from '../../shared/remote-data.utils'; import { MockElementRef } from '../../shared/testing/element-ref.mock'; -import { - createPaginatedList, - createPaginatedList, -} from '../../shared/testing/utils.test'; +import { createPaginatedList } from '../../shared/testing/utils.test'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { CollectionSelectorComponent } from './collection-selector.component'; diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts index 5ab784f4f5..7d4500ec07 100644 --- a/src/app/navbar/navbar.component.spec.ts +++ b/src/app/navbar/navbar.component.spec.ts @@ -23,10 +23,7 @@ import { AppState, storeModuleConfig, } from '../app.reducer'; -import { - BrowseByDataType, - BrowseByDataType, -} from '../browse-by/browse-by-switcher/browse-by-data-type'; +import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-data-type'; import { authReducer } from '../core/auth/auth.reducer'; import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; import { BrowseService } from '../core/browse/browse.service'; diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts index 1c8edfbb34..29b2a85d57 100644 --- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts +++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts @@ -1,27 +1,18 @@ import { NgIf } from '@angular/common'; import { - Component, Component, Input, - Input, - Optional, Optional, } from '@angular/core'; import { - ControlContainer, ControlContainer, FormsModule, NgForm, - NgForm, } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { controlContainerFactory } from '../../../process-form.component'; import { controlContainerFactory } from '../../../process-form-factory'; -import { - ValueInputComponent, - ValueInputComponent, -} from '../value-input.component'; +import { ValueInputComponent } from '../value-input.component'; /** * Represents the user inputted value of a date parameter diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts index 5c4526b494..21e88edfcc 100644 --- a/src/app/register-page/create-profile/create-profile.component.ts +++ b/src/app/register-page/create-profile/create-profile.component.ts @@ -5,72 +5,43 @@ import { } from '@angular/common'; import { Component, - Component, - OnInit, OnInit, } from '@angular/core'; import { ReactiveFormsModule, UntypedFormBuilder, - UntypedFormBuilder, - UntypedFormControl, UntypedFormControl, UntypedFormGroup, - UntypedFormGroup, - Validators, Validators, } from '@angular/forms'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { Store } from '@ngrx/store'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; -import { - Observable, - Observable, -} from 'rxjs'; -import { - map, - map, -} from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { LangConfig } from '../../../config/lang-config.interface'; import { environment } from '../../../environments/environment'; import { AuthenticateAction } from '../../core/auth/auth.actions'; -import { - CoreState, - CoreState, -} from '../../core/core-state.model'; +import { CoreState } from '../../core/core-state.model'; import { RemoteData } from '../../core/data/remote-data'; import { END_USER_AGREEMENT_METADATA_FIELD, EndUserAgreementService, } from '../../core/end-user-agreement/end-user-agreement.service'; -import { - EPersonDataService, - EPersonDataService, -} from '../../core/eperson/eperson-data.service'; -import { - EPerson, - EPerson, -} from '../../core/eperson/models/eperson.model'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; import { getFirstCompletedRemoteData, - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload, } from '../../core/shared/operators'; -import { - Registration, - Registration, -} from '../../core/shared/registration.model'; +import { Registration } from '../../core/shared/registration.model'; import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component'; import { isEmpty } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts index 9d7a86d6a9..e2cc5293cc 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts @@ -13,10 +13,8 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { - combineLatest as observableCombineLatest, combineLatest as observableCombineLatest, Observable, } from 'rxjs'; @@ -31,10 +29,7 @@ import { ItemDataService } from '../../core/data/item-data.service'; import { ItemRequestDataService } from '../../core/data/item-request-data.service'; import { RemoteData } from '../../core/data/remote-data'; import { EPerson } from '../../core/eperson/models/eperson.model'; -import { - redirectOn4xx, - redirectOn4xx, -} from '../../core/shared/authorized.operators'; +import { redirectOn4xx } from '../../core/shared/authorized.operators'; import { Item } from '../../core/shared/item.model'; import { ItemRequest } from '../../core/shared/item-request.model'; import { @@ -43,10 +38,7 @@ import { } from '../../core/shared/operators'; import { isNotEmpty } from '../../shared/empty.util'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { - NotificationsService, - NotificationsService, -} from '../../shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { VarDirective } from '../../shared/utils/var.directive'; import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model'; import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-email-request-copy.component'; diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts index 692e859160..3f44a6ed1f 100644 --- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts +++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts @@ -1,26 +1,18 @@ import { - Location, Location, NgClass, NgIf, } from '@angular/common'; import { Component, - Component, - EventEmitter, EventEmitter, Input, - Input, - Output, Output, } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { - RequestCopyEmail, - RequestCopyEmail, -} from './request-copy-email.model'; +import { RequestCopyEmail } from './request-copy-email.model'; @Component({ diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts index 24a13c1369..3b28ed447a 100644 --- a/src/app/search-page/configuration-search-page.component.ts +++ b/src/app/search-page/configuration-search-page.component.ts @@ -4,11 +4,8 @@ import { NgTemplateOutlet, } from '@angular/common'; import { - ChangeDetectionStrategy, ChangeDetectionStrategy, Component, - Component, - Inject, Inject, } from '@angular/core'; import { Router } from '@angular/router'; @@ -20,33 +17,17 @@ import { } from '../../config/app-config.interface'; import { RouteService } from '../core/services/route.service'; import { SearchService } from '../core/shared/search/search.service'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component'; -import { - pushInOut, - pushInOut, -} from '../shared/animations/push'; -import { - HostWindowService, - HostWindowService, -} from '../shared/host-window.service'; -import { - SearchComponent, - SearchComponent, -} from '../shared/search/search.component'; +import { pushInOut } from '../shared/animations/push'; +import { HostWindowService } from '../shared/host-window.service'; +import { SearchComponent } from '../shared/search/search.component'; import { SearchLabelsComponent } from '../shared/search/search-labels/search-labels.component'; import { ThemedSearchResultsComponent } from '../shared/search/search-results/themed-search-results.component'; import { ThemedSearchSidebarComponent } from '../shared/search/search-sidebar/themed-search-sidebar.component'; import { ThemedSearchFormComponent } from '../shared/search-form/themed-search-form.component'; import { PageWithSidebarComponent } from '../shared/sidebar/page-with-sidebar.component'; -import { - SidebarService, - SidebarService, -} from '../shared/sidebar/sidebar.service'; +import { SidebarService } from '../shared/sidebar/sidebar.service'; import { ViewModeSwitchComponent } from '../shared/view-mode-switch/view-mode-switch.component'; /** diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts index 1a53ec5495..56a6e92323 100644 --- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts +++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts @@ -23,32 +23,17 @@ import { take, } from 'rxjs/operators'; -import { - BulkAccessConfigDataService, - BulkAccessConfigDataService, -} from '../../core/config/bulk-access-config-data.service'; -import { - BulkAccessConditionOptions, - BulkAccessConditionOptions, -} from '../../core/config/models/bulk-access-condition-options.model'; +import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service'; +import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model'; import { RemoteData } from '../../core/data/remote-data'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { Item } from '../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { AlertComponent } from '../alert/alert.component'; -import { - AlertType, - AlertType, -} from '../alert/alert-type'; +import { AlertType } from '../alert/alert-type'; import { SelectableListService } from '../object-list/selectable-list/selectable-list.service'; import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component'; -import { - createAccessControlInitialFormState, - createAccessControlInitialFormState, -} from './access-control-form-container-intial-state'; +import { createAccessControlInitialFormState } from './access-control-form-container-intial-state'; import { BulkAccessControlService } from './bulk-access-control.service'; import { ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID, diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts index dcdf94929a..264f110137 100644 --- a/src/app/shared/alert/alert.component.spec.ts +++ b/src/app/shared/alert/alert.component.spec.ts @@ -1,10 +1,7 @@ import { CommonModule } from '@angular/common'; import { - ChangeDetectorRef, ChangeDetectorRef, Component, - Component, - NO_ERRORS_SCHEMA, NO_ERRORS_SCHEMA, } from '@angular/core'; import { @@ -13,10 +10,7 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts index eff18e90c8..15dcd51ddd 100644 --- a/src/app/shared/alert/alert.component.ts +++ b/src/app/shared/alert/alert.component.ts @@ -12,8 +12,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { fadeOutLeave, - fadeOutLeave, - fadeOutState, fadeOutState, } from '../animations/fade'; import { AlertType } from './alert-type'; diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts index 515812f3a1..224620c6e1 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts @@ -9,24 +9,15 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - NoopAnimationsModule, - NoopAnimationsModule, -} from '@angular/platform-browser/animations'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; -import { - NgbDropdownModule, - NgbDropdownModule, -} from '@ng-bootstrap/ng-bootstrap'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { Store, StoreModule, } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; -import { - of, - of, -} from 'rxjs'; +import { of } from 'rxjs'; import { APP_DATA_SERVICES_MAP } from '../../../config/app-config.interface'; import { AppState } from '../../app.reducer'; @@ -34,14 +25,8 @@ import { authReducer, AuthState, } from '../../core/auth/auth.reducer'; -import { - AuthService, - AuthService, -} from '../../core/auth/auth.service'; -import { - AuthTokenInfo, - AuthTokenInfo, -} from '../../core/auth/models/auth-token-info.model'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; import { HostWindowService } from '../host-window.service'; import { ActivatedRouteStub } from '../testing/active-router.stub'; import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts index 4db360f1d6..f6ec107392 100644 --- a/src/app/shared/browse-by/browse-by.component.spec.ts +++ b/src/app/shared/browse-by/browse-by.component.spec.ts @@ -32,16 +32,10 @@ import { BrowseEntry } from '../../core/shared/browse-entry.model'; import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; import { ITEM } from '../../core/shared/item.resource-type'; import { PageInfo } from '../../core/shared/page-info.model'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { ViewMode } from '../../core/shared/view-mode.model'; import { HostWindowService } from '../host-window.service'; -import { - getMockThemeService, - getMockThemeService, -} from '../mocks/theme-service.mock'; +import { getMockThemeService } from '../mocks/theme-service.mock'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { DEFAULT_CONTEXT, diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts index ab0e5e7b8c..7c5e943a81 100644 --- a/src/app/shared/browse-by/browse-by.component.ts +++ b/src/app/shared/browse-by/browse-by.component.ts @@ -17,24 +17,17 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - combineLatest as observableCombineLatest, combineLatest as observableCombineLatest, Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { map } from 'rxjs/operators'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../core/cache/models/sort-options.model'; import { PaginatedList } from '../../core/data/paginated-list.model'; @@ -44,24 +37,15 @@ import { RouteService } from '../../core/services/route.service'; import { ViewMode } from '../../core/shared/view-mode.model'; import { fadeIn, - fadeIn, - fadeInOut, fadeInOut, } from '../animations/fade'; import { hasValue } from '../empty.util'; import { ErrorComponent } from '../error/error.component'; import { ThemedLoadingComponent } from '../loading/themed-loading.component'; import { ObjectCollectionComponent } from '../object-collection/object-collection.component'; -import { - ListableObject, - ListableObject, -} from '../object-collection/shared/listable-object.model'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../pagination/pagination-component-options.model'; +import { ListableObject } from '../object-collection/shared/listable-object.model'; +import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { ThemedResultsBackButtonComponent } from '../results-back-button/themed-results-back-button.component'; -import { StartsWithType } from '../starts-with/starts-with-decorator'; import { StartsWithLoaderComponent } from '../starts-with/starts-with-loader.component'; import { StartsWithType } from '../starts-with/starts-with-type'; import { VarDirective } from '../utils/var.directive'; diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts index 25dc1be535..b67102add5 100644 --- a/src/app/shared/browse-by/shared-browse-by.module.ts +++ b/src/app/shared/browse-by/shared-browse-by.module.ts @@ -1,7 +1,4 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; +import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { BrowseByComponent } from './browse-by.component'; diff --git a/src/app/shared/browse-by/themed-browse-by.component.ts b/src/app/shared/browse-by/themed-browse-by.component.ts index 98bda5cb98..d125ebaa2c 100644 --- a/src/app/shared/browse-by/themed-browse-by.component.ts +++ b/src/app/shared/browse-by/themed-browse-by.component.ts @@ -14,7 +14,6 @@ import { PaginatedList } from '../../core/data/paginated-list.model'; import { RemoteData } from '../../core/data/remote-data'; import { ListableObject } from '../object-collection/shared/listable-object.model'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; -import { StartsWithType } from '../starts-with/starts-with-decorator'; import { StartsWithType } from '../starts-with/starts-with-type'; import { ThemedComponent } from '../theme-support/themed.component'; import { BrowseByComponent } from './browse-by.component'; diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts index 7e755659fc..d330c0b6ff 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -18,7 +18,6 @@ import { FormsModule, ReactiveFormsModule, UntypedFormControl, - UntypedFormControl, } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts index acaf4f5786..73d00e81c3 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts @@ -17,10 +17,7 @@ import { DynamicInputModel, } from '@ng-dynamic-forms/core'; import { TranslateModule } from '@ngx-translate/core'; -import { - Operation, - Operation, -} from 'fast-json-patch'; +import { Operation } from 'fast-json-patch'; import { of as observableOf } from 'rxjs'; import { AuthService } from '../../../../core/auth/auth.service'; @@ -34,8 +31,6 @@ import { AuthServiceMock } from '../../../mocks/auth.service.mock'; import { NotificationsService } from '../../../notifications/notifications.service'; import { createFailedRemoteDataObject$, - createFailedRemoteDataObject$, - createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../remote-data.utils'; import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts index 6c7b30d8d6..dfca0e1ae4 100644 --- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts +++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts @@ -22,10 +22,7 @@ import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { - Operation, - Operation, -} from 'fast-json-patch'; +import { Operation } from 'fast-json-patch'; import { FileUploader } from 'ng2-file-upload'; import { BehaviorSubject, @@ -46,14 +43,8 @@ import { MetadataMap, MetadataValue, } from '../../../../core/shared/metadata.models'; -import { - NoContent, - NoContent, -} from '../../../../core/shared/NoContent.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; +import { NoContent } from '../../../../core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { ResourceType } from '../../../../core/shared/resource-type'; import { hasValue, diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index 5def3e0a73..4d5eb04e8c 100644 --- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -1,21 +1,12 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync, } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { of as observableOf } from 'rxjs'; diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index 9c1e20b1be..a860ba7c17 100644 --- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -1,11 +1,5 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, @@ -15,10 +9,7 @@ import { ActivatedRoute, Router, } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule, TranslateService, diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts index 3e68955735..e3d12d81ea 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts @@ -21,10 +21,7 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$, } from '../../../../remote-data.utils'; -import { - NotificationsServiceStub, - NotificationsServiceStub, -} from '../../../../testing/notifications-service.stub'; +import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub'; import { ComcolMetadataComponent } from './comcol-metadata.component'; describe('ComColMetadataComponent', () => { diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts index 306b0e0905..b81e759a86 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts @@ -8,14 +8,8 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - NoopAnimationsModule, - NoopAnimationsModule, -} from '@angular/platform-browser/animations'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; @@ -23,20 +17,12 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service import { RequestService } from '../../../../../core/data/request.service'; import { GroupDataService } from '../../../../../core/eperson/group-data.service'; import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; -import { - NotificationsService, - NotificationsService, -} from '../../../../notifications/notifications.service'; +import { NotificationsService } from '../../../../notifications/notifications.service'; import { createFailedRemoteDataObject$, - createFailedRemoteDataObject$, - createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../../remote-data.utils'; -import { - NotificationsServiceStub, - NotificationsServiceStub, -} from '../../../../testing/notifications-service.stub'; +import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub'; import { ComcolRoleComponent } from './comcol-role.component'; describe('ComcolRoleComponent', () => { diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts index ac21bac4b9..1795555453 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts @@ -11,7 +11,6 @@ import { RouterLink } from '@angular/router'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { BehaviorSubject, @@ -24,10 +23,7 @@ import { } from 'rxjs/operators'; import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths'; -import { - DSONameService, - DSONameService, -} from '../../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { RemoteData } from '../../../../../core/data/remote-data'; import { RequestService } from '../../../../../core/data/request.service'; import { GroupDataService } from '../../../../../core/eperson/group-data.service'; diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts index 58f8be788a..682bc339a2 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts @@ -1,11 +1,5 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, @@ -15,18 +9,12 @@ import { ActivatedRoute, Router, } from '@angular/router'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { Community } from '../../../../core/shared/community.model'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../../core/shared/dspace-object.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { EditComColPageComponent } from './edit-comcol-page.component'; describe('EditComColPageComponent', () => { diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts index 6577890673..c69d4ae392 100644 --- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -12,37 +12,25 @@ import { import { FormsModule } from '@angular/forms'; import { EventType, - EventType, - Router, Router, RouterLink, RouterLinkActive, Scroll, - Scroll, } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - combineLatest, combineLatest, Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { map, - map, - take, take, } from 'rxjs/operators'; import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths'; -import { - getCommunityPageRoute, - getCommunityPageRoute, -} from '../../../community-page/community-page-routing-paths'; +import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths'; import { BrowseService } from '../../../core/browse/browse.service'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { RemoteData } from '../../../core/data/remote-data'; diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts index 4ead849a3f..1672ad169f 100644 --- a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts +++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts @@ -18,12 +18,8 @@ import { import { RemoteData } from '../../../../core/data/remote-data'; import { Collection } from '../../../../core/shared/collection.model'; import { Community } from '../../../../core/shared/community.model'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { hasValue } from '../../../empty.util'; import { ThemedSearchComponent } from '../../../search/themed-search.component'; diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts index edb3e2f082..f889366dfe 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts @@ -14,7 +14,6 @@ import { ViewChild, } from '@angular/core'; import { - NgbTooltip, NgbTooltip, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index ba7933ffdc..0ff9227b68 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -1,7 +1,4 @@ -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TestBed, waitForAsync, @@ -9,7 +6,6 @@ import { import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { - NgbModal, NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; @@ -25,24 +21,15 @@ import { } from 'rxjs'; import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service'; -import { - AdminSidebarComponent, - AdminSidebarComponent, -} from '../../admin/admin-sidebar/admin-sidebar.component'; +import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; import { Collection } from '../../core/shared/collection.model'; import { Community } from '../../core/shared/community.model'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { Item } from '../../core/shared/item.model'; -import { - MenuService, - MenuService, -} from '../menu/menu.service'; +import { MenuService } from '../menu/menu.service'; import { MenuID } from '../menu/menu-id.model'; import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; import { MenuItemType } from '../menu/menu-item-type.model'; @@ -53,14 +40,8 @@ import { } from '../remote-data.utils'; import { MenuServiceStub } from '../testing/menu-service.stub'; import { createPaginatedList } from '../testing/utils.test'; -import { - DSOEditMenuResolver, - DSOEditMenuResolver, -} from './dso-edit-menu.resolver'; -import { - DsoVersioningModalService, - DsoVersioningModalService, -} from './dso-versioning-modal-service/dso-versioning-modal.service'; +import { DSOEditMenuResolver } from './dso-edit-menu.resolver'; +import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service'; describe('DSOEditMenuResolver', () => { diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts index b46931084d..4c4e6d3446 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts @@ -4,16 +4,12 @@ import { TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model'; -import { MenuItemType } from '../../../../shared/menu/menu-item-type.model'; import { MenuService } from '../../../menu/menu.service'; import { CSSVariableService } from '../../../sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts index 3fe47be7e9..8f458d4e56 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts @@ -5,11 +5,8 @@ import { NgIf, } from '@angular/common'; import { - Component, Component, Inject, - Inject, - Injector, Injector, } from '@angular/core'; import { Router } from '@angular/router'; @@ -22,16 +19,10 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { MenuID } from 'src/app/shared/menu/menu-id.model'; import { MenuSection } from 'src/app/shared/menu/menu-section.model'; -import { - MenuSectionComponent, - MenuSectionComponent, -} from 'src/app/shared/menu/menu-section/menu-section.component'; +import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component'; import { hasValue } from '../../../empty.util'; -import { - MenuService, - MenuService, -} from '../../../menu/menu.service'; +import { MenuService } from '../../../menu/menu.service'; /** * Represents an expandable section in the dso edit menus diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts index 2533b49cf1..0e13deffe4 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts @@ -1,38 +1,24 @@ import { Component } from '@angular/core'; import { - ComponentFixture, ComponentFixture, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { ActivatedRoute, Router, - Router, } from '@angular/router'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model'; -import { MenuItemType } from '../../../../shared/menu/menu-item-type.model'; import { MenuService } from '../../../menu/menu.service'; -import { - OnClickMenuItemModel, - OnClickMenuItemModel, -} from '../../../menu/menu-item/models/onclick.model'; +import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model'; import { CSSVariableService } from '../../../sass-helper/css-variable.service'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; -import { - MenuServiceStub, - MenuServiceStub, -} from '../../../testing/menu-service.stub'; +import { MenuServiceStub } from '../../../testing/menu-service.stub'; import { RouterStub } from '../../../testing/router.stub'; import { DsoEditMenuSectionComponent } from './dso-edit-menu-section.component'; diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts index fda26c4373..7e8019a54b 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -15,30 +15,20 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { - FindListOptions, - FindListOptions, -} from '../../../../core/data/find-list-options.model'; +import { FindListOptions } from '../../../../core/data/find-list-options.model'; import { buildPaginatedList, PaginatedList, } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; -import { - Collection, - Collection, -} from '../../../../core/shared/collection.model'; +import { Collection } from '../../../../core/shared/collection.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { SearchService } from '../../../../core/shared/search/search.service'; diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 2a3bf35dbf..c5c3644b84 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -23,7 +23,6 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { @@ -41,10 +40,7 @@ import { tap, } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { SortOptions } from '../../../core/cache/models/sort-options.model'; import { buildPaginatedList, @@ -69,18 +65,12 @@ import { import { HoverClassDirective } from '../../hover-class.directive'; import { ThemedLoadingComponent } from '../../loading/themed-loading.component'; import { NotificationType } from '../../notifications/models/notification-type'; -import { - NotificationsService, - NotificationsService, -} from '../../notifications/notifications.service'; +import { NotificationsService } from '../../notifications/notifications.service'; import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type'; import { ListableObject } from '../../object-collection/shared/listable-object.model'; import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { ListableNotificationObject } from '../../object-list/listable-notification-object/listable-notification-object.model'; -import { - LISTABLE_NOTIFICATION_OBJECT, - LISTABLE_NOTIFICATION_OBJECT, -} from '../../object-list/listable-notification-object/listable-notification-object.resource-type'; +import { LISTABLE_NOTIFICATION_OBJECT } from '../../object-list/listable-notification-object/listable-notification-object.resource-type'; import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model'; import { SearchResult } from '../../search/models/search-result.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 13f5c49119..27b09b749c 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -10,20 +10,13 @@ import { import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - environment, - environment, -} from '../../../../../environments/environment'; +import { environment } from '../../../../../environments/environment'; import { COMMUNITY_PARENT_PARAMETER, - COMMUNITY_PARENT_PARAMETER, - getCommunityCreateRoute, getCommunityCreateRoute, } from '../../../../community-page/community-page-routing-paths'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../../../core/cache/models/sort-options.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts index db79d040d4..65424e643d 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts @@ -10,18 +10,10 @@ import { import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - environment, - environment, -} from '../../../../../environments/environment'; -import { - getCollectionEditRoute, - getCollectionEditRoute, -} from '../../../../collection-page/collection-page-routing-paths'; +import { environment } from '../../../../../environments/environment'; +import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../../../core/cache/models/sort-options.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts index 591db83df2..6f781cb9eb 100644 --- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts @@ -10,18 +10,10 @@ import { import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - environment, - environment, -} from '../../../../../environments/environment'; -import { - getCommunityEditRoute, - getCommunityEditRoute, -} from '../../../../community-page/community-page-routing-paths'; +import { environment } from '../../../../../environments/environment'; +import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths'; import { SortDirection, - SortDirection, - SortOptions, SortOptions, } from '../../../../core/cache/models/sort-options.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts index 4db36c9ec2..25f26f3d6a 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts @@ -24,10 +24,7 @@ import { } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../../../core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService, diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts index c6ee8d3e41..86ae24758c 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts @@ -24,41 +24,20 @@ import { switchMap, } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../../../core/data/feature-authorization/authorization-data.service'; -import { - FeatureID, - FeatureID, -} from '../../../../core/data/feature-authorization/feature-id'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService, } from '../../../../core/data/processes/script-data.service'; -import { - RemoteData, - RemoteData, -} from '../../../../core/data/remote-data'; +import { RemoteData } from '../../../../core/data/remote-data'; import { Collection } from '../../../../core/shared/collection.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; -import { - getProcessDetailRoute, - getProcessDetailRoute, -} from '../../../../process-page/process-page-routing.paths'; -import { - Process, - Process, -} from '../../../../process-page/processes/process.model'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; +import { Process } from '../../../../process-page/processes/process.model'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; import { isNotEmpty } from '../../../empty.util'; @@ -67,8 +46,6 @@ import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, - DSOSelectorModalWrapperComponent, - SelectorActionType, SelectorActionType, } from '../dso-selector-modal-wrapper.component'; diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts index 15cef550a1..e2d32e0fea 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts @@ -24,10 +24,7 @@ import { } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../../../core/data/feature-authorization/authorization-data.service'; +import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService, diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts index 58dfb10306..6907ee0d58 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts @@ -24,42 +24,21 @@ import { switchMap, } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; -import { - AuthorizationDataService, - AuthorizationDataService, -} from '../../../../core/data/feature-authorization/authorization-data.service'; -import { - FeatureID, - FeatureID, -} from '../../../../core/data/feature-authorization/feature-id'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; +import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../../core/data/feature-authorization/feature-id'; import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService, } from '../../../../core/data/processes/script-data.service'; -import { - RemoteData, - RemoteData, -} from '../../../../core/data/remote-data'; +import { RemoteData } from '../../../../core/data/remote-data'; import { Collection } from '../../../../core/shared/collection.model'; import { Community } from '../../../../core/shared/community.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; -import { - getProcessDetailRoute, - getProcessDetailRoute, -} from '../../../../process-page/process-page-routing.paths'; -import { - Process, - Process, -} from '../../../../process-page/processes/process.model'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; +import { Process } from '../../../../process-page/processes/process.model'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; import { isNotEmpty } from '../../../empty.util'; @@ -68,8 +47,6 @@ import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component'; import { DSOSelectorModalWrapperComponent, - DSOSelectorModalWrapperComponent, - SelectorActionType, SelectorActionType, } from '../dso-selector-modal-wrapper.component'; diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts index 65b636a1d2..7833035391 100644 --- a/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts +++ b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts @@ -39,11 +39,7 @@ import { EPersonMock } from '../testing/eperson.mock'; import { GroupMock } from '../testing/group-mock'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { createTestComponent } from '../testing/utils.test'; -import { - EpersonGroupListComponent, - EpersonGroupListComponent, - SearchEvent, -} from './eperson-group-list.component'; +import { EpersonGroupListComponent } from './eperson-group-list.component'; import { SearchEvent } from './eperson-group-list-event-type'; import { EpersonSearchBoxComponent } from './eperson-search-box/eperson-search-box.component'; import { GroupSearchBoxComponent } from './group-search-box/group-search-box.component'; diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts index 084fc8bf17..7ae02b02e9 100644 --- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts +++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts @@ -16,12 +16,8 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { createTestComponent } from '../../testing/utils.test'; -import { SearchEvent } from '../eperson-group-list.component'; import { SearchEvent } from '../eperson-group-list-event-type'; -import { - EpersonSearchBoxComponent, - EpersonSearchBoxComponent, -} from './eperson-search-box.component'; +import { EpersonSearchBoxComponent } from './eperson-search-box.component'; describe('EpersonSearchBoxComponent test suite', () => { let comp: EpersonSearchBoxComponent; diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts index b7006570ce..2abf209297 100644 --- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts +++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts @@ -12,7 +12,6 @@ import { TranslateModule } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { isNotNull } from '../../empty.util'; -import { SearchEvent } from '../eperson-group-list.component'; import { SearchEvent } from '../eperson-group-list-event-type'; /** diff --git a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts index c835a3a286..4c1397dcbe 100644 --- a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts +++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts @@ -16,7 +16,6 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { createTestComponent } from '../../testing/utils.test'; -import { SearchEvent } from '../eperson-group-list.component'; import { SearchEvent } from '../eperson-group-list-event-type'; import { GroupSearchBoxComponent } from './group-search-box.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts index 5351315b82..f182410510 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts @@ -1,38 +1,23 @@ import { CUSTOM_ELEMENTS_SCHEMA, - CUSTOM_ELEMENTS_SCHEMA, - DebugElement, DebugElement, NgZone, - NgZone, - SimpleChange, SimpleChange, } from '@angular/core'; import { ComponentFixture, - ComponentFixture, - inject, inject, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { FormsModule, - FormsModule, - ReactiveFormsModule, ReactiveFormsModule, UntypedFormControl, - UntypedFormControl, - UntypedFormGroup, UntypedFormGroup, } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { - BrowserDynamicTestingModule, - BrowserDynamicTestingModule, -} from '@angular/platform-browser-dynamic/testing'; +import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicCheckboxGroupModel, @@ -67,117 +52,46 @@ import { DynamicNGBootstrapTextAreaComponent, DynamicNGBootstrapTimePickerComponent, } from '@ng-dynamic-forms/ui-ng-bootstrap'; -import { - Store, - Store, -} from '@ngrx/store'; +import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; -import { - NgxMaskModule, - NgxMaskModule, -} from 'ngx-mask'; -import { - of as observableOf, - of as observableOf, -} from 'rxjs'; +import { NgxMaskModule } from 'ngx-mask'; +import { of as observableOf } from 'rxjs'; import { - APP_CONFIG, APP_CONFIG, APP_DATA_SERVICES_MAP, APP_DYNAMIC_FORM_CONTROL_FN, } from '../../../../../config/app-config.interface'; -import { - environment, - environment, -} from '../../../../../environments/environment'; -import { - ItemDataService, - ItemDataService, -} from '../../../../core/data/item-data.service'; -import { - RelationshipDataService, - RelationshipDataService, -} from '../../../../core/data/relationship-data.service'; -import { - Item, - Item, -} from '../../../../core/shared/item.model'; -import { - WorkspaceItem, - WorkspaceItem, -} from '../../../../core/submission/models/workspaceitem.model'; -import { - SubmissionObjectDataService, - SubmissionObjectDataService, -} from '../../../../core/submission/submission-object-data.service'; +import { environment } from '../../../../../environments/environment'; +import { ItemDataService } from '../../../../core/data/item-data.service'; +import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; +import { Item } from '../../../../core/shared/item.model'; +import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; +import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service'; import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model'; -import { - SubmissionService, - SubmissionService, -} from '../../../../submission/submission.service'; -import { - SelectableListService, - SelectableListService, -} from '../../../object-list/selectable-list/selectable-list.service'; -import { - createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject, -} from '../../../remote-data.utils'; -import { - FormService, - FormService, -} from '../../form.service'; -import { - FormBuilderService, - FormBuilderService, -} from '../form-builder.service'; -import { - DsDynamicFormControlContainerComponent, - DsDynamicFormControlContainerComponent, - dsDynamicFormControlMapFn, -} from './ds-dynamic-form-control-container.component'; +import { SubmissionService } from '../../../../submission/submission.service'; +import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; +import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; +import { FormService } from '../../form.service'; +import { FormBuilderService } from '../form-builder.service'; +import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-control-container.component'; import { dsDynamicFormControlMapFn } from './ds-dynamic-form-control-map-fn'; -import { - DsDynamicTypeBindRelationService, - DsDynamicTypeBindRelationService, -} from './ds-dynamic-type-bind-relation.service'; -import { - DsDynamicFormArrayComponent, - DsDynamicFormArrayComponent, -} from './models/array-group/dynamic-form-array.component'; -import { - DsDatePickerComponent, - DsDatePickerComponent, -} from './models/date-picker/date-picker.component'; +import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service'; +import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component'; +import { DsDatePickerComponent } from './models/date-picker/date-picker.component'; import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model'; -import { - DsDatePickerInlineComponent, - DsDatePickerInlineComponent, -} from './models/date-picker-inline/dynamic-date-picker-inline.component'; +import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component'; import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model'; -import { - DsDynamicFormGroupComponent, - DsDynamicFormGroupComponent, -} from './models/form-group/dynamic-form-group.component'; -import { - DsDynamicListComponent, - DsDynamicListComponent, -} from './models/list/dynamic-list.component'; +import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component'; +import { DsDynamicListComponent } from './models/list/dynamic-list.component'; import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model'; import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model'; -import { - DsDynamicLookupComponent, - DsDynamicLookupComponent, -} from './models/lookup/dynamic-lookup.component'; +import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component'; import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model'; import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model'; import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component'; import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model'; -import { - DsDynamicRelationGroupComponent, - DsDynamicRelationGroupComponent, -} from './models/relation-group/dynamic-relation-group.components'; +import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components'; import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model'; import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component'; import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index 156f356390..d40f3ed0ba 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -33,13 +33,21 @@ import { } from '@angular/forms'; import { NgbModal, - NgbModal, - NgbModalRef, NgbModalRef, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; import { + DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, + DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX_GROUP, + DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER, + DYNAMIC_FORM_CONTROL_TYPE_GROUP, + DYNAMIC_FORM_CONTROL_TYPE_INPUT, + DYNAMIC_FORM_CONTROL_TYPE_RADIO_GROUP, + DYNAMIC_FORM_CONTROL_TYPE_SELECT, + DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA, + DYNAMIC_FORM_CONTROL_TYPE_TIMEPICKER, + DynamicDatePickerModel, DynamicFormArrayGroupModel, DynamicFormArrayModel, DynamicFormComponentService, @@ -68,44 +76,30 @@ import { Store } from '@ngrx/store'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { - combineLatest as observableCombineLatest, combineLatest as observableCombineLatest, Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { find, - find, - map, map, startWith, - startWith, switchMap, - switchMap, - take, take, } from 'rxjs/operators'; import { - APP_CONFIG, APP_CONFIG, APP_DYNAMIC_FORM_CONTROL_FN, AppConfig, - AppConfig, DynamicFormControlFn, } from '../../../../../config/app-config.interface'; import { AppState } from '../../../../app.reducer'; import { ItemDataService } from '../../../../core/data/item-data.service'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { - RelationshipDataService, - RelationshipDataService, -} from '../../../../core/data/relationship-data.service'; +import { RelationshipDataService } from '../../../../core/data/relationship-data.service'; import { RemoteData } from '../../../../core/data/remote-data'; import { Collection } from '../../../../core/shared/collection.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; @@ -128,53 +122,30 @@ import { paginatedRelationsToItems } from '../../../../item-page/simple/item-typ import { SubmissionService } from '../../../../submission/submission.service'; import { hasNoValue, - hasNoValue, - hasValue, hasValue, isNotEmpty, - isNotEmpty, - isNotUndefined, isNotUndefined, } from '../../../empty.util'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer'; -import { - SelectableListService, - SelectableListService, -} from '../../../object-list/selectable-list/selectable-list.service'; -import { - SearchResult, - SearchResult, -} from '../../../search/models/search-result.model'; +import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; +import { SearchResult } from '../../../search/models/search-result.model'; import { followLink } from '../../../utils/follow-link-config.model'; -import { - itemLinksToFollow, - itemLinksToFollow, -} from '../../../utils/relation-query.utils'; +import { itemLinksToFollow } from '../../../utils/relation-query.utils'; import { FormService } from '../../form.service'; import { FormBuilderService } from '../form-builder.service'; -import { - FormFieldMetadataValueObject, - FormFieldMetadataValueObject, -} from '../models/form-field-metadata-value.model'; +import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model'; import { RelationshipOptions } from '../models/relationship-options.model'; import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants'; -import { - DsDynamicTypeBindRelationService, - DsDynamicTypeBindRelationService, -} from './ds-dynamic-type-bind-relation.service'; +import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service'; import { ExistingMetadataListElementComponent, ReorderableRelationship, - ReorderableRelationship, } from './existing-metadata-list-element/existing-metadata-list-element.component'; import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component'; import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component'; import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component'; -import { - DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH, - DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH, -} from './models/custom-switch/custom-switch.model'; +import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model'; import { DsDatePickerComponent } from './models/date-picker/date-picker.component'; import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model'; import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component'; @@ -194,10 +165,7 @@ import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdo import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component'; import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model'; -import { - DsDynamicLookupRelationModalComponent, - DsDynamicLookupRelationModalComponent, -} from './relation-lookup-modal/dynamic-lookup-relation-modal.component'; +import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component'; export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type | null { switch (model.type) { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn.ts index 223b44404c..51af3c798f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn.ts @@ -50,6 +50,8 @@ import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component'; import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model'; export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type | null { + const datepickerModel = model as DynamicDatePickerModel; + switch (model.type) { case DYNAMIC_FORM_CONTROL_TYPE_ARRAY: return DsDynamicFormArrayComponent; @@ -61,8 +63,6 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type< return (model instanceof DynamicListCheckboxGroupModel) ? DsDynamicListComponent : DynamicNGBootstrapCheckboxGroupComponent; case DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER: - const datepickerModel = model as DynamicDatePickerModel; - return datepickerModel.inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent; case DYNAMIC_FORM_CONTROL_TYPE_GROUP: diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts index 41c2d55a10..f3ca411853 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts @@ -35,14 +35,8 @@ import { getAllSucceededRemoteData, getRemoteDataPayload, } from '../../../../../core/shared/operators'; -import { - SubmissionObjectEntry, - SubmissionObjectEntry, -} from '../../../../../submission/objects/submission-objects.reducer'; -import { - SubmissionService, - SubmissionService, -} from '../../../../../submission/submission.service'; +import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer'; +import { SubmissionService } from '../../../../../submission/submission.service'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts index 50fd0a6971..342e36d718 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts @@ -1,7 +1,4 @@ -import { - DebugElement, - DebugElement, -} from '@angular/core'; +import { DebugElement } from '@angular/core'; import { ComponentFixture, inject, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts index 24444f506d..62c86f1bad 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts @@ -4,25 +4,17 @@ import { } from '@angular/common'; import { Component, - Component, - EventEmitter, EventEmitter, Input, - Input, Output, - Output, - ViewChild, ViewChild, } from '@angular/core'; import { ReactiveFormsModule, UntypedFormGroup, - UntypedFormGroup, } from '@angular/forms'; import { NgbDatepicker, - NgbDatepicker, - NgbDatepickerConfig, NgbDatepickerConfig, NgbDatepickerModule, } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts index 1749821458..a6cf7a29f2 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts @@ -18,10 +18,7 @@ import { UntypedFormControl, UntypedFormGroup, } from '@angular/forms'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts index f96b71b0ae..4589171e36 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts @@ -1,31 +1,21 @@ import { - DOCUMENT, DOCUMENT, NgClass, NgIf, } from '@angular/common'; import { Component, - Component, - EventEmitter, EventEmitter, HostListener, - HostListener, - Inject, Inject, Input, - Input, - OnInit, OnInit, Output, - Output, - Renderer2, Renderer2, } from '@angular/core'; import { FormsModule, UntypedFormGroup, - UntypedFormGroup, } from '@angular/forms'; import { DynamicFormControlComponent, @@ -34,15 +24,9 @@ import { } from '@ng-dynamic-forms/core'; import isEqual from 'lodash/isEqual'; -import { - hasValue, - hasValue, -} from '../../../../../empty.util'; +import { hasValue } from '../../../../../empty.util'; import { NumberPickerComponent } from '../../../../number-picker/number-picker.component'; -import { - DynamicDsDatePickerModel, - DynamicDsDatePickerModel, -} from './date-picker.model'; +import { DynamicDsDatePickerModel } from './date-picker.model'; export type DatePickerFieldType = '_year' | '_month' | '_day'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts index 7ae73c695e..8dc19267e8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts @@ -5,27 +5,17 @@ import { } from '@angular/common'; import { ChangeDetectorRef, - ChangeDetectorRef, - Component, Component, EventEmitter, - EventEmitter, - Input, Input, OnInit, - OnInit, - Output, Output, } from '@angular/core'; import { - AbstractControl, AbstractControl, ReactiveFormsModule, UntypedFormGroup, - UntypedFormGroup, ValidationErrors, - ValidationErrors, - ValidatorFn, ValidatorFn, } from '@angular/forms'; import { NgbButtonsModule } from '@ng-bootstrap/ng-bootstrap'; @@ -37,26 +27,11 @@ import { } from '@ng-dynamic-forms/core'; import findKey from 'lodash/findKey'; -import { - PaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, -} from '../../../../../../core/shared/operators'; -import { - PageInfo, - PageInfo, -} from '../../../../../../core/shared/page-info.model'; -import { - VocabularyEntry, - VocabularyEntry, -} from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { - VocabularyService, - VocabularyService, -} from '../../../../../../core/submission/vocabularies/vocabulary.service'; +import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; +import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; +import { PageInfo } from '../../../../../../core/shared/page-info.model'; +import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { hasValue, isNotEmpty, diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts index a2be80c4b8..d65e06313f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts @@ -18,15 +18,11 @@ import { UntypedFormGroup, } from '@angular/forms'; import { - NgbModal, NgbModal, NgbModalRef, - NgbModalRef, - NgbTypeahead, NgbTypeahead, NgbTypeaheadModule, NgbTypeaheadSelectItemEvent, - NgbTypeaheadSelectItemEvent, } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, @@ -35,12 +31,8 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { Observable, - Observable, - of as observableOf, of as observableOf, Subject, - Subject, - Subscription, Subscription, } from 'rxjs'; import { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts index 81ac8c9f8a..cc87f7bfbc 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts @@ -5,43 +5,29 @@ import { NgIf, } from '@angular/common'; import { - ChangeDetectorRef, ChangeDetectorRef, Component, - Component, - CUSTOM_ELEMENTS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA, } from '@angular/core'; import { ComponentFixture, - ComponentFixture, - inject, inject, TestBed, - TestBed, - waitForAsync, waitForAsync, } from '@angular/core/testing'; import { FormsModule, - FormsModule, - ReactiveFormsModule, ReactiveFormsModule, UntypedFormControl, - UntypedFormControl, - UntypedFormGroup, UntypedFormGroup, } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { - NgbModule, NgbModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, - DynamicFormLayoutService, - DynamicFormValidationService, DynamicFormValidationService, } from '@ng-dynamic-forms/core'; import { provideMockStore } from '@ngrx/store/testing'; @@ -53,25 +39,13 @@ import { } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment.test'; -import { - FormRowModel, - FormRowModel, -} from '../../../../../../core/config/models/config-submission-form.model'; +import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model'; import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model'; import { SubmissionObjectDataService } from '../../../../../../core/submission/submission-object-data.service'; -import { - VocabularyService, - VocabularyService, -} from '../../../../../../core/submission/vocabularies/vocabulary.service'; +import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { SubmissionService } from '../../../../../../submission/submission.service'; -import { - createTestComponent, - createTestComponent, -} from '../../../../../testing/utils.test'; -import { - VocabularyServiceStub, - VocabularyServiceStub, -} from '../../../../../testing/vocabulary-service.stub'; +import { createTestComponent } from '../../../../../testing/utils.test'; +import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub'; import { Chips } from '../../../../chips/models/chips.model'; import { FormComponent } from '../../../../form.component'; import { FormService } from '../../../../form.service'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts index ffac600d03..051bb3f225 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts @@ -1,3 +1,8 @@ +import { + AsyncPipe, + NgForOf, + NgIf, +} from '@angular/common'; import { ChangeDetectorRef, Component, @@ -6,20 +11,19 @@ import { Input, OnInit, Output, - ViewChild ViewChild, } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; - -import { Observable, of as observableOf } from 'rxjs'; -import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators'; -import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; -import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; -import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbDropdown, + NgbDropdownModule, +} from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, DynamicFormValidationService, } from '@ng-dynamic-forms/core'; +import { TranslateModule } from '@ngx-translate/core'; +import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { Observable, of as observableOf, @@ -31,14 +35,6 @@ import { tap, } from 'rxjs/operators'; -import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; -import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { isEmpty } from '../../../../../empty.util'; -import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; -import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component'; import { buildPaginatedList, PaginatedList, @@ -49,9 +45,6 @@ import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/ import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { isEmpty } from '../../../../../empty.util'; import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model'; -import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; -import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { TranslateModule } from '@ngx-translate/core'; import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component'; import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model'; @@ -68,9 +61,9 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo AsyncPipe, InfiniteScrollModule, NgForOf, - TranslateModule + TranslateModule, ], - standalone: true + standalone: true, }) export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit { @ViewChild('dropdownMenu', { read: ElementRef }) dropdownMenu: ElementRef; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts index 9a05d7fda7..78e50de898 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts @@ -31,31 +31,17 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { - VocabularyEntry, - VocabularyEntry, -} from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; +import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model'; import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model'; import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service'; import { mockDynamicFormLayoutService, - mockDynamicFormLayoutService, - mockDynamicFormValidationService, mockDynamicFormValidationService, } from '../../../../../testing/dynamic-form-mock-services'; -import { - createTestComponent, - createTestComponent, -} from '../../../../../testing/utils.test'; +import { createTestComponent } from '../../../../../testing/utils.test'; import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub'; -import { - Chips, - Chips, -} from '../../../../chips/models/chips.model'; -import { - FormFieldMetadataValueObject, - FormFieldMetadataValueObject, -} from '../../../models/form-field-metadata-value.model'; +import { Chips } from '../../../../chips/models/chips.model'; +import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model'; import { DsDynamicTagComponent } from './dynamic-tag.component'; import { DynamicTagModel } from './dynamic-tag.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts index 06565dd8a6..d8f12197d2 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts @@ -1,59 +1,38 @@ import { NgIf } from '@angular/common'; import { ChangeDetectorRef, - ChangeDetectorRef, - Component, Component, EventEmitter, - EventEmitter, - Input, Input, OnInit, - OnInit, Output, - Output, - ViewChild, ViewChild, } from '@angular/core'; import { FormsModule, UntypedFormGroup, - UntypedFormGroup, } from '@angular/forms'; import { - NgbTypeahead, NgbTypeahead, NgbTypeaheadModule, NgbTypeaheadSelectItemEvent, - NgbTypeaheadSelectItemEvent, } from '@ng-bootstrap/ng-bootstrap'; import { DynamicFormLayoutService, - DynamicFormLayoutService, - DynamicFormValidationService, DynamicFormValidationService, } from '@ng-dynamic-forms/core'; import isEqual from 'lodash/isEqual'; import { Observable, - Observable, - of as observableOf, of as observableOf, } from 'rxjs'; import { catchError, - catchError, - debounceTime, debounceTime, distinctUntilChanged, - distinctUntilChanged, - map, map, merge, - merge, switchMap, - switchMap, - tap, tap, } from 'rxjs/operators'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index 423c714ec3..d55f27fd75 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -5,118 +5,52 @@ import { } from '@angular/common'; import { Component, - Component, - EventEmitter, EventEmitter, NgZone, - NgZone, - OnDestroy, OnDestroy, OnInit, - OnInit, - Output, Output, } from '@angular/core'; +import { Router } from '@angular/router'; import { - Router, - Router, -} from '@angular/router'; -import { - NgbActiveModal, NgbActiveModal, NgbNavModule, } from '@ng-bootstrap/ng-bootstrap'; -import { - Store, - Store, -} from '@ngrx/store'; +import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - combineLatest as observableCombineLatest, combineLatest as observableCombineLatest, Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { map, - map, - skip, skip, switchMap, - switchMap, - take, take, } from 'rxjs/operators'; -import { - AppState, - AppState, -} from '../../../../../app.reducer'; -import { - RemoteDataBuildService, - RemoteDataBuildService, -} from '../../../../../core/cache/builders/remote-data-build.service'; -import { - RequestParam, - RequestParam, -} from '../../../../../core/cache/models/request-param.model'; -import { - ExternalSourceDataService, - ExternalSourceDataService, -} from '../../../../../core/data/external-source-data.service'; -import { - FindListOptions, - FindListOptions, -} from '../../../../../core/data/find-list-options.model'; -import { - LookupRelationService, - LookupRelationService, -} from '../../../../../core/data/lookup-relation.service'; -import { - PaginatedList, - PaginatedList, -} from '../../../../../core/data/paginated-list.model'; -import { - RelationshipDataService, - RelationshipDataService, -} from '../../../../../core/data/relationship-data.service'; -import { - RelationshipTypeDataService, - RelationshipTypeDataService, -} from '../../../../../core/data/relationship-type-data.service'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; -import { - ExternalSource, - ExternalSource, -} from '../../../../../core/shared/external-source.model'; +import { AppState } from '../../../../../app.reducer'; +import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; +import { RequestParam } from '../../../../../core/cache/models/request-param.model'; +import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service'; +import { FindListOptions } from '../../../../../core/data/find-list-options.model'; +import { LookupRelationService } from '../../../../../core/data/lookup-relation.service'; +import { PaginatedList } from '../../../../../core/data/paginated-list.model'; +import { RelationshipDataService } from '../../../../../core/data/relationship-data.service'; +import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service'; +import { Context } from '../../../../../core/shared/context.model'; +import { ExternalSource } from '../../../../../core/shared/external-source.model'; import { Item } from '../../../../../core/shared/item.model'; -import { - RelationshipType, - RelationshipType, -} from '../../../../../core/shared/item-relationships/relationship-type.model'; +import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model'; import { getAllSucceededRemoteDataPayload, - getAllSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload, } from '../../../../../core/shared/operators'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../../empty.util'; import { ThemedLoadingComponent } from '../../../../loading/themed-loading.component'; @@ -124,10 +58,7 @@ import { ListableObject } from '../../../../object-collection/shared/listable-ob import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer'; import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service'; import { SearchResult } from '../../../../search/models/search-result.model'; -import { - followLink, - followLink, -} from '../../../../utils/follow-link-config.model'; +import { followLink } from '../../../../utils/follow-link-config.model'; import { RelationshipOptions } from '../../models/relationship-options.model'; import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component'; import { @@ -137,6 +68,7 @@ import { } from './relationship.actions'; import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component'; import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; @Component({ selector: 'ds-dynamic-lookup-relation-modal', diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts index 18d273084a..d7090b55c8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts @@ -1,7 +1,5 @@ import { EventEmitter, - EventEmitter, - NO_ERRORS_SCHEMA, NO_ERRORS_SCHEMA, } from '@angular/core'; import { @@ -11,16 +9,11 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { - RouterTestingModule, - RouterTestingModule, -} from '@angular/router/testing'; +import { RouterTestingModule } from '@angular/router/testing'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { EMPTY, - EMPTY, - of as observableOf, of as observableOf, } from 'rxjs'; @@ -31,10 +24,7 @@ import { ExternalSource } from '../../../../../../core/shared/external-source.mo import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; import { Item } from '../../../../../../core/shared/item.model'; import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../../core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { ErrorComponent } from '../../../../../error/error.component'; import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../../object-collection/object-collection.component'; @@ -45,10 +35,7 @@ import { createPendingRemoteDataObject$, createSuccessfulRemoteDataObject$, } from '../../../../../remote-data.utils'; -import { - PaginatedSearchOptions, - PaginatedSearchOptions, -} from '../../../../../search/models/paginated-search-options.model'; +import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model'; import { ThemedSearchFormComponent } from '../../../../../search-form/themed-search-form.component'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; import { createPaginatedList } from '../../../../../testing/utils.test'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index 56b39f3910..6190662504 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -4,32 +4,21 @@ import { } from '@angular/common'; import { Component, - Component, - ComponentRef, ComponentRef, EventEmitter, - EventEmitter, - Input, Input, OnDestroy, - OnDestroy, OnInit, - OnInit, - Output, Output, } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, - NgbModal, - NgbModalRef, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { Observable, - Observable, - Subscription, Subscription, } from 'rxjs'; import { @@ -41,34 +30,15 @@ import { import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service'; import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../../../core/data/remote-data'; -import { - PaginationService, - PaginationService, -} from '../../../../../../core/pagination/pagination.service'; -import { - Collection, - Collection, -} from '../../../../../../core/shared/collection.model'; +import { PaginationService } from '../../../../../../core/pagination/pagination.service'; +import { Collection } from '../../../../../../core/shared/collection.model'; import { Context } from '../../../../../../core/shared/context.model'; import { ExternalSource } from '../../../../../../core/shared/external-source.model'; import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; -import { - Item, - Item, -} from '../../../../../../core/shared/item.model'; -import { - ItemType, - ItemType, -} from '../../../../../../core/shared/item-relationships/item-type.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../../../core/shared/operators'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service'; +import { Item } from '../../../../../../core/shared/item.model'; +import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; +import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators'; +import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component'; import { fadeIn, @@ -76,32 +46,21 @@ import { } from '../../../../../animations/fade'; import { hasValue, - hasValue, - hasValueOperator, hasValueOperator, } from '../../../../../empty.util'; import { ErrorComponent } from '../../../../../error/error.component'; import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../../object-collection/object-collection.component'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; -import { - SelectableListService, - SelectableListService, -} from '../../../../../object-list/selectable-list/selectable-list.service'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; import { PageSizeSelectorComponent } from '../../../../../page-size-selector/page-size-selector.component'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model'; import { ThemedSearchFormComponent } from '../../../../../search-form/themed-search-form.component'; import { VarDirective } from '../../../../../utils/var.directive'; import { RelationshipOptions } from '../../../models/relationship-options.model'; -import { - ExternalSourceEntryImportModalComponent, - ExternalSourceEntryImportModalComponent, -} from './external-source-entry-import-modal/external-source-entry-import-modal.component'; -import { - ThemedExternalSourceEntryImportModalComponent, - ThemedExternalSourceEntryImportModalComponent, -} from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component'; +import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 7d2464f105..d9581dcd85 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -15,20 +15,14 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { switchMap, - switchMap, - take, take, } from 'rxjs/operators'; -import { - ItemDataService, - ItemDataService, -} from '../../../../../../../core/data/item-data.service'; +import { ItemDataService } from '../../../../../../../core/data/item-data.service'; import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service'; import { PaginatedList } from '../../../../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../../../../core/data/remote-data'; @@ -40,33 +34,16 @@ import { MetadataValue } from '../../../../../../../core/shared/metadata.models' import { Metadata } from '../../../../../../../core/shared/metadata.utils'; import { getFirstSucceededRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, getRemoteDataPayload, } from '../../../../../../../core/shared/operators'; import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component'; import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component'; -import { - NotificationsService, - NotificationsService, -} from '../../../../../../notifications/notifications.service'; +import { NotificationsService } from '../../../../../../notifications/notifications.service'; import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type'; -import { - ItemSearchResult, - ItemSearchResult, -} from '../../../../../../object-collection/shared/item-search-result.model'; -import { - ListableObject, - ListableObject, -} from '../../../../../../object-collection/shared/listable-object.model'; -import { - SelectableListService, - SelectableListService, -} from '../../../../../../object-list/selectable-list/selectable-list.service'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../../../../../pagination/pagination-component-options.model'; +import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; +import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model'; +import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; +import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../../../../../../search/models/paginated-search-options.model'; import { SearchResult } from '../../../../../../search/models/search-result.model'; import { SearchResultsComponent } from '../../../../../../search/search-results/search-results.component'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index 9fbb1686ff..309a8eb792 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -4,24 +4,16 @@ import { } from '@angular/common'; import { Component, - Component, - EventEmitter, EventEmitter, Input, - Input, - OnDestroy, OnDestroy, OnInit, - OnInit, - Output, Output, } from '@angular/core'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject, - BehaviorSubject, - Observable, Observable, } from 'rxjs'; import { @@ -33,10 +25,7 @@ import { } from 'rxjs/operators'; import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service'; -import { - PaginatedList, - PaginatedList, -} from '../../../../../../core/data/paginated-list.model'; +import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service'; import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { Context } from '../../../../../../core/shared/context.model'; @@ -49,34 +38,18 @@ import { getRemoteDataPayload, } from '../../../../../../core/shared/operators'; import { SearchService } from '../../../../../../core/shared/search/search.service'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-configuration.service'; +import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component'; import { hasValue } from '../../../../../empty.util'; import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type'; -import { - ListableObject, - ListableObject, -} from '../../../../../object-collection/shared/listable-object.model'; +import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; -import { - PaginationComponentOptions, - PaginationComponentOptions, -} from '../../../../../pagination/pagination-component-options.model'; +import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { SearchObjects } from '../../../../../search/models/search-objects.model'; -import { - SearchResult, - SearchResult, -} from '../../../../../search/models/search-result.model'; +import { SearchResult } from '../../../../../search/models/search-result.model'; import { ThemedSearchComponent } from '../../../../../search/themed-search.component'; import { VarDirective } from '../../../../../utils/var.directive'; -import { - RelationshipOptions, - RelationshipOptions, -} from '../../../models/relationship-options.model'; +import { RelationshipOptions } from '../../../models/relationship-options.model'; @Component({ diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts index a4b51c129f..075ab1444d 100644 --- a/src/app/shared/form/chips/chips.component.ts +++ b/src/app/shared/form/chips/chips.component.ts @@ -20,23 +20,13 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import isObject from 'lodash/isObject'; import { SortablejsModule } from 'ngx-sortablejs'; -import { - BehaviorSubject, - BehaviorSubject, -} from 'rxjs'; -import { - Options, - Options, -} from 'sortablejs'; +import { BehaviorSubject } from 'rxjs'; +import { Options } from 'sortablejs'; -import { - DragService, - DragService, -} from '../../../core/drag.service'; +import { DragService } from '../../../core/drag.service'; import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive'; import { Chips } from './models/chips.model'; import { ChipsItem } from './models/chips-item.model'; diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts index 39985df1a4..e1d47da7bd 100644 --- a/src/app/shared/form/form.component.ts +++ b/src/app/shared/form/form.component.ts @@ -47,14 +47,9 @@ import { } from '../empty.util'; import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component'; import { FormBuilderService } from './builder/form-builder.service'; -import { - FormFieldMetadataValueObject, - FormFieldMetadataValueObject, -} from './builder/models/form-field-metadata-value.model'; +import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model'; import { FormEntry, - FormEntry, - FormError, FormError, } from './form.reducer'; import { FormService } from './form.service'; diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts index 5189b44ef0..cb46384d87 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts @@ -14,10 +14,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../core/shared/dspace-object.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { getMockThemeService } from '../../mocks/theme-service.mock'; import { ListableObjectComponentLoaderComponent } from '../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { ThemeService } from '../../theme-support/theme.service'; diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts index c768522ac4..97a21b29ee 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts @@ -14,30 +14,16 @@ import { } from '@ngx-translate/core'; import { Observable, - Observable, - of, of, } from 'rxjs'; -import { - RemoteData, - RemoteData, -} from '../../../../core/data/remote-data'; +import { RemoteData } from '../../../../core/data/remote-data'; import { RequestService } from '../../../../core/data/request.service'; -import { - DSpaceObject, - DSpaceObject, -} from '../../../../core/shared/dspace-object.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { SearchService } from '../../../../core/shared/search/search.service'; import { NotificationsService } from '../../../notifications/notifications.service'; -import { - ClaimedApprovedTaskSearchResult, - ClaimedApprovedTaskSearchResult, -} from '../../../object-collection/shared/claimed-approved-task-search-result.model'; -import { - ClaimedTaskActionsAbstractComponent, - ClaimedTaskActionsAbstractComponent, -} from '../abstract/claimed-task-actions-abstract.component'; +import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve'; diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts index 79dbd11057..79492de722 100644 --- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts @@ -23,10 +23,7 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { SearchService } from '../../../../core/shared/search/search.service'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model'; -import { - ClaimedTaskActionsAbstractComponent, - ClaimedTaskActionsAbstractComponent, -} from '../abstract/claimed-task-actions-abstract.component'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task'; diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts index 4cf4867373..db88544654 100644 --- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts @@ -12,7 +12,6 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute, Router, - Router, } from '@angular/router'; import { TranslateLoader, diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts index be43ed6c64..331910bc82 100644 --- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts @@ -4,12 +4,9 @@ import { } from '@angular/common'; import { Component, - Component, - Injector, Injector, } from '@angular/core'; import { - Router, Router, RouterLink, } from '@angular/router'; @@ -17,22 +14,12 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { RequestService } from '../../../../core/data/request.service'; -import { - SearchService, - SearchService, -} from '../../../../core/shared/search/search.service'; -import { - NotificationsService, - NotificationsService, -} from '../../../notifications/notifications.service'; -import { - ClaimedTaskActionsAbstractComponent, - ClaimedTaskActionsAbstractComponent, -} from '../abstract/claimed-task-actions-abstract.component'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; export const WORKFLOW_TASK_OPTION_EDIT_METADATA = 'submit_edit_metadata'; diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts index 75fc0072d9..785964ec46 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts @@ -1,20 +1,15 @@ import { Component, - Component, - Injector, Injector, } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { RequestService } from '../../../../core/data/request.service'; @@ -23,10 +18,7 @@ import { ADVANCED_WORKFLOW_ACTION_RATING, ADVANCED_WORKFLOW_TASK_OPTION_RATING, } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; -import { - NotificationsService, - NotificationsService, -} from '../../../notifications/notifications.service'; +import { NotificationsService } from '../../../notifications/notifications.service'; import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; /** diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts index b81b82b26f..5ec7c25629 100644 --- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts @@ -3,28 +3,20 @@ import { NgIf, } from '@angular/common'; import { - Component, Component, Injector, - Injector, - OnInit, OnInit, } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, - UntypedFormBuilder, UntypedFormGroup, - UntypedFormGroup, - Validators, Validators, } from '@angular/forms'; import { Router } from '@angular/router'; import { NgbModal, - NgbModal, - NgbModalRef, NgbModalRef, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; @@ -42,14 +34,8 @@ import { RequestService } from '../../../../core/data/request.service'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { SearchService } from '../../../../core/shared/search/search.service'; import { NotificationsService } from '../../../notifications/notifications.service'; -import { - ClaimedDeclinedTaskSearchResult, - ClaimedDeclinedTaskSearchResult, -} from '../../../object-collection/shared/claimed-declined-task-search-result.model'; -import { - ClaimedTaskActionsAbstractComponent, - ClaimedTaskActionsAbstractComponent, -} from '../abstract/claimed-task-actions-abstract.component'; +import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject'; diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts index d6d18ed7be..4964ba88bd 100644 --- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts @@ -12,10 +12,7 @@ import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { - Observable, - Observable, -} from 'rxjs'; +import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; import { RemoteData } from '../../../../core/data/remote-data'; @@ -24,10 +21,7 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { SearchService } from '../../../../core/shared/search/search.service'; import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; import { NotificationsService } from '../../../notifications/notifications.service'; -import { - ClaimedTaskActionsAbstractComponent, - ClaimedTaskActionsAbstractComponent, -} from '../abstract/claimed-task-actions-abstract.component'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool'; diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts index 6fb34cf566..b8a1de8a6d 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts @@ -6,16 +6,9 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { - AdvancedClaimedTaskActionSelectReviewerComponent -} from './advanced-claimed-task-action-select-reviewer.component'; -import { ActivatedRoute, Router } from '@angular/router'; -import { RouterStub } from '../../../testing/router.stub'; -import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { NotificationsService } from '../../../notifications/notifications.service'; ActivatedRoute, Router, } from '@angular/router'; -import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; @@ -24,14 +17,6 @@ import { SearchService } from '../../../../core/shared/search/search.service'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { By } from '@angular/platform-browser'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { Location } from '@angular/common'; -import { - ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER -} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; -import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; -import { of as observableOf } from 'rxjs'; import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; @@ -41,6 +26,7 @@ import { RouterStub } from '../../../testing/router.stub'; import { SearchServiceStub } from '../../../testing/search-service.stub'; import { AdvancedClaimedTaskActionSelectReviewerComponent } from './advanced-claimed-task-action-select-reviewer.component'; + const taskId = 'claimed-task-1'; const workflowId = 'workflow-1'; @@ -68,11 +54,11 @@ describe('AdvancedClaimedTaskActionSelectReviewerComponent', () => { searchService = new SearchServiceStub(); await TestBed.configureTestingModule({ - imports: [ + imports: [ TranslateModule.forRoot(), - AdvancedClaimedTaskActionSelectReviewerComponent - ], - providers: [ + AdvancedClaimedTaskActionSelectReviewerComponent, + ], + providers: [ { provide: ActivatedRoute, useValue: route }, { provide: ClaimedTaskDataService, useValue: claimedTaskDataService }, { provide: NotificationsService, useValue: notificationService }, @@ -80,9 +66,9 @@ describe('AdvancedClaimedTaskActionSelectReviewerComponent', () => { { provide: Router, useValue: router }, { provide: SearchService, useValue: searchService }, Location, - ], - schemas: [NO_ERRORS_SCHEMA] -}).compileComponents(); + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); }); beforeEach(() => { diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts index 4b12b9bd9a..4409ac74d5 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts @@ -4,15 +4,12 @@ import { } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { RequestService } from '../../../../core/data/request.service'; @@ -21,14 +18,8 @@ import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER, ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER, } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; -import { - NotificationsService, - NotificationsService, -} from '../../../notifications/notifications.service'; -import { - AdvancedClaimedTaskActionsAbstractComponent, - AdvancedClaimedTaskActionsAbstractComponent, -} from '../abstract/advanced-claimed-task-actions-abstract.component'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; /** * Advanced Workflow button that redirect to the {@link AdvancedWorkflowActionSelectReviewerComponent} diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts index fa66730981..1834aa31f1 100644 --- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts @@ -12,7 +12,6 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute, Router, - Router, } from '@angular/router'; import { NgbModal, @@ -27,10 +26,7 @@ import { of as observableOf } from 'rxjs'; import { AuthService } from '../../../core/auth/auth.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { RequestService } from '../../../core/data/request.service'; -import { - EPerson, - EPerson, -} from '../../../core/eperson/models/eperson.model'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; import { Item } from '../../../core/shared/item.model'; import { SearchService } from '../../../core/shared/search/search.service'; import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts index e3d3b89e12..be3153fc13 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts @@ -16,39 +16,19 @@ import { mergeMap, tap, } from 'rxjs/operators'; -import { - Context, - Context, -} from 'src/app/core/shared/context.model'; +import { Context } from 'src/app/core/shared/context.model'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; -import { - LinkService, - LinkService, -} from '../../../../core/cache/builders/link.service'; -import { - ObjectCacheService, - ObjectCacheService, -} from '../../../../core/cache/object-cache.service'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; +import { LinkService } from '../../../../core/cache/builders/link.service'; +import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; import { RemoteData } from '../../../../core/data/remote-data'; -import { - Item, - Item, -} from '../../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; +import { Item } from '../../../../core/shared/item.model'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../empty.util'; import { ClaimedTaskActionsComponent } from '../../../mydspace-actions/claimed-task/claimed-task-actions.component'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts index a4808a8360..ad846abae8 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts @@ -18,7 +18,6 @@ import { Context } from 'src/app/core/shared/context.model'; import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; -import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts index a8ba3289b0..3705580a2d 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts @@ -13,7 +13,6 @@ import { Context } from 'src/app/core/shared/context.model'; import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../core/cache/builders/link.service'; -import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index 11aab0c4f9..178c1bd5b9 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -9,14 +9,8 @@ import { import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; -import { - LinkService, - LinkService, -} from '../../../core/cache/builders/link.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { LinkService } from '../../../core/cache/builders/link.service'; import { Collection } from '../../../core/shared/collection.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; @@ -25,10 +19,7 @@ import { hasValue, } from '../../empty.util'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; -import { - AbstractListableElementComponent, - AbstractListableElementComponent, -} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { followLink } from '../../utils/follow-link-config.model'; /** diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts index 3287903546..c134af774e 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts @@ -9,28 +9,17 @@ import { import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; -import { - LinkService, - LinkService, -} from '../../../core/cache/builders/link.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { LinkService } from '../../../core/cache/builders/link.service'; import { Community } from '../../../core/shared/community.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; import { hasNoValue, - hasNoValue, - hasValue, hasValue, } from '../../empty.util'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; -import { - AbstractListableElementComponent, - AbstractListableElementComponent, -} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { followLink } from '../../utils/follow-link-config.model'; /** diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts index 4080759fdb..f8a40249b0 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts @@ -11,24 +11,15 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { provideMockStore } from '@ngrx/store/testing'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { AuthService } from '../../../../core/auth/auth.service'; -import { - LinkService, - LinkService, -} from '../../../../core/cache/builders/link.service'; +import { LinkService } from '../../../../core/cache/builders/link.service'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { - BitstreamFormatDataService, - BitstreamFormatDataService, -} from '../../../../core/data/bitstream-format-data.service'; +import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; import { CommunityDataService } from '../../../../core/data/community-data.service'; import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts index cb34442b70..f60d0c5454 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts @@ -11,24 +11,15 @@ import { import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { AuthService } from '../../../../core/auth/auth.service'; -import { - LinkService, - LinkService, -} from '../../../../core/cache/builders/link.service'; +import { LinkService } from '../../../../core/cache/builders/link.service'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../../../../core/cache/object-cache.service'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; -import { - BitstreamFormatDataService, - BitstreamFormatDataService, -} from '../../../../core/data/bitstream-format-data.service'; +import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; import { CommunityDataService } from '../../../../core/data/community-data.service'; import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service'; import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service'; diff --git a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts index 1f9d0b435d..baf4366fdb 100644 --- a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts +++ b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts @@ -1,15 +1,9 @@ import { Component } from '@angular/core'; -import { - Bundle, - Bundle, -} from '../../../core/shared/bundle.model'; +import { Bundle } from '../../../core/shared/bundle.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; -import { - AbstractListableElementComponent, - AbstractListableElementComponent, -} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; @Component({ selector: 'ds-bundle-list-element', diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts index c6a6fe2f1a..c03598d954 100644 --- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts +++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts @@ -5,10 +5,7 @@ import { RouterLink } from '@angular/router'; import { Collection } from '../../../core/shared/collection.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; -import { - AbstractListableElementComponent, - AbstractListableElementComponent, -} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; @Component({ selector: 'ds-collection-list-element', diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts index 9b0dc1d240..adde4420ec 100644 --- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts +++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts @@ -6,10 +6,7 @@ import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { Community } from '../../../core/shared/community.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; -import { - AbstractListableElementComponent, - AbstractListableElementComponent, -} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; @Component({ selector: 'ds-community-list-element', diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts index d077f4495e..ac5cedb530 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts @@ -8,36 +8,18 @@ import { waitForAsync, } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { - TranslateModule, - TranslateModule, -} from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../../../../config/app-config.interface'; -import { - environment, - environment, -} from '../../../../../../environments/environment'; -import { - DSONameService, - DSONameService, -} from '../../../../../core/breadcrumbs/dso-name.service'; +import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { environment } from '../../../../../../environments/environment'; +import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { Context } from '../../../../../core/shared/context.model'; import { Item } from '../../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; -import { - DSONameServiceMock, - DSONameServiceMock, -} from '../../../../mocks/dso-name.service.mock'; +import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../../mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../mocks/theme-service.mock'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts index c9d1a02b2a..7c3d869a08 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts @@ -8,41 +8,24 @@ import { } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { - Context, - Context, -} from 'src/app/core/shared/context.model'; +import { Context } from 'src/app/core/shared/context.model'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { RemoteData } from '../../../../../core/data/remote-data'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { - ClaimedTask, - ClaimedTask, -} from '../../../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model'; -import { - ClaimedTaskSearchResult, - ClaimedTaskSearchResult, -} from '../../../../object-collection/shared/claimed-task-search-result.model'; +import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../../search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; /** diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts index f0b8bea779..37e8c917b1 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts @@ -11,38 +11,21 @@ import { Observable } from 'rxjs'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { RemoteData } from '../../../../../core/data/remote-data'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { - ClaimedTask, - ClaimedTask, -} from '../../../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model'; -import { - ClaimedTaskSearchResult, - ClaimedTaskSearchResult, -} from '../../../../object-collection/shared/claimed-task-search-result.model'; +import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../../search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; /** diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts index 9e2c8ff9a0..3f243fdfb5 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts @@ -13,37 +13,20 @@ import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-colle import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { RemoteData } from '../../../../../core/data/remote-data'; -import { - Context, - Context, -} from '../../../../../core/shared/context.model'; +import { Context } from '../../../../../core/shared/context.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { - ClaimedTask, - ClaimedTask, -} from '../../../../../core/tasks/models/claimed-task-object.model'; -import { - ClaimedTaskSearchResult, - ClaimedTaskSearchResult, -} from '../../../../object-collection/shared/claimed-task-search-result.model'; +import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model'; +import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model'; import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../../search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; /** diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts index 83c0800e2f..724137987a 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts @@ -18,8 +18,6 @@ import { import { map, mergeMap, - mergeMap, - tap, tap, } from 'rxjs/operators'; @@ -35,22 +33,14 @@ import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model'; import { Context } from '../../../../core/shared/context.model'; -import { - Item, - Item, -} from '../../../../core/shared/item.model'; -import { - getFirstCompletedRemoteData, - getFirstCompletedRemoteData, -} from '../../../../core/shared/operators'; +import { Item } from '../../../../core/shared/item.model'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service'; import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { hasValue, - hasValue, - isNotEmpty, isNotEmpty, } from '../../../empty.util'; import { ClaimedTaskActionsComponent } from '../../../mydspace-actions/claimed-task/claimed-task-actions.component'; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts index 471db6a95a..7c88dcc36d 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts @@ -11,45 +11,25 @@ import { BehaviorSubject } from 'rxjs'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../core/cache/builders/link.service'; -import { - Context, - Context, -} from '../../../../core/shared/context.model'; +import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, -} from '../../../../core/shared/operators'; +import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; -import { - CollectionElementLinkType, - CollectionElementLinkType, -} from '../../../object-collection/collection-element-link.type'; -import { - ItemSearchResult, - ItemSearchResult, -} from '../../../object-collection/shared/item-search-result.model'; +import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; +import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; /** * This component renders workflowitem object for the search result in the list view. diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts index 13666db7ee..939e814372 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts @@ -9,34 +9,19 @@ import { tick, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { of as observableOf } from 'rxjs'; import { take } from 'rxjs/operators'; -import { - APP_CONFIG, - APP_CONFIG, -} from '../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; +import { APP_CONFIG } from '../../../../../config/app-config.interface'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { ItemDataService } from '../../../../core/data/item-data.service'; -import { - Context, - Context, -} from '../../../../core/shared/context.model'; +import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; -import { - DSONameServiceMock, - DSONameServiceMock, -} from '../../../mocks/dso-name.service.mock'; +import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; @@ -47,7 +32,6 @@ import { TruncatableService } from '../../../truncatable/truncatable.service'; import { WorkspaceItemSearchResultListElementComponent } from './workspace-item-search-result-list-element.component'; - let component: WorkspaceItemSearchResultListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts index f75f7eaa0b..8938064da6 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts @@ -11,42 +11,25 @@ import { BehaviorSubject } from 'rxjs'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from '../../../../../config/app-config.interface'; -import { - DSONameService, - DSONameService, -} from '../../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteDataPayload, -} from '../../../../core/shared/operators'; +import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { WorkspaceitemActionsComponent } from '../../../mydspace-actions/workspaceitem/workspaceitem-actions.component'; -import { - CollectionElementLinkType, - CollectionElementLinkType, -} from '../../../object-collection/collection-element-link.type'; -import { - ItemSearchResult, - ItemSearchResult, -} from '../../../object-collection/shared/item-search-result.model'; +import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; +import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; -import { - SearchResultListElementComponent, - SearchResultListElementComponent, -} from '../../search-result-list-element/search-result-list-element.component'; +import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; /** * This component renders workspaceitem object for the search result in the list view. diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts index ba19fb9d4b..c262dee259 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -14,10 +14,7 @@ import { map, } from 'rxjs/operators'; -import { - DSONameService, - DSONameService, -} from '../../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { LinkService } from '../../../core/cache/builders/link.service'; import { RemoteData } from '../../../core/data/remote-data'; import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts index e2c2ae69a2..afa3fb893e 100644 --- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts +++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts @@ -1,16 +1,10 @@ -import { - NO_ERRORS_SCHEMA, - NO_ERRORS_SCHEMA, -} from '@angular/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync, } from '@angular/core/testing'; -import { - By, - By, -} from '@angular/platform-browser'; +import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; @@ -18,51 +12,21 @@ import { of as observableOf } from 'rxjs'; import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { GroupDataService } from '../../../core/eperson/group-data.service'; -import { - PaginationService, - PaginationService, -} from '../../../core/pagination/pagination.service'; +import { PaginationService } from '../../../core/pagination/pagination.service'; import { LinkHeadService } from '../../../core/services/link-head.service'; -import { - Collection, - Collection, -} from '../../../core/shared/collection.model'; +import { Collection } from '../../../core/shared/collection.model'; import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { - HostWindowService, - HostWindowService, -} from '../../host-window.service'; +import { HostWindowService } from '../../host-window.service'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; -import { - createSuccessfulRemoteDataObject$, - createSuccessfulRemoteDataObject$, -} from '../../remote-data.utils'; -import { - HostWindowServiceStub, - HostWindowServiceStub, -} from '../../testing/host-window-service.stub'; -import { - ObjectSelectServiceStub, - ObjectSelectServiceStub, -} from '../../testing/object-select-service.stub'; -import { - PaginationServiceStub, - PaginationServiceStub, -} from '../../testing/pagination-service.stub'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { HostWindowServiceStub } from '../../testing/host-window-service.stub'; +import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub'; +import { PaginationServiceStub } from '../../testing/pagination-service.stub'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; -import { - createPaginatedList, - createPaginatedList, -} from '../../testing/utils.test'; -import { - ObjectSelectService, - ObjectSelectService, -} from '../object-select.service'; -import { - CollectionSelectComponent, - CollectionSelectComponent, -} from './collection-select.component'; +import { createPaginatedList } from '../../testing/utils.test'; +import { ObjectSelectService } from '../object-select.service'; +import { CollectionSelectComponent } from './collection-select.component'; describe('CollectionSelectComponent', () => { let comp: CollectionSelectComponent; diff --git a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts index e8b5d1de45..90e0f5057a 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts @@ -20,7 +20,6 @@ import { } from '../../core/cache/models/sort-options.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { EnumKeysPipe } from '../utils/enum-keys-pipe'; diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts index 8f3afa61b3..80a612aacb 100644 --- a/src/app/shared/page-size-selector/page-size-selector.component.ts +++ b/src/app/shared/page-size-selector/page-size-selector.component.ts @@ -21,7 +21,6 @@ import { import { PaginationService } from '../../core/pagination/pagination.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model'; import { SidebarDropdownComponent } from '../sidebar/sidebar-dropdown.component'; diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts index 3ed23c8052..197d7665e6 100644 --- a/src/app/shared/search/advanced-search/advanced-search.component.ts +++ b/src/app/shared/search/advanced-search/advanced-search.component.ts @@ -10,33 +10,23 @@ import { OnInit, } from '@angular/core'; import { - FormBuilder, FormBuilder, FormControl, - FormControl, - FormGroup, FormGroup, ReactiveFormsModule, Validators, - Validators, } from '@angular/forms'; import { Router } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { APP_CONFIG, - APP_CONFIG, - AppConfig, AppConfig, } from 'src/config/app-config.interface'; import { SearchService } from '../../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; -import { - slide, - slide, -} from '../../animations/slide'; +import { slide } from '../../animations/slide'; import { BrowserOnlyPipe } from '../../utils/browser-only.pipe'; @Component({ diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts index dabea2c1e2..a5d9b9119d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts @@ -45,7 +45,6 @@ import { SearchFilterService, } from '../../../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { hasNoValue, hasValue, diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index e91860bbb4..4a302ffc51 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -18,7 +18,6 @@ import { import { SearchService } from '../../../../core/shared/search/search.service'; import { SequenceService } from '../../../../core/shared/sequence.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; import { FilterType } from '../../models/filter-type.model'; import { SearchFilterConfig } from '../../models/search-filter-config.model'; diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index 37d895315b..37e2e42420 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -40,7 +40,6 @@ import { import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { RouterStub } from '../../../../testing/router.stub'; import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; import { FacetValue } from '../../../models/facet-value.model'; diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts index b36a3f8a72..ad8019fce1 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts @@ -1,60 +1,76 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; -import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { + AsyncPipe, + LowerCasePipe, + NgFor, + NgIf, +} from '@angular/common'; +import { + Component, + Inject, + OnDestroy, + OnInit, +} from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; -import { BehaviorSubject, combineLatest, Observable, Subscription, } from 'rxjs'; -import { filter, map, take, } from 'rxjs/operators'; +import { + NgbModal, + NgbModalRef, +} from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; +import { + BehaviorSubject, + combineLatest, + Observable, + Subscription, +} from 'rxjs'; +import { + filter, + map, + take, +} from 'rxjs/operators'; -import { APP_CONFIG, AppConfig, } from '../../../../../../config/app-config.interface'; +import { + APP_CONFIG, + AppConfig, +} from '../../../../../../config/app-config.interface'; import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config'; import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; import { PageInfo } from '../../../../../core/shared/page-info.model'; import { SearchService } from '../../../../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { - VocabularyEntryDetail -} from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; -import { hasValue } from '../../../../empty.util'; -import { - VocabularyTreeviewModalComponent -} from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component'; -import { FacetValue } from '../../../models/facet-value.model'; -import { SearchFilterConfig } from '../../../models/search-filter-config.model'; -import { addOperatorToFilterValue, getFacetValueForType } from '../../../search.utils'; -import { TranslateModule } from '@ngx-translate/core'; -import { FormsModule } from '@angular/forms'; -import { - FilterInputSuggestionsComponent -} from '../../../../input-suggestions/filter-suggestions/filter-input-suggestions.component'; -import { - SearchFacetOptionComponent -} from '../search-facet-filter-options/search-facet-option/search-facet-option.component'; -import { - SearchFacetSelectedOptionComponent -} from '../search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component'; -import { AsyncPipe, LowerCasePipe, NgFor, NgIf } from '@angular/common'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; import { FILTER_CONFIG, IN_PLACE_SEARCH, REFRESH_FILTER, SCOPE, - SearchFilterService - IN_PLACE_SEARCH, - REFRESH_FILTER, - SCOPE, SearchFilterService, } from '../../../../../core/shared/search/search-filter.service'; +import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; +import { hasValue } from '../../../../empty.util'; +import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component'; +import { FilterInputSuggestionsComponent } from '../../../../input-suggestions/filter-suggestions/filter-input-suggestions.component'; +import { FacetValue } from '../../../models/facet-value.model'; +import { SearchFilterConfig } from '../../../models/search-filter-config.model'; +import { + addOperatorToFilterValue, + getFacetValueForType, +} from '../../../search.utils'; +import { + facetLoad, + SearchFacetFilterComponent, +} from '../search-facet-filter/search-facet-filter.component'; +import { SearchFacetOptionComponent } from '../search-facet-filter-options/search-facet-option/search-facet-option.component'; +import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component'; @Component({ - selector: 'ds-search-hierarchy-filter', - styleUrls: ['./search-hierarchy-filter.component.scss'], - templateUrl: './search-hierarchy-filter.component.html', - animations: [facetLoad], - standalone: true, - imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule] + selector: 'ds-search-hierarchy-filter', + styleUrls: ['./search-hierarchy-filter.component.scss'], + templateUrl: './search-hierarchy-filter.component.html', + animations: [facetLoad], + standalone: true, + imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule], }) /** diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts index 71ec55c6b1..a6af76e0b6 100644 --- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts @@ -41,7 +41,6 @@ import { SearchFilterService, } from '../../../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { hasValue } from '../../../../empty.util'; import { DebounceDirective } from '../../../../utils/debounce.directive'; import { SearchFilterConfig } from '../../../models/search-filter-config.model'; diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index 88f8722c14..e81da7a865 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -16,7 +16,6 @@ import { environment } from 'src/environments/environment'; import { SearchService } from '../../../core/shared/search/search.service'; import { SearchFilterService } from '../../../core/shared/search/search-filter.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; import { SearchFiltersComponent } from './search-filters.component'; diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts index 4284ddbcf5..5ae05ef432 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts +++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts @@ -25,7 +25,6 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub'; import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; import { PaginationServiceStub } from '../../../testing/pagination-service.stub'; diff --git a/src/app/shared/search/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts index 17c82ed26e..a2f33918d8 100644 --- a/src/app/shared/search/search-labels/search-labels.component.spec.ts +++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts @@ -15,7 +15,6 @@ import { of as observableOf } from 'rxjs'; import { SearchService } from '../../../core/shared/search/search.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchServiceStub } from '../../testing/search-service.stub'; import { ObjectKeysPipe } from '../../utils/object-keys-pipe'; import { SearchLabelComponent } from './search-label/search-label.component'; diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts index 7bd982fb76..d1562b3734 100644 --- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts +++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts @@ -19,10 +19,7 @@ import { Context } from '../../../core/shared/context.model'; import { SearchService } from '../../../core/shared/search/search.service'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type'; -import { - MYDSPACE_ROUTE, - SEARCH_CONFIG_SERVICE, -} from '../../../my-dspace-page/my-dspace-page.component'; +import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { RouterStub } from '../../testing/router.stub'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts index 2339b8a912..fec23281cd 100644 --- a/src/app/shared/search/search.component.spec.ts +++ b/src/app/shared/search/search.component.spec.ts @@ -47,7 +47,6 @@ import { SortConfig, } from '../../core/shared/search/search-filters/search-config.model'; import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { HostWindowService } from '../host-window.service'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts index 1180c45563..81e258d017 100644 --- a/src/app/shared/subscriptions/subscriptions-data.service.ts +++ b/src/app/shared/subscriptions/subscriptions-data.service.ts @@ -11,10 +11,7 @@ import { } from 'rxjs/operators'; import { sendRequest } from 'src/app/core/shared/request.operators'; -import { - DSONameService, - DSONameService, -} from '../../core/breadcrumbs/dso-name.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; import { RequestParam } from '../../core/cache/models/request-param.model'; import { ObjectCacheService } from '../../core/cache/object-cache.service'; @@ -41,10 +38,7 @@ import { } from '../empty.util'; import { NotificationsService } from '../notifications/notifications.service'; import { followLink } from '../utils/follow-link-config.model'; -import { - Subscription, - Subscription, -} from './models/subscription.model'; +import { Subscription } from './models/subscription.model'; /** * Provides methods to retrieve subscription resources from the REST API related CRUD actions. diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts index ddb83328b1..c78fef0521 100644 --- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts +++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts @@ -1,7 +1,4 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; +import { CommonModule } from '@angular/common'; import { DebugElement } from '@angular/core'; import { ComponentFixture, @@ -20,10 +17,7 @@ import { AuthService } from '../../core/auth/auth.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { Collection } from '../../core/shared/collection.model'; -import { - UsageReport, - UsageReport, -} from '../../core/statistics/models/usage-report.model'; +import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts index 1dfe3ad8bf..2115150e8f 100644 --- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts +++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts @@ -2,10 +2,7 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { - Collection, - Collection, -} from '../../core/shared/collection.model'; +import { Collection } from '../../core/shared/collection.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts index 6155092275..e29e37880f 100644 --- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts +++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts @@ -1,7 +1,4 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; +import { CommonModule } from '@angular/common'; import { DebugElement } from '@angular/core'; import { ComponentFixture, @@ -20,10 +17,7 @@ import { AuthService } from '../../core/auth/auth.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { Community } from '../../core/shared/community.model'; -import { - UsageReport, - UsageReport, -} from '../../core/statistics/models/usage-report.model'; +import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { StatisticsTableComponent } from '../statistics-table/statistics-table.component'; diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts index 1580519a49..f45cef494a 100644 --- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts +++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts @@ -2,10 +2,7 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { - Community, - Community, -} from '../../core/shared/community.model'; +import { Community } from '../../core/shared/community.model'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { VarDirective } from '../../shared/utils/var.directive'; import { StatisticsPageDirective } from '../statistics-page/statistics-page.directive'; diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts index b973d2047f..06a2857d10 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts +++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts @@ -1,65 +1,63 @@ +import { CommonModule } from '@angular/common'; +import { inject } from '@angular/core'; import { - getSubmissionAccessesConfigNotChangeDiscoverableService, - getSubmissionAccessesConfigService -} from '../../../shared/mocks/section-accesses-config.service.mock'; -import { SectionAccessesService } from './section-accesses.service'; -import { SectionFormOperationsService } from '../form/section-form-operations.service'; -import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; -import { TranslateModule } from '@ngx-translate/core'; -import { - SubmissionJsonPatchOperationsService -} from '../../../core/submission/submission-json-patch-operations.service'; -import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock'; -import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; -import { - SubmissionJsonPatchOperationsServiceStub -} from '../../../shared/testing/submission-json-patch-operations-service.stub'; - -import { of as observableOf } from 'rxjs'; -import { Store } from '@ngrx/store'; -import { FormComponent } from '../../../shared/form/form.component'; + ComponentFixture, + TestBed, +} from '@angular/core/testing'; import { DynamicCheckboxModel, DynamicDatePickerModel, DynamicFormArrayModel, DynamicSelectModel, } from '@ng-dynamic-forms/core'; +import { Store } from '@ngrx/store'; +import { provideMockStore } from '@ngrx/store/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { of as observableOf } from 'rxjs'; +import { + APP_CONFIG, + APP_DATA_SERVICES_MAP, + APP_DYNAMIC_FORM_CONTROL_FN, +} from 'src/config/app-config.interface'; +import { environment } from 'src/environments/environment.test'; import { AppState } from '../../../app.reducer'; import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service'; +import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; +import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; +import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; +import { dsDynamicFormControlMapFn } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; +import { DsDynamicTypeBindRelationService } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; +import { FormComponent } from '../../../shared/form/form.component'; import { FormService } from '../../../shared/form/form.service'; import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; +import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; import { getMockFormService } from '../../../shared/mocks/form-service.mock'; +import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock'; +import { + getSubmissionAccessesConfigNotChangeDiscoverableService, + getSubmissionAccessesConfigService, +} from '../../../shared/mocks/section-accesses-config.service.mock'; import { mockAccessesFormData } from '../../../shared/mocks/submission.mock'; -import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub'; -import { provideMockStore } from '@ngrx/store/testing'; import { - DsDynamicTypeBindRelationService -} from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service'; -import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service'; -import { SubmissionService } from '../../submission.service'; -import { APP_CONFIG, APP_DATA_SERVICES_MAP, APP_DYNAMIC_FORM_CONTROL_FN } from 'src/config/app-config.interface'; -import { environment } from 'src/environments/environment.test'; -import { CommonModule } from '@angular/common'; -import { - dsDynamicFormControlMapFn -} from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; + accessConditionChangeEvent, + checkboxChangeEvent, +} from '../../../shared/testing/form-event.stub'; import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub'; +import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub'; +import { SubmissionService } from '../../submission.service'; +import { SectionFormOperationsService } from '../form/section-form-operations.service'; import { SectionsService } from '../sections.service'; import { SubmissionSectionAccessesComponent } from './section-accesses.component'; -import { TestBed } from '@angular/core/testing'; +import { SectionAccessesService } from './section-accesses.service'; -ComponentFixture, - inject, - TestBed, -} from '@angular/core/testing'; function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService { return jasmine.createSpyObj('DsDynamicTypeBindRelationService', { getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'), matchesCondition: jasmine.createSpy('matchesCondition'), - subscribeRelations: jasmine.createSpy('subscribeRelations') + subscribeRelations: jasmine.createSpy('subscribeRelations'), }); } @@ -104,32 +102,32 @@ describe('SubmissionSectionAccessesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - CommonModule, - TranslateModule.forRoot(), - SubmissionSectionAccessesComponent, - FormComponent, - ], - providers: [ - { provide: SectionsService, useValue: sectionsServiceStub }, - { provide: SubmissionAccessesConfigDataService, useValue: submissionAccessesConfigService }, - { provide: SectionAccessesService, useValue: sectionAccessesService }, - { provide: SectionFormOperationsService, useValue: sectionFormOperationsService }, - { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder }, - { provide: FormService, useValue: getMockFormService() }, - { provide: Store, useValue: storeStub }, - { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub }, - { provide: 'sectionDataProvider', useValue: sectionData }, - { provide: 'submissionIdProvider', useValue: '1508' }, - { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService()}, - { provide: SubmissionObjectDataService, useValue: {} }, - { provide: SubmissionService, useValue: {} }, - { provide: APP_CONFIG, useValue: environment }, - { provide: APP_DATA_SERVICES_MAP, useValue: {} }, - { provide: APP_DYNAMIC_FORM_CONTROL_FN, useValue: dsDynamicFormControlMapFn }, - FormBuilderService, - provideMockStore({}) - ], + imports: [ + CommonModule, + TranslateModule.forRoot(), + SubmissionSectionAccessesComponent, + FormComponent, + ], + providers: [ + { provide: SectionsService, useValue: sectionsServiceStub }, + { provide: SubmissionAccessesConfigDataService, useValue: submissionAccessesConfigService }, + { provide: SectionAccessesService, useValue: sectionAccessesService }, + { provide: SectionFormOperationsService, useValue: sectionFormOperationsService }, + { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder }, + { provide: FormService, useValue: getMockFormService() }, + { provide: Store, useValue: storeStub }, + { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub }, + { provide: 'sectionDataProvider', useValue: sectionData }, + { provide: 'submissionIdProvider', useValue: '1508' }, + { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() }, + { provide: SubmissionObjectDataService, useValue: {} }, + { provide: SubmissionService, useValue: {} }, + { provide: APP_CONFIG, useValue: environment }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, + { provide: APP_DYNAMIC_FORM_CONTROL_FN, useValue: dsDynamicFormControlMapFn }, + FormBuilderService, + provideMockStore({}), + ], }) .compileComponents(); }); @@ -200,35 +198,35 @@ describe('SubmissionSectionAccessesComponent', () => { beforeEach(async () => { formService = getMockFormService(); await TestBed.configureTestingModule({ - imports: [ - CommonModule, - TranslateModule.forRoot(), - SubmissionSectionAccessesComponent, - FormComponent, - ], - providers: [ - { provide: SectionsService, useValue: sectionsServiceStub }, - { provide: SubmissionAccessesConfigDataService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() }, - { provide: SectionAccessesService, useValue: sectionAccessesService }, - { provide: SectionFormOperationsService, useValue: sectionFormOperationsService }, - { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder }, - { provide: FormService, useValue: formService }, - { provide: Store, useValue: storeStub }, - { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub }, - { provide: 'sectionDataProvider', useValue: sectionData }, - { provide: 'submissionIdProvider', useValue: '1508' }, - { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService()}, - { provide: SubmissionObjectDataService, useValue: {} }, - { provide: SubmissionService, useValue: {} }, - { provide: APP_CONFIG, useValue: environment }, - { provide: APP_DATA_SERVICES_MAP, useValue: {} }, - { provide: APP_DYNAMIC_FORM_CONTROL_FN, useValue: dsDynamicFormControlMapFn }, - FormBuilderService, - provideMockStore({}) + imports: [ + CommonModule, + TranslateModule.forRoot(), + SubmissionSectionAccessesComponent, + FormComponent, + ], + providers: [ + { provide: SectionsService, useValue: sectionsServiceStub }, + { provide: SubmissionAccessesConfigDataService, useValue: getSubmissionAccessesConfigNotChangeDiscoverableService() }, + { provide: SectionAccessesService, useValue: sectionAccessesService }, + { provide: SectionFormOperationsService, useValue: sectionFormOperationsService }, + { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder }, + { provide: FormService, useValue: formService }, + { provide: Store, useValue: storeStub }, + { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub }, + { provide: 'sectionDataProvider', useValue: sectionData }, + { provide: 'submissionIdProvider', useValue: '1508' }, + { provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() }, + { provide: SubmissionObjectDataService, useValue: {} }, + { provide: SubmissionService, useValue: {} }, + { provide: APP_CONFIG, useValue: environment }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, + { provide: APP_DYNAMIC_FORM_CONTROL_FN, useValue: dsDynamicFormControlMapFn }, + FormBuilderService, + provideMockStore({}), ], }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index ecfbaa8d55..24488d1adb 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -36,8 +36,6 @@ import { AccessConditionOption } from '../../../../../core/config/models/config- import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model'; import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner'; import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder'; -import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model'; -import { WorkspaceitemSectionUploadObject } from '../../../../../core/submission/models/workspaceitem-section-upload.model'; import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model'; import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service'; import { dateToISOFormat } from '../../../../../shared/date.util'; diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts index fca6ea8f30..3551b7c4ea 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.ts +++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts @@ -12,10 +12,7 @@ import { ViewChild, } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { - NgbModalOptions, - NgbModalOptions, -} from '@ng-bootstrap/ng-bootstrap/modal/modal-config'; +import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config'; import { DynamicFormControlModel } from '@ng-dynamic-forms/core'; import { TranslateModule } from '@ngx-translate/core'; import { @@ -28,10 +25,7 @@ import { filter } from 'rxjs/operators'; import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model'; import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner'; import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder'; -import { - Bitstream, - Bitstream, -} from '../../../../core/shared/bitstream.model'; +import { Bitstream } from '../../../../core/shared/bitstream.model'; import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model'; import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service'; import { diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts index 89d75f33b2..f7aa9ca024 100644 --- a/src/app/suggestions-page/suggestions-page.component.ts +++ b/src/app/suggestions-page/suggestions-page.component.ts @@ -46,10 +46,7 @@ import { WorkspaceItem } from '../core/submission/models/workspaceitem.model'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { SuggestionActionsComponent } from '../notifications/suggestion-actions/suggestion-actions.component'; import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-approve-and-import'; -import { - SuggestionApproveAndImport, - SuggestionListElementComponent, -} from '../notifications/suggestion-list-element/suggestion-list-element.component'; +import { SuggestionListElementComponent } from '../notifications/suggestion-list-element/suggestion-list-element.component'; import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service'; import { SuggestionBulkResult, diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts index a9e70f7f17..b8620e7d89 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts @@ -5,30 +5,19 @@ import { } from '@angular/common'; import { Component, - Component, - OnInit, OnInit, } from '@angular/core'; import { ReactiveFormsModule, UntypedFormControl, - UntypedFormControl, UntypedFormGroup, - UntypedFormGroup, - Validators, Validators, } from '@angular/forms'; import { NgbRatingModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - RatingAdvancedWorkflowInfo, - RatingAdvancedWorkflowInfo, -} from '../../../core/tasks/models/rating-advanced-workflow-info.model'; -import { - WorkflowAction, - WorkflowAction, -} from '../../../core/tasks/models/workflow-action-object.model'; +import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model'; +import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { ModifyItemOverviewComponent } from '../../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { VarDirective } from '../../../shared/utils/var.directive'; import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index 7386658550..72f5623626 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -1,14 +1,10 @@ import { CommonModule, Location, - Location, } from '@angular/common'; import { - Component, Component, OnDestroy, - OnDestroy, - OnInit, OnInit, } from '@angular/core'; import { @@ -19,38 +15,22 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { EPersonListActionConfig } from '../../../access-control/group-registry/group-form/members-list/members-list.component'; import { RequestService } from '../../../core/data/request.service'; -import { - WorkflowActionDataService, - WorkflowActionDataService, -} from '../../../core/data/workflow-action-data.service'; +import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; import { EPerson } from '../../../core/eperson/models/eperson.model'; import { RouteService } from '../../../core/services/route.service'; import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; -import { - SelectReviewerAdvancedWorkflowInfo, - SelectReviewerAdvancedWorkflowInfo, -} from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model'; -import { - WorkflowAction, - WorkflowAction, -} from '../../../core/tasks/models/workflow-action-object.model'; +import { SelectReviewerAdvancedWorkflowInfo } from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model'; +import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; import { ModifyItemOverviewComponent } from '../../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; import { hasValue } from '../../../shared/empty.util'; -import { - NotificationsService, - NotificationsService, -} from '../../../shared/notifications/notifications.service'; -import { - AdvancedWorkflowActionComponent, - AdvancedWorkflowActionComponent, -} from '../advanced-workflow-action/advanced-workflow-action.component'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component'; import { ReviewersListComponent } from './reviewers-list/reviewers-list.component'; export const ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts index 653ffde80e..ab1494341e 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts @@ -10,10 +10,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { MockComponent } from 'ng-mocks'; import { of as observableOf } from 'rxjs'; -import { - RequestService, - RequestService, -} from '../../../core/data/request.service'; +import { RequestService } from '../../../core/data/request.service'; import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; import { RouteService } from '../../../core/services/route.service'; import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; @@ -23,10 +20,7 @@ import { DSOSelectorComponent } from '../../../shared/dso-selector/dso-selector/ import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; -import { - RequestServiceStub, - RequestServiceStub, -} from '../../../shared/testing/request-service.stub'; +import { RequestServiceStub } from '../../../shared/testing/request-service.stub'; import { routeServiceStub } from '../../../shared/testing/route-service.stub'; import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub'; import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts index a09989a97a..a12a40b52a 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts @@ -5,25 +5,17 @@ import { } from '@angular/core'; import { ActivatedRoute, - ActivatedRoute, - Router, Router, } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { - Observable, - Observable, -} from 'rxjs'; +import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { RequestService } from '../../../core/data/request.service'; import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; import { RouteService } from '../../../core/services/route.service'; import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; -import { - WorkflowItemDataService, - WorkflowItemDataService, -} from '../../../core/submission/workflowitem-data.service'; +import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts index f29278b0c1..e2c99cec5a 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts @@ -8,40 +8,22 @@ import { NO_ERRORS_SCHEMA, ViewContainerRef, } from '@angular/core'; -import { - ChangeDetectionStrategy, - Component, -} from '@angular/core'; import { ComponentFixture, - ComponentFixture, - TestBed, TestBed, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - Router, - Router, -} from '@angular/router'; +import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { getMockThemeService } from 'src/app/shared/mocks/theme-service.mock'; import { ThemeService } from 'src/app/shared/theme-support/theme.service'; import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths'; -import { - DynamicComponentLoaderDirective, - DynamicComponentLoaderDirective, -} from '../../../shared/abstract-component-loader/dynamic-component-loader.directive'; +import { DynamicComponentLoaderDirective } from '../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator'; -import { - RouterStub, - RouterStub, -} from '../../../shared/testing/router.stub'; -import { - AdvancedWorkflowActionsLoaderComponent, - AdvancedWorkflowActionsLoaderComponent, -} from './advanced-workflow-actions-loader.component'; +import { RouterStub } from '../../../shared/testing/router.stub'; +import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-actions-loader.component'; const ADVANCED_WORKFLOW_ACTION_TEST = 'testaction'; diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts index 1d9e95c14e..797146e1f2 100644 --- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts @@ -1,7 +1,6 @@ import { CommonModule, Location, - Location, } from '@angular/common'; import { Component } from '@angular/core'; import { @@ -11,14 +10,10 @@ import { import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { - RequestService, - RequestService, -} from '../../core/data/request.service'; +import { RequestService } from '../../core/data/request.service'; import { RouteService } from '../../core/services/route.service'; import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { ModifyItemOverviewComponent } from '../../item-page/edit-item-page/modify-item-overview/modify-item-overview.component'; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts index 5deb449745..ea3ee4ae42 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts @@ -16,27 +16,16 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService, - TranslateService, } from '@ngx-translate/core'; import { map, - map, - Observable, Observable, switchMap, - switchMap, - take, take, } from 'rxjs'; -import { - RemoteData, - RemoteData, -} from '../../core/data/remote-data'; -import { - RouteService, - RouteService, -} from '../../core/services/route.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { RouteService } from '../../core/services/route.service'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { NoContent } from '../../core/shared/NoContent.model'; import { diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index 24b17d6c1f..d1a2d7d2d7 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -37,10 +37,7 @@ import { coreEffects } from '../../app/core/core.effects'; import { coreReducers } from '../../app/core/core.reducers'; import { CoreState } from '../../app/core/core-state.model'; import { LocaleService } from '../../app/core/locale/locale.service'; -import { - BrowserReferrerService, - BrowserReferrerService, -} from '../../app/core/services/browser.referrer.service'; +import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service'; import { BrowserHardRedirectService, locationProvider, @@ -49,10 +46,7 @@ import { import { ClientCookieService } from '../../app/core/services/client-cookie.service'; import { CookieService } from '../../app/core/services/cookie.service'; import { HardRedirectService } from '../../app/core/services/hard-redirect.service'; -import { - ReferrerService, - ReferrerService, -} from '../../app/core/services/referrer.service'; +import { ReferrerService } from '../../app/core/services/referrer.service'; import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service'; import { KlaroService } from '../../app/shared/cookies/klaro.service'; import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service'; diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 8b3577c790..4de5687d04 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -1,7 +1,4 @@ -import { - XhrFactory, - XhrFactory, -} from '@angular/common'; +import { XhrFactory } from '@angular/common'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { @@ -44,20 +41,11 @@ import { LocaleService } from '../../app/core/locale/locale.service'; import { ServerLocaleService } from '../../app/core/locale/server-locale.service'; import { CookieService } from '../../app/core/services/cookie.service'; import { HardRedirectService } from '../../app/core/services/hard-redirect.service'; -import { - ReferrerService, - ReferrerService, -} from '../../app/core/services/referrer.service'; -import { - ServerReferrerService, - ServerReferrerService, -} from '../../app/core/services/server.referrer.service'; +import { ReferrerService } from '../../app/core/services/referrer.service'; +import { ServerReferrerService } from '../../app/core/services/server.referrer.service'; import { ServerCookieService } from '../../app/core/services/server-cookie.service'; import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service'; -import { - ServerXhrService, - ServerXhrService, -} from '../../app/core/services/server-xhr.service'; +import { ServerXhrService } from '../../app/core/services/server-xhr.service'; import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock'; import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock'; import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts index ada22abcef..00c02fb728 100644 --- a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts +++ b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts @@ -4,17 +4,12 @@ import { } from '@angular/common'; import { ChangeDetectionStrategy, - ChangeDetectionStrategy, - Component, Component, } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { - EditBitstreamPageComponent as BaseComponent, - EditBitstreamPageComponent as BaseComponent, -} from '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; +import { EditBitstreamPageComponent as BaseComponent } from '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; import { ErrorComponent } from '../../../../../app/shared/error/error.component'; import { FormComponent } from '../../../../../app/shared/form/form.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 90846daf5f..3dcec71730 100644 --- a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -6,10 +6,7 @@ import { import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { - DsoEditMetadataComponent as BaseComponent, - DsoEditMetadataComponent as BaseComponent, -} from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component'; +import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component'; import { DsoEditMetadataFieldValuesComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component'; import { DsoEditMetadataHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component'; import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component'; diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts index a8a005447a..736bf8e7b6 100644 --- a/src/themes/custom/app/search-page/configuration-search-page.component.ts +++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts @@ -10,16 +10,9 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component'; -import { - ConfigurationSearchPageComponent as BaseComponent, - ConfigurationSearchPageComponent as BaseComponent, -} from '../../../../app/search-page/configuration-search-page.component'; -import { - pushInOut, - pushInOut, -} from '../../../../app/shared/animations/push'; +import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component'; +import { pushInOut } from '../../../../app/shared/animations/push'; import { SearchLabelsComponent } from '../../../../app/shared/search/search-labels/search-labels.component'; import { ThemedSearchResultsComponent } from '../../../../app/shared/search/search-results/themed-search-results.component'; import { ThemedSearchSidebarComponent } from '../../../../app/shared/search/search-sidebar/themed-search-sidebar.component'; diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts index 0ab321e45a..a0a0bd5fab 100644 --- a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -1,11 +1,18 @@ +import { + AsyncPipe, + NgFor, + NgIf, +} from '@angular/common'; import { Component } from '@angular/core'; -import { AsyncPipe, NgFor, NgIf } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; +import { + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; +import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { CollectionDropdownComponent as BaseComponent } from '../../../../../app/shared/collection-dropdown/collection-dropdown.component'; +import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; @Component({ selector: 'ds-collection-dropdown', @@ -13,9 +20,8 @@ import { CollectionDropdownComponent as BaseComponent } from '../../../../../app // templateUrl: './collection-dropdown.component.html', styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'], // styleUrls: ['./collection-dropdown.component.scss'] - , standalone: true, - imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule] + imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule], }) export class CollectionDropdownComponent extends BaseComponent { diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index 454de8a4f4..20eb34e7a9 100644 --- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -5,23 +5,14 @@ import { import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../../../../../app/core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component'; import { fadeIn, - fadeIn, - fadeInOut, fadeInOut, } from '../../../../../../../../../app/shared/animations/fade'; import { ErrorComponent } from '../../../../../../../../../app/shared/error/error.component'; -import { - DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent, - DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent, -} from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; +import { DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; import { ThemedLoadingComponent } from '../../../../../../../../../app/shared/loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../../../../../../app/shared/object-collection/object-collection.component'; import { PageSizeSelectorComponent } from '../../../../../../../../../app/shared/page-size-selector/page-size-selector.component'; diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index 4bda10d1c7..0a27a05cf9 100644 --- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -6,16 +6,9 @@ import { Component } from '@angular/core'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { - SearchConfigurationService, - SearchConfigurationService, -} from '../../../../../../../../../app/core/shared/search/search-configuration.service'; +import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component'; -import { - DsDynamicLookupRelationSearchTabComponent as BaseComponent, - DsDynamicLookupRelationSearchTabComponent as BaseComponent, -} from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; +import { DsDynamicLookupRelationSearchTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; import { ThemedSearchComponent } from '../../../../../../../../../app/shared/search/themed-search.component'; import { VarDirective } from '../../../../../../../../../app/shared/utils/var.directive'; diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts index 19c324a152..d99499e1b7 100644 --- a/src/themes/custom/app/shared/loading/loading.component.ts +++ b/src/themes/custom/app/shared/loading/loading.component.ts @@ -3,13 +3,12 @@ import { Component } from '@angular/core'; import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component'; @Component({ - selector: 'ds-loading', - styleUrls: ['../../../../../app/shared/loading/loading.component.scss'], - // styleUrls: ['./loading.component.scss'], + selector: 'ds-loading', + styleUrls: ['../../../../../app/shared/loading/loading.component.scss'], + // styleUrls: ['./loading.component.scss'], templateUrl: '../../../../../app/shared/loading/loading.component.html', - // templateUrl: './loading.component.html' - , - standalone: true + // templateUrl: './loading.component.html' + standalone: true, }) export class LoadingComponent extends BaseComponent { diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts index 4ca6776ab4..7c8fab5dda 100644 --- a/src/themes/custom/eager-theme.module.ts +++ b/src/themes/custom/eager-theme.module.ts @@ -1,21 +1,12 @@ -import { - CommonModule, - CommonModule, -} from '@angular/common'; +import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ItemPageModule } from '../../app/item-page/item-page.module'; import { ItemSharedModule } from '../../app/item-page/item-shared.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { RootModule } from '../../app/root.module'; -import { - SharedBrowseByModule, - SharedBrowseByModule, -} from '../../app/shared/browse-by/shared-browse-by.module'; -import { - DsoPageModule, - DsoPageModule, -} from '../../app/shared/dso-page/dso-page.module'; +import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module'; +import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module'; import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component'; import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component'; import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component'; @@ -23,21 +14,12 @@ import { PersonComponent } from './app/entity-groups/research-entities/item-page import { FooterComponent } from './app/footer/footer.component'; import { HeaderComponent } from './app/header/header.component'; import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component'; -import { - HomeNewsComponent, - HomeNewsComponent, -} from './app/home-page/home-news/home-news.component'; +import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component'; import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component'; import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component'; -import { - NavbarComponent, - NavbarComponent, -} from './app/navbar/navbar.component'; -import { - SearchNavbarComponent, - SearchNavbarComponent, -} from './app/search-navbar/search-navbar.component'; +import { NavbarComponent } from './app/navbar/navbar.component'; +import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component'; import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component'; import { CreateCollectionParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; import { CreateCommunityParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts index 6dfcb64719..4f96c1a110 100644 --- a/src/themes/dspace/eager-theme.module.ts +++ b/src/themes/dspace/eager-theme.module.ts @@ -2,27 +2,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { NavbarModule } from '../../app/navbar/navbar.module'; -import { - RootModule, - RootModule, -} from '../../app/root.module'; +import { RootModule } from '../../app/root.module'; import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module'; -import { - HeaderComponent, - HeaderComponent, -} from './app/header/header.component'; -import { - HeaderNavbarWrapperComponent, - HeaderNavbarWrapperComponent, -} from './app/header-nav-wrapper/header-navbar-wrapper.component'; -import { - HomeNewsComponent, - HomeNewsComponent, -} from './app/home-page/home-news/home-news.component'; -import { - NavbarComponent, - NavbarComponent, -} from './app/navbar/navbar.component'; +import { HeaderComponent } from './app/header/header.component'; +import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component'; +import { HomeNewsComponent } from './app/home-page/home-news/home-news.component'; +import { NavbarComponent } from './app/navbar/navbar.component'; /** * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.