From d21660e5be3b1b24257378659dbb59435d0b75f7 Mon Sep 17 00:00:00 2001 From: futa-ikeda Date: Tue, 25 Nov 2025 17:07:18 -0500 Subject: [PATCH 1/5] fix(preprints): Fix for preprint file upload bug --- .../store/preprint-stepper/preprint-stepper.state.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts index d63e44fad..f1c9bbeb8 100644 --- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts +++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts @@ -223,9 +223,14 @@ export class PreprintStepperState { ctx.setState(patch({ preprintFile: patch({ isLoading: true }) })); - return this.fileService - .updateFileContent(action.file, uploadedFile.links.upload) - .pipe(switchMap(() => this.fileService.renameEntry(uploadedFile.links.upload, action.file.name, 'replace'))); + return this.fileService.updateFileContent(action.file, uploadedFile.links.upload).pipe( + switchMap(() => { + if (uploadedFile.name !== action.file.name) { + return this.fileService.renameEntry(uploadedFile.links.upload, action.file.name, 'replace'); + } + return EMPTY; + }) + ); } @Action(FetchPreprintPrimaryFile) From 71209f7e6ec93de575ba5e6e9ccb185ee6c86394 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Tue, 2 Dec 2025 17:23:05 -0500 Subject: [PATCH 2/5] feat(forking): Change resourceType --- .../project-overview-toolbar.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.ts b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.ts index 2ef801f41..812e20ef2 100644 --- a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.ts +++ b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.ts @@ -66,7 +66,7 @@ export class ProjectOverviewToolbarComponent { isPublic = signal(false); isBookmarked = signal(false); - resourceType = ResourceType.Registration; + resourceType = ResourceType.Project; bookmarksCollectionId = select(BookmarksSelectors.getBookmarksCollectionId); bookmarks = select(BookmarksSelectors.getBookmarks); From 1a08fceaaea9c581e878747474d4201c94f3680e Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 3 Dec 2025 10:16:21 -0500 Subject: [PATCH 3/5] feat(project-overview-toolbar): fix test --- .../project-overview-toolbar.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts index 7bf548355..4e3da221d 100644 --- a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts +++ b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts @@ -179,7 +179,7 @@ describe('ProjectOverviewToolbarComponent', () => { }); it('should have resourceType set to Registration', () => { - expect(component.resourceType).toBe(ResourceType.Registration); + expect(component.resourceType).toBe(ResourceType.Project); }); }); }); From 8395f94d1ffc0b46a0be948a59c4f0ec89100843 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 3 Dec 2025 10:30:19 -0500 Subject: [PATCH 4/5] Update src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts Co-authored-by: nsemets --- .../project-overview-toolbar.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts index 4e3da221d..76bfdb06a 100644 --- a/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts +++ b/src/app/features/project/overview/components/project-overview-toolbar/project-overview-toolbar.component.spec.ts @@ -178,7 +178,7 @@ describe('ProjectOverviewToolbarComponent', () => { expect(component.ResourceType).toBe(ResourceType); }); - it('should have resourceType set to Registration', () => { + it('should have resourceType set to Project', () => { expect(component.resourceType).toBe(ResourceType.Project); }); }); From 6a362c5ad63e0b5366de1064e4b01752d7426dc5 Mon Sep 17 00:00:00 2001 From: nsemets Date: Mon, 8 Dec 2025 17:52:51 +0200 Subject: [PATCH 5/5] [ENG-9917] Add registration_date_updated log to angular osf #810 - Ticket: [ENG-9917] - Feature flag: n/a ## Summary of Changes 1. Added translation for activity log. --- src/assets/i18n/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 5e7b617d2..7c9090df4 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -3064,6 +3064,7 @@ "registration_approved_no_user": "Registration of {{node}} was approved", "registration_cancelled": "{{user}} cancelled a registration of {{node}}", "registration_initiated": "{{user}} initiated a registration of {{node}}", + "registration_date_updated": "An OSF Support Team member updated the registration date of {{node}}", "resource_identifier_added": "{{user}} has added a Resource to Registration {{node}}", "resource_identifier_removed": "{{user}} has removed a Resource to Registration {{node}}", "resource_identifier_updated": "{{user}} has updated a Resource to Registration {{node}}",