Skip to content

Commit bc1e266

Browse files
[DURACOM-327] isolate core dependencies, add relative path, refactor imports
1 parent addd1b0 commit bc1e266

1,498 files changed

Lines changed: 7192 additions & 7170 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
} from './src/config/app-config.interface';
5252
import { extendEnvironmentWithAppConfig } from './src/config/config.util';
5353
import { logStartupMessage } from './startup-message';
54-
import { TOKENITEM } from './src/app/core/auth/models/auth-token-info.model';
54+
import { TOKENITEM } from '@core/auth/models/auth-token-info.model';
5555
import { CommonEngine } from '@angular/ssr';
5656
import { APP_BASE_HREF } from '@angular/common';
5757
import {

src/app/access-control/access-control-routes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { AbstractControl } from '@angular/forms';
22
import { Route } from '@angular/router';
3+
import { i18nBreadcrumbResolver } from '@core/breadcrumbs/i18n-breadcrumb.resolver';
4+
import { groupAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
5+
import { siteAdministratorGuard } from '@core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
36
import {
47
DYNAMIC_ERROR_MESSAGES_MATCHER,
58
DynamicErrorMessagesMatcher,
69
} from '@ng-dynamic-forms/core';
710

8-
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
9-
import { groupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
10-
import { siteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
1111
import {
1212
EPERSON_PATH,
1313
GROUP_PATH,

src/app/access-control/access-control-routing-paths.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { URLCombiner } from '@core/url-combiner/url-combiner';
2+
13
import { getAccessControlModuleRoute } from '../app-routing-paths';
2-
import { URLCombiner } from '../core/url-combiner/url-combiner';
34

45
export const EPERSON_PATH = 'epeople';
56

src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import {
44
TestBed,
55
waitForAsync,
66
} from '@angular/core/testing';
7+
import { buildPaginatedList } from '@core/data/paginated-list.model';
8+
import { PageInfo } from '@core/shared/page-info.model';
79
import {
810
NgbAccordionModule,
911
NgbNavModule,
1012
} from '@ng-bootstrap/ng-bootstrap';
1113
import { TranslateModule } from '@ngx-translate/core';
1214
import { of } from 'rxjs';
1315

14-
import { buildPaginatedList } from '../../../core/data/paginated-list.model';
15-
import { PageInfo } from '../../../core/shared/page-info.model';
1616
import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
1717
import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
1818
import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';

src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ import {
55
OnDestroy,
66
OnInit,
77
} from '@angular/core';
8+
import {
9+
buildPaginatedList,
10+
PaginatedList,
11+
} from '@core/data/paginated-list.model';
12+
import { RemoteData } from '@core/data/remote-data';
13+
import { PageInfo } from '@core/shared/page-info.model';
14+
import { SearchConfigurationService } from '@core/shared/search/search-configuration.service';
815
import {
916
NgbAccordionModule,
1017
NgbNavModule,
@@ -20,13 +27,6 @@ import {
2027
map,
2128
} from 'rxjs/operators';
2229

23-
import {
24-
buildPaginatedList,
25-
PaginatedList,
26-
} from '../../../core/data/paginated-list.model';
27-
import { RemoteData } from '../../../core/data/remote-data';
28-
import { PageInfo } from '../../../core/shared/page-info.model';
29-
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
3030
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
3131
import { hasValue } from '../../../shared/empty.util';
3232
import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';

src/app/access-control/epeople-registry/epeople-registry.actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-classes-per-file */
2+
import { EPerson } from '@core/eperson/models/eperson.model';
23
import { Action } from '@ngrx/store';
34

4-
import { EPerson } from '../../core/eperson/models/eperson.model';
55
import { type } from '../../shared/ngrx/type';
66

77
/**

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@ import {
2020
} from '@angular/platform-browser';
2121
import { Router } from '@angular/router';
2222
import { RouterTestingModule } from '@angular/router/testing';
23+
import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service';
24+
import { FindListOptions } from '@core/data/find-list-options.model';
25+
import {
26+
buildPaginatedList,
27+
PaginatedList,
28+
} from '@core/data/paginated-list.model';
29+
import { RemoteData } from '@core/data/remote-data';
30+
import { RequestService } from '@core/data/request.service';
31+
import { EPersonDataService } from '@core/eperson/eperson-data.service';
32+
import { EPerson } from '@core/eperson/models/eperson.model';
33+
import { PaginationService } from '@core/pagination/pagination.service';
34+
import { PageInfo } from '@core/shared/page-info.model';
2335
import {
2436
NgbModal,
2537
NgbModule,
@@ -30,18 +42,6 @@ import {
3042
of,
3143
} from 'rxjs';
3244

33-
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
34-
import { FindListOptions } from '../../core/data/find-list-options.model';
35-
import {
36-
buildPaginatedList,
37-
PaginatedList,
38-
} from '../../core/data/paginated-list.model';
39-
import { RemoteData } from '../../core/data/remote-data';
40-
import { RequestService } from '../../core/data/request.service';
41-
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
42-
import { EPerson } from '../../core/eperson/models/eperson.model';
43-
import { PaginationService } from '../../core/pagination/pagination.service';
44-
import { PageInfo } from '../../core/shared/page-info.model';
4545
import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
4646
import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
4747
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';

src/app/access-control/epeople-registry/epeople-registry.component.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,25 @@ import {
1515
Router,
1616
RouterModule,
1717
} from '@angular/router';
18+
import { DSONameService } from '@core/breadcrumbs/dso-name.service';
19+
import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service';
20+
import { FeatureID } from '@core/data/feature-authorization/feature-id';
21+
import {
22+
buildPaginatedList,
23+
PaginatedList,
24+
} from '@core/data/paginated-list.model';
25+
import { RemoteData } from '@core/data/remote-data';
26+
import { RequestService } from '@core/data/request.service';
27+
import { EPersonDataService } from '@core/eperson/eperson-data.service';
28+
import { EPerson } from '@core/eperson/models/eperson.model';
29+
import { EpersonDtoModel } from '@core/eperson/models/eperson-dto.model';
30+
import { PaginationService } from '@core/pagination/pagination.service';
31+
import { NoContent } from '@core/shared/NoContent.model';
32+
import {
33+
getAllSucceededRemoteData,
34+
getFirstCompletedRemoteData,
35+
} from '@core/shared/operators';
36+
import { PageInfo } from '@core/shared/page-info.model';
1837
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
1938
import {
2039
TranslateModule,
@@ -32,25 +51,6 @@ import {
3251
take,
3352
} from 'rxjs/operators';
3453

35-
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
36-
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
37-
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
38-
import {
39-
buildPaginatedList,
40-
PaginatedList,
41-
} from '../../core/data/paginated-list.model';
42-
import { RemoteData } from '../../core/data/remote-data';
43-
import { RequestService } from '../../core/data/request.service';
44-
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
45-
import { EPerson } from '../../core/eperson/models/eperson.model';
46-
import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
47-
import { PaginationService } from '../../core/pagination/pagination.service';
48-
import { NoContent } from '../../core/shared/NoContent.model';
49-
import {
50-
getAllSucceededRemoteData,
51-
getFirstCompletedRemoteData,
52-
} from '../../core/shared/operators';
53-
import { PageInfo } from '../../core/shared/page-info.model';
5454
import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
5555
import { hasValue } from '../../shared/empty.util';
5656
import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';

src/app/access-control/epeople-registry/epeople-registry.reducers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { EPerson } from '../../core/eperson/models/eperson.model';
1+
import { EPerson } from '@core/eperson/models/eperson.model';
2+
23
import {
34
EPeopleRegistryAction,
45
EPeopleRegistryActionTypes,

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ import {
2121
Router,
2222
RouterModule,
2323
} from '@angular/router';
24+
import { AuthService } from '@core/auth/auth.service';
25+
import { EpersonRegistrationService } from '@core/data/eperson-registration.service';
26+
import { AuthorizationDataService } from '@core/data/feature-authorization/authorization-data.service';
27+
import { FindListOptions } from '@core/data/find-list-options.model';
28+
import {
29+
buildPaginatedList,
30+
PaginatedList,
31+
} from '@core/data/paginated-list.model';
32+
import { RemoteData } from '@core/data/remote-data';
33+
import { RequestService } from '@core/data/request.service';
34+
import { EPersonDataService } from '@core/eperson/eperson-data.service';
35+
import { GroupDataService } from '@core/eperson/group-data.service';
36+
import { EPerson } from '@core/eperson/models/eperson.model';
37+
import { PaginationService } from '@core/pagination/pagination.service';
38+
import { PageInfo } from '@core/shared/page-info.model';
2439
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
2540
import { TranslateModule } from '@ngx-translate/core';
2641
import {
2742
Observable,
2843
of,
2944
} from 'rxjs';
3045

31-
import { AuthService } from '../../../core/auth/auth.service';
32-
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
33-
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
34-
import { FindListOptions } from '../../../core/data/find-list-options.model';
35-
import {
36-
buildPaginatedList,
37-
PaginatedList,
38-
} from '../../../core/data/paginated-list.model';
39-
import { RemoteData } from '../../../core/data/remote-data';
40-
import { RequestService } from '../../../core/data/request.service';
41-
import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
42-
import { GroupDataService } from '../../../core/eperson/group-data.service';
43-
import { EPerson } from '../../../core/eperson/models/eperson.model';
44-
import { PaginationService } from '../../../core/pagination/pagination.service';
45-
import { PageInfo } from '../../../core/shared/page-info.model';
4646
import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
4747
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
4848
import { FormComponent } from '../../../shared/form/form.component';

0 commit comments

Comments
 (0)