diff --git a/src/app/core/interceptors/view-only.interceptor.ts b/src/app/core/interceptors/view-only.interceptor.ts index 908913796..a0a4d91e1 100644 --- a/src/app/core/interceptors/view-only.interceptor.ts +++ b/src/app/core/interceptors/view-only.interceptor.ts @@ -15,6 +15,10 @@ export const viewOnlyInterceptor: HttpInterceptorFn = ( const viewOnlyParam = getViewOnlyParam(router); if (!req.url.includes('/api.crossref.org/funders') && viewOnlyParam) { + if (req.url.includes('view_only=')) { + return next(req); + } + const separator = req.url.includes('?') ? '&' : '?'; const updatedUrl = `${req.url}${separator}view_only=${encodeURIComponent(viewOnlyParam)}`; diff --git a/src/app/features/files/components/file-keywords/file-keywords.component.html b/src/app/features/files/components/file-keywords/file-keywords.component.html index 495d7d9e5..123708174 100644 --- a/src/app/features/files/components/file-keywords/file-keywords.component.html +++ b/src/app/features/files/components/file-keywords/file-keywords.component.html @@ -1,21 +1,28 @@

{{ 'files.detail.keywords.title' | translate }}

-
- + @if (!hasViewOnly()) { +
+ - - -
+ + +
+ } @if (!isTagsLoading()) {
@for (tag of tags(); track $index) { - + }
} @else { diff --git a/src/app/features/files/components/file-keywords/file-keywords.component.ts b/src/app/features/files/components/file-keywords/file-keywords.component.ts index 7991a5740..80e08b78d 100644 --- a/src/app/features/files/components/file-keywords/file-keywords.component.ts +++ b/src/app/features/files/components/file-keywords/file-keywords.component.ts @@ -7,11 +7,12 @@ import { Chip } from 'primeng/chip'; import { InputText } from 'primeng/inputtext'; import { Skeleton } from 'primeng/skeleton'; -import { ChangeDetectionStrategy, Component, DestroyRef, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; -import { CustomValidators } from '@osf/shared/helpers'; +import { CustomValidators, hasViewOnlyParam } from '@osf/shared/helpers'; import { InputLimits } from '@shared/constants'; import { FilesSelectors, UpdateTags } from '../../store'; @@ -26,10 +27,12 @@ import { FilesSelectors, UpdateTags } from '../../store'; export class FileKeywordsComponent { private readonly actions = createDispatchMap({ updateTags: UpdateTags }); private readonly destroyRef = inject(DestroyRef); + private readonly router = inject(Router); readonly tags = select(FilesSelectors.getFileTags); readonly isTagsLoading = select(FilesSelectors.isFileTagsLoading); readonly file = select(FilesSelectors.getOpenedFile); + readonly hasViewOnly = computed(() => hasViewOnlyParam(this.router)); keywordControl = new FormControl('', { nonNullable: true, diff --git a/src/app/features/files/components/file-metadata/file-metadata.component.html b/src/app/features/files/components/file-metadata/file-metadata.component.html index 868f4fbd1..1f24fde19 100644 --- a/src/app/features/files/components/file-metadata/file-metadata.component.html +++ b/src/app/features/files/components/file-metadata/file-metadata.component.html @@ -2,15 +2,17 @@

{{ 'files.detail.fileMetadata.title' | translate }}

-
- + @if (!hasViewOnly()) { +
+ - -
+ +
+ }
@if (isLoading()) { diff --git a/src/app/features/files/components/file-metadata/file-metadata.component.ts b/src/app/features/files/components/file-metadata/file-metadata.component.ts index cd7ec7d92..5c24dfa75 100644 --- a/src/app/features/files/components/file-metadata/file-metadata.component.ts +++ b/src/app/features/files/components/file-metadata/file-metadata.component.ts @@ -8,11 +8,12 @@ import { Skeleton } from 'primeng/skeleton'; import { filter, map, of } from 'rxjs'; -import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { languageCodes } from '@osf/shared/constants'; +import { hasViewOnlyParam } from '@osf/shared/helpers'; import { LanguageCodeModel } from '@osf/shared/models'; import { FileMetadataFields } from '../../constants'; @@ -33,11 +34,13 @@ import { environment } from 'src/environments/environment'; export class FileMetadataComponent { private readonly actions = createDispatchMap({ setFileMetadata: SetFileMetadata }); private readonly route = inject(ActivatedRoute); + private readonly router = inject(Router); private readonly dialogService = inject(DialogService); private readonly translateService = inject(TranslateService); fileMetadata = select(FilesSelectors.getFileCustomMetadata); isLoading = select(FilesSelectors.isFileMetadataLoading); + hasViewOnly = computed(() => hasViewOnlyParam(this.router)); readonly languageCodes = languageCodes; diff --git a/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.html b/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.html index 73a66aca3..06b9f50c5 100644 --- a/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.html +++ b/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.html @@ -98,7 +98,7 @@

{{ 'files.detail.resourceMetadata.fields.dateModified' | translate }}

@if (isResourceContributorsLoading()) { } @else { - @if (contributors()?.length) { + @if (contributors()?.length && !hasViewOnly()) {

{{ 'files.detail.resourceMetadata.fields.contributors' | translate }}

diff --git a/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.ts b/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.ts index 3e962d0c2..adcaaab74 100644 --- a/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.ts +++ b/src/app/features/files/components/file-resource-metadata/file-resource-metadata.component.ts @@ -5,8 +5,10 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Skeleton } from 'primeng/skeleton'; import { DatePipe } from '@angular/common'; -import { ChangeDetectionStrategy, Component, input } from '@angular/core'; -import { RouterLink } from '@angular/router'; +import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'; +import { Router, RouterLink } from '@angular/router'; + +import { hasViewOnlyParam } from '@osf/shared/helpers'; import { FilesSelectors } from '../../store'; @@ -18,9 +20,12 @@ import { FilesSelectors } from '../../store'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class FileResourceMetadataComponent { + private readonly router = inject(Router); + resourceType = input('nodes'); resourceMetadata = select(FilesSelectors.getResourceMetadata); contributors = select(FilesSelectors.getContributors); isResourceMetadataLoading = select(FilesSelectors.isResourceMetadataLoading); isResourceContributorsLoading = select(FilesSelectors.isResourceContributorsLoading); + hasViewOnly = computed(() => hasViewOnlyParam(this.router)); } diff --git a/src/app/features/files/mappers/resource-metadata.mapper.ts b/src/app/features/files/mappers/resource-metadata.mapper.ts index b5a993af2..0f3890722 100644 --- a/src/app/features/files/mappers/resource-metadata.mapper.ts +++ b/src/app/features/files/mappers/resource-metadata.mapper.ts @@ -13,16 +13,19 @@ export function MapResourceMetadata( description: shortInfo.data.attributes.description, dateCreated: new Date(shortInfo.data.attributes.date_created), dateModified: new Date(shortInfo.data.attributes.date_modified), - funders: customMetadata.data.embeds.custom_metadata.data.attributes.funders.map((funder) => ({ - funderName: funder.funder_name, - funderIdentifier: funder.funder_identifier, - funderIdentifierType: funder.funder_identifier_type, - awardNumber: funder.award_number, - awardUri: funder.award_uri, - awardTitle: funder.award_title, - })), - identifiers: IdentifiersMapper.fromJsonApi(shortInfo.data.embeds.identifiers), - language: customMetadata.data.embeds.custom_metadata.data.attributes.language, - resourceTypeGeneral: customMetadata.data.embeds.custom_metadata.data.attributes.resource_type_general, + funders: + customMetadata.data.embeds?.custom_metadata?.data?.attributes?.funders?.map((funder) => ({ + funderName: funder.funder_name, + funderIdentifier: funder.funder_identifier, + funderIdentifierType: funder.funder_identifier_type, + awardNumber: funder.award_number, + awardUri: funder.award_uri, + awardTitle: funder.award_title, + })) || [], + identifiers: shortInfo.data.embeds?.identifiers?.data.length + ? IdentifiersMapper.fromJsonApi(shortInfo.data.embeds?.identifiers) + : [], + language: customMetadata.data.embeds?.custom_metadata?.data?.attributes?.language || '', + resourceTypeGeneral: customMetadata.data.embeds?.custom_metadata?.data?.attributes?.resource_type_general || '', }; } diff --git a/src/app/features/files/pages/file-detail/file-detail.component.html b/src/app/features/files/pages/file-detail/file-detail.component.html index 05c85e754..1e7d75fd7 100644 --- a/src/app/features/files/pages/file-detail/file-detail.component.html +++ b/src/app/features/files/pages/file-detail/file-detail.component.html @@ -1,6 +1,6 @@ - + {{ 'files.detail.tabs.details' | translate }} {{ 'files.detail.tabs.revisions' | translate }} @@ -12,13 +12,13 @@
- + {{ 'files.detail.backToList' | translate }}
- @if (!isAnonymous()) { + @if (!isAnonymous() && !hasViewOnly()) {
} - @if (file() && !isAnonymous()) { + @if (file() && !isAnonymous() && !hasViewOnly()) { } @else { -
+
hasViewOnlyParam(this.router)); + safeLink: SafeResourceUrl | null = null; resourceId = ''; resourceType = ''; @@ -221,7 +223,7 @@ export class FileDetailComponent { .subscribe(() => { const link = this.file()?.links.render; if (link) { - this.safeLink = this.sanitizer.bypassSecurityTrustResourceUrl(link); + this.safeLink = this.sanitizer.bypassSecurityTrustResourceUrl(this.addViewOnlyToUrl(link)); } this.resourceId = this.file()?.target.id || ''; this.resourceType = this.file()?.target.type || ''; @@ -393,4 +395,14 @@ export class FileDetailComponent { this.actions.getCedarTemplates(); } } + + private addViewOnlyToUrl(url: string): string { + if (!this.hasViewOnly()) return url; + + const viewOnlyParam = getViewOnlyParam(); + if (!viewOnlyParam) return url; + + const separator = url.includes('?') ? '&' : '?'; + return `${url}${separator}view_only=${encodeURIComponent(viewOnlyParam)}`; + } } diff --git a/src/app/features/files/pages/files-container/files-container.component.scss b/src/app/features/files/pages/files-container/files-container.component.scss new file mode 100644 index 000000000..da0c027b5 --- /dev/null +++ b/src/app/features/files/pages/files-container/files-container.component.scss @@ -0,0 +1,5 @@ +:host { + display: flex; + flex-direction: column; + flex: 1; +} diff --git a/src/app/features/files/pages/files-container/files-container.component.ts b/src/app/features/files/pages/files-container/files-container.component.ts index dc4406436..7e4f1ab78 100644 --- a/src/app/features/files/pages/files-container/files-container.component.ts +++ b/src/app/features/files/pages/files-container/files-container.component.ts @@ -4,6 +4,7 @@ import { RouterOutlet } from '@angular/router'; @Component({ selector: 'osf-files-container', imports: [RouterOutlet], + styleUrl: './files-container.component.scss', templateUrl: './files-container.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) diff --git a/src/app/features/files/pages/files/files.component.spec.ts b/src/app/features/files/pages/files/files.component.spec.ts index a2c0d202a..4a6c370a9 100644 --- a/src/app/features/files/pages/files/files.component.spec.ts +++ b/src/app/features/files/pages/files/files.component.spec.ts @@ -13,6 +13,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { SENTRY_TOKEN } from '@core/factory/sentry.factory'; import { FilesTreeComponent, FormSelectComponent, @@ -66,6 +67,14 @@ describe('Component: Files', () => { MockProvider(ActivatedRoute), MockProvider(CustomConfirmationService), DialogService, + { + provide: SENTRY_TOKEN, + useValue: { + captureException: jest.fn(), + captureMessage: jest.fn(), + setUser: jest.fn(), + }, + }, provideMockStore({ signals: [ { diff --git a/src/app/features/files/pages/files/files.component.ts b/src/app/features/files/pages/files/files.component.ts index eb6f6bdcd..e1c19a3e7 100644 --- a/src/app/features/files/pages/files/files.component.ts +++ b/src/app/features/files/pages/files/files.component.ts @@ -390,7 +390,10 @@ export class FilesComponent { } navigateToFile(file: OsfFile) { - this.router.navigate([file.guid], { relativeTo: this.activeRoute }); + this.router.navigate([file.guid], { + relativeTo: this.activeRoute, + queryParamsHandling: 'merge', + }); } getAddonName(addons: ConfiguredAddonModel[], provider: string): string { diff --git a/src/app/features/project/overview/components/files-widget/files-widget.component.ts b/src/app/features/project/overview/components/files-widget/files-widget.component.ts index 5007345db..6d3d8b31a 100644 --- a/src/app/features/project/overview/components/files-widget/files-widget.component.ts +++ b/src/app/features/project/overview/components/files-widget/files-widget.component.ts @@ -218,7 +218,10 @@ export class FilesWidgetComponent { } navigateToFile(file: OsfFile) { - this.router.navigate(['files', file.guid], { relativeTo: this.activeRoute.parent }); + this.router.navigate(['files', file.guid], { + relativeTo: this.activeRoute.parent, + queryParamsHandling: 'merge', + }); } onFilesPageChange(page: number) { diff --git a/src/app/shared/components/files-tree/files-tree.component.html b/src/app/shared/components/files-tree/files-tree.component.html index e86b7da08..bd600d050 100644 --- a/src/app/shared/components/files-tree/files-tree.component.html +++ b/src/app/shared/components/files-tree/files-tree.component.html @@ -1,4 +1,4 @@ -
+
@if (!hasViewOnly()) {
+
} @else { -
+
({ id: contributor.id, - userId: contributor.embeds.users.data.id, + userId: contributor.embeds?.users?.data?.id || '', type: contributor.type, isBibliographic: contributor.attributes.bibliographic, isUnregisteredContributor: !!contributor.attributes.unregistered_contributor, isCurator: contributor.attributes.is_curator, permission: contributor.attributes.permission, - fullName: contributor.embeds.users.data.attributes.full_name, - givenName: contributor.embeds.users.data.attributes.given_name, - familyName: contributor.embeds.users.data.attributes.family_name, - education: contributor.embeds.users.data.attributes.education, - employment: contributor.embeds.users.data.attributes.employment, + fullName: contributor.embeds?.users?.data?.attributes?.full_name || '', + givenName: contributor.embeds?.users?.data?.attributes?.given_name || '', + familyName: contributor.embeds?.users?.data?.attributes?.family_name || '', + education: contributor.embeds?.users?.data?.attributes?.education || '', + employment: contributor.embeds?.users?.data?.attributes?.employment || '', })); } diff --git a/src/app/shared/services/activity-logs/activity-logs.service.ts b/src/app/shared/services/activity-logs/activity-logs.service.ts index 853a451f3..f7b6dd20b 100644 --- a/src/app/shared/services/activity-logs/activity-logs.service.ts +++ b/src/app/shared/services/activity-logs/activity-logs.service.ts @@ -38,7 +38,7 @@ export class ActivityLogsService { fetchLogs(projectId: string, page = 1, pageSize: number): Observable> { const url = `${this.apiUrl}/nodes/${projectId}/logs/`; const params: Record = { - 'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node', 'group'], + 'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node'], page, 'page[size]': pageSize, }; @@ -58,7 +58,7 @@ export class ActivityLogsService { ): Observable> { const url = `${this.apiUrl}/registrations/${registrationId}/logs/`; const params: Record = { - 'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node', 'group'], + 'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node'], page, 'page[size]': pageSize, }; diff --git a/src/app/shared/services/files.service.ts b/src/app/shared/services/files.service.ts index 0a7232fed..a707a819c 100644 --- a/src/app/shared/services/files.service.ts +++ b/src/app/shared/services/files.service.ts @@ -1,7 +1,7 @@ import { Observable, of, switchMap, throwError } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { HttpEvent } from '@angular/common/http'; +import { HttpEvent, HttpEventType } from '@angular/common/http'; import { inject, Injectable } from '@angular/core'; import { MapFileCustomMetadata, MapFileRevision } from '@osf/features/files/mappers'; @@ -95,6 +95,16 @@ export class FilesService { }; return this.jsonApiService.putFile(uploadLink, file, params).pipe( + switchMap((event) => { + if (event.type === HttpEventType.Response && event.body?.data?.id) { + const fileId = event.body.data.id.split('/').pop(); + if (fileId) { + return this.getFileGuid(fileId).pipe(map(() => event)); + } + } + + return of(event); + }), catchError((error) => { this.toastService.showError(error.error.message); return throwError(() => error); @@ -166,10 +176,12 @@ export class FilesService { } getFolderDownloadLink(storageLink: string, folderId: string, isRootFolder: boolean): string { + const separator = storageLink.includes('?') ? '&' : '?'; + if (isRootFolder) { - return `${storageLink}?zip=`; + return `${storageLink}${separator}zip=`; } - return `${storageLink}${folderId}/?zip=`; + return `${storageLink}${folderId}/${separator}zip=`; } getFileTarget(fileGuid: string): Observable { @@ -250,8 +262,11 @@ export class FilesService { } getFileRevisions(link: string): Observable { + const separator = link.includes('?') ? '&' : '?'; + const urlWithRevisions = `${link}${separator}revisions=`; + return this.jsonApiService - .get(`${link}?revisions=`) + .get(urlWithRevisions) .pipe(map((response) => MapFileRevision(response.data))); } diff --git a/src/testing/data/activity-logs/activity-logs.data.ts b/src/testing/data/activity-logs/activity-logs.data.ts index c2ce8570f..f1e5bcdce 100644 --- a/src/testing/data/activity-logs/activity-logs.data.ts +++ b/src/testing/data/activity-logs/activity-logs.data.ts @@ -2,7 +2,7 @@ import { environment } from 'src/environments/environment'; import structuredClone from 'structured-clone'; export const ACTIVITY_LOGS_EMBEDS_QS = - 'embed%5B%5D=original_node&embed%5B%5D=user&embed%5B%5D=linked_node&embed%5B%5D=linked_registration&embed%5B%5D=template_node&embed%5B%5D=group'; + 'embed%5B%5D=original_node&embed%5B%5D=user&embed%5B%5D=linked_node&embed%5B%5D=linked_registration&embed%5B%5D=template_node'; export function buildRegistrationLogsUrl( registrationId: string,