Merge branch 'release/26.15.0'

Author: felliott

CHANGELOG

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.15.0 (2026-08-03)
+====================
+
+* Improve tracking for download dashboard.
+
 26.14.0 (2026-07-20)
 ====================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osf",
-  "version": "26.14.0",
+  "version": "26.15.0",
   "scripts": {
     "ng": "ng",
     "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

src/app/features/files/pages/file-detail/file-detail.component.spec.ts

@@ -169,11 +169,14 @@ describe('FileDetailComponent', () => {
     setup();
     (store.dispatch as Mock).mockClear();
     const openSpy = vi.spyOn(window, 'open').mockReturnValue({ focus: vi.fn() } as unknown as Window);
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
     component.downloadRevision('3');
 
     expect(dataciteService.logIdentifiableDownload).toHaveBeenCalledWith(component.fileMetadata$);
-    expect(openSpy).toHaveBeenCalledWith('https://osf.test/download/?revision=3');
+    expect(openSpy).toHaveBeenCalledWith(
+      `https://osf.test/download/?revision=3&source=file-detail&tz=${encodeURIComponent(timeZone)}`
+    );
     expect(store.dispatch).toHaveBeenCalledWith(new GetFileRevisions('https://osf.test/upload'));
   });
 
@@ -223,11 +226,14 @@ describe('FileDetailComponent', () => {
     setup();
     (store.dispatch as Mock).mockClear();
     const openSpy = vi.spyOn(window, 'open').mockReturnValue({ focus: vi.fn() } as unknown as Window);
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
     component.downloadFile();
 
     expect(dataciteService.logIdentifiableDownload).toHaveBeenCalledWith(component.fileMetadata$);
-    expect(openSpy).toHaveBeenCalledWith('https://osf.test/download');
+    expect(openSpy).toHaveBeenCalledWith(
+      `https://osf.test/download?source=file-detail&tz=${encodeURIComponent(timeZone)}`
+    );
     openSpy.mockRestore();
   });
 

src/app/features/files/pages/file-detail/file-detail.component.ts

@@ -40,6 +40,7 @@ import { MetadataTabsComponent } from '@osf/shared/components/metadata-tabs/meta
 import { SubHeaderComponent } from '@osf/shared/components/sub-header/sub-header.component';
 import { MetadataResourceEnum } from '@osf/shared/enums/metadata-resource.enum';
 import { ResourceType } from '@osf/shared/enums/resource-type.enum';
+import { appendDownloadTrackingParams } from '@osf/shared/helpers/download-link.helper';
 import { getMfrUrlWithVersion } from '@osf/shared/helpers/mfr-url.helper';
 import { CustomConfirmationService } from '@osf/shared/services/custom-confirmation.service';
 import { DataciteService } from '@osf/shared/services/datacite/datacite.service';
@@ -250,7 +251,8 @@ export class FileDetailComponent implements OnDestroy {
     const storageLink = this.file()?.links.upload || '';
 
     if (downloadUrl) {
-      window.open(`${downloadUrl}/?revision=${version}`)?.focus();
+      const link = appendDownloadTrackingParams(`${downloadUrl}/?revision=${version}`, 'file-detail');
+      window.open(link)?.focus();
       this.actions.getFileRevisions(storageLink);
     }
   }
@@ -266,7 +268,7 @@ export class FileDetailComponent implements OnDestroy {
       .logIdentifiableDownload(this.fileMetadata$)
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe();
-    window.open(link)?.focus();
+    window.open(appendDownloadTrackingParams(link, 'file-detail'))?.focus();
   }
 
   deleteEntry(link: string): void {

src/app/features/preprints/components/preprint-details/share-and-download/share-and-download.component.spec.ts

@@ -85,7 +85,7 @@ describe('ShareAndDownloadComponent', () => {
 
     component.download();
 
-    expect(socialShareService.createDownloadUrl).toHaveBeenCalledWith(mockPreprint.id);
+    expect(socialShareService.createDownloadUrl).toHaveBeenCalledWith(mockPreprint.id, 'preprint');
     expect(openSpy).toHaveBeenCalledWith('https://example.com/download');
     expect(focus).toHaveBeenCalled();
     expect(dataciteService.logIdentifiableDownload).toHaveBeenCalledWith(component.preprint$);
@@ -124,7 +124,7 @@ describe('ShareAndDownloadComponent', () => {
 
     component.download();
 
-    expect(socialShareService.createDownloadUrl).toHaveBeenCalledWith(mockPreprint.id);
+    expect(socialShareService.createDownloadUrl).toHaveBeenCalledWith(mockPreprint.id, 'preprint');
     expect(dataciteService.logIdentifiableDownload).not.toHaveBeenCalled();
     openSpy.mockRestore();
   });

src/app/features/preprints/components/preprint-details/share-and-download/share-and-download.component.ts

@@ -43,7 +43,7 @@ export class ShareAndDownloadComponent {
       return;
     }
 
-    const downloadLink = this.socialShareService.createDownloadUrl(preprint.id);
+    const downloadLink = this.socialShareService.createDownloadUrl(preprint.id, 'preprint');
     const downloadWindow = window.open(downloadLink);
 
     if (!downloadWindow) {

src/app/features/preprints/pages/preprint-download-redirect/preprint-download-redirect.component.spec.ts

@@ -58,7 +58,7 @@ describe('PreprintDownloadRedirectComponent', () => {
   it('should redirect to download URL when id is present in browser', () => {
     const redirectSpy = vi.spyOn(PreprintDownloadRedirectComponent.prototype, 'redirect').mockImplementation(vi.fn());
     const { mockSocialShareService } = setup({ id: MOCK_ID });
-    expect(mockSocialShareService.createDownloadUrl).toHaveBeenCalledWith(MOCK_ID);
+    expect(mockSocialShareService.createDownloadUrl).toHaveBeenCalledWith(MOCK_ID, 'preprint');
     expect(redirectSpy).toHaveBeenCalledWith(MOCK_DOWNLOAD_URL);
     redirectSpy.mockRestore();
   });

src/app/features/preprints/pages/preprint-download-redirect/preprint-download-redirect.component.ts

@@ -24,7 +24,7 @@ export class PreprintDownloadRedirectComponent {
       return;
     }
 
-    const url = this.socialShareService.createDownloadUrl(id);
+    const url = this.socialShareService.createDownloadUrl(id, 'preprint');
     this.redirect(url);
   }
 

src/app/shared/helpers/download-link.helper.ts

@@ -0,0 +1,5 @@
+export function appendDownloadTrackingParams(link: string, source: string): string {
+  const separator = link.includes('?') ? '&' : '?';
+  const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return `${link}${separator}source=${encodeURIComponent(source)}&tz=${encodeURIComponent(tz)}`;
+}

src/app/shared/services/file-download.service.spec.ts

@@ -44,7 +44,7 @@ describe('FileDownloadService', () => {
     });
 
     expect(dataciteService.logFileDownload).toHaveBeenCalledWith('node-1', 'nodes');
-    expect(filesService.getFolderDownloadLink).toHaveBeenCalledWith('/folder/download/');
+    expect(filesService.getFolderDownloadLink).toHaveBeenCalledWith('/folder/download/', 'files');
     expect(openSpy).toHaveBeenCalledWith('/folder/download/?zip=', '_blank');
   });
 
@@ -63,6 +63,7 @@ describe('FileDownloadService', () => {
 
   it('logs datacite and opens file download link', () => {
     const openSpy = vi.spyOn(window, 'open').mockReturnValue({ focus: vi.fn() } as unknown as Window);
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
     service.downloadFile({
       resourceId: 'node-1',
@@ -71,11 +72,12 @@ describe('FileDownloadService', () => {
     });
 
     expect(dataciteService.logFileDownload).toHaveBeenCalledWith('node-1', 'nodes');
-    expect(openSpy).toHaveBeenCalledWith('/file/download/', '_blank');
+    expect(openSpy).toHaveBeenCalledWith(`/file/download/?source=files&tz=${encodeURIComponent(timeZone)}`, '_blank');
   });
 
   it('downloads file from file model', () => {
     const openSpy = vi.spyOn(window, 'open').mockReturnValue({ focus: vi.fn() } as unknown as Window);
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
     const file = FileModelMock.simple({
       kind: FileKind.File,
       links: { ...FileModelMock.simple().links, download: '/file/download/' },
@@ -88,7 +90,7 @@ describe('FileDownloadService', () => {
     });
 
     expect(dataciteService.logFileDownload).toHaveBeenCalledWith('node-1', 'nodes');
-    expect(openSpy).toHaveBeenCalledWith('/file/download/', '_blank');
+    expect(openSpy).toHaveBeenCalledWith(`/file/download/?source=files&tz=${encodeURIComponent(timeZone)}`, '_blank');
   });
 
   it('downloads folder zip from file model', () => {
@@ -106,7 +108,7 @@ describe('FileDownloadService', () => {
     });
 
     expect(dataciteService.logFileDownload).toHaveBeenCalledWith('node-1', 'nodes');
-    expect(filesService.getFolderDownloadLink).toHaveBeenCalledWith('/folder/upload/');
+    expect(filesService.getFolderDownloadLink).toHaveBeenCalledWith('/folder/upload/', 'files');
     expect(openSpy).toHaveBeenCalledWith('/folder/upload/?zip=', '_blank');
   });
 });