Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,47 @@ describe('PreprintFileSectionComponent', () => {
expect(component.safeLink()).toBeNull();
});

it('should pin the safe link to the latest file version to bust stale MFR/CDN caches', () => {
const downloadUrl = 'https://files.osf.io/v1/resources/abc/providers/osfstorage/def';
setup({
selectorOverrides: [
{
selector: PreprintSelectors.getPreprintFile,
value: {
...mockFile,
links: { ...mockFile.links, render: `https://mfr.osf.io/render?url=${encodeURIComponent(downloadUrl)}` },
},
},
],
});

const safeLink = component.safeLink();
const nestedDownloadUrl = new URL(new URL(safeLink!).searchParams.get('url')!);

expect(nestedDownloadUrl.searchParams.get('version')).toBe('1');
});

it('should not add a version param when there are no file versions yet', () => {
const downloadUrl = 'https://files.osf.io/v1/resources/abc/providers/osfstorage/def';
setup({
selectorOverrides: [
{
selector: PreprintSelectors.getPreprintFile,
value: {
...mockFile,
links: { ...mockFile.links, render: `https://mfr.osf.io/render?url=${encodeURIComponent(downloadUrl)}` },
},
},
{ selector: PreprintSelectors.getPreprintFileVersions, value: [] },
],
});

const safeLink = component.safeLink();
const nestedDownloadUrl = new URL(new URL(safeLink!).searchParams.get('url')!);

expect(nestedDownloadUrl.searchParams.has('version')).toBe(false);
});

it('should compute version menu items from file versions', () => {
setup();
const menuItems = component.versionMenuItems();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ProviderReviewsWorkflow } from '@osf/features/preprints/enums';
import { PreprintSelectors } from '@osf/features/preprints/store/preprint';
import { LoadingSpinnerComponent } from '@osf/shared/components/loading-spinner/loading-spinner.component';
import { IS_LARGE, IS_MEDIUM } from '@osf/shared/helpers/breakpoints.tokens';
import { getMfrUrlWithVersion } from '@osf/shared/helpers/mfr-url.helper';
import { SafeUrlPipe } from '@osf/shared/pipes/safe-url.pipe';
import { DataciteService } from '@osf/shared/services/datacite/datacite.service';

Expand Down Expand Up @@ -43,7 +44,11 @@ export class PreprintFileSectionComponent {
fileVersions = select(PreprintSelectors.getPreprintFileVersions);
areFileVersionsLoading = select(PreprintSelectors.arePreprintFileVersionsLoading);

safeLink = computed(() => this.file()?.links.render ?? null);
safeLink = computed(() => {
const latestVersionId = this.fileVersions()?.[0]?.id ?? '';

return getMfrUrlWithVersion(this.file()?.links.render, latestVersionId);
});
isIframeLoading = true;

versionMenuItems = computed(() => {
Expand Down
Loading