Merge branch 'release/26.18.0'

Author: cslzchen

CHANGELOG

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.18.0 (2026-09-10)
+====================
+
+* Project Creation and Project Read-only
+
 26.17.1 (2026-09-01)
 ====================
 

package.json

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

src/app/core/components/request-access/request-access.component.html

@@ -1,35 +1,44 @@
 <section class="container text-center flex flex-column flex-1 my-7 mx-3 p-3 md:p-4">
-  <h2>{{ 'requestAccess.title' | translate }}</h2>
+  <h2>{{ titleTranslation() | translate }}</h2>
 
-  <p class="mt-4">{{ 'requestAccess.message' | translate }}</p>
+  <p class="mt-4">
+    <span [innerHTML]="messageTranslation() | translate"></span>
+    @if (isProjectReadOnly()) {
+      <a class="ml-1 font-bold" [href]="'mailto:' + supportEmail">{{ supportEmail }}</a>
+    }
+  </p>
 
-  <div class="flex flex-column text-left mt-4">
-    <label class="font-bold" for="comment">
-      {{ 'requestAccess.commentLabel' | translate }}
-    </label>
+  @if (!isProjectReadOnly()) {
+    <div class="flex flex-column text-left mt-4">
+      <label class="font-bold" for="comment">
+        {{ 'requestAccess.commentLabel' | translate }}
+      </label>
 
-    <textarea
-      class="comment-input"
-      pTextarea
-      id="comment"
-      [rows]="3"
-      [maxLength]="commentLimit"
-      [(ngModel)]="comment"
-    ></textarea>
-  </div>
+      <textarea
+        class="comment-input"
+        pTextarea
+        id="comment"
+        [rows]="3"
+        [maxLength]="commentLimit"
+        [(ngModel)]="comment"
+      ></textarea>
+    </div>
+  }
 
   <div class="flex align-items-center gap-3 mt-6">
-    <p-button
-      class="w-full"
-      styleClass="w-full"
-      [label]="'requestAccess.requestAccess' | translate"
-      (onClick)="requestAccess()"
-    ></p-button>
+    @if (!isProjectReadOnly()) {
+      <p-button
+        class="w-full"
+        styleClass="w-full"
+        [label]="'requestAccess.requestAccess' | translate"
+        (onClick)="requestAccess()"
+      ></p-button>
+    }
 
     <p-button
       class="w-full"
       styleClass="w-full"
-      severity="secondary"
+      [severity]="isProjectReadOnly() ? 'primary' : 'secondary'"
       [label]="'requestAccess.switchAccount' | translate"
       (onClick)="switchAccount()"
     ></p-button>

src/app/core/components/request-access/request-access.component.spec.ts

@@ -9,6 +9,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { AuthService } from '@core/services/auth.service';
+import { UserSelectors } from '@core/store/user';
 import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { RequestAccessService } from '@osf/shared/services/request-access.service';
 import { ToastService } from '@osf/shared/services/toast.service';
@@ -18,10 +19,17 @@ import { AuthServiceMock, AuthServiceMockType } from '@testing/providers/auth-se
 import { LoaderServiceMock, provideLoaderServiceMock } from '@testing/providers/loader-service.mock';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 import { RouterMockBuilder, RouterMockType } from '@testing/providers/router-provider.mock';
+import { BaseSetupOverrides, mergeSignalOverrides, provideMockStore } from '@testing/providers/store-provider.mock';
 import { ToastServiceMock, ToastServiceMockType } from '@testing/providers/toast-provider.mock';
 
 import { RequestAccessComponent } from './request-access.component';
 
+interface SetupOverrides extends BaseSetupOverrides {
+  routeId?: string;
+  requestAccessResult?: Observable<void>;
+  requestAccessError?: HttpErrorResponse;
+}
+
 describe('RequestAccessComponent', () => {
   let fixture: ComponentFixture<RequestAccessComponent>;
   let component: RequestAccessComponent;
@@ -31,12 +39,10 @@ describe('RequestAccessComponent', () => {
   let toastServiceMock: ToastServiceMockType;
   let authServiceMock: AuthServiceMockType;
 
-  function setup(overrides?: {
-    routeId?: string;
-    requestAccessResult?: Observable<void>;
-    requestAccessError?: HttpErrorResponse;
-  }) {
+  function setup(overrides?: SetupOverrides) {
     const routeId = overrides?.routeId ?? 'project-1';
+    const defaultSignals = [{ selector: UserSelectors.isProjectReadOnly, value: false }];
+    const signals = mergeSignalOverrides(defaultSignals, overrides?.selectorOverrides ?? []);
     routerMock = RouterMockBuilder.create().withNavigate(vi.fn().mockResolvedValue(true)).build();
     loaderServiceMock = new LoaderServiceMock();
     toastServiceMock = ToastServiceMock.simple();
@@ -60,6 +66,7 @@ describe('RequestAccessComponent', () => {
         MockProvider(RequestAccessService, requestAccessServiceMock),
         MockProvider(ToastService, toastServiceMock),
         MockProvider(AuthService, authServiceMock),
+        provideMockStore({ signals }),
       ],
     });
 
@@ -86,6 +93,23 @@ describe('RequestAccessComponent', () => {
     expect(supportLink.textContent).toContain(component.supportEmail);
   });
 
+  it('should expose title and message translations based on read-only state', () => {
+    setup({ selectorOverrides: [{ selector: UserSelectors.isProjectReadOnly, value: true }] });
+    expect(component.titleTranslation()).toBe('requestAccess.readOnlyTitle');
+    expect(component.messageTranslation()).toBe('requestAccess.messageReadOnly');
+
+    const buttons = fixture.nativeElement.querySelectorAll('p-button');
+    expect(buttons).toHaveLength(1);
+  });
+
+  it('should expose title and message translations based on non-read-only state', () => {
+    setup({ selectorOverrides: [{ selector: UserSelectors.isProjectReadOnly, value: false }] });
+    expect(component.titleTranslation()).toBe('requestAccess.title');
+    expect(component.messageTranslation()).toBe('requestAccess.message');
+    const buttons = fixture.nativeElement.querySelectorAll('p-button');
+    expect(buttons.length).toBe(2);
+  });
+
   it('should request access and handle success flow', () => {
     setup({ routeId: 'project-123' });
     component.comment.set('please grant access');

src/app/core/components/request-access/request-access.component.ts

@@ -1,3 +1,5 @@
+import { select } from '@ngxs/store';
+
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
@@ -6,13 +8,14 @@ import { Textarea } from 'primeng/textarea';
 import { map, of } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { ChangeDetectionStrategy, Component, inject, model } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, inject, model } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { AuthService } from '@core/services/auth.service';
+import { UserSelectors } from '@osf/core/store/user/user.selectors';
 import { InputLimits } from '@osf/shared/constants/input-limits.const';
 import { LoaderService } from '@osf/shared/services/loader.service';
 import { RequestAccessService } from '@osf/shared/services/request-access.service';
@@ -41,6 +44,16 @@ export class RequestAccessComponent {
   private readonly toastService = inject(ToastService);
   private readonly authService = inject(AuthService);
 
+  readonly isProjectReadOnly = select(UserSelectors.isProjectReadOnly);
+
+  readonly titleTranslation = computed(() =>
+    this.isProjectReadOnly() ? 'requestAccess.readOnlyTitle' : 'requestAccess.title'
+  );
+
+  readonly messageTranslation = computed(() =>
+    this.isProjectReadOnly() ? 'requestAccess.messageReadOnly' : 'requestAccess.message'
+  );
+
   requestAccess() {
     this.loaderService.show();
     this.requestAccessService.requestAccessToProject(this.id(), this.comment()).subscribe({

src/app/core/store/user/user.selectors.ts

@@ -58,4 +58,14 @@ export class UserSelectors {
   static getActiveFlags(state: UserStateModel): string[] {
     return state.activeFlags || [];
   }
+
+  @Selector([UserState])
+  static isProjectCreationDisabled(state: UserStateModel): boolean {
+    return state.activeFlags?.includes('prevent_project_creation') || false;
+  }
+
+  @Selector([UserState])
+  static isProjectReadOnly(state: UserStateModel): boolean {
+    return state.activeFlags?.includes('project_read_only') || false;
+  }
 }

src/app/features/analytics/components/view-duplicates/view-duplicates.component.html

@@ -2,6 +2,8 @@
   [title]="'project.analytics.kpi.forks' | translate"
   [showButton]="isAuthenticated()"
   [buttonLabel]="'project.overview.actions.forkProjectLabel' | translate"
+  [isButtonDisabled]="preventDuplicateCreation()"
+  [buttonTooltip]="duplicateButtonTooltip() | translate"
   (buttonClick)="handleForkResource()"
 />
 

src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts

@@ -7,6 +7,7 @@ import { of } from 'rxjs';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { UserSelectors } from '@osf/core/store/user/user.selectors';
 import { ProjectOverviewSelectors } from '@osf/features/project/overview/store';
 import { RegistrySelectors } from '@osf/features/registry/store/registry';
 import { ContributorsListComponent } from '@osf/shared/components/contributors-list/contributors-list.component';
@@ -24,25 +25,41 @@ import { provideOSFCore } from '@testing/osf.testing.provider';
 import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock';
 import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
 import { RouterMockBuilder } from '@testing/providers/router-provider.mock';
-import { provideMockStore } from '@testing/providers/store-provider.mock';
+import { BaseSetupOverrides, mergeSignalOverrides, provideMockStore } from '@testing/providers/store-provider.mock';
 
 import { ViewDuplicatesComponent } from './view-duplicates.component';
 
+interface SetupOverrides extends BaseSetupOverrides {
+  selectors?: any[];
+}
+
 describe('Component: View Duplicates', () => {
   let component: ViewDuplicatesComponent;
   let fixture: ComponentFixture<ViewDuplicatesComponent>;
   let routerMock: ReturnType<RouterMockBuilder['build']>;
   let activatedRouteMock: ReturnType<ActivatedRouteMockBuilder['build']>;
   let mockCustomDialogService: ReturnType<CustomDialogServiceMockBuilder['build']>;
 
-  beforeEach(() => {
+  function setup(overrides: SetupOverrides = {}) {
     mockCustomDialogService = CustomDialogServiceMockBuilder.create().build();
     routerMock = RouterMockBuilder.create().build();
     activatedRouteMock = ActivatedRouteMockBuilder.create()
       .withParams({ id: 'rid' })
       .withData({ resourceType: ResourceType.Project })
       .build();
 
+    const defaultSelectors = [
+      { selector: DuplicatesSelectors.getDuplicates, value: [] },
+      { selector: DuplicatesSelectors.getDuplicatesLoading, value: false },
+      { selector: DuplicatesSelectors.getDuplicatesTotalCount, value: 0 },
+      { selector: ProjectOverviewSelectors.getProject, value: MOCK_PROJECT_OVERVIEW },
+      { selector: ProjectOverviewSelectors.isProjectAnonymous, value: false },
+      { selector: RegistrySelectors.getRegistry, value: undefined },
+      { selector: RegistrySelectors.isRegistryAnonymous, value: false },
+      { selector: UserSelectors.isProjectCreationDisabled, value: false },
+    ];
+    const signals = mergeSignalOverrides(defaultSelectors, overrides.selectors || []);
+
     TestBed.configureTestingModule({
       imports: [
         ViewDuplicatesComponent,
@@ -58,15 +75,7 @@ describe('Component: View Duplicates', () => {
       providers: [
         provideOSFCore(),
         provideMockStore({
-          signals: [
-            { selector: DuplicatesSelectors.getDuplicates, value: [] },
-            { selector: DuplicatesSelectors.getDuplicatesLoading, value: false },
-            { selector: DuplicatesSelectors.getDuplicatesTotalCount, value: 0 },
-            { selector: ProjectOverviewSelectors.getProject, value: MOCK_PROJECT_OVERVIEW },
-            { selector: ProjectOverviewSelectors.isProjectAnonymous, value: false },
-            { selector: RegistrySelectors.getRegistry, value: undefined },
-            { selector: RegistrySelectors.isRegistryAnonymous, value: false },
-          ],
+          signals,
         }),
         MockProvider(CustomDialogService, mockCustomDialogService),
         MockProvider(Router, routerMock),
@@ -78,13 +87,23 @@ describe('Component: View Duplicates', () => {
     component = fixture.componentInstance;
 
     fixture.detectChanges();
-  });
+  }
 
   it('should create', () => {
+    setup();
     expect(component).toBeTruthy();
   });
 
+  it('should disable fork button and show tooltip when isProjectCreationDisabled is true', () => {
+    setup({
+      selectors: [{ selector: UserSelectors.isProjectCreationDisabled, value: true }],
+    });
+    expect(component.preventDuplicateCreation()).toBe(true);
+    expect(component.duplicateButtonTooltip()).toBe('project.overview.actions.duplicatingProjectsNotAllowed');
+  });
+
   it('should open ForkDialog with width 450px when small and not refresh on failure', () => {
+    setup();
     (component as any).actions = { ...component.actions, getDuplicates: vi.fn() };
 
     const openSpy = vi
@@ -98,12 +117,14 @@ describe('Component: View Duplicates', () => {
   });
 
   it('should update currentPage when page is defined', () => {
+    setup();
     const event: PaginatorState = { page: 1 } as PaginatorState;
     component.onPageChange(event);
     expect(component.currentPage()).toBe(2);
   });
 
   it('should not update currentPage when page is undefined', () => {
+    setup();
     component.currentPage.set(5);
     const event: PaginatorState = { page: undefined } as PaginatorState;
     component.onPageChange(event);

src/app/features/analytics/components/view-duplicates/view-duplicates.component.ts

@@ -77,11 +77,15 @@ export class ViewDuplicatesComponent {
   isDuplicatesLoading = select(DuplicatesSelectors.getDuplicatesLoading);
   totalDuplicates = select(DuplicatesSelectors.getDuplicatesTotalCount);
   isAuthenticated = select(UserSelectors.isAuthenticated);
+  preventDuplicateCreation = select(UserSelectors.isProjectCreationDisabled);
 
   readonly pageSize = 10;
 
   currentPage = signal<number>(1);
   firstIndex = computed(() => (this.currentPage() - 1) * this.pageSize);
+  duplicateButtonTooltip = computed(() =>
+    this.preventDuplicateCreation() ? 'project.overview.actions.duplicatingProjectsNotAllowed' : ''
+  );
 
   readonly forkActionItems = (resourceId: string) => [
     {

src/app/features/collections/components/add-to-collection/add-to-collection.component.html

@@ -19,6 +19,7 @@ <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?
             [stepperActiveValue]="stepperActiveValue()"
             [collectionId]="primaryCollectionId() ?? ''"
             [targetStepValue]="AddToCollectionSteps.SelectProject"
+            [isProjectReadOnly]="isProjectReadOnly()"
             (projectSelected)="handleProjectSelected()"
             (stepChange)="handleChangeStep($event)"
           />
@@ -68,7 +69,8 @@ <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?
 
           <p-button
             [label]="(isEditMode() ? 'common.buttons.update' : 'common.buttons.addToCollection') | translate"
-            [disabled]="stepperActiveValue() !== AddToCollectionSteps.Complete"
+            [disabled]="stepperActiveValue() !== AddToCollectionSteps.Complete || isProjectReadOnly()"
+            [pTooltip]="disabledAddButtonTooltip() | translate"
             (click)="handleAddToCollection()"
           />
         </div>