-
Notifications
You must be signed in to change notification settings - Fork 29
Feat/478 - View only links #311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ec4e6e0
feat(view-only-links): added components to the vol creation process
rnastyuk d3529e9
Merge branch 'main' into feat/478-view-only-links
rnastyuk 1a37d2c
feat(view-only-links): added vol for projects and registrations
rnastyuk b3de106
Merge branch 'main' into feat/478-view-only-links
rnastyuk 194b21f
Merge branch 'main' into feat/478-view-only-links
rnastyuk d7f69ec
feat(view-only-links): fixed comments
rnastyuk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| export const VIEW_ONLY_EXCLUDED_ROUTES = [ | ||
| 'metadata', | ||
| 'registrations', | ||
| 'contributors', | ||
| 'addons', | ||
| 'settings', | ||
| 'resources', | ||
| 'links', | ||
| ]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { inject } from '@angular/core'; | ||
| import { CanActivateFn, Router } from '@angular/router'; | ||
|
|
||
| import { VIEW_ONLY_EXCLUDED_ROUTES } from '@core/constants/view-only-excluded-routes.const'; | ||
| import { hasViewOnlyParam } from '@osf/shared/helpers'; | ||
|
|
||
| export const viewOnlyGuard: CanActivateFn = (route) => { | ||
| const router = inject(Router); | ||
|
|
||
| if (!hasViewOnlyParam(router)) { | ||
| return true; | ||
| } | ||
|
|
||
| const routePath = route.routeConfig?.path || ''; | ||
|
|
||
| const isBlocked = VIEW_ONLY_EXCLUDED_ROUTES.some( | ||
| (blockedRoute) => routePath === blockedRoute || routePath.startsWith(`${blockedRoute}/`) | ||
| ); | ||
|
|
||
| if (!isBlocked) { | ||
| return true; | ||
| } | ||
|
|
||
| const urlSegments = router.url.split('/'); | ||
| const resourceId = urlSegments[1]; | ||
| const viewOnlyParam = new URLSearchParams(window.location.search).get('view_only'); | ||
|
|
||
| if (resourceId && viewOnlyParam) { | ||
| router.navigate([resourceId, 'overview'], { | ||
| queryParams: { view_only: viewOnlyParam }, | ||
| }); | ||
| } else { | ||
| router.navigate(['/']); | ||
| } | ||
|
|
||
| return false; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| export * from './auth.interceptor'; | ||
| export * from './error.interceptor'; | ||
| export * from './view-only.interceptor'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { Observable } from 'rxjs'; | ||
|
|
||
| import { HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest } from '@angular/common/http'; | ||
| import { inject } from '@angular/core'; | ||
| import { Router } from '@angular/router'; | ||
|
|
||
| import { getViewOnlyParam } from '@osf/shared/helpers'; | ||
|
|
||
| export const viewOnlyInterceptor: HttpInterceptorFn = ( | ||
| req: HttpRequest<unknown>, | ||
| next: HttpHandlerFn | ||
| ): Observable<HttpEvent<unknown>> => { | ||
| const router = inject(Router); | ||
|
|
||
| const viewOnlyParam = getViewOnlyParam(router); | ||
|
|
||
| if (!req.url.includes('/api.crossref.org/funders') && viewOnlyParam) { | ||
| const separator = req.url.includes('?') ? '&' : '?'; | ||
| const updatedUrl = `${req.url}${separator}view_only=${encodeURIComponent(viewOnlyParam)}`; | ||
|
|
||
| const viewOnlyReq = req.clone({ | ||
| url: updatedUrl, | ||
| }); | ||
|
|
||
| return next(viewOnlyReq); | ||
| } else { | ||
| return next(req); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,4 +20,5 @@ export interface OsfFileTarget { | |
| wikiEnabled: boolean; | ||
| public: boolean; | ||
| type: string; | ||
| isAnonymous?: boolean; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.