mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
[DURACOM-191] fix lint errors manually and automatically
This commit is contained in:
@@ -1,9 +1,6 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import {
|
import { AbstractControl } from '@angular/forms';
|
||||||
AbstractControl,
|
|
||||||
AbstractControl,
|
|
||||||
} from '@angular/forms';
|
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {
|
import {
|
||||||
|
@@ -17,14 +17,10 @@ import { TranslateModule } from '@ngx-translate/core';
|
|||||||
import { NgxPaginationModule } from 'ngx-pagination';
|
import { NgxPaginationModule } from 'ngx-pagination';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
BehaviorSubject,
|
|
||||||
Subscription,
|
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
distinctUntilChanged,
|
distinctUntilChanged,
|
||||||
distinctUntilChanged,
|
|
||||||
map,
|
|
||||||
map,
|
map,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
@@ -34,24 +30,14 @@ import {
|
|||||||
} from '../../../core/data/paginated-list.model';
|
} from '../../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PageInfo } from '../../../core/shared/page-info.model';
|
import { PageInfo } from '../../../core/shared/page-info.model';
|
||||||
import {
|
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
|
||||||
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-configuration.service';
|
||||||
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
|
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
|
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 { 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 { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
|
||||||
import {
|
import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
|
||||||
SelectableListState,
|
import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
|
||||||
SelectableListState,
|
|
||||||
} from '../../../shared/object-list/selectable-list/selectable-list.reducer';
|
|
||||||
import {
|
|
||||||
SelectableListService,
|
|
||||||
SelectableListService,
|
|
||||||
} from '../../../shared/object-list/selectable-list/selectable-list.service';
|
|
||||||
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
||||||
|
@@ -1,7 +1,4 @@
|
|||||||
import {
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
} from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
|
@@ -30,26 +30,17 @@ import {
|
|||||||
of as observableOf,
|
of as observableOf,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
|
|
||||||
import {
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
AuthorizationDataService,
|
|
||||||
AuthorizationDataService,
|
|
||||||
} from '../../core/data/feature-authorization/authorization-data.service';
|
|
||||||
import { FindListOptions } from '../../core/data/find-list-options.model';
|
import { FindListOptions } from '../../core/data/find-list-options.model';
|
||||||
import {
|
import {
|
||||||
buildPaginatedList,
|
buildPaginatedList,
|
||||||
PaginatedList,
|
PaginatedList,
|
||||||
} from '../../core/data/paginated-list.model';
|
} from '../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import {
|
import { RequestService } from '../../core/data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../../core/data/request.service';
|
|
||||||
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
|
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
|
||||||
import { EPerson } from '../../core/eperson/models/eperson.model';
|
import { EPerson } from '../../core/eperson/models/eperson.model';
|
||||||
import {
|
import { PaginationService } from '../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../core/pagination/pagination.service';
|
|
||||||
import { PageInfo } from '../../core/shared/page-info.model';
|
import { PageInfo } from '../../core/shared/page-info.model';
|
||||||
import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
@@ -158,7 +149,7 @@ describe('EPeopleRegistryComponent', () => {
|
|||||||
builderService = getMockFormBuilderService();
|
builderService = getMockFormBuilderService();
|
||||||
|
|
||||||
paginationService = new PaginationServiceStub();
|
paginationService = new PaginationServiceStub();
|
||||||
awaitTestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
|
imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
|
||||||
TranslateModule.forRoot(), EPeopleRegistryComponent],
|
TranslateModule.forRoot(), EPeopleRegistryComponent],
|
||||||
providers: [
|
providers: [
|
||||||
|
@@ -17,10 +17,7 @@ import {
|
|||||||
Router,
|
Router,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
NgbModal,
|
|
||||||
NgbModal,
|
|
||||||
} from '@ng-bootstrap/ng-bootstrap';
|
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
@@ -37,55 +34,26 @@ import {
|
|||||||
take,
|
take,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
DSONameService,
|
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
||||||
} 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 {
|
import {
|
||||||
buildPaginatedList,
|
buildPaginatedList,
|
||||||
PaginatedList,
|
PaginatedList,
|
||||||
} from '../../core/data/paginated-list.model';
|
} from '../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import {
|
import { RequestService } from '../../core/data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../../core/data/request.service';
|
|
||||||
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
|
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
|
||||||
import { EPerson } from '../../core/eperson/models/eperson.model';
|
import { EPerson } from '../../core/eperson/models/eperson.model';
|
||||||
import {
|
import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
|
||||||
EpersonDtoModel,
|
import { PaginationService } from '../../core/pagination/pagination.service';
|
||||||
EpersonDtoModel,
|
import { NoContent } from '../../core/shared/NoContent.model';
|
||||||
} from '../../core/eperson/models/eperson-dto.model';
|
|
||||||
import {
|
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../core/pagination/pagination.service';
|
|
||||||
import {
|
|
||||||
NoContent,
|
|
||||||
NoContent,
|
|
||||||
} from '../../core/shared/NoContent.model';
|
|
||||||
import {
|
import {
|
||||||
getAllSucceededRemoteData,
|
getAllSucceededRemoteData,
|
||||||
getAllSucceededRemoteData,
|
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
} from '../../core/shared/operators';
|
} from '../../core/shared/operators';
|
||||||
import {
|
import { PageInfo } from '../../core/shared/page-info.model';
|
||||||
PageInfo,
|
import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
|
||||||
PageInfo,
|
|
||||||
} from '../../core/shared/page-info.model';
|
|
||||||
import {
|
|
||||||
ConfirmationModalComponent,
|
|
||||||
ConfirmationModalComponent,
|
|
||||||
} from '../../shared/confirmation-modal/confirmation-modal.component';
|
|
||||||
import { hasValue } from '../../shared/empty.util';
|
import { hasValue } from '../../shared/empty.util';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
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 { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||||
import {
|
import {
|
||||||
getEPersonEditRoute,
|
getEPersonEditRoute,
|
||||||
getEPersonEditRoute,
|
|
||||||
getEPersonsRoute,
|
|
||||||
getEPersonsRoute,
|
getEPersonsRoute,
|
||||||
} from '../access-control-routing-paths';
|
} from '../access-control-routing-paths';
|
||||||
import { EPersonFormComponent } from './eperson-form/eperson-form.component';
|
import { EPersonFormComponent } from './eperson-form/eperson-form.component';
|
||||||
|
@@ -18,8 +18,6 @@ import {
|
|||||||
} from '@angular/platform-browser';
|
} from '@angular/platform-browser';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
@@ -33,31 +31,19 @@ import {
|
|||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
|
|
||||||
import { AuthService } from '../../../core/auth/auth.service';
|
import { AuthService } from '../../../core/auth/auth.service';
|
||||||
import {
|
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
|
||||||
EpersonRegistrationService,
|
|
||||||
EpersonRegistrationService,
|
|
||||||
} from '../../../core/data/eperson-registration.service';
|
|
||||||
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import {
|
import { FindListOptions } from '../../../core/data/find-list-options.model';
|
||||||
FindListOptions,
|
|
||||||
FindListOptions,
|
|
||||||
} from '../../../core/data/find-list-options.model';
|
|
||||||
import {
|
import {
|
||||||
buildPaginatedList,
|
buildPaginatedList,
|
||||||
PaginatedList,
|
PaginatedList,
|
||||||
} from '../../../core/data/paginated-list.model';
|
} from '../../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import {
|
import { RequestService } from '../../../core/data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../../../core/data/request.service';
|
|
||||||
import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
|
import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
|
||||||
import { GroupDataService } from '../../../core/eperson/group-data.service';
|
import { GroupDataService } from '../../../core/eperson/group-data.service';
|
||||||
import { EPerson } from '../../../core/eperson/models/eperson.model';
|
import { EPerson } from '../../../core/eperson/models/eperson.model';
|
||||||
import {
|
import { PaginationService } from '../../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../../core/pagination/pagination.service';
|
|
||||||
import { PageInfo } from '../../../core/shared/page-info.model';
|
import { PageInfo } from '../../../core/shared/page-info.model';
|
||||||
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
|
||||||
import { FormComponent } from '../../../shared/form/form.component';
|
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 { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
||||||
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
|
||||||
import {
|
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
|
||||||
ActivatedRouteStub,
|
|
||||||
ActivatedRouteStub,
|
|
||||||
} from '../../../shared/testing/active-router.stub';
|
|
||||||
import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
|
import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
|
||||||
import {
|
import {
|
||||||
EPersonMock,
|
EPersonMock,
|
||||||
EPersonMock,
|
|
||||||
EPersonMock2,
|
|
||||||
EPersonMock2,
|
EPersonMock2,
|
||||||
} from '../../../shared/testing/eperson.mock';
|
} from '../../../shared/testing/eperson.mock';
|
||||||
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
||||||
import {
|
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
||||||
PaginationServiceStub,
|
import { RouterStub } from '../../../shared/testing/router.stub';
|
||||||
PaginationServiceStub,
|
|
||||||
} from '../../../shared/testing/pagination-service.stub';
|
|
||||||
import {
|
|
||||||
RouterStub,
|
|
||||||
RouterStub,
|
|
||||||
} from '../../../shared/testing/router.stub';
|
|
||||||
import { createPaginatedList } from '../../../shared/testing/utils.test';
|
import { createPaginatedList } from '../../../shared/testing/utils.test';
|
||||||
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
|
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
|
||||||
import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
|
import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
|
||||||
import { EPeopleRegistryComponent } from '../epeople-registry.component';
|
import { EPeopleRegistryComponent } from '../epeople-registry.component';
|
||||||
import {
|
import { EPersonFormComponent } from './eperson-form.component';
|
||||||
EPersonFormComponent,
|
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
|
||||||
EPersonFormComponent,
|
|
||||||
} from './eperson-form.component';
|
|
||||||
import {
|
|
||||||
ValidateEmailNotTaken,
|
|
||||||
ValidateEmailNotTaken,
|
|
||||||
} from './validators/email-taken.validator';
|
|
||||||
|
|
||||||
describe('EPersonFormComponent', () => {
|
describe('EPersonFormComponent', () => {
|
||||||
let component: EPersonFormComponent;
|
let component: EPersonFormComponent;
|
||||||
|
@@ -14,8 +14,6 @@ import {
|
|||||||
import { UntypedFormGroup } from '@angular/forms';
|
import { UntypedFormGroup } from '@angular/forms';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
@@ -45,14 +43,8 @@ import {
|
|||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { AuthService } from '../../../core/auth/auth.service';
|
import { AuthService } from '../../../core/auth/auth.service';
|
||||||
import {
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
|
||||||
DSONameService,
|
|
||||||
} from '../../../core/breadcrumbs/dso-name.service';
|
|
||||||
import {
|
|
||||||
EpersonRegistrationService,
|
|
||||||
EpersonRegistrationService,
|
|
||||||
} from '../../../core/data/eperson-registration.service';
|
|
||||||
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
@@ -70,14 +62,8 @@ import {
|
|||||||
getRemoteDataPayload,
|
getRemoteDataPayload,
|
||||||
} from '../../../core/shared/operators';
|
} from '../../../core/shared/operators';
|
||||||
import { PageInfo } from '../../../core/shared/page-info.model';
|
import { PageInfo } from '../../../core/shared/page-info.model';
|
||||||
import {
|
import { Registration } from '../../../core/shared/registration.model';
|
||||||
Registration,
|
import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
|
||||||
Registration,
|
|
||||||
} from '../../../core/shared/registration.model';
|
|
||||||
import {
|
|
||||||
TYPE_REQUEST_FORGOT,
|
|
||||||
TYPE_REQUEST_FORGOT,
|
|
||||||
} from '../../../register-email-form/register-email-form.component';
|
|
||||||
import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
|
import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
|
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 { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
||||||
import { getEPersonsRoute } from '../../access-control-routing-paths';
|
import { getEPersonsRoute } from '../../access-control-routing-paths';
|
||||||
import {
|
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
|
||||||
ValidateEmailNotTaken,
|
|
||||||
ValidateEmailNotTaken,
|
|
||||||
} from './validators/email-taken.validator';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-eperson-form',
|
selector: 'ds-eperson-form',
|
||||||
|
@@ -1,19 +1,14 @@
|
|||||||
import {
|
import {
|
||||||
Location,
|
|
||||||
Location,
|
Location,
|
||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import {
|
import { Router } from '@angular/router';
|
||||||
Router,
|
|
||||||
Router,
|
|
||||||
} from '@angular/router';
|
|
||||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import { UiSwitchModule } from 'ngx-ui-switch';
|
import { UiSwitchModule } from 'ngx-ui-switch';
|
||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
@@ -21,8 +16,6 @@ import { take } from 'rxjs/operators';
|
|||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import {
|
||||||
BATCH_IMPORT_SCRIPT_NAME,
|
BATCH_IMPORT_SCRIPT_NAME,
|
||||||
BATCH_IMPORT_SCRIPT_NAME,
|
|
||||||
ScriptDataService,
|
|
||||||
ScriptDataService,
|
ScriptDataService,
|
||||||
} from '../../core/data/processes/script-data.service';
|
} from '../../core/data/processes/script-data.service';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
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 { getFirstCompletedRemoteData } from '../../core/shared/operators';
|
||||||
import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
|
import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
|
||||||
import { Process } from '../../process-page/processes/process.model';
|
import { Process } from '../../process-page/processes/process.model';
|
||||||
import {
|
import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
|
||||||
ProcessParameter,
|
|
||||||
ProcessParameter,
|
|
||||||
} from '../../process-page/processes/process-parameter.model';
|
|
||||||
import { ImportBatchSelectorComponent } from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
|
import { ImportBatchSelectorComponent } from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
|
||||||
import {
|
import {
|
||||||
isEmpty,
|
isEmpty,
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../shared/empty.util';
|
} from '../../shared/empty.util';
|
||||||
import {
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../shared/notifications/notifications.service';
|
|
||||||
import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
|
import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -60,6 +60,7 @@ describe('LdnServicesOverviewComponent', () => {
|
|||||||
{
|
{
|
||||||
provide: NgbModal, useValue: {
|
provide: NgbModal, useValue: {
|
||||||
open: () => {
|
open: () => {
|
||||||
|
//
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@@ -21,8 +21,6 @@ import { getMockFormService } from '../../../../shared/mocks/form-service.mock';
|
|||||||
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
||||||
import {
|
import {
|
||||||
createFailedRemoteDataObject$,
|
createFailedRemoteDataObject$,
|
||||||
createFailedRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
createSuccessfulRemoteDataObject$,
|
||||||
} from '../../../../shared/remote-data.utils';
|
} from '../../../../shared/remote-data.utils';
|
||||||
import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
|
||||||
|
@@ -3,27 +3,14 @@ import { Router } from '@angular/router';
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
|
||||||
BitstreamFormatDataService,
|
|
||||||
BitstreamFormatDataService,
|
|
||||||
} from '../../../../core/data/bitstream-format-data.service';
|
|
||||||
import { RemoteData } from '../../../../core/data/remote-data';
|
import { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import {
|
import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
|
||||||
BitstreamFormat,
|
|
||||||
BitstreamFormat,
|
|
||||||
} from '../../../../core/shared/bitstream-format.model';
|
|
||||||
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
|
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
|
||||||
import {
|
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
|
||||||
NotificationsService,
|
|
||||||
} from '../../../../shared/notifications/notifications.service';
|
|
||||||
import {
|
|
||||||
getBitstreamFormatsModuleRoute,
|
|
||||||
getBitstreamFormatsModuleRoute,
|
|
||||||
} from '../../admin-registries-routing-paths';
|
|
||||||
import { FormatFormComponent } from '../format-form/format-form.component';
|
import { FormatFormComponent } from '../format-form/format-form.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -4,11 +4,8 @@ import {
|
|||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
@@ -22,7 +19,6 @@ import {
|
|||||||
hot,
|
hot,
|
||||||
} from 'jasmine-marbles';
|
} from 'jasmine-marbles';
|
||||||
import {
|
import {
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
of as observableOf,
|
||||||
of,
|
of,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
@@ -49,10 +45,7 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications-
|
|||||||
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
|
||||||
import { createPaginatedList } from '../../../shared/testing/utils.test';
|
import { createPaginatedList } from '../../../shared/testing/utils.test';
|
||||||
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
|
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
|
||||||
import {
|
import { BitstreamFormatsComponent } from './bitstream-formats.component';
|
||||||
BitstreamFormatsComponent,
|
|
||||||
BitstreamFormatsComponent,
|
|
||||||
} from './bitstream-formats.component';
|
|
||||||
|
|
||||||
describe('BitstreamFormatsComponent', () => {
|
describe('BitstreamFormatsComponent', () => {
|
||||||
let comp: BitstreamFormatsComponent;
|
let comp: BitstreamFormatsComponent;
|
||||||
|
@@ -4,77 +4,41 @@ import {
|
|||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
|
||||||
Component,
|
Component,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
combineLatest as observableCombineLatest,
|
|
||||||
Observable,
|
|
||||||
Observable,
|
Observable,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
map,
|
map,
|
||||||
map,
|
|
||||||
mergeMap,
|
|
||||||
mergeMap,
|
mergeMap,
|
||||||
switchMap,
|
switchMap,
|
||||||
switchMap,
|
|
||||||
take,
|
take,
|
||||||
take,
|
|
||||||
toArray,
|
|
||||||
toArray,
|
toArray,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
|
||||||
BitstreamFormatDataService,
|
|
||||||
BitstreamFormatDataService,
|
|
||||||
} from '../../../core/data/bitstream-format-data.service';
|
|
||||||
import { FindListOptions } from '../../../core/data/find-list-options.model';
|
import { FindListOptions } from '../../../core/data/find-list-options.model';
|
||||||
import {
|
import { PaginatedList } from '../../../core/data/paginated-list.model';
|
||||||
PaginatedList,
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
PaginatedList,
|
import { PaginationService } from '../../../core/pagination/pagination.service';
|
||||||
} from '../../../core/data/paginated-list.model';
|
import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
|
||||||
import {
|
import { NoContent } from '../../../core/shared/NoContent.model';
|
||||||
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 { getFirstCompletedRemoteData } from '../../../core/shared/operators';
|
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
|
||||||
import {
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../../shared/notifications/notifications.service';
|
|
||||||
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
import { PaginationComponent } from '../../../shared/pagination/pagination.component';
|
||||||
import {
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
PaginationComponentOptions,
|
|
||||||
PaginationComponentOptions,
|
|
||||||
} from '../../../shared/pagination/pagination-component-options.model';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This component renders a list of bitstream formats
|
* This component renders a list of bitstream formats
|
||||||
|
@@ -10,7 +10,6 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
@@ -18,10 +17,7 @@ import { map } from 'rxjs/operators';
|
|||||||
import { 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 { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
|
import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
|
||||||
import {
|
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
} from '../../../../core/shared/operators';
|
|
||||||
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
||||||
import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
|
import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
|
||||||
import { FormatFormComponent } from '../format-form/format-form.component';
|
import { FormatFormComponent } from '../format-form/format-form.component';
|
||||||
|
@@ -6,10 +6,7 @@ import {
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import {
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
TranslateModule,
|
|
||||||
TranslateModule,
|
|
||||||
} from '@ngx-translate/core';
|
|
||||||
|
|
||||||
import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
|
import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
|
||||||
import { AuthService } from '../../../../../core/auth/auth.service';
|
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 { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
|
||||||
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
|
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
|
||||||
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
|
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
|
||||||
import {
|
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
|
||||||
TruncatableService,
|
import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
|
||||||
TruncatableService,
|
|
||||||
} from '../../../../../shared/truncatable/truncatable.service';
|
|
||||||
import {
|
|
||||||
CollectionAdminSearchResultGridElementComponent,
|
|
||||||
CollectionAdminSearchResultGridElementComponent,
|
|
||||||
} from './collection-admin-search-result-grid-element.component';
|
|
||||||
|
|
||||||
describe('CollectionAdminSearchResultGridElementComponent', () => {
|
describe('CollectionAdminSearchResultGridElementComponent', () => {
|
||||||
let component: CollectionAdminSearchResultGridElementComponent;
|
let component: CollectionAdminSearchResultGridElementComponent;
|
||||||
|
@@ -1,23 +1,14 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
|
|
||||||
import {
|
import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
|
||||||
getCollectionEditRoute,
|
import { Collection } from '../../../../../core/shared/collection.model';
|
||||||
getCollectionEditRoute,
|
|
||||||
} from '../../../../../collection-page/collection-page-routing-paths';
|
|
||||||
import {
|
|
||||||
Collection,
|
|
||||||
Collection,
|
|
||||||
} from '../../../../../core/shared/collection.model';
|
|
||||||
import { Context } from '../../../../../core/shared/context.model';
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.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 { 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 { CollectionSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
|
||||||
import {
|
import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
|
||||||
SearchResultGridElementComponent,
|
|
||||||
SearchResultGridElementComponent,
|
|
||||||
} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
|
|
||||||
|
|
||||||
@listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
|
@listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -25,10 +25,7 @@ import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub
|
|||||||
import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
|
import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
|
||||||
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
|
import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
|
||||||
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
|
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
|
||||||
import {
|
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
|
||||||
TruncatableService,
|
|
||||||
TruncatableService,
|
|
||||||
} from '../../../../../shared/truncatable/truncatable.service';
|
|
||||||
import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
|
import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
|
||||||
|
|
||||||
describe('CommunityAdminSearchResultGridElementComponent', () => {
|
describe('CommunityAdminSearchResultGridElementComponent', () => {
|
||||||
|
@@ -1,23 +1,14 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
|
|
||||||
import {
|
import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
|
||||||
getCommunityEditRoute,
|
import { Community } from '../../../../../core/shared/community.model';
|
||||||
getCommunityEditRoute,
|
|
||||||
} from '../../../../../community-page/community-page-routing-paths';
|
|
||||||
import {
|
|
||||||
Community,
|
|
||||||
Community,
|
|
||||||
} from '../../../../../core/shared/community.model';
|
|
||||||
import { Context } from '../../../../../core/shared/context.model';
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.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 { 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 { CommunitySearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
|
||||||
import {
|
import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
|
||||||
SearchResultGridElementComponent,
|
|
||||||
SearchResultGridElementComponent,
|
|
||||||
} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
|
|
||||||
|
|
||||||
@listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
|
@listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -2,32 +2,14 @@ import { Component } from '@angular/core';
|
|||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
|
||||||
getCollectionEditRoute,
|
import { Collection } from '../../../../../core/shared/collection.model';
|
||||||
getCollectionEditRoute,
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
} from '../../../../../collection-page/collection-page-routing-paths';
|
|
||||||
import {
|
|
||||||
Collection,
|
|
||||||
Collection,
|
|
||||||
} from '../../../../../core/shared/collection.model';
|
|
||||||
import {
|
|
||||||
Context,
|
|
||||||
Context,
|
|
||||||
} from '../../../../../core/shared/context.model';
|
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import {
|
import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
|
||||||
CollectionSearchResult,
|
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||||
CollectionSearchResult,
|
|
||||||
} from '../../../../../shared/object-collection/shared/collection-search-result.model';
|
|
||||||
import {
|
|
||||||
listableObjectComponent,
|
|
||||||
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 { CollectionSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
|
||||||
import {
|
import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
|
||||||
SearchResultListElementComponent,
|
|
||||||
SearchResultListElementComponent,
|
|
||||||
} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
|
|
||||||
|
|
||||||
@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
|
@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -2,32 +2,14 @@ import { Component } from '@angular/core';
|
|||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
|
||||||
getCommunityEditRoute,
|
import { Community } from '../../../../../core/shared/community.model';
|
||||||
getCommunityEditRoute,
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
} from '../../../../../community-page/community-page-routing-paths';
|
|
||||||
import {
|
|
||||||
Community,
|
|
||||||
Community,
|
|
||||||
} from '../../../../../core/shared/community.model';
|
|
||||||
import {
|
|
||||||
Context,
|
|
||||||
Context,
|
|
||||||
} from '../../../../../core/shared/context.model';
|
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import {
|
import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
|
||||||
CommunitySearchResult,
|
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||||
CommunitySearchResult,
|
|
||||||
} from '../../../../../shared/object-collection/shared/community-search-result.model';
|
|
||||||
import {
|
|
||||||
listableObjectComponent,
|
|
||||||
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 { CommunitySearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
|
||||||
import {
|
import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
|
||||||
SearchResultListElementComponent,
|
|
||||||
SearchResultListElementComponent,
|
|
||||||
} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
|
|
||||||
|
|
||||||
@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
|
@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -1,16 +1,10 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
import {
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
Context,
|
|
||||||
Context,
|
|
||||||
} from '../../../../../core/shared/context.model';
|
|
||||||
import { Item } from '../../../../../core/shared/item.model';
|
import { Item } from '../../../../../core/shared/item.model';
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
|
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
|
||||||
import {
|
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||||
listableObjectComponent,
|
|
||||||
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 { 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 { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
|
||||||
import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component';
|
import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component';
|
||||||
|
@@ -6,16 +6,12 @@ import {
|
|||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { isEmpty } from '../../../shared/empty.util';
|
||||||
isEmpty,
|
|
||||||
isEmpty,
|
|
||||||
} from '../../../shared/empty.util';
|
|
||||||
import { MenuService } from '../../../shared/menu/menu.service';
|
import { MenuService } from '../../../shared/menu/menu.service';
|
||||||
import { MenuID } from '../../../shared/menu/menu-id.model';
|
import { MenuID } from '../../../shared/menu/menu-id.model';
|
||||||
import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
|
import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
|
||||||
|
@@ -10,56 +10,27 @@ import {
|
|||||||
tick,
|
tick,
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { By } from '@angular/platform-browser';
|
||||||
By,
|
|
||||||
By,
|
|
||||||
} from '@angular/platform-browser';
|
|
||||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
|
||||||
} from '@angular/router';
|
|
||||||
import {
|
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import {
|
|
||||||
NgbModal,
|
|
||||||
NgbModal,
|
NgbModal,
|
||||||
NgbModalRef,
|
NgbModalRef,
|
||||||
} from '@ng-bootstrap/ng-bootstrap';
|
} from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { of as observableOf } from 'rxjs';
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
|
||||||
} from 'rxjs';
|
|
||||||
|
|
||||||
import {
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
AuthService,
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
AuthService,
|
|
||||||
} from '../../core/auth/auth.service';
|
|
||||||
import {
|
|
||||||
AuthorizationDataService,
|
|
||||||
AuthorizationDataService,
|
|
||||||
} from '../../core/data/feature-authorization/authorization-data.service';
|
|
||||||
import { ScriptDataService } from '../../core/data/processes/script-data.service';
|
import { ScriptDataService } from '../../core/data/processes/script-data.service';
|
||||||
import {
|
import { Item } from '../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../core/shared/item.model';
|
|
||||||
import { MenuService } from '../../shared/menu/menu.service';
|
import { MenuService } from '../../shared/menu/menu.service';
|
||||||
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
|
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
|
||||||
import {
|
import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
|
||||||
createSuccessfulRemoteDataObject,
|
|
||||||
createSuccessfulRemoteDataObject,
|
|
||||||
} from '../../shared/remote-data.utils';
|
|
||||||
import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
|
import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
|
||||||
import {
|
import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
|
||||||
AuthServiceStub,
|
|
||||||
AuthServiceStub,
|
|
||||||
} from '../../shared/testing/auth-service.stub';
|
|
||||||
import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
|
import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
|
||||||
import createSpy = jasmine.createSpy;
|
|
||||||
import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
|
import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
|
||||||
import { ThemeService } from '../../shared/theme-support/theme.service';
|
import { ThemeService } from '../../shared/theme-support/theme.service';
|
||||||
import { AdminSidebarComponent } from './admin-sidebar.component';
|
import { AdminSidebarComponent } from './admin-sidebar.component';
|
||||||
|
@@ -15,14 +15,9 @@ import { Router } from '@angular/router';
|
|||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
combineLatest as combineLatestObservable,
|
combineLatest as combineLatestObservable,
|
||||||
combineLatest as combineLatestObservable,
|
|
||||||
Observable,
|
|
||||||
Observable,
|
Observable,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { map } from 'rxjs/operators';
|
||||||
map,
|
|
||||||
map,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
|
|
||||||
import { bgColor } from '../../../shared/animations/bgColor';
|
import { bgColor } from '../../../shared/animations/bgColor';
|
||||||
import { rotate } from '../../../shared/animations/rotate';
|
import { rotate } from '../../../shared/animations/rotate';
|
||||||
|
@@ -43,7 +43,6 @@ import { getSearchResultFor } from '../../../../../shared/search/search-result-e
|
|||||||
import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
|
import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
|
||||||
import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
|
import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
|
||||||
import {
|
import {
|
||||||
SupervisionOrderListEntry,
|
|
||||||
SupervisionOrderListEntry,
|
SupervisionOrderListEntry,
|
||||||
SupervisionOrderStatusComponent,
|
SupervisionOrderStatusComponent,
|
||||||
} from './supervision-order-status/supervision-order-status.component';
|
} from './supervision-order-status/supervision-order-status.component';
|
||||||
|
@@ -13,18 +13,12 @@ import { AuthService } from '../../../../../core/auth/auth.service';
|
|||||||
import { LinkService } from '../../../../../core/cache/builders/link.service';
|
import { LinkService } from '../../../../../core/cache/builders/link.service';
|
||||||
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
|
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
|
||||||
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import {
|
import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
|
||||||
DSpaceObject,
|
|
||||||
DSpaceObject,
|
|
||||||
} from '../../../../../core/shared/dspace-object.model';
|
|
||||||
import { Item } from '../../../../../core/shared/item.model';
|
import { Item } from '../../../../../core/shared/item.model';
|
||||||
import { ListableModule } from '../../../../../core/shared/listable.module';
|
import { ListableModule } from '../../../../../core/shared/listable.module';
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
|
import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
|
||||||
import {
|
import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
|
||||||
SupervisionOrderDataService,
|
|
||||||
SupervisionOrderDataService,
|
|
||||||
} from '../../../../../core/supervision-order/supervision-order-data.service';
|
|
||||||
import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
|
import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
|
||||||
import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock';
|
import { AuthServiceMock } from '../../../../../shared/mocks/auth.service.mock';
|
||||||
import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
|
import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
|
||||||
|
@@ -10,18 +10,12 @@ import {
|
|||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
BehaviorSubject,
|
|
||||||
Observable,
|
|
||||||
Observable,
|
Observable,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
map,
|
map,
|
||||||
map,
|
|
||||||
mergeMap,
|
|
||||||
mergeMap,
|
mergeMap,
|
||||||
take,
|
take,
|
||||||
take,
|
|
||||||
tap,
|
|
||||||
tap,
|
tap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
@@ -33,19 +27,13 @@ import { RemoteData } from '../../../../../core/data/remote-data';
|
|||||||
import { Context } from '../../../../../core/shared/context.model';
|
import { Context } from '../../../../../core/shared/context.model';
|
||||||
import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
|
import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
|
||||||
import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
|
import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
|
||||||
import {
|
import { Item } from '../../../../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../../../../core/shared/item.model';
|
|
||||||
import {
|
import {
|
||||||
getAllSucceededRemoteData,
|
getAllSucceededRemoteData,
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
getRemoteDataPayload,
|
getRemoteDataPayload,
|
||||||
} from '../../../../../core/shared/operators';
|
} from '../../../../../core/shared/operators';
|
||||||
import {
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
ViewMode,
|
|
||||||
ViewMode,
|
|
||||||
} from '../../../../../core/shared/view-mode.model';
|
|
||||||
import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
|
import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
|
||||||
import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
|
import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
|
||||||
import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
|
import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
|
||||||
|
@@ -14,10 +14,7 @@ import { AuthService } from '../../../../../core/auth/auth.service';
|
|||||||
import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
|
||||||
import { LinkService } from '../../../../../core/cache/builders/link.service';
|
import { LinkService } from '../../../../../core/cache/builders/link.service';
|
||||||
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import {
|
import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
|
||||||
DSpaceObject,
|
|
||||||
DSpaceObject,
|
|
||||||
} from '../../../../../core/shared/dspace-object.model';
|
|
||||||
import { Item } from '../../../../../core/shared/item.model';
|
import { Item } from '../../../../../core/shared/item.model';
|
||||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||||
import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
|
import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
|
||||||
|
@@ -13,10 +13,7 @@ import {
|
|||||||
StoreModule,
|
StoreModule,
|
||||||
} from '@ngrx/store';
|
} from '@ngrx/store';
|
||||||
|
|
||||||
import {
|
import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
|
||||||
NOTIFICATIONS_MODULE_PATH,
|
|
||||||
NOTIFICATIONS_MODULE_PATH,
|
|
||||||
} from './admin/admin-routing-paths';
|
|
||||||
import { storeModuleConfig } from './app.reducer';
|
import { storeModuleConfig } from './app.reducer';
|
||||||
import {
|
import {
|
||||||
ACCESS_CONTROL_MODULE_PATH,
|
ACCESS_CONTROL_MODULE_PATH,
|
||||||
@@ -36,19 +33,13 @@ import {
|
|||||||
} from './app-routing-paths';
|
} from './app-routing-paths';
|
||||||
import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-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 { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
|
||||||
import {
|
import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
|
||||||
AuthBlockingGuard,
|
|
||||||
AuthBlockingGuard,
|
|
||||||
} from './core/auth/auth-blocking.guard';
|
|
||||||
import { AuthenticatedGuard } from './core/auth/authenticated.guard';
|
import { AuthenticatedGuard } from './core/auth/authenticated.guard';
|
||||||
import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.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 { 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 { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
|
||||||
import { ReloadGuard } from './core/reload/reload.guard';
|
import { ReloadGuard } from './core/reload/reload.guard';
|
||||||
import {
|
import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
|
||||||
ForgotPasswordCheckGuard,
|
|
||||||
ForgotPasswordCheckGuard,
|
|
||||||
} from './core/rest-property/forgot-password-check-guard.guard';
|
|
||||||
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
||||||
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
|
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
|
||||||
import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
|
import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
|
||||||
|
@@ -45,16 +45,10 @@ import {
|
|||||||
} from './core/services/window.service';
|
} from './core/services/window.service';
|
||||||
import { distinctNext } from './core/shared/distinct-next';
|
import { distinctNext } from './core/shared/distinct-next';
|
||||||
import { HostWindowResizeAction } from './shared/host-window.actions';
|
import { HostWindowResizeAction } from './shared/host-window.actions';
|
||||||
import {
|
import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
|
||||||
IdleModalComponent,
|
|
||||||
IdleModalComponent,
|
|
||||||
} from './shared/idle-modal/idle-modal.component';
|
|
||||||
import { CSSVariableService } from './shared/sass-helper/css-variable.service';
|
import { CSSVariableService } from './shared/sass-helper/css-variable.service';
|
||||||
import { HostWindowState } from './shared/search/host-window.reducer';
|
import { HostWindowState } from './shared/search/host-window.reducer';
|
||||||
import {
|
import { ThemeService } from './shared/theme-support/theme.service';
|
||||||
ThemeService,
|
|
||||||
ThemeService,
|
|
||||||
} from './shared/theme-support/theme.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-app',
|
selector: 'ds-app',
|
||||||
|
@@ -27,67 +27,36 @@ import { NgxMaskModule } from 'ngx-mask';
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
APP_CONFIG,
|
APP_CONFIG,
|
||||||
APP_CONFIG,
|
|
||||||
AppConfig,
|
|
||||||
AppConfig,
|
AppConfig,
|
||||||
} from '../config/app-config.interface';
|
} from '../config/app-config.interface';
|
||||||
import {
|
import { StoreDevModules } from '../config/store/devtools';
|
||||||
StoreDevModules,
|
import { environment } from '../environments/environment';
|
||||||
StoreDevModules,
|
import { EagerThemesModule } from '../themes/eager-themes.module';
|
||||||
} from '../config/store/devtools';
|
|
||||||
import {
|
|
||||||
environment,
|
|
||||||
environment,
|
|
||||||
} from '../environments/environment';
|
|
||||||
import {
|
|
||||||
EagerThemesModule,
|
|
||||||
EagerThemesModule,
|
|
||||||
} from '../themes/eager-themes.module';
|
|
||||||
import { AppComponent } from './app.component';
|
import { AppComponent } from './app.component';
|
||||||
import { appEffects } from './app.effects';
|
import { appEffects } from './app.effects';
|
||||||
import {
|
import {
|
||||||
appMetaReducers,
|
appMetaReducers,
|
||||||
appMetaReducers,
|
|
||||||
debugMetaReducers,
|
|
||||||
debugMetaReducers,
|
debugMetaReducers,
|
||||||
} from './app.metareducers';
|
} from './app.metareducers';
|
||||||
import {
|
import {
|
||||||
appReducers,
|
|
||||||
appReducers,
|
appReducers,
|
||||||
AppState,
|
AppState,
|
||||||
AppState,
|
|
||||||
storeModuleConfig,
|
|
||||||
storeModuleConfig,
|
storeModuleConfig,
|
||||||
} from './app.reducer';
|
} from './app.reducer';
|
||||||
import { AppRoutingModule } from './app-routing.module';
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
|
import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
|
||||||
import {
|
import { AuthInterceptor } from './core/auth/auth.interceptor';
|
||||||
AuthInterceptor,
|
import { LocaleInterceptor } from './core/locale/locale.interceptor';
|
||||||
AuthInterceptor,
|
import { LogInterceptor } from './core/log/log.interceptor';
|
||||||
} from './core/auth/auth.interceptor';
|
|
||||||
import {
|
|
||||||
LocaleInterceptor,
|
|
||||||
LocaleInterceptor,
|
|
||||||
} from './core/locale/locale.interceptor';
|
|
||||||
import {
|
|
||||||
LogInterceptor,
|
|
||||||
LogInterceptor,
|
|
||||||
} from './core/log/log.interceptor';
|
|
||||||
import {
|
import {
|
||||||
models,
|
models,
|
||||||
provideCore,
|
provideCore,
|
||||||
} from './core/provide-core';
|
} from './core/provide-core';
|
||||||
import { ClientCookieService } from './core/services/client-cookie.service';
|
import { ClientCookieService } from './core/services/client-cookie.service';
|
||||||
import { ListableModule } from './core/shared/listable.module';
|
import { ListableModule } from './core/shared/listable.module';
|
||||||
import {
|
import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
|
||||||
XsrfInterceptor,
|
|
||||||
XsrfInterceptor,
|
|
||||||
} from './core/xsrf/xsrf.interceptor';
|
|
||||||
import { NavbarModule } from './navbar/navbar.module';
|
import { NavbarModule } from './navbar/navbar.module';
|
||||||
import {
|
import { RootModule } from './root.module';
|
||||||
RootModule,
|
|
||||||
RootModule,
|
|
||||||
} from './root.module';
|
|
||||||
import { ThemedRootComponent } from './root/themed-root.component';
|
import { ThemedRootComponent } from './root/themed-root.component';
|
||||||
import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator';
|
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';
|
import { METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP } from './shared/metadata-representation/metadata-representation.decorator';
|
||||||
|
@@ -1,8 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
isPlatformServer,
|
isPlatformServer,
|
||||||
isPlatformServer,
|
|
||||||
Location,
|
|
||||||
Location,
|
Location,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
@@ -30,24 +28,15 @@ import {
|
|||||||
|
|
||||||
import { getForbiddenRoute } from '../../app-routing-paths';
|
import { getForbiddenRoute } from '../../app-routing-paths';
|
||||||
import { AuthService } from '../../core/auth/auth.service';
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import { SignpostingDataService } from '../../core/data/signposting-data.service';
|
import { SignpostingDataService } from '../../core/data/signposting-data.service';
|
||||||
import {
|
import { SignpostingLink } from '../../core/data/signposting-links.model';
|
||||||
SignpostingLink,
|
|
||||||
SignpostingLink,
|
|
||||||
} from '../../core/data/signposting-links.model';
|
|
||||||
import { HardRedirectService } from '../../core/services/hard-redirect.service';
|
import { HardRedirectService } from '../../core/services/hard-redirect.service';
|
||||||
import { ServerResponseService } from '../../core/services/server-response.service';
|
import { ServerResponseService } from '../../core/services/server-response.service';
|
||||||
import {
|
import { redirectOn4xx } from '../../core/shared/authorized.operators';
|
||||||
redirectOn4xx,
|
|
||||||
redirectOn4xx,
|
|
||||||
} from '../../core/shared/authorized.operators';
|
|
||||||
import { Bitstream } from '../../core/shared/bitstream.model';
|
import { Bitstream } from '../../core/shared/bitstream.model';
|
||||||
import { FileService } from '../../core/shared/file.service';
|
import { FileService } from '../../core/shared/file.service';
|
||||||
import { getRemoteDataPayload } from '../../core/shared/operators';
|
import { getRemoteDataPayload } from '../../core/shared/operators';
|
||||||
|
@@ -4,21 +4,14 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
ChangeDetectionStrategy,
|
|
||||||
ChangeDetectorRef,
|
|
||||||
ChangeDetectorRef,
|
ChangeDetectorRef,
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { UntypedFormGroup } from '@angular/forms';
|
import { UntypedFormGroup } from '@angular/forms';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
@@ -44,48 +37,23 @@ import {
|
|||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
filter,
|
filter,
|
||||||
filter,
|
|
||||||
map,
|
|
||||||
map,
|
map,
|
||||||
switchMap,
|
switchMap,
|
||||||
switchMap,
|
|
||||||
tap,
|
|
||||||
tap,
|
tap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import { BitstreamDataService } from '../../core/data/bitstream-data.service';
|
import { BitstreamDataService } from '../../core/data/bitstream-data.service';
|
||||||
import {
|
import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
|
||||||
BitstreamFormatDataService,
|
import { PaginatedList } from '../../core/data/paginated-list.model';
|
||||||
BitstreamFormatDataService,
|
|
||||||
} from '../../core/data/bitstream-format-data.service';
|
|
||||||
import {
|
|
||||||
PaginatedList,
|
|
||||||
PaginatedList,
|
|
||||||
} from '../../core/data/paginated-list.model';
|
|
||||||
import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
|
import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
|
||||||
import {
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
RemoteData,
|
import { Bitstream } from '../../core/shared/bitstream.model';
|
||||||
RemoteData,
|
import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
|
||||||
} from '../../core/data/remote-data';
|
import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
|
||||||
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 { Bundle } from '../../core/shared/bundle.model';
|
import { Bundle } from '../../core/shared/bundle.model';
|
||||||
import { Item } from '../../core/shared/item.model';
|
import { Item } from '../../core/shared/item.model';
|
||||||
import {
|
import { Metadata } from '../../core/shared/metadata.utils';
|
||||||
Metadata,
|
|
||||||
Metadata,
|
|
||||||
} from '../../core/shared/metadata.utils';
|
|
||||||
import {
|
import {
|
||||||
getAllSucceededRemoteDataPayload,
|
getAllSucceededRemoteDataPayload,
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
@@ -96,12 +64,8 @@ import {
|
|||||||
import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
|
import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
hasValue,
|
|
||||||
hasValueOperator,
|
|
||||||
hasValueOperator,
|
hasValueOperator,
|
||||||
isEmpty,
|
isEmpty,
|
||||||
isEmpty,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../shared/empty.util';
|
} from '../../shared/empty.util';
|
||||||
import { ErrorComponent } from '../../shared/error/error.component';
|
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 { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
|
||||||
import { FormComponent } from '../../shared/form/form.component';
|
import { FormComponent } from '../../shared/form/form.component';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import {
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../shared/notifications/notifications.service';
|
|
||||||
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
|
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.component';
|
import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.component';
|
||||||
|
@@ -8,10 +8,7 @@ import { Component } from '@angular/core';
|
|||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { Observable } from 'rxjs';
|
||||||
Observable,
|
|
||||||
Observable,
|
|
||||||
} from 'rxjs';
|
|
||||||
|
|
||||||
import { VarDirective } from '../shared/utils/var.directive';
|
import { VarDirective } from '../shared/utils/var.directive';
|
||||||
import { Breadcrumb } from './breadcrumb/breadcrumb.model';
|
import { Breadcrumb } from './breadcrumb/breadcrumb.model';
|
||||||
|
@@ -18,35 +18,22 @@ import {
|
|||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
Observable,
|
Observable,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { map } from 'rxjs/operators';
|
||||||
map,
|
|
||||||
map,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
|
import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
APP_CONFIG,
|
APP_CONFIG,
|
||||||
APP_CONFIG,
|
|
||||||
AppConfig,
|
|
||||||
AppConfig,
|
AppConfig,
|
||||||
} from '../../../config/app-config.interface';
|
} from '../../../config/app-config.interface';
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { BrowseService } from '../../core/browse/browse.service';
|
import { BrowseService } from '../../core/browse/browse.service';
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import {
|
import { PaginationService } from '../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../core/pagination/pagination.service';
|
|
||||||
import { Item } from '../../core/shared/item.model';
|
import { Item } from '../../core/shared/item.model';
|
||||||
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
||||||
import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-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 { 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 { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
|
||||||
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
|
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
|
||||||
import {
|
import { isValidDate } from '../../shared/date.util';
|
||||||
isValidDate,
|
|
||||||
isValidDate,
|
|
||||||
} from '../../shared/date.util';
|
|
||||||
import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
|
import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../shared/empty.util';
|
} from '../../shared/empty.util';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import {
|
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||||
PaginationComponentOptions,
|
|
||||||
PaginationComponentOptions,
|
|
||||||
} from '../../shared/pagination/pagination-component-options.model';
|
|
||||||
import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
|
|
||||||
import { StartsWithType } from '../../shared/starts-with/starts-with-type';
|
import { StartsWithType } from '../../shared/starts-with/starts-with-type';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import {
|
||||||
|
@@ -13,10 +13,7 @@ import {
|
|||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { cold } from 'jasmine-marbles';
|
||||||
cold,
|
|
||||||
cold,
|
|
||||||
} from 'jasmine-marbles';
|
|
||||||
import {
|
import {
|
||||||
Observable,
|
Observable,
|
||||||
of as observableOf,
|
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 { routeServiceStub } from 'src/app/shared/testing/route-service.stub';
|
||||||
import { ThemeService } from 'src/app/shared/theme-support/theme.service';
|
import { ThemeService } from 'src/app/shared/theme-support/theme.service';
|
||||||
|
|
||||||
import {
|
import { APP_CONFIG } from '../../../config/app-config.interface';
|
||||||
APP_CONFIG,
|
|
||||||
APP_CONFIG,
|
|
||||||
} from '../../../config/app-config.interface';
|
|
||||||
import { BrowseService } from '../../core/browse/browse.service';
|
import { BrowseService } from '../../core/browse/browse.service';
|
||||||
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
||||||
import { SortDirection } from '../../core/cache/models/sort-options.model';
|
import { SortDirection } from '../../core/cache/models/sort-options.model';
|
||||||
|
@@ -4,84 +4,45 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
Inject,
|
|
||||||
Inject,
|
Inject,
|
||||||
Input,
|
Input,
|
||||||
Input,
|
|
||||||
OnChanges,
|
|
||||||
OnChanges,
|
OnChanges,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
Params,
|
Params,
|
||||||
Params,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
BehaviorSubject,
|
|
||||||
combineLatest as observableCombineLatest,
|
|
||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
Observable,
|
Observable,
|
||||||
Observable,
|
|
||||||
of as observableOf,
|
of as observableOf,
|
||||||
of as observableOf,
|
|
||||||
Subscription,
|
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { map } from 'rxjs/operators';
|
||||||
map,
|
|
||||||
map,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
|
import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
APP_CONFIG,
|
APP_CONFIG,
|
||||||
APP_CONFIG,
|
|
||||||
AppConfig,
|
|
||||||
AppConfig,
|
AppConfig,
|
||||||
} from '../../../config/app-config.interface';
|
} from '../../../config/app-config.interface';
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { BrowseService } from '../../core/browse/browse.service';
|
import { BrowseService } from '../../core/browse/browse.service';
|
||||||
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import {
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
DSpaceObjectDataService,
|
import { PaginatedList } from '../../core/data/paginated-list.model';
|
||||||
DSpaceObjectDataService,
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
} from '../../core/data/dspace-object-data.service';
|
import { PaginationService } from '../../core/pagination/pagination.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 { BrowseEntry } from '../../core/shared/browse-entry.model';
|
import { BrowseEntry } from '../../core/shared/browse-entry.model';
|
||||||
import {
|
import { Context } from '../../core/shared/context.model';
|
||||||
Context,
|
|
||||||
Context,
|
|
||||||
} from '../../core/shared/context.model';
|
|
||||||
import { Item } from '../../core/shared/item.model';
|
import { Item } from '../../core/shared/item.model';
|
||||||
import { getFirstSucceededRemoteData } from '../../core/shared/operators';
|
import { getFirstSucceededRemoteData } from '../../core/shared/operators';
|
||||||
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
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 { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
hasValue,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../shared/empty.util';
|
} from '../../shared/empty.util';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import {
|
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||||
PaginationComponentOptions,
|
|
||||||
PaginationComponentOptions,
|
|
||||||
} from '../../shared/pagination/pagination-component-options.model';
|
|
||||||
import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
|
|
||||||
import { StartsWithType } from '../../shared/starts-with/starts-with-type';
|
import { StartsWithType } from '../../shared/starts-with/starts-with-type';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
|
||||||
BrowseByDataType,
|
|
||||||
BrowseByDataType,
|
|
||||||
} from '../browse-by-switcher/browse-by-data-type';
|
|
||||||
|
|
||||||
export const BBM_PAGINATION_ID = 'bbm';
|
export const BBM_PAGINATION_ID = 'bbm';
|
||||||
|
|
||||||
|
@@ -2,14 +2,9 @@ import { Component } from '@angular/core';
|
|||||||
|
|
||||||
import { Context } from '../../core/shared/context.model';
|
import { Context } from '../../core/shared/context.model';
|
||||||
import { GenericConstructor } from '../../core/shared/generic-constructor';
|
import { GenericConstructor } from '../../core/shared/generic-constructor';
|
||||||
import {
|
import { hasNoValue } from '../../shared/empty.util';
|
||||||
hasNoValue,
|
|
||||||
hasNoValue,
|
|
||||||
} from '../../shared/empty.util';
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_THEME,
|
DEFAULT_THEME,
|
||||||
DEFAULT_THEME,
|
|
||||||
resolveTheme,
|
|
||||||
resolveTheme,
|
resolveTheme,
|
||||||
} from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
} from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||||
import { BrowseByDateComponent } from '../browse-by-date/browse-by-date.component';
|
import { BrowseByDateComponent } from '../browse-by-date/browse-by-date.component';
|
||||||
|
@@ -1,15 +1,10 @@
|
|||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
SimpleChange,
|
|
||||||
SimpleChange,
|
SimpleChange,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} 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 { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
|
||||||
import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
|
import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
|
||||||
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
|
import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
|
||||||
import {
|
import { ThemeService } from '../../shared/theme-support/theme.service';
|
||||||
ThemeService,
|
|
||||||
ThemeService,
|
|
||||||
} from '../../shared/theme-support/theme.service';
|
|
||||||
import { BrowseByDataType } from './browse-by-data-type';
|
import { BrowseByDataType } from './browse-by-data-type';
|
||||||
import {
|
import { rendersBrowseBy } from './browse-by-decorator';
|
||||||
rendersBrowseBy,
|
import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
|
||||||
rendersBrowseBy,
|
|
||||||
} from './browse-by-decorator';
|
|
||||||
import {
|
|
||||||
BrowseBySwitcherComponent,
|
|
||||||
BrowseBySwitcherComponent,
|
|
||||||
} from './browse-by-switcher.component';
|
|
||||||
|
|
||||||
@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType)
|
@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType)
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -4,51 +4,29 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
Input,
|
|
||||||
Input,
|
Input,
|
||||||
OnChanges,
|
OnChanges,
|
||||||
OnChanges,
|
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Params,
|
|
||||||
Params,
|
Params,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
Observable,
|
Observable,
|
||||||
Observable,
|
|
||||||
Subscription,
|
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { BrowseDefinition } from '../../core/shared/browse-definition.model';
|
||||||
BrowseDefinition,
|
|
||||||
BrowseDefinition,
|
|
||||||
} from '../../core/shared/browse-definition.model';
|
|
||||||
import { Context } from '../../core/shared/context.model';
|
import { Context } from '../../core/shared/context.model';
|
||||||
import {
|
import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
|
||||||
HierarchicalBrowseDefinition,
|
import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
|
||||||
HierarchicalBrowseDefinition,
|
import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
|
||||||
} 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 { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
||||||
import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-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';
|
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 { VocabularyTreeviewComponent } from '../../shared/form/vocabulary-treeview/vocabulary-treeview.component';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
|
||||||
BrowseByDataType,
|
|
||||||
BrowseByDataType,
|
|
||||||
} from '../browse-by-switcher/browse-by-data-type';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-browse-by-taxonomy',
|
selector: 'ds-browse-by-taxonomy',
|
||||||
|
@@ -1,48 +1,30 @@
|
|||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
CommonModule,
|
CommonModule,
|
||||||
CommonModule,
|
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { of as observableOf } from 'rxjs';
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
|
||||||
} from 'rxjs';
|
|
||||||
|
|
||||||
import {
|
import { APP_CONFIG } from '../../../config/app-config.interface';
|
||||||
APP_CONFIG,
|
import { environment } from '../../../environments/environment';
|
||||||
APP_CONFIG,
|
|
||||||
} from '../../../config/app-config.interface';
|
|
||||||
import {
|
|
||||||
environment,
|
|
||||||
environment,
|
|
||||||
} from '../../../environments/environment';
|
|
||||||
import { BrowseService } from '../../core/browse/browse.service';
|
import { BrowseService } from '../../core/browse/browse.service';
|
||||||
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
import { ItemDataService } from '../../core/data/item-data.service';
|
import { ItemDataService } from '../../core/data/item-data.service';
|
||||||
import { PaginationService } from '../../core/pagination/pagination.service';
|
import { PaginationService } from '../../core/pagination/pagination.service';
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import {
|
import { Item } from '../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../core/shared/item.model';
|
|
||||||
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
||||||
import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-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';
|
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 { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import { RouterMock } from '../../shared/mocks/router.mock';
|
import { RouterMock } from '../../shared/mocks/router.mock';
|
||||||
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
|
||||||
import {
|
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
|
||||||
ActivatedRouteStub,
|
|
||||||
ActivatedRouteStub,
|
|
||||||
} from '../../shared/testing/active-router.stub';
|
|
||||||
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
|
||||||
import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
|
import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
@@ -121,7 +100,7 @@ describe('BrowseByTitleComponent', () => {
|
|||||||
],
|
],
|
||||||
schemas: [NO_ERRORS_SCHEMA],
|
schemas: [NO_ERRORS_SCHEMA],
|
||||||
})
|
})
|
||||||
.overrideComponent(BrowseByTitlePageComponent, {
|
.overrideComponent(BrowseByTitleComponent, {
|
||||||
remove: { imports: [
|
remove: { imports: [
|
||||||
ComcolPageHeaderComponent,
|
ComcolPageHeaderComponent,
|
||||||
ComcolPageLogoComponent,
|
ComcolPageLogoComponent,
|
||||||
|
@@ -9,15 +9,10 @@ import {
|
|||||||
import { Params } from '@angular/router';
|
import { Params } from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { combineLatest as observableCombineLatest } from 'rxjs';
|
import { combineLatest as observableCombineLatest } from 'rxjs';
|
||||||
import {
|
import { map } from 'rxjs/operators';
|
||||||
map,
|
|
||||||
map,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
|
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 { 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 { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import {
|
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||||
PaginationComponentOptions,
|
|
||||||
PaginationComponentOptions,
|
|
||||||
} from '../../shared/pagination/pagination-component-options.model';
|
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import {
|
||||||
BrowseByMetadataComponent,
|
BrowseByMetadataComponent,
|
||||||
|
@@ -21,16 +21,10 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import { Observable } from 'rxjs';
|
||||||
Observable,
|
|
||||||
Observable,
|
|
||||||
} from 'rxjs';
|
|
||||||
import {
|
import {
|
||||||
hasNoValue,
|
hasNoValue,
|
||||||
hasNoValue,
|
|
||||||
isNotNull,
|
|
||||||
isNotNull,
|
isNotNull,
|
||||||
} from 'src/app/shared/empty.util';
|
} 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 { RequestService } from '../../core/data/request.service';
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import { ItemType } from '../../core/shared/item-relationships/item-type.model';
|
import { ItemType } from '../../core/shared/item-relationships/item-type.model';
|
||||||
import {
|
import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
|
||||||
NONE_ENTITY_TYPE,
|
|
||||||
NONE_ENTITY_TYPE,
|
|
||||||
} from '../../core/shared/item-relationships/item-type.resource-type';
|
|
||||||
import { MetadataValue } from '../../core/shared/metadata.models';
|
import { MetadataValue } from '../../core/shared/metadata.models';
|
||||||
import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
|
import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
|
||||||
import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
|
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 { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import {
|
||||||
collectionFormEntityTypeSelectionConfig,
|
collectionFormEntityTypeSelectionConfig,
|
||||||
collectionFormEntityTypeSelectionConfig,
|
|
||||||
collectionFormModels,
|
|
||||||
collectionFormModels,
|
collectionFormModels,
|
||||||
} from './collection-form.models';
|
} from './collection-form.models';
|
||||||
|
|
||||||
|
@@ -25,10 +25,7 @@ import {
|
|||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import { CollectionDataService } from '../../core/data/collection-data.service';
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
|
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
|
||||||
import {
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
AuthorizationDataService,
|
|
||||||
AuthorizationDataService,
|
|
||||||
} from '../../core/data/feature-authorization/authorization-data.service';
|
|
||||||
import { ItemDataService } from '../../core/data/item-data.service';
|
import { ItemDataService } from '../../core/data/item-data.service';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import { GroupDataService } from '../../core/eperson/group-data.service';
|
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 { ConfigurationProperty } from '../../core/shared/configuration-property.model';
|
||||||
import { SearchService } from '../../core/shared/search/search.service';
|
import { SearchService } from '../../core/shared/search/search.service';
|
||||||
import { 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 { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
|
||||||
import { ErrorComponent } from '../../shared/error/error.component';
|
import { ErrorComponent } from '../../shared/error/error.component';
|
||||||
import { HostWindowService } from '../../shared/host-window.service';
|
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 { RouterStub } from '../../shared/testing/router.stub';
|
||||||
import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
|
import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
|
||||||
import { SearchServiceStub } from '../../shared/testing/search-service.stub';
|
import { SearchServiceStub } from '../../shared/testing/search-service.stub';
|
||||||
import {
|
import { createPaginatedList } from '../../shared/testing/utils.test';
|
||||||
createPaginatedList,
|
|
||||||
createPaginatedList,
|
|
||||||
} from '../../shared/testing/utils.test';
|
|
||||||
import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
|
import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import { CollectionItemMapperComponent } from './collection-item-mapper.component';
|
import { CollectionItemMapperComponent } from './collection-item-mapper.component';
|
||||||
|
@@ -17,7 +17,6 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
@@ -34,37 +33,17 @@ import {
|
|||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import {
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
CollectionDataService,
|
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
||||||
CollectionDataService,
|
import { ItemDataService } from '../../core/data/item-data.service';
|
||||||
} 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 { PaginatedList } from '../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import {
|
import { DSpaceObject } from '../../core/shared/dspace-object.model';
|
||||||
DSpaceObject,
|
import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
|
||||||
DSpaceObject,
|
import { NoContent } from '../../core/shared/NoContent.model';
|
||||||
} 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 {
|
import {
|
||||||
getAllSucceededRemoteData,
|
getAllSucceededRemoteData,
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
@@ -74,20 +53,13 @@ import {
|
|||||||
} from '../../core/shared/operators';
|
} from '../../core/shared/operators';
|
||||||
import { SearchService } from '../../core/shared/search/search.service';
|
import { SearchService } from '../../core/shared/search/search.service';
|
||||||
import { 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 { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
|
||||||
import {
|
import {
|
||||||
fadeIn,
|
fadeIn,
|
||||||
fadeInOut,
|
fadeInOut,
|
||||||
} from '../../shared/animations/fade';
|
} from '../../shared/animations/fade';
|
||||||
import {
|
import { isNotEmpty } from '../../shared/empty.util';
|
||||||
isNotEmpty,
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
isNotEmpty,
|
|
||||||
} from '../../shared/empty.util';
|
|
||||||
import {
|
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../shared/notifications/notifications.service';
|
|
||||||
import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
|
import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
|
||||||
import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
|
import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
|
||||||
import { ThemedSearchFormComponent } from '../../shared/search-form/themed-search-form.component';
|
import { ThemedSearchFormComponent } from '../../shared/search-form/themed-search-form.component';
|
||||||
|
@@ -22,18 +22,12 @@ import {
|
|||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { AuthService } from '../core/auth/auth.service';
|
import { AuthService } from '../core/auth/auth.service';
|
||||||
import {
|
import { DSONameService } from '../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../core/breadcrumbs/dso-name.service';
|
|
||||||
import { SortOptions } from '../core/cache/models/sort-options.model';
|
import { SortOptions } from '../core/cache/models/sort-options.model';
|
||||||
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../core/data/feature-authorization/feature-id';
|
||||||
import { RemoteData } from '../core/data/remote-data';
|
import { RemoteData } from '../core/data/remote-data';
|
||||||
import {
|
import { redirectOn4xx } from '../core/shared/authorized.operators';
|
||||||
redirectOn4xx,
|
|
||||||
redirectOn4xx,
|
|
||||||
} from '../core/shared/authorized.operators';
|
|
||||||
import { Bitstream } from '../core/shared/bitstream.model';
|
import { Bitstream } from '../core/shared/bitstream.model';
|
||||||
import { Collection } from '../core/shared/collection.model';
|
import { Collection } from '../core/shared/collection.model';
|
||||||
import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
|
import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
|
||||||
|
@@ -12,16 +12,10 @@ import { of as observableOf } from 'rxjs';
|
|||||||
|
|
||||||
import { AuthService } from '../../core/auth/auth.service';
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
CollectionDataService,
|
|
||||||
CollectionDataService,
|
|
||||||
} from '../../core/data/collection-data.service';
|
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import { RequestService } from '../../core/data/request.service';
|
import { RequestService } from '../../core/data/request.service';
|
||||||
import {
|
import { RouteService } from '../../core/services/route.service';
|
||||||
RouteService,
|
|
||||||
RouteService,
|
|
||||||
} from '../../core/services/route.service';
|
|
||||||
import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
|
import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
|
||||||
import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
|
import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
|
@@ -4,19 +4,12 @@ import { Router } from '@angular/router';
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { CollectionDataService } from '../../core/data/collection-data.service';
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import {
|
import { RequestService } from '../../core/data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../../core/data/request.service';
|
|
||||||
import { RouteService } from '../../core/services/route.service';
|
import { RouteService } from '../../core/services/route.service';
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
|
import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
|
||||||
|
@@ -1,21 +1,12 @@
|
|||||||
import {
|
import { CommonModule } from '@angular/common';
|
||||||
CommonModule,
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
CommonModule,
|
|
||||||
} from '@angular/common';
|
|
||||||
import {
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
} from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
|
@@ -5,33 +5,18 @@ import {
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
CollectionDataService,
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
CollectionDataService,
|
import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
|
||||||
} from '../../core/data/collection-data.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.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 { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -2,14 +2,10 @@ import {
|
|||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { ActivatedRoute } from '@angular/router';
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
|
||||||
} from '@angular/router';
|
|
||||||
import {
|
import {
|
||||||
of as observableOf,
|
of as observableOf,
|
||||||
of,
|
of,
|
||||||
of,
|
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
|
|
||||||
import { Community } from '../../../core/shared/community.model';
|
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 () => {
|
beforeEach(async () => {
|
||||||
await TestBed.configureTestingModule({
|
await TestBed.configureTestingModule({
|
||||||
imports: [CollectionAccessControlComponent],
|
imports: [CollectionAccessControlComponent],
|
||||||
|
@@ -1,11 +1,8 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import {
|
||||||
@@ -14,10 +11,7 @@ import {
|
|||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import {
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
TranslateModule,
|
|
||||||
TranslateModule,
|
|
||||||
} from '@ngx-translate/core';
|
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
|
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 { Item } from '../../../core/shared/item.model';
|
||||||
import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock';
|
import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { createFailedRemoteDataObject$,
|
import {
|
||||||
|
createFailedRemoteDataObject$,
|
||||||
createSuccessfulRemoteDataObject,
|
createSuccessfulRemoteDataObject,
|
||||||
createSuccessfulRemoteDataObject$
|
createSuccessfulRemoteDataObject$,
|
||||||
,
|
|
||||||
} from '../../../shared/remote-data.utils';
|
} from '../../../shared/remote-data.utils';
|
||||||
import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
|
import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
|
||||||
import { CollectionMetadataComponent } from './collection-metadata.component';
|
import { CollectionMetadataComponent } from './collection-metadata.component';
|
||||||
|
@@ -8,20 +8,15 @@ import {
|
|||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
NavigationEnd,
|
NavigationEnd,
|
||||||
NavigationEnd,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
Scroll,
|
Scroll,
|
||||||
Scroll,
|
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
combineLatest as combineLatestObservable,
|
combineLatest as combineLatestObservable,
|
||||||
@@ -29,8 +24,6 @@ import {
|
|||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
map,
|
map,
|
||||||
map,
|
|
||||||
switchMap,
|
|
||||||
switchMap,
|
switchMap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
@@ -39,23 +32,15 @@ import { ItemTemplateDataService } from '../../../core/data/item-template-data.s
|
|||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { RequestService } from '../../../core/data/request.service';
|
import { RequestService } from '../../../core/data/request.service';
|
||||||
import { Collection } from '../../../core/shared/collection.model';
|
import { Collection } from '../../../core/shared/collection.model';
|
||||||
import {
|
import { Item } from '../../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../../core/shared/item.model';
|
|
||||||
import { NoContent } from '../../../core/shared/NoContent.model';
|
import { NoContent } from '../../../core/shared/NoContent.model';
|
||||||
import {
|
import {
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
getFirstSucceededRemoteDataPayload,
|
||||||
} from '../../../core/shared/operators';
|
} from '../../../core/shared/operators';
|
||||||
import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
|
import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import {
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../../shared/notifications/notifications.service';
|
|
||||||
import { VarDirective } from '../../../shared/utils/var.directive';
|
import { VarDirective } from '../../../shared/utils/var.directive';
|
||||||
import { CollectionFormComponent } from '../../collection-form/collection-form.component';
|
import { CollectionFormComponent } from '../../collection-form/collection-form.component';
|
||||||
import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
|
import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
|
||||||
|
@@ -1,52 +1,30 @@
|
|||||||
import {
|
import {
|
||||||
DebugElement,
|
DebugElement,
|
||||||
DebugElement,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { By } from '@angular/platform-browser';
|
||||||
By,
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
By,
|
|
||||||
} from '@angular/platform-browser';
|
|
||||||
import {
|
|
||||||
NoopAnimationsModule,
|
|
||||||
NoopAnimationsModule,
|
|
||||||
} from '@angular/platform-browser/animations';
|
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
import { RequestService } from '../../../core/data/request.service';
|
import { RequestService } from '../../../core/data/request.service';
|
||||||
import {
|
import { GroupDataService } from '../../../core/eperson/group-data.service';
|
||||||
GroupDataService,
|
import { Collection } from '../../../core/shared/collection.model';
|
||||||
GroupDataService,
|
|
||||||
} from '../../../core/eperson/group-data.service';
|
|
||||||
import {
|
|
||||||
Collection,
|
|
||||||
Collection,
|
|
||||||
} from '../../../core/shared/collection.model';
|
|
||||||
import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
|
import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import {
|
import {
|
||||||
createSuccessfulRemoteDataObject,
|
createSuccessfulRemoteDataObject,
|
||||||
createSuccessfulRemoteDataObject,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
createSuccessfulRemoteDataObject$,
|
||||||
} from '../../../shared/remote-data.utils';
|
} from '../../../shared/remote-data.utils';
|
||||||
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
||||||
import {
|
import { CollectionRolesComponent } from './collection-roles.component';
|
||||||
CollectionRolesComponent,
|
|
||||||
CollectionRolesComponent,
|
|
||||||
} from './collection-roles.component';
|
|
||||||
|
|
||||||
describe('CollectionRolesComponent', () => {
|
describe('CollectionRolesComponent', () => {
|
||||||
|
|
||||||
|
@@ -2,10 +2,7 @@ import {
|
|||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import { HttpClient } from '@angular/common/http';
|
||||||
HttpClient,
|
|
||||||
HttpClient,
|
|
||||||
} from '@angular/common/http';
|
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
Input,
|
Input,
|
||||||
@@ -15,7 +12,6 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
@@ -29,35 +25,20 @@ import {
|
|||||||
tap,
|
tap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
|
||||||
BitstreamDataService,
|
import { CollectionDataService } from '../../../../core/data/collection-data.service';
|
||||||
BitstreamDataService,
|
|
||||||
} from '../../../../core/data/bitstream-data.service';
|
|
||||||
import {
|
|
||||||
CollectionDataService,
|
|
||||||
CollectionDataService,
|
|
||||||
} from '../../../../core/data/collection-data.service';
|
|
||||||
import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
|
import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
|
||||||
import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
|
import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
|
||||||
import { RequestService } from '../../../../core/data/request.service';
|
import { RequestService } from '../../../../core/data/request.service';
|
||||||
import {
|
import { Collection } from '../../../../core/shared/collection.model';
|
||||||
Collection,
|
|
||||||
Collection,
|
|
||||||
} from '../../../../core/shared/collection.model';
|
|
||||||
import { ContentSource } from '../../../../core/shared/content-source.model';
|
import { ContentSource } from '../../../../core/shared/content-source.model';
|
||||||
import {
|
import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
|
||||||
ContentSourceSetSerializer,
|
|
||||||
ContentSourceSetSerializer,
|
|
||||||
} from '../../../../core/shared/content-source-set-serializer';
|
|
||||||
import {
|
import {
|
||||||
getAllSucceededRemoteDataPayload,
|
getAllSucceededRemoteDataPayload,
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
getFirstSucceededRemoteDataPayload,
|
getFirstSucceededRemoteDataPayload,
|
||||||
} from '../../../../core/shared/operators';
|
} from '../../../../core/shared/operators';
|
||||||
import {
|
import { Process } from '../../../../process-page/processes/process.model';
|
||||||
Process,
|
|
||||||
Process,
|
|
||||||
} from '../../../../process-page/processes/process.model';
|
|
||||||
import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
|
import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
|
||||||
import { hasValue } from '../../../../shared/empty.util';
|
import { hasValue } from '../../../../shared/empty.util';
|
||||||
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
Location,
|
Location,
|
||||||
Location,
|
|
||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
@@ -27,7 +26,6 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import {
|
import {
|
||||||
|
@@ -8,15 +8,9 @@ import {
|
|||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { of as observableOf } from 'rxjs';
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
|
||||||
} from 'rxjs';
|
|
||||||
|
|
||||||
import {
|
import { CollectionDataService } from '../../core/data/collection-data.service';
|
||||||
CollectionDataService,
|
|
||||||
CollectionDataService,
|
|
||||||
} from '../../core/data/collection-data.service';
|
|
||||||
import { EditCollectionPageComponent } from './edit-collection-page.component';
|
import { EditCollectionPageComponent } from './edit-collection-page.component';
|
||||||
|
|
||||||
describe('EditCollectionPageComponent', () => {
|
describe('EditCollectionPageComponent', () => {
|
||||||
|
@@ -7,8 +7,6 @@ import {
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
@@ -16,10 +14,7 @@ import {
|
|||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import {
|
import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
|
||||||
EditComColPageComponent,
|
|
||||||
EditComColPageComponent,
|
|
||||||
} from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
|
|
||||||
import { getCollectionPageRoute } from '../collection-page-routing-paths';
|
import { getCollectionPageRoute } from '../collection-page-routing-paths';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1,22 +1,13 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import {
|
|
||||||
TranslateModule,
|
|
||||||
TranslateModule,
|
|
||||||
} from '@ngx-translate/core';
|
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
|
import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
|
||||||
@@ -30,10 +21,7 @@ import {
|
|||||||
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
|
||||||
import { ThemeService } from '../../shared/theme-support/theme.service';
|
import { ThemeService } from '../../shared/theme-support/theme.service';
|
||||||
import { getCollectionEditRoute } from '../collection-page-routing-paths';
|
import { getCollectionEditRoute } from '../collection-page-routing-paths';
|
||||||
import {
|
import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
|
||||||
EditItemTemplatePageComponent,
|
|
||||||
EditItemTemplatePageComponent,
|
|
||||||
} from './edit-item-template-page.component';
|
|
||||||
|
|
||||||
describe('EditItemTemplatePageComponent', () => {
|
describe('EditItemTemplatePageComponent', () => {
|
||||||
let comp: EditItemTemplatePageComponent;
|
let comp: EditItemTemplatePageComponent;
|
||||||
|
@@ -7,26 +7,19 @@ import {
|
|||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import {
|
import {
|
||||||
first,
|
|
||||||
first,
|
first,
|
||||||
map,
|
map,
|
||||||
map,
|
|
||||||
switchMap,
|
|
||||||
switchMap,
|
switchMap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
|
||||||
ItemTemplateDataService,
|
|
||||||
ItemTemplateDataService,
|
|
||||||
} from '../../core/data/item-template-data.service';
|
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import { Item } from '../../core/shared/item.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 { AlertType } from '../../shared/alert/alert-type';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import { VarDirective } from '../../shared/utils/var.directive';
|
import { VarDirective } from '../../shared/utils/var.directive';
|
||||||
import {
|
import { getCollectionEditRoute } from '../collection-page-routing-paths';
|
||||||
getCollectionEditRoute,
|
|
||||||
getCollectionEditRoute,
|
|
||||||
} from '../collection-page-routing-paths';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-edit-item-template-page',
|
selector: 'ds-edit-item-template-page',
|
||||||
|
@@ -12,20 +12,14 @@ import {
|
|||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import {
|
import { RouterLinkWithHref } from '@angular/router';
|
||||||
RouterLinkWithHref,
|
|
||||||
RouterLinkWithHref,
|
|
||||||
} from '@angular/router';
|
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import {
|
import {
|
||||||
TranslateLoader,
|
TranslateLoader,
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import {
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
v4 as uuidv4,
|
|
||||||
v4 as uuidv4,
|
|
||||||
} from 'uuid';
|
|
||||||
|
|
||||||
import { buildPaginatedList } from '../../core/data/paginated-list.model';
|
import { buildPaginatedList } from '../../core/data/paginated-list.model';
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
CdkTreeModule,
|
CdkTreeModule,
|
||||||
FlatTreeControl,
|
FlatTreeControl,
|
||||||
FlatTreeControl,
|
|
||||||
} from '@angular/cdk/tree';
|
} from '@angular/cdk/tree';
|
||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
@@ -17,32 +16,18 @@ import { RouterLink } from '@angular/router';
|
|||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../core/cache/models/sort-options.model';
|
} from '../../core/cache/models/sort-options.model';
|
||||||
import {
|
import { FindListOptions } from '../../core/data/find-list-options.model';
|
||||||
FindListOptions,
|
|
||||||
FindListOptions,
|
|
||||||
} from '../../core/data/find-list-options.model';
|
|
||||||
import { isEmpty } from '../../shared/empty.util';
|
import { isEmpty } from '../../shared/empty.util';
|
||||||
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
|
||||||
import { TruncatableComponent } from '../../shared/truncatable/truncatable.component';
|
import { TruncatableComponent } from '../../shared/truncatable/truncatable.component';
|
||||||
import { TruncatablePartComponent } from '../../shared/truncatable/truncatable-part/truncatable-part.component';
|
import { TruncatablePartComponent } from '../../shared/truncatable/truncatable-part/truncatable-part.component';
|
||||||
import {
|
import { CommunityListDatasource } from '../community-list-datasource';
|
||||||
CommunityListDatasource,
|
import { CommunityListService } from '../community-list-service';
|
||||||
CommunityListDatasource,
|
|
||||||
} from '../community-list-datasource';
|
|
||||||
import {
|
|
||||||
CommunityListService,
|
|
||||||
CommunityListService,
|
|
||||||
} from '../community-list-service';
|
|
||||||
import { FlatNode } from '../flat-node.model';
|
import { FlatNode } from '../flat-node.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -19,29 +19,13 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { environment } from '../../../environments/environment';
|
||||||
environment,
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
environment,
|
import { ObjectCacheService } from '../../core/cache/object-cache.service';
|
||||||
} from '../../../environments/environment';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import {
|
import { RequestService } from '../../core/data/request.service';
|
||||||
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 { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
|
import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
|
||||||
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
|
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
|
||||||
|
@@ -3,17 +3,12 @@ import {
|
|||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
ChangeDetectionStrategy,
|
|
||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
@@ -21,26 +16,17 @@ import {
|
|||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import {
|
import {
|
||||||
filter,
|
|
||||||
filter,
|
filter,
|
||||||
map,
|
map,
|
||||||
map,
|
|
||||||
mergeMap,
|
|
||||||
mergeMap,
|
mergeMap,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { AuthService } from '../core/auth/auth.service';
|
import { AuthService } from '../core/auth/auth.service';
|
||||||
import {
|
import { DSONameService } from '../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../core/breadcrumbs/dso-name.service';
|
|
||||||
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../core/data/feature-authorization/feature-id';
|
||||||
import { RemoteData } from '../core/data/remote-data';
|
import { RemoteData } from '../core/data/remote-data';
|
||||||
import {
|
import { redirectOn4xx } from '../core/shared/authorized.operators';
|
||||||
redirectOn4xx,
|
|
||||||
redirectOn4xx,
|
|
||||||
} from '../core/shared/authorized.operators';
|
|
||||||
import { Bitstream } from '../core/shared/bitstream.model';
|
import { Bitstream } from '../core/shared/bitstream.model';
|
||||||
import { Community } from '../core/shared/community.model';
|
import { Community } from '../core/shared/community.model';
|
||||||
import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
|
import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
|
||||||
|
@@ -1,8 +1,5 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import {
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
} from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
@@ -16,10 +13,7 @@ import { of as observableOf } from 'rxjs';
|
|||||||
import { AuthService } from '../../core/auth/auth.service';
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import { RequestService } from '../../core/data/request.service';
|
import { RequestService } from '../../core/data/request.service';
|
||||||
import {
|
import { RouteService } from '../../core/services/route.service';
|
||||||
RouteService,
|
|
||||||
RouteService,
|
|
||||||
} from '../../core/services/route.service';
|
|
||||||
import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
|
import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
|
||||||
|
@@ -7,18 +7,11 @@ import { Router } from '@angular/router';
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import {
|
import { RequestService } from '../../core/data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../../core/data/request.service';
|
|
||||||
import { RouteService } from '../../core/services/route.service';
|
import { RouteService } from '../../core/services/route.service';
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
|
import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
|
||||||
|
@@ -10,13 +10,9 @@ import {
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../core/breadcrumbs/dso-name.service';
|
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
|
import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
|
||||||
|
@@ -2,14 +2,10 @@ import {
|
|||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { ActivatedRoute } from '@angular/router';
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
|
||||||
} from '@angular/router';
|
|
||||||
import {
|
import {
|
||||||
of as observableOf,
|
of as observableOf,
|
||||||
of,
|
of,
|
||||||
of,
|
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
|
|
||||||
import { Community } from '../../../core/shared/community.model';
|
import { Community } from '../../../core/shared/community.model';
|
||||||
@@ -20,21 +16,7 @@ import { CommunityAccessControlComponent } from './community-access-control.comp
|
|||||||
describe('CommunityAccessControlComponent', () => {
|
describe('CommunityAccessControlComponent', () => {
|
||||||
let component: CommunityAccessControlComponent;
|
let component: CommunityAccessControlComponent;
|
||||||
let fixture: ComponentFixture<CommunityAccessControlComponent>;
|
let fixture: ComponentFixture<CommunityAccessControlComponent>;
|
||||||
let routeStub = {
|
|
||||||
parent: {
|
|
||||||
parent: {
|
|
||||||
data: {
|
|
||||||
pipe: () => {
|
|
||||||
return {
|
|
||||||
pipe: () => {
|
|
||||||
return of({});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
const testCommunity = Object.assign(new Community(),
|
const testCommunity = Object.assign(new Community(),
|
||||||
{
|
{
|
||||||
type: 'community',
|
type: 'community',
|
||||||
|
@@ -11,10 +11,7 @@ import { Observable } from 'rxjs';
|
|||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import {
|
import { Community } from '../../../core/shared/community.model';
|
||||||
Community,
|
|
||||||
Community,
|
|
||||||
} from '../../../core/shared/community.model';
|
|
||||||
import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
|
import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
|
||||||
import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
|
import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
|
||||||
|
|
||||||
|
@@ -12,10 +12,7 @@ import { ActivatedRoute } from '@angular/router';
|
|||||||
import { cold } from 'jasmine-marbles';
|
import { cold } from 'jasmine-marbles';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import {
|
import { Collection } from '../../../core/shared/collection.model';
|
||||||
Collection,
|
|
||||||
Collection,
|
|
||||||
} from '../../../core/shared/collection.model';
|
|
||||||
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
||||||
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
||||||
import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component';
|
import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component';
|
||||||
|
@@ -12,10 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import { Community } from '../../../core/shared/community.model';
|
||||||
Community,
|
|
||||||
Community,
|
|
||||||
} from '../../../core/shared/community.model';
|
|
||||||
import { CurationFormComponent } from '../../../curation-form/curation-form.component';
|
import { CurationFormComponent } from '../../../curation-form/curation-form.component';
|
||||||
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
|
||||||
import { CommunityCurateComponent } from './community-curate.component';
|
import { CommunityCurateComponent } from './community-curate.component';
|
||||||
|
@@ -1,19 +1,13 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import {
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
TranslateModule,
|
|
||||||
TranslateModule,
|
|
||||||
} from '@ngx-translate/core';
|
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
|
||||||
import { CommunityDataService } from '../../../core/data/community-data.service';
|
import { CommunityDataService } from '../../../core/data/community-data.service';
|
||||||
|
@@ -7,15 +7,9 @@ import {
|
|||||||
TestBed,
|
TestBed,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import {
|
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
NoopAnimationsModule,
|
|
||||||
NoopAnimationsModule,
|
|
||||||
} from '@angular/platform-browser/animations';
|
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { of as observableOf } from 'rxjs';
|
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 { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import {
|
import {
|
||||||
createSuccessfulRemoteDataObject,
|
createSuccessfulRemoteDataObject,
|
||||||
createSuccessfulRemoteDataObject,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
createSuccessfulRemoteDataObject$,
|
||||||
} from '../../../shared/remote-data.utils';
|
} from '../../../shared/remote-data.utils';
|
||||||
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
|
||||||
|
@@ -1,26 +1,14 @@
|
|||||||
import {
|
import { CommonModule } from '@angular/common';
|
||||||
CommonModule,
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
CommonModule,
|
|
||||||
} from '@angular/common';
|
|
||||||
import {
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
} from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import { of as observableOf } from 'rxjs';
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
|
||||||
} from 'rxjs';
|
|
||||||
|
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import { EditCommunityPageComponent } from './edit-community-page.component';
|
import { EditCommunityPageComponent } from './edit-community-page.component';
|
||||||
|
@@ -7,8 +7,6 @@ import {
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
|
@@ -15,34 +15,20 @@ import {
|
|||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { switchMap } from 'rxjs/operators';
|
||||||
switchMap,
|
|
||||||
switchMap,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../../../core/cache/models/sort-options.model';
|
} from '../../../../core/cache/models/sort-options.model';
|
||||||
import {
|
import { CollectionDataService } from '../../../../core/data/collection-data.service';
|
||||||
CollectionDataService,
|
|
||||||
CollectionDataService,
|
|
||||||
} from '../../../../core/data/collection-data.service';
|
|
||||||
import { PaginatedList } from '../../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../../../core/data/remote-data';
|
import { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import {
|
import { PaginationService } from '../../../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../../../core/pagination/pagination.service';
|
|
||||||
import { Collection } from '../../../../core/shared/collection.model';
|
import { Collection } from '../../../../core/shared/collection.model';
|
||||||
import { Community } from '../../../../core/shared/community.model';
|
import { Community } from '../../../../core/shared/community.model';
|
||||||
import { fadeIn } from '../../../../shared/animations/fade';
|
import { fadeIn } from '../../../../shared/animations/fade';
|
||||||
import {
|
import { hasValue } from '../../../../shared/empty.util';
|
||||||
hasValue,
|
|
||||||
hasValue,
|
|
||||||
} from '../../../../shared/empty.util';
|
|
||||||
import { ErrorComponent } from '../../../../shared/error/error.component';
|
import { ErrorComponent } from '../../../../shared/error/error.component';
|
||||||
import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
|
||||||
import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component';
|
import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component';
|
||||||
|
@@ -24,16 +24,10 @@ import { Community } from '../../../../core/shared/community.model';
|
|||||||
import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
|
import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
|
||||||
import { PageInfo } from '../../../../core/shared/page-info.model';
|
import { PageInfo } from '../../../../core/shared/page-info.model';
|
||||||
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
|
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
|
||||||
import {
|
import { HostWindowService } from '../../../../shared/host-window.service';
|
||||||
HostWindowService,
|
|
||||||
HostWindowService,
|
|
||||||
} from '../../../../shared/host-window.service';
|
|
||||||
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
|
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
|
||||||
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
|
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
|
||||||
import {
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
} from '../../../../shared/remote-data.utils';
|
|
||||||
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
|
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
|
||||||
import { 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 { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
|
||||||
|
@@ -15,33 +15,19 @@ import {
|
|||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { switchMap } from 'rxjs/operators';
|
||||||
switchMap,
|
|
||||||
switchMap,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
SortDirection,
|
SortDirection,
|
||||||
SortDirection,
|
|
||||||
SortOptions,
|
|
||||||
SortOptions,
|
SortOptions,
|
||||||
} from '../../../../core/cache/models/sort-options.model';
|
} from '../../../../core/cache/models/sort-options.model';
|
||||||
import {
|
import { CommunityDataService } from '../../../../core/data/community-data.service';
|
||||||
CommunityDataService,
|
|
||||||
CommunityDataService,
|
|
||||||
} from '../../../../core/data/community-data.service';
|
|
||||||
import { PaginatedList } from '../../../../core/data/paginated-list.model';
|
import { PaginatedList } from '../../../../core/data/paginated-list.model';
|
||||||
import { RemoteData } from '../../../../core/data/remote-data';
|
import { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import {
|
import { PaginationService } from '../../../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../../../core/pagination/pagination.service';
|
|
||||||
import { Community } from '../../../../core/shared/community.model';
|
import { Community } from '../../../../core/shared/community.model';
|
||||||
import { fadeIn } from '../../../../shared/animations/fade';
|
import { fadeIn } from '../../../../shared/animations/fade';
|
||||||
import {
|
import { hasValue } from '../../../../shared/empty.util';
|
||||||
hasValue,
|
|
||||||
hasValue,
|
|
||||||
} from '../../../../shared/empty.util';
|
|
||||||
import { ErrorComponent } from '../../../../shared/error/error.component';
|
import { ErrorComponent } from '../../../../shared/error/error.component';
|
||||||
import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component';
|
||||||
import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component';
|
import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component';
|
||||||
|
@@ -6,7 +6,6 @@ import {
|
|||||||
} from 'jasmine-marbles';
|
} from 'jasmine-marbles';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { TestScheduler } from 'rxjs/testing';
|
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 { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
|
||||||
import { getMockRequestService } from '../../shared/mocks/request.service.mock';
|
import { getMockRequestService } from '../../shared/mocks/request.service.mock';
|
||||||
|
@@ -4,32 +4,21 @@ import { Observable } from 'rxjs';
|
|||||||
|
|
||||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||||
import {
|
import { RequestParam } from '../cache/models/request-param.model';
|
||||||
RequestParam,
|
|
||||||
RequestParam,
|
|
||||||
} from '../cache/models/request-param.model';
|
|
||||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||||
import {
|
import {
|
||||||
CreateData,
|
CreateData,
|
||||||
CreateData,
|
|
||||||
CreateDataImpl,
|
|
||||||
CreateDataImpl,
|
CreateDataImpl,
|
||||||
} from '../data/base/create-data';
|
} from '../data/base/create-data';
|
||||||
import { IdentifiableDataService } from '../data/base/identifiable-data.service';
|
import { IdentifiableDataService } from '../data/base/identifiable-data.service';
|
||||||
import { RemoteData } from '../data/remote-data';
|
import { RemoteData } from '../data/remote-data';
|
||||||
import {
|
import { RequestService } from '../data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../data/request.service';
|
|
||||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||||
import {
|
import {
|
||||||
getFirstSucceededRemoteData,
|
getFirstSucceededRemoteData,
|
||||||
getRemoteDataPayload,
|
getRemoteDataPayload,
|
||||||
} from '../shared/operators';
|
} from '../shared/operators';
|
||||||
import {
|
import { Feedback } from './models/feedback.model';
|
||||||
Feedback,
|
|
||||||
Feedback,
|
|
||||||
} from './models/feedback.model';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for checking and managing the feedback
|
* Service for checking and managing the feedback
|
||||||
|
@@ -11,20 +11,11 @@ import {
|
|||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { hasValue } from '../../shared/empty.util';
|
import { hasValue } from '../../shared/empty.util';
|
||||||
import {
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../shared/notifications/notifications.service';
|
|
||||||
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
||||||
import {
|
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||||
RemoteDataBuildService,
|
|
||||||
RemoteDataBuildService,
|
|
||||||
} from '../cache/builders/remote-data-build.service';
|
|
||||||
import { RequestParam } from '../cache/models/request-param.model';
|
import { RequestParam } from '../cache/models/request-param.model';
|
||||||
import {
|
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||||
ObjectCacheService,
|
|
||||||
ObjectCacheService,
|
|
||||||
} from '../cache/object-cache.service';
|
|
||||||
import { CoreState } from '../core-state.model';
|
import { CoreState } from '../core-state.model';
|
||||||
import {
|
import {
|
||||||
DeleteData,
|
DeleteData,
|
||||||
@@ -35,28 +26,16 @@ import {
|
|||||||
SearchData,
|
SearchData,
|
||||||
SearchDataImpl,
|
SearchDataImpl,
|
||||||
} from '../data/base/search-data';
|
} from '../data/base/search-data';
|
||||||
import {
|
import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
|
||||||
DSOChangeAnalyzer,
|
|
||||||
DSOChangeAnalyzer,
|
|
||||||
} from '../data/dso-change-analyzer.service';
|
|
||||||
import { FindListOptions } from '../data/find-list-options.model';
|
import { FindListOptions } from '../data/find-list-options.model';
|
||||||
import { PaginatedList } from '../data/paginated-list.model';
|
import { PaginatedList } from '../data/paginated-list.model';
|
||||||
import { RemoteData } from '../data/remote-data';
|
import { RemoteData } from '../data/remote-data';
|
||||||
import { PostRequest } from '../data/request.models';
|
import { PostRequest } from '../data/request.models';
|
||||||
import {
|
import { RequestService } from '../data/request.service';
|
||||||
RequestService,
|
|
||||||
RequestService,
|
|
||||||
} from '../data/request.service';
|
|
||||||
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
|
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
|
||||||
import {
|
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||||
HALEndpointService,
|
|
||||||
HALEndpointService,
|
|
||||||
} from '../shared/hal-endpoint.service';
|
|
||||||
import { NoContent } from '../shared/NoContent.model';
|
import { NoContent } from '../shared/NoContent.model';
|
||||||
import {
|
import { WorkspaceItem } from './models/workspaceitem.model';
|
||||||
WorkspaceItem,
|
|
||||||
WorkspaceItem,
|
|
||||||
} from './models/workspaceitem.model';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A service that provides methods to make REST requests with workspaceitems endpoint.
|
* A service that provides methods to make REST requests with workspaceitems endpoint.
|
||||||
|
@@ -4,70 +4,45 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
ChangeDetectorRef,
|
ChangeDetectorRef,
|
||||||
ChangeDetectorRef,
|
|
||||||
Component,
|
|
||||||
Component,
|
Component,
|
||||||
Input,
|
Input,
|
||||||
Input,
|
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
UntypedFormControl,
|
UntypedFormControl,
|
||||||
UntypedFormControl,
|
|
||||||
UntypedFormGroup,
|
|
||||||
UntypedFormGroup,
|
UntypedFormGroup,
|
||||||
} from '@angular/forms';
|
} from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
Observable,
|
Observable,
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import { map } from 'rxjs/operators';
|
||||||
map,
|
|
||||||
map,
|
|
||||||
} from 'rxjs/operators';
|
|
||||||
|
|
||||||
import { ConfigurationDataService } from '../core/data/configuration-data.service';
|
import { ConfigurationDataService } from '../core/data/configuration-data.service';
|
||||||
import {
|
import { ScriptDataService } from '../core/data/processes/script-data.service';
|
||||||
ScriptDataService,
|
import { RemoteData } from '../core/data/remote-data';
|
||||||
ScriptDataService,
|
|
||||||
} from '../core/data/processes/script-data.service';
|
|
||||||
import {
|
|
||||||
RemoteData,
|
|
||||||
RemoteData,
|
|
||||||
} from '../core/data/remote-data';
|
|
||||||
import { ConfigurationProperty } from '../core/shared/configuration-property.model';
|
import { ConfigurationProperty } from '../core/shared/configuration-property.model';
|
||||||
import {
|
import {
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
getFirstSucceededRemoteDataPayload,
|
||||||
} from '../core/shared/operators';
|
} from '../core/shared/operators';
|
||||||
import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
|
import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
|
||||||
import { Process } from '../process-page/processes/process.model';
|
import { Process } from '../process-page/processes/process.model';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
|
||||||
hasValue,
|
hasValue,
|
||||||
isEmpty,
|
isEmpty,
|
||||||
isEmpty,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../shared/empty.util';
|
} from '../shared/empty.util';
|
||||||
import { HandleService } from '../shared/handle.service';
|
import { HandleService } from '../shared/handle.service';
|
||||||
import {
|
import { NotificationsService } from '../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../shared/notifications/notifications.service';
|
|
||||||
|
|
||||||
export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
|
export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
|
||||||
|
|
||||||
|
@@ -4,18 +4,13 @@ import {
|
|||||||
TestBed,
|
TestBed,
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { By } from '@angular/platform-browser';
|
||||||
By,
|
|
||||||
By,
|
|
||||||
} from '@angular/platform-browser';
|
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
of,
|
of,
|
||||||
of,
|
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
|
|
||||||
|
|
||||||
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
||||||
import { MetadataValue } from '../../../core/shared/metadata.models';
|
import { MetadataValue } from '../../../core/shared/metadata.models';
|
||||||
|
@@ -1,9 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
CdkDragDrop,
|
|
||||||
CdkDragDrop,
|
CdkDragDrop,
|
||||||
CdkDropList,
|
CdkDropList,
|
||||||
moveItemInArray,
|
moveItemInArray,
|
||||||
moveItemInArray,
|
|
||||||
} from '@angular/cdk/drag-drop';
|
} from '@angular/cdk/drag-drop';
|
||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
@@ -19,7 +17,6 @@ import {
|
|||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
Observable,
|
Observable,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
|
|
||||||
|
|
||||||
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
||||||
import {
|
import {
|
||||||
|
@@ -1,7 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
DebugElement,
|
DebugElement,
|
||||||
DebugElement,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
@@ -9,19 +7,12 @@ import {
|
|||||||
TestBed,
|
TestBed,
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import { By } from '@angular/platform-browser';
|
||||||
By,
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
By,
|
|
||||||
} from '@angular/platform-browser';
|
|
||||||
import {
|
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
Observable,
|
Observable,
|
||||||
of,
|
of,
|
||||||
of,
|
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
|
import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
|
||||||
import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.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 { createPaginatedList } from 'src/app/shared/testing/utils.test';
|
||||||
import { VocabularyServiceStub } from 'src/app/shared/testing/vocabulary-service.stub';
|
import { VocabularyServiceStub } from 'src/app/shared/testing/vocabulary-service.stub';
|
||||||
|
|
||||||
import {
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
DSONameService,
|
import { ItemDataService } from '../../../core/data/item-data.service';
|
||||||
DSONameService,
|
import { RelationshipDataService } from '../../../core/data/relationship-data.service';
|
||||||
} from '../../../core/breadcrumbs/dso-name.service';
|
import { Collection } from '../../../core/shared/collection.model';
|
||||||
import {
|
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
|
||||||
ItemDataService,
|
import { Item } from '../../../core/shared/item.model';
|
||||||
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 {
|
import {
|
||||||
MetadataValue,
|
MetadataValue,
|
||||||
MetadataValue,
|
|
||||||
VIRTUAL_METADATA_PREFIX,
|
|
||||||
VIRTUAL_METADATA_PREFIX,
|
VIRTUAL_METADATA_PREFIX,
|
||||||
} from '../../../core/shared/metadata.models';
|
} from '../../../core/shared/metadata.models';
|
||||||
import {
|
import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
||||||
ItemMetadataRepresentation,
|
|
||||||
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 { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
|
||||||
import {
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
} from '../../../shared/remote-data.utils';
|
|
||||||
import { VarDirective } from '../../../shared/utils/var.directive';
|
import { VarDirective } from '../../../shared/utils/var.directive';
|
||||||
import {
|
import {
|
||||||
DsoEditMetadataChangeType,
|
DsoEditMetadataChangeType,
|
||||||
DsoEditMetadataChangeType,
|
|
||||||
DsoEditMetadataValue,
|
|
||||||
DsoEditMetadataValue,
|
DsoEditMetadataValue,
|
||||||
} from '../dso-edit-metadata-form';
|
} from '../dso-edit-metadata-form';
|
||||||
import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
|
import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
|
||||||
|
@@ -1,10 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
DebugElement,
|
DebugElement,
|
||||||
DebugElement,
|
|
||||||
Injectable,
|
Injectable,
|
||||||
Injectable,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
@@ -13,10 +10,7 @@ import {
|
|||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import {
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
RouterTestingModule,
|
|
||||||
RouterTestingModule,
|
|
||||||
} from '@angular/router/testing';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { Operation } from 'fast-json-patch';
|
import { Operation } from 'fast-json-patch';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
@@ -30,8 +30,6 @@ import {
|
|||||||
of,
|
of,
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
|
|
||||||
import { Observable } from 'rxjs/internal/Observable';
|
|
||||||
import {
|
import {
|
||||||
debounceTime,
|
debounceTime,
|
||||||
distinctUntilChanged,
|
distinctUntilChanged,
|
||||||
|
@@ -11,12 +11,8 @@ import { Store } from '@ngrx/store';
|
|||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import { of as observableOf } from 'rxjs';
|
||||||
of as observableOf,
|
|
||||||
of as observableOf,
|
|
||||||
} from 'rxjs';
|
|
||||||
import {
|
import {
|
||||||
map,
|
map,
|
||||||
switchMap,
|
switchMap,
|
||||||
@@ -28,10 +24,7 @@ import { LogOutAction } from '../../core/auth/auth.actions';
|
|||||||
import { AuthService } from '../../core/auth/auth.service';
|
import { AuthService } from '../../core/auth/auth.service';
|
||||||
import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
|
import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
|
||||||
import { isNotEmpty } from '../../shared/empty.util';
|
import { isNotEmpty } from '../../shared/empty.util';
|
||||||
import {
|
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../shared/notifications/notifications.service';
|
|
||||||
import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
|
import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@@ -1,58 +1,37 @@
|
|||||||
import { NgIf } from '@angular/common';
|
import { NgIf } from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
|
||||||
Component,
|
Component,
|
||||||
Inject,
|
Inject,
|
||||||
Inject,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
UntypedFormBuilder,
|
UntypedFormBuilder,
|
||||||
UntypedFormBuilder,
|
|
||||||
Validators,
|
|
||||||
Validators,
|
Validators,
|
||||||
} from '@angular/forms';
|
} from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
|
|
||||||
import { getHomePageRoute } from '../../../app-routing-paths';
|
import { getHomePageRoute } from '../../../app-routing-paths';
|
||||||
import { AuthService } from '../../../core/auth/auth.service';
|
import { AuthService } from '../../../core/auth/auth.service';
|
||||||
import {
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
RemoteData,
|
|
||||||
RemoteData,
|
|
||||||
} from '../../../core/data/remote-data';
|
|
||||||
import { EPerson } from '../../../core/eperson/models/eperson.model';
|
import { EPerson } from '../../../core/eperson/models/eperson.model';
|
||||||
import {
|
import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
|
||||||
FeedbackDataService,
|
import { RouteService } from '../../../core/services/route.service';
|
||||||
FeedbackDataService,
|
|
||||||
} from '../../../core/feedback/feedback-data.service';
|
|
||||||
import {
|
|
||||||
RouteService,
|
|
||||||
RouteService,
|
|
||||||
} from '../../../core/services/route.service';
|
|
||||||
import {
|
import {
|
||||||
NativeWindowRef,
|
NativeWindowRef,
|
||||||
NativeWindowService,
|
NativeWindowService,
|
||||||
} from '../../../core/services/window.service';
|
} from '../../../core/services/window.service';
|
||||||
import {
|
import { NoContent } from '../../../core/shared/NoContent.model';
|
||||||
NoContent,
|
|
||||||
NoContent,
|
|
||||||
} from '../../../core/shared/NoContent.model';
|
|
||||||
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
|
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
|
||||||
import { URLCombiner } from '../../../core/url-combiner/url-combiner';
|
import { URLCombiner } from '../../../core/url-combiner/url-combiner';
|
||||||
import { ErrorComponent } from '../../../shared/error/error.component';
|
import { ErrorComponent } from '../../../shared/error/error.component';
|
||||||
import {
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../../shared/notifications/notifications.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-feedback-form',
|
selector: 'ds-feedback-form',
|
||||||
|
@@ -4,8 +4,6 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
Component,
|
|
||||||
Input,
|
|
||||||
Input,
|
Input,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { RouterLink } from '@angular/router';
|
import { RouterLink } from '@angular/router';
|
||||||
@@ -23,16 +21,10 @@ import {
|
|||||||
|
|
||||||
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
|
||||||
import {
|
import { Item } from '../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../core/shared/item.model';
|
|
||||||
import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
|
import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
|
||||||
import { AlertComponent } from '../../shared/alert/alert.component';
|
import { AlertComponent } from '../../shared/alert/alert.component';
|
||||||
import {
|
import { AlertType } from '../../shared/alert/alert-type';
|
||||||
AlertType,
|
|
||||||
AlertType,
|
|
||||||
} from '../../shared/alert/alert-type';
|
|
||||||
import {
|
import {
|
||||||
DsoWithdrawnReinstateModalService,
|
DsoWithdrawnReinstateModalService,
|
||||||
REQUEST_REINSTATE,
|
REQUEST_REINSTATE,
|
||||||
|
@@ -1,102 +1,62 @@
|
|||||||
import {
|
import {
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
Location,
|
Location,
|
||||||
Location,
|
|
||||||
NgIf,
|
NgIf,
|
||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
Component,
|
|
||||||
Component,
|
Component,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
UntypedFormBuilder,
|
UntypedFormBuilder,
|
||||||
UntypedFormBuilder,
|
|
||||||
UntypedFormControl,
|
|
||||||
UntypedFormControl,
|
UntypedFormControl,
|
||||||
UntypedFormGroup,
|
UntypedFormGroup,
|
||||||
UntypedFormGroup,
|
|
||||||
Validators,
|
|
||||||
Validators,
|
Validators,
|
||||||
} from '@angular/forms';
|
} from '@angular/forms';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
combineLatest as observableCombineLatest,
|
|
||||||
Observable,
|
|
||||||
Observable,
|
Observable,
|
||||||
of as observableOf,
|
of as observableOf,
|
||||||
of as observableOf,
|
|
||||||
Subscription,
|
|
||||||
Subscription,
|
Subscription,
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import {
|
import {
|
||||||
filter,
|
filter,
|
||||||
filter,
|
|
||||||
map,
|
|
||||||
map,
|
map,
|
||||||
switchMap,
|
switchMap,
|
||||||
switchMap,
|
|
||||||
take,
|
|
||||||
take,
|
take,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
getBitstreamDownloadRoute,
|
getBitstreamDownloadRoute,
|
||||||
getBitstreamDownloadRoute,
|
|
||||||
getForbiddenRoute,
|
|
||||||
getForbiddenRoute,
|
getForbiddenRoute,
|
||||||
} from '../../../app-routing-paths';
|
} from '../../../app-routing-paths';
|
||||||
import {
|
import { AuthService } from '../../../core/auth/auth.service';
|
||||||
AuthService,
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
AuthService,
|
import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
|
||||||
} from '../../../core/auth/auth.service';
|
|
||||||
import {
|
|
||||||
DSONameService,
|
|
||||||
DSONameService,
|
|
||||||
} from '../../../core/breadcrumbs/dso-name.service';
|
|
||||||
import {
|
|
||||||
BitstreamDataService,
|
|
||||||
BitstreamDataService,
|
|
||||||
} from '../../../core/data/bitstream-data.service';
|
|
||||||
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
|
||||||
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
|
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
|
||||||
import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
|
import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
|
||||||
import {
|
import { EPerson } from '../../../core/eperson/models/eperson.model';
|
||||||
EPerson,
|
import { Bitstream } from '../../../core/shared/bitstream.model';
|
||||||
EPerson,
|
|
||||||
} from '../../../core/eperson/models/eperson.model';
|
|
||||||
import {
|
|
||||||
Bitstream,
|
|
||||||
Bitstream,
|
|
||||||
} from '../../../core/shared/bitstream.model';
|
|
||||||
import { Item } from '../../../core/shared/item.model';
|
import { Item } from '../../../core/shared/item.model';
|
||||||
import { ItemRequest } from '../../../core/shared/item-request.model';
|
import { ItemRequest } from '../../../core/shared/item-request.model';
|
||||||
import {
|
import {
|
||||||
getFirstCompletedRemoteData,
|
getFirstCompletedRemoteData,
|
||||||
getFirstCompletedRemoteData,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
|
||||||
getFirstSucceededRemoteDataPayload,
|
getFirstSucceededRemoteDataPayload,
|
||||||
} from '../../../core/shared/operators';
|
} from '../../../core/shared/operators';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
hasValue,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../../shared/empty.util';
|
} from '../../../shared/empty.util';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
|
@@ -3,10 +3,6 @@ import {
|
|||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
|
||||||
ChangeDetectionStrategy,
|
|
||||||
NO_ERRORS_SCHEMA,
|
|
||||||
} from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
fakeAsync,
|
fakeAsync,
|
||||||
@@ -15,16 +11,11 @@ import {
|
|||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRouteSnapshot,
|
ActivatedRouteSnapshot,
|
||||||
ActivatedRouteSnapshot,
|
|
||||||
CanActivate,
|
|
||||||
CanActivate,
|
CanActivate,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
RouterStateSnapshot,
|
RouterStateSnapshot,
|
||||||
RouterStateSnapshot,
|
|
||||||
UrlTree,
|
|
||||||
UrlTree,
|
UrlTree,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import {
|
import {
|
||||||
|
@@ -6,22 +6,14 @@ import {
|
|||||||
} from '@angular/common';
|
} from '@angular/common';
|
||||||
import {
|
import {
|
||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
ChangeDetectionStrategy,
|
|
||||||
Component,
|
|
||||||
Component,
|
Component,
|
||||||
Injector,
|
Injector,
|
||||||
Injector,
|
|
||||||
OnInit,
|
|
||||||
OnInit,
|
OnInit,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
CanActivate,
|
|
||||||
CanActivate,
|
CanActivate,
|
||||||
Route,
|
Route,
|
||||||
Route,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
RouterLink,
|
RouterLink,
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
@@ -36,15 +28,10 @@ import {
|
|||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
import {
|
import { GenericConstructor } from '../../core/shared/generic-constructor';
|
||||||
GenericConstructor,
|
|
||||||
GenericConstructor,
|
|
||||||
} from '../../core/shared/generic-constructor';
|
|
||||||
import { Item } from '../../core/shared/item.model';
|
import { Item } from '../../core/shared/item.model';
|
||||||
import {
|
import {
|
||||||
fadeIn,
|
fadeIn,
|
||||||
fadeIn,
|
|
||||||
fadeInOut,
|
|
||||||
fadeInOut,
|
fadeInOut,
|
||||||
} from '../../shared/animations/fade';
|
} from '../../shared/animations/fade';
|
||||||
import { isNotEmpty } from '../../shared/empty.util';
|
import { isNotEmpty } from '../../shared/empty.util';
|
||||||
|
@@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common';
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import {
|
import {
|
||||||
NgbModule,
|
NgbModule,
|
||||||
NgbModule,
|
|
||||||
NgbTooltipModule,
|
|
||||||
NgbTooltipModule,
|
NgbTooltipModule,
|
||||||
} from '@ng-bootstrap/ng-bootstrap';
|
} 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 { ItemVersionsModule } from '../versions/item-versions.module';
|
||||||
import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
|
import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
|
||||||
import { EditItemPageComponent } from './edit-item-page.component';
|
import { EditItemPageComponent } from './edit-item-page.component';
|
||||||
import {
|
import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
|
||||||
ItemAccessControlComponent,
|
|
||||||
ItemAccessControlComponent,
|
|
||||||
} from './item-access-control/item-access-control.component';
|
|
||||||
import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
|
import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
|
||||||
import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
|
import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
|
||||||
import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
|
import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
|
||||||
|
@@ -28,22 +28,13 @@ import {
|
|||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
import {
|
import { LinkService } from '../../../core/cache/builders/link.service';
|
||||||
LinkService,
|
|
||||||
LinkService,
|
|
||||||
} from '../../../core/cache/builders/link.service';
|
|
||||||
import {
|
import {
|
||||||
buildPaginatedList,
|
buildPaginatedList,
|
||||||
PaginatedList,
|
PaginatedList,
|
||||||
} from '../../../core/data/paginated-list.model';
|
} from '../../../core/data/paginated-list.model';
|
||||||
import {
|
import { Bitstream } from '../../../core/shared/bitstream.model';
|
||||||
Bitstream,
|
import { Bundle } from '../../../core/shared/bundle.model';
|
||||||
Bitstream,
|
|
||||||
} from '../../../core/shared/bitstream.model';
|
|
||||||
import {
|
|
||||||
Bundle,
|
|
||||||
Bundle,
|
|
||||||
} from '../../../core/shared/bundle.model';
|
|
||||||
import { Item } from '../../../core/shared/item.model';
|
import { Item } from '../../../core/shared/item.model';
|
||||||
import {
|
import {
|
||||||
getFirstSucceededRemoteDataPayload,
|
getFirstSucceededRemoteDataPayload,
|
||||||
@@ -52,8 +43,6 @@ import {
|
|||||||
import { AlertComponent } from '../../../shared/alert/alert.component';
|
import { AlertComponent } from '../../../shared/alert/alert.component';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
hasValue,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../../shared/empty.util';
|
} from '../../../shared/empty.util';
|
||||||
import { NgForTrackByIdDirective } from '../../../shared/ng-for-track-by-id.directive';
|
import { NgForTrackByIdDirective } from '../../../shared/ng-for-track-by-id.directive';
|
||||||
|
@@ -17,10 +17,7 @@ import {
|
|||||||
|
|
||||||
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import {
|
import { Item } from '../../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../../core/shared/item.model';
|
|
||||||
import { CurationFormComponent } from '../../../curation-form/curation-form.component';
|
import { CurationFormComponent } from '../../../curation-form/curation-form.component';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@ import { By } from '@angular/platform-browser';
|
|||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
Router,
|
Router,
|
||||||
Router,
|
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { provideMockStore } from '@ngrx/store/testing';
|
import { provideMockStore } from '@ngrx/store/testing';
|
||||||
import { REQUEST } from '@nguniversal/express-engine/tokens';
|
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 { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub';
|
||||||
import { AuthRequestServiceStub } from 'src/app/shared/testing/auth-request-service.stub';
|
import { AuthRequestServiceStub } from 'src/app/shared/testing/auth-request-service.stub';
|
||||||
|
|
||||||
import {
|
import { APP_CONFIG } from '../../../../../config/app-config.interface';
|
||||||
APP_CONFIG,
|
|
||||||
APP_CONFIG,
|
|
||||||
} from '../../../../../config/app-config.interface';
|
|
||||||
import { LinkService } from '../../../../core/cache/builders/link.service';
|
import { LinkService } from '../../../../core/cache/builders/link.service';
|
||||||
import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
|
import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
|
||||||
import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
|
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 { RelationshipDataService } from '../../../../core/data/relationship-data.service';
|
||||||
import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
|
import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
|
||||||
import { GroupDataService } from '../../../../core/eperson/group-data.service';
|
import { GroupDataService } from '../../../../core/eperson/group-data.service';
|
||||||
import {
|
import { PaginationService } from '../../../../core/pagination/pagination.service';
|
||||||
PaginationService,
|
|
||||||
PaginationService,
|
|
||||||
} from '../../../../core/pagination/pagination.service';
|
|
||||||
import { LinkHeadService } from '../../../../core/services/link-head.service';
|
import { LinkHeadService } from '../../../../core/services/link-head.service';
|
||||||
import {
|
import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
|
||||||
ConfigurationProperty,
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
ConfigurationProperty,
|
|
||||||
} from '../../../../core/shared/configuration-property.model';
|
|
||||||
import {
|
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../../../core/shared/item.model';
|
|
||||||
import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
|
import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
|
||||||
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
|
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
|
||||||
import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
|
import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
|
||||||
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
|
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
|
||||||
import { HostWindowService } from '../../../../shared/host-window.service';
|
import { HostWindowService } from '../../../../shared/host-window.service';
|
||||||
import {
|
import { RouterMock } from '../../../../shared/mocks/router.mock';
|
||||||
RouterMock,
|
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
|
||||||
RouterMock,
|
|
||||||
} from '../../../../shared/mocks/router.mock';
|
|
||||||
import {
|
|
||||||
SelectableListService,
|
|
||||||
SelectableListService,
|
|
||||||
} from '../../../../shared/object-list/selectable-list/selectable-list.service';
|
|
||||||
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
|
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
|
||||||
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
|
||||||
import {
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
createSuccessfulRemoteDataObject$,
|
|
||||||
} from '../../../../shared/remote-data.utils';
|
|
||||||
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
|
import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
|
||||||
import {
|
import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
|
||||||
PaginationServiceStub,
|
|
||||||
PaginationServiceStub,
|
|
||||||
} from '../../../../shared/testing/pagination-service.stub';
|
|
||||||
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
|
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
|
||||||
import {
|
import { createPaginatedList } from '../../../../shared/testing/utils.test';
|
||||||
createPaginatedList,
|
import { EditRelationshipListComponent } from './edit-relationship-list.component';
|
||||||
createPaginatedList,
|
|
||||||
} from '../../../../shared/testing/utils.test';
|
|
||||||
import {
|
|
||||||
EditRelationshipListComponent,
|
|
||||||
EditRelationshipListComponent,
|
|
||||||
} from './edit-relationship-list.component';
|
|
||||||
|
|
||||||
let comp: EditRelationshipListComponent;
|
let comp: EditRelationshipListComponent;
|
||||||
let fixture: ComponentFixture<EditRelationshipListComponent>;
|
let fixture: ComponentFixture<EditRelationshipListComponent>;
|
||||||
|
@@ -3,17 +3,12 @@ import {
|
|||||||
Component,
|
Component,
|
||||||
NO_ERRORS_SCHEMA,
|
NO_ERRORS_SCHEMA,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
|
||||||
import {
|
import {
|
||||||
ComponentFixture,
|
|
||||||
ComponentFixture,
|
ComponentFixture,
|
||||||
TestBed,
|
TestBed,
|
||||||
TestBed,
|
|
||||||
waitForAsync,
|
|
||||||
waitForAsync,
|
waitForAsync,
|
||||||
} from '@angular/core/testing';
|
} from '@angular/core/testing';
|
||||||
import {
|
import {
|
||||||
NgbModal,
|
|
||||||
NgbModal,
|
NgbModal,
|
||||||
NgbModalRef,
|
NgbModalRef,
|
||||||
} from '@ng-bootstrap/ng-bootstrap';
|
} 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 { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
|
||||||
import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
|
import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
|
||||||
import {
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
Item,
|
|
||||||
Item,
|
|
||||||
} from '../../../../core/shared/item.model';
|
|
||||||
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
|
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
|
||||||
import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
|
import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
|
||||||
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
|
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 { createPaginatedList } from '../../../../shared/testing/utils.test';
|
||||||
import { ThemeService } from '../../../../shared/theme-support/theme.service';
|
import { ThemeService } from '../../../../shared/theme-support/theme.service';
|
||||||
import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadata.component';
|
import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadata.component';
|
||||||
import {
|
import { EditRelationshipComponent } from './edit-relationship.component';
|
||||||
EditRelationshipComponent,
|
|
||||||
EditRelationshipComponent,
|
|
||||||
} from './edit-relationship.component';
|
|
||||||
|
|
||||||
let objectUpdatesService;
|
let objectUpdatesService;
|
||||||
const url = 'http://test-url.com/test-url';
|
const url = 'http://test-url.com/test-url';
|
||||||
|
@@ -9,8 +9,6 @@ import {
|
|||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
NgbModal,
|
NgbModal,
|
||||||
NgbModal,
|
|
||||||
NgbModalRef,
|
|
||||||
NgbModalRef,
|
NgbModalRef,
|
||||||
} from '@ng-bootstrap/ng-bootstrap';
|
} from '@ng-bootstrap/ng-bootstrap';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
@@ -26,14 +24,8 @@ import {
|
|||||||
take,
|
take,
|
||||||
} from 'rxjs/operators';
|
} from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
|
||||||
FieldChangeType,
|
import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
|
||||||
FieldChangeType,
|
|
||||||
} from '../../../../core/data/object-updates/field-change-type.model';
|
|
||||||
import {
|
|
||||||
FieldUpdate,
|
|
||||||
FieldUpdate,
|
|
||||||
} from '../../../../core/data/object-updates/field-update.model';
|
|
||||||
import {
|
import {
|
||||||
DeleteRelationship,
|
DeleteRelationship,
|
||||||
RelationshipIdentifiable,
|
RelationshipIdentifiable,
|
||||||
@@ -47,8 +39,6 @@ import {
|
|||||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||||
import {
|
import {
|
||||||
hasValue,
|
hasValue,
|
||||||
hasValue,
|
|
||||||
isNotEmpty,
|
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
} from '../../../../shared/empty.util';
|
} from '../../../../shared/empty.util';
|
||||||
import { ListableObjectComponentLoaderComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
|
import { ListableObjectComponentLoaderComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
|
||||||
|
@@ -9,15 +9,12 @@ import {
|
|||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
ActivatedRoute,
|
ActivatedRoute,
|
||||||
ActivatedRoute,
|
|
||||||
Router,
|
|
||||||
Router,
|
Router,
|
||||||
} from '@angular/router';
|
} from '@angular/router';
|
||||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {
|
import {
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
TranslateService,
|
TranslateService,
|
||||||
TranslateService,
|
|
||||||
} from '@ngx-translate/core';
|
} from '@ngx-translate/core';
|
||||||
import {
|
import {
|
||||||
combineLatest as observableCombineLatest,
|
combineLatest as observableCombineLatest,
|
||||||
@@ -59,10 +56,7 @@ import {
|
|||||||
} from '../../../core/shared/operators';
|
} from '../../../core/shared/operators';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
|
import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
|
||||||
import {
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
NotificationsService,
|
|
||||||
NotificationsService,
|
|
||||||
} from '../../../shared/notifications/notifications.service';
|
|
||||||
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
||||||
import { VarDirective } from '../../../shared/utils/var.directive';
|
import { VarDirective } from '../../../shared/utils/var.directive';
|
||||||
import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
|
import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user