Skip to content

Commit 34412fd

Browse files
[DURACOM-327] move core dependencies (imported files) into core folder, move config (app) into core, move core states files into core folder, replace import of some constants for route paths with strings to avoid import/dependency from other part of the app
1 parent b9587b0 commit 34412fd

File tree

97 files changed

+130
-130
lines changed

Some content is hidden

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

97 files changed

+130
-130
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import {
1111
import { TranslateModule } from '@ngx-translate/core';
1212
import { of } from 'rxjs';
1313

14-
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1514
import { buildPaginatedList } from '../../../core/data/paginated-list.model';
1615
import { getMockThemeService } from '../../../core/mocks/theme-service.mock';
1716
import { PageInfo } from '../../../core/shared/page-info.model';
17+
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1818
import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
1919
import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
2020
import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
map,
2222
} from 'rxjs/operators';
2323

24-
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
2524
import {
2625
buildPaginatedList,
2726
PaginatedList,
@@ -31,6 +30,7 @@ import { ListableObject } from '../../../core/object-collection/listable-object.
3130
import { PageInfo } from '../../../core/shared/page-info.model';
3231
import { PaginationComponentOptions } from '../../../core/shared/pagination-component-options.model';
3332
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
33+
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
3434
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
3535
import { ListableObjectComponentLoaderComponent } from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
3636
import { SelectableListItemControlComponent } from '../../../shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';

src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {
33
of,
44
} from 'rxjs';
55

6-
import { createSuccessfulRemoteDataObject$ } from '../../../core/utilities/remote-data.utils';
76
import { PaginatedList } from '../../../core/data/paginated-list.model';
87
import { RemoteData } from '../../../core/data/remote-data';
8+
import { createSuccessfulRemoteDataObject$ } from '../../../core/utilities/remote-data.utils';
99
import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
1010
import { LdnService } from '../ldn-services-model/ldn-services.model';
1111

src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import {
1616
import { cold } from 'jasmine-marbles';
1717
import { of as observableOf } from 'rxjs';
1818

19-
import { createSuccessfulRemoteDataObject } from '../../core/utilities/remote-data.utils';
2019
import { TranslateLoaderMock } from '../../core/mocks/translate-loader.mock';
2120
import { Bitstream } from '../../core/shared/bitstream.model';
2221
import { DSpaceObject } from '../../core/shared/dspace-object.model';
22+
import { createSuccessfulRemoteDataObject } from '../../core/utilities/remote-data.utils';
2323
import { ResourcePoliciesComponent } from '../../shared/resource-policies/resource-policies.component';
2424
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
2525

src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
import { TranslateModule } from '@ngx-translate/core';
1313
import { of as observableOf } from 'rxjs';
1414

15-
import { createSuccessfulRemoteDataObject } from '../../core/utilities/remote-data.utils';
1615
import { getForbiddenRoute } from '../../app-routing-paths';
1716
import { AuthService } from '../../core/auth/auth.service';
1817
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
@@ -21,6 +20,7 @@ import { HardRedirectService } from '../../core/services/hard-redirect.service';
2120
import { ServerResponseService } from '../../core/services/server-response.service';
2221
import { Bitstream } from '../../core/shared/bitstream.model';
2322
import { FileService } from '../../core/shared/file.service';
23+
import { createSuccessfulRemoteDataObject } from '../../core/utilities/remote-data.utils';
2424
import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
2525

2626
describe('BitstreamDownloadPageComponent', () => {

src/app/bitstream-page/bitstream-page-authorizations.guard.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { AuthService } from 'src/app/core/auth/auth.service';
1111
import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
1212
import { FeatureID } from 'src/app/core/data/feature-authorization/feature-id';
1313

14-
import { createSuccessfulRemoteDataObject$ } from '../core/utilities/remote-data.utils';
1514
import { BitstreamDataService } from '../core/data/bitstream-data.service';
1615
import { Bitstream } from '../core/shared/bitstream.model';
16+
import { createSuccessfulRemoteDataObject$ } from '../core/utilities/remote-data.utils';
1717
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
1818

1919
describe('bitstreamPageAuthorizationsGuard', () => {

src/app/bitstream-page/bitstream-page-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { Route } from '@angular/router';
33
import { authenticatedGuard } from '../core/auth/authenticated.guard';
44
import { bitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
55
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
6+
import { bitstreamPageResolver } from '../core/shared/resolvers/bitstream-page.resolver';
67
import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
78
import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
89
import { resourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
910
import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
1011
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
1112
import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
12-
import { bitstreamPageResolver } from '../core/shared/resolvers/bitstream-page.resolver';
1313
import { bitstreamPageAuthorizationsGuard } from './bitstream-page-authorizations.guard';
1414
import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
1515
import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';

src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { first } from 'rxjs/operators';
22

3+
import { RouterMock } from '../../core/mocks/router.mock';
4+
import { Community } from '../../core/shared/community.model';
35
import {
46
createFailedRemoteDataObject$,
57
createSuccessfulRemoteDataObject$,
68
} from '../../core/utilities/remote-data.utils';
7-
import { RouterMock } from '../../core/mocks/router.mock';
8-
import { Community } from '../../core/shared/community.model';
99
import { createCollectionPageGuard } from './create-collection-page.guard';
1010

1111
describe('createCollectionPageGuard', () => {

src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
of,
99
} from 'rxjs';
1010

11-
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1211
import { Community } from '../../../core/shared/community.model';
12+
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1313
import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
1414
import { CollectionAccessControlComponent } from './collection-access-control.component';
1515

src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { ActivatedRoute } from '@angular/router';
1212
import { cold } from 'jasmine-marbles';
1313
import { of as observableOf } from 'rxjs';
1414

15-
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1615
import { Collection } from '../../../core/shared/collection.model';
1716
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
17+
import { createSuccessfulRemoteDataObject } from '../../../core/utilities/remote-data.utils';
1818
import { ResourcePoliciesComponent } from '../../../shared/resource-policies/resource-policies.component';
1919
import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
2020

0 commit comments

Comments
 (0)