Skip to content

Commit dbcf2eb

Browse files
atarix83atarix83
committed
[DURACOM-327] Split followLink array in order to remove dependendy between core and app
1 parent 64d2a47 commit dbcf2eb

44 files changed

Lines changed: 223 additions & 177 deletions

Some content is hidden

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { CanActivateFn } from '@angular/router';
22
import { dsoPageSingleFeatureGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
33
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
4-
import { bitstreamPageResolver } from '@dspace/core/resolvers/bitstream-page.resolver';
54
import { of } from 'rxjs';
65

6+
import { bitstreamPageResolver } from './bitstream-page.resolver';
7+
78
/**
89
* Guard for preventing unauthorized access to certain {@link Bitstream} pages requiring specific authorizations.
910
* Checks authorization rights for managing policies.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { Route } from '@angular/router';
22
import { authenticatedGuard } from '@dspace/core/auth/authenticated.guard';
33
import { bitstreamBreadcrumbResolver } from '@dspace/core/breadcrumbs/bitstream-breadcrumb.resolver';
44
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
5-
import { bitstreamPageResolver } from '@dspace/core/resolvers/bitstream-page.resolver';
65

76
import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
87
import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
98
import { resourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
109
import { resourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
1110
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
1211
import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
12+
import { bitstreamPageResolver } from './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/core/resolvers/bitstream-page.resolver.ts renamed to src/app/bitstream-page/bitstream-page.resolver.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,14 @@ import {
44
ResolveFn,
55
RouterStateSnapshot,
66
} from '@angular/router';
7-
import { Observable } from 'rxjs';
8-
9-
import { BitstreamDataService } from '../data/bitstream-data.service';
10-
import { RemoteData } from '../data/remote-data';
11-
import { Bitstream } from '../shared/bitstream.model';
7+
import { BitstreamDataService } from '@dspace/core/data/bitstream-data.service';
8+
import { RemoteData } from '@dspace/core/data/remote-data';
129
import {
13-
followLink,
14-
FollowLinkConfig,
15-
} from '../shared/follow-link-config.model';
16-
import { getFirstCompletedRemoteData } from '../shared/operators';
17-
18-
/**
19-
* The self links defined in this list are expected to be requested somewhere in the near future
20-
* Requesting them as embeds will limit the number of requests
21-
*/
22-
export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
23-
followLink('bundle', {}, followLink('primaryBitstream'), followLink('item')),
24-
followLink('format'),
25-
];
10+
Bitstream,
11+
BITSTREAM_PAGE_LINKS_TO_FOLLOW,
12+
} from '@dspace/core/shared/bitstream.model';
13+
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
14+
import { Observable } from 'rxjs';
2615

2716
/**
2817
* Method for resolving a bitstream based on the parameters in the current route

‎src/app/collection-page/collection-page-administrator.guard.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { CanActivateFn } from '@angular/router';
22
import { dsoPageSingleFeatureGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
33
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
4-
import { collectionPageResolver } from '@dspace/core/resolvers/collection-page.resolver';
54
import { of } from 'rxjs';
65

6+
import { collectionPageResolver } from './collection-page.resolver';
7+
78
/**
89
* Guard for preventing unauthorized access to certain {@link Collection} pages requiring administrator rights
910
* Check administrator authorization rights

‎src/app/collection-page/collection-page-routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { authenticatedGuard } from '@dspace/core/auth/authenticated.guard';
33
import { collectionBreadcrumbResolver } from '@dspace/core/breadcrumbs/collection-breadcrumb.resolver';
44
import { communityBreadcrumbResolver } from '@dspace/core/breadcrumbs/community-breadcrumb.resolver';
55
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
6-
import { collectionPageResolver } from '@dspace/core/resolvers/collection-page.resolver';
76

87
import { browseByGuard } from '../browse-by/browse-by-guard';
98
import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
109
import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
1110
import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
1211
import { MenuRoute } from '../shared/menu/menu-route.model';
1312
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
13+
import { collectionPageResolver } from './collection-page.resolver';
1414
import { collectionPageAdministratorGuard } from './collection-page-administrator.guard';
1515
import {
1616
COLLECTION_CREATE_PATH,

src/app/core/resolvers/collection-page.resolver.spec.ts renamed to src/app/collection-page/collection-page.resolver.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
12
import { Observable } from 'rxjs';
23
import { first } from 'rxjs/operators';
34

4-
import { createSuccessfulRemoteDataObject$ } from '../utilities/remote-data.utils';
55
import { collectionPageResolver } from './collection-page.resolver';
66

77
describe('collectionPageResolver', () => {

src/app/core/resolvers/collection-page.resolver.ts renamed to src/app/collection-page/collection-page.resolver.ts

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,18 @@ import {
44
ResolveFn,
55
RouterStateSnapshot,
66
} from '@angular/router';
7+
import { CollectionDataService } from '@dspace/core/data/collection-data.service';
8+
import { RemoteData } from '@dspace/core/data/remote-data';
9+
import { ResolvedAction } from '@dspace/core/resolving/resolver.actions';
10+
import {
11+
Collection,
12+
COLLECTION_PAGE_LINKS_TO_FOLLOW,
13+
} from '@dspace/core/shared/collection.model';
14+
import { getFirstCompletedRemoteData } from '@dspace/core/shared/operators';
715
import { Store } from '@ngrx/store';
816
import { Observable } from 'rxjs';
917

10-
import { AppState } from '../../app.reducer';
11-
import { CollectionDataService } from '../data/collection-data.service';
12-
import { RemoteData } from '../data/remote-data';
13-
import { ResolvedAction } from '../resolving/resolver.actions';
14-
import { Collection } from '../shared/collection.model';
15-
import {
16-
followLink,
17-
FollowLinkConfig,
18-
} from '../shared/follow-link-config.model';
19-
import { getFirstCompletedRemoteData } from '../shared/operators';
20-
21-
/**
22-
* The self links defined in this list are expected to be requested somewhere in the near future
23-
* Requesting them as embeds will limit the number of requests
24-
*/
25-
export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
26-
followLink('parentCommunity', {},
27-
followLink('parentCommunity'),
28-
),
29-
followLink('logo'),
30-
];
18+
import { AppState } from '../app.reducer';
3119

3220
/**
3321
* Method for resolving a collection based on the parameters in the current route

‎src/app/community-page/community-page-administrator.guard.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { CanActivateFn } from '@angular/router';
22
import { dsoPageSingleFeatureGuard } from '@dspace/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
33
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
4-
import { communityPageResolver } from '@dspace/core/resolvers/community-page.resolver';
54
import { of } from 'rxjs';
65

6+
import { communityPageResolver } from './community-page.resolver';
7+
78
/**
89
* Guard for preventing unauthorized access to certain {@link Community} pages requiring administrator rights
910
* Check administrator authorization rights

‎src/app/community-page/community-page-routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { Route } from '@angular/router';
22
import { authenticatedGuard } from '@dspace/core/auth/authenticated.guard';
33
import { communityBreadcrumbResolver } from '@dspace/core/breadcrumbs/community-breadcrumb.resolver';
44
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
5-
import { communityPageResolver } from '@dspace/core/resolvers/community-page.resolver';
65

76
import { browseByGuard } from '../browse-by/browse-by-guard';
87
import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
98
import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
109
import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
1110
import { MenuRoute } from '../shared/menu/menu-route.model';
1211
import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-tracker.resolver';
12+
import { communityPageResolver } from './community-page.resolver';
1313
import { communityPageAdministratorGuard } from './community-page-administrator.guard';
1414
import {
1515
COMMUNITY_CREATE_PATH,

src/app/core/resolvers/community-page.resolver.spec.ts renamed to src/app/community-page/community-page.resolver.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
12
import { Observable } from 'rxjs';
23
import { first } from 'rxjs/operators';
34

4-
import { createSuccessfulRemoteDataObject$ } from '../utilities/remote-data.utils';
55
import { communityPageResolver } from './community-page.resolver';
66

77
describe('communityPageResolver', () => {

0 commit comments

Comments
 (0)