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 @@ -26,6 +26,7 @@ <h3>{{ 'collections.addToCollection.selectProject' | translate }}</h3>
<div class="mt-4 w-full lg:w-6">
<osf-project-selector
[excludeProjectIds]="excludedProjectIds()"
[publicOnly]="true"
[(selectedProject)]="currentSelectedProject"
(projectChange)="handleProjectChange($event)"
(projectsLoaded)="handleProjectsLoaded($event)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
import { provideStore } from '@ngxs/store';
import { provideStore, Store } from '@ngxs/store';

import { MockProvider } from 'ng-mocks';

import { ComponentFixture, TestBed } from '@angular/core/testing';

import { UserState } from '@core/store/user';
import { ProjectModel } from '@osf/shared/models/projects/projects.model';
import { ToastService } from '@osf/shared/services/toast.service';
import { ProjectsState } from '@shared/stores/projects';

import { provideOSFCore } from '@testing/osf.testing.provider';

import { ProjectSelectorComponent } from './project-selector.component';

const makeProject = (id: string, isPublic: boolean): ProjectModel =>
({ id, title: `Project ${id}`, isPublic }) as ProjectModel;

describe('ProjectSelectorComponent', () => {
let component: ProjectSelectorComponent;
let fixture: ComponentFixture<ProjectSelectorComponent>;
let store: Store;

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ProjectSelectorComponent],
providers: [provideOSFCore(), MockProvider(ToastService), provideStore([ProjectsState, UserState])],
});

store = TestBed.inject(Store);
fixture = TestBed.createComponent(ProjectSelectorComponent);
component = fixture.componentInstance;
fixture.detectChanges();
Expand Down Expand Up @@ -51,4 +57,36 @@ describe('ProjectSelectorComponent', () => {

expect(mockEvent.originalEvent.preventDefault).toHaveBeenCalled();
});

describe('publicOnly filtering', () => {
const publicProject = makeProject('1', true);
const privateProject = makeProject('2', false);

const setProjects = (projects: ProjectModel[]) => {
store.reset({
...store.snapshot(),
projects: { projects: { data: projects, isLoading: false, error: null } },
});
};

it('should show all projects when publicOnly is false', () => {
fixture.componentRef.setInput('publicOnly', false);
setProjects([publicProject, privateProject]);
fixture.detectChanges();

const ids = component.projectsOptions().map((o) => o.value.id);
expect(ids).toContain('1');
expect(ids).toContain('2');
});

it('should only show public projects when publicOnly is true', () => {
fixture.componentRef.setInput('publicOnly', true);
setProjects([publicProject, privateProject]);
fixture.detectChanges();

const ids = component.projectsOptions().map((o) => o.value.id);
expect(ids).toContain('1');
expect(ids).not.toContain('2');
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export class ProjectSelectorComponent {
placeholder = input<string>('common.buttons.select');
showClear = input<boolean>(true);
excludeProjectIds = input<string[]>([]);
publicOnly = input<boolean>(false);
selectedProject = model<ProjectModel | null>(null);

projectChange = output<ProjectModel | null>();
Expand Down Expand Up @@ -105,7 +106,9 @@ export class ProjectSelectorComponent {
}

const excludeSet = new Set(excludeIds);
const availableProjects = projects.filter((project) => !excludeSet.has(project.id));
const availableProjects = projects.filter(
(project) => !excludeSet.has(project.id) && (!this.publicOnly() || project.isPublic)
);

const options = availableProjects.map((project) => ({
label: project.title,
Expand All @@ -132,6 +135,10 @@ export class ProjectSelectorComponent {
'filter[current_user_permissions]': 'admin',
};

if (this.publicOnly()) {
params['filter[public]'] = 'true';
}

if (filterTitle && filterTitle.trim()) {
params['filter[title]'] = filterTitle;
}
Expand Down
Loading