Skip to content
Merged
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
1 change: 0 additions & 1 deletion src/app/features/project/metadata/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ export { ProjectMetadataLicenseComponent } from './project-metadata-license/proj
export { ProjectMetadataPublicationDoiComponent } from './project-metadata-publication-doi/project-metadata-publication-doi.component';
export { ProjectMetadataResourceInformationComponent } from './project-metadata-resource-information/project-metadata-resource-information.component';
export { ProjectMetadataSubjectsComponent } from './project-metadata-subjects/project-metadata-subjects.component';
export { ProjectMetadataTagsComponent } from './project-metadata-tags/project-metadata-tags.component';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

14 changes: 10 additions & 4 deletions src/app/features/project/metadata/project-metadata.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,16 @@ <h2>
[currentProject]="currentProject()"
/>

<osf-project-metadata-tags
(tagsChanged)="onTagsChanged($event)"
[currentProject]="currentProject()"
/>
<p-card>
<div class="flex flex-column gap-3">
<h2>{{ 'project.overview.metadata.tags' | translate }}</h2>

<osf-tags-input
(tagsChanged)="onTagsChanged($event)"
[tags]="currentProject()?.tags || []"
></osf-tags-input>
</div>
</p-card>

<osf-project-metadata-subjects
(subjectsChanged)="onSubjectsChanged($event)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
ProjectMetadataPublicationDoiComponent,
ProjectMetadataResourceInformationComponent,
ProjectMetadataSubjectsComponent,
ProjectMetadataTagsComponent,
} from '@osf/features/project/metadata/components';
import {
AffiliatedInstitutionsDialogComponent,
Expand Down Expand Up @@ -55,7 +54,7 @@ import {
} from '@osf/features/project/metadata/store';
import { ProjectOverviewSubject } from '@osf/features/project/overview/models';
import { ContributorsSelectors, GetAllContributors } from '@osf/shared/components/contributors/store';
import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
import { LoadingSpinnerComponent, SubHeaderComponent, TagsInputComponent } from '@shared/components';
import { CustomConfirmationService, ToastService } from '@shared/services';
import { GetSubjects, SubjectsSelectors, UpdateProjectSubjects } from '@shared/stores/subjects';

Expand All @@ -70,7 +69,6 @@ import { GetSubjects, SubjectsSelectors, UpdateProjectSubjects } from '@shared/s
ProjectMetadataResourceInformationComponent,
ProjectMetadataLicenseComponent,
ProjectMetadataPublicationDoiComponent,
ProjectMetadataTagsComponent,
ProjectMetadataSubjectsComponent,
ProjectMetadataFundingComponent,
ProjectMetadataAffiliatedInstitutionsComponent,
Expand All @@ -82,6 +80,7 @@ import { GetSubjects, SubjectsSelectors, UpdateProjectSubjects } from '@shared/s
TabPanels,
Tabs,
LoadingSpinnerComponent,
TagsInputComponent,
],
templateUrl: './project-metadata.component.html',
styleUrl: './project-metadata.component.scss',
Expand Down
1 change: 1 addition & 0 deletions src/app/shared/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export { SearchInputComponent } from './search-input/search-input.component';
export { SelectComponent } from './select/select.component';
export { StepperComponent } from './stepper/stepper.component';
export { SubHeaderComponent } from './sub-header/sub-header.component';
export { TagsInputComponent } from './tags-input/tags-input.component';
export { TextInputComponent } from './text-input/text-input.component';
export { ToastComponent } from './toast/toast.component';
export { TruncatedTextComponent } from './truncated-text/truncated-text.component';
Expand Down
10 changes: 10 additions & 0 deletions src/app/shared/components/tags-input/tags-input.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div>
<p-chips
class="w-full"
styleClass="w-full"
[ngModel]="tags()"
(ngModelChange)="onTagsChange($event)"
[placeholder]="'common.placeholder.addTag' | translate"
separator=","
></p-chips>
</div>
Empty file.
22 changes: 22 additions & 0 deletions src/app/shared/components/tags-input/tags-input.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { TagsInputComponent } from './tags-input.component';

describe('TagsInputComponent', () => {
let component: TagsInputComponent;
let fixture: ComponentFixture<TagsInputComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [TagsInputComponent],
}).compileComponents();

fixture = TestBed.createComponent(TagsInputComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
22 changes: 22 additions & 0 deletions src/app/shared/components/tags-input/tags-input.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { TranslatePipe } from '@ngx-translate/core';

import { Chips } from 'primeng/chips';

import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
import { FormsModule } from '@angular/forms';

@Component({
selector: 'osf-tags-input',
imports: [TranslatePipe, FormsModule, Chips],
templateUrl: './tags-input.component.html',
styleUrl: './tags-input.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class TagsInputComponent {
tags = input<string[]>([]);
tagsChanged = output<string[]>();

onTagsChange(tags: string[]): void {
this.tagsChanged.emit(tags);
}
}
3 changes: 3 additions & 0 deletions src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
"deleteConfirmation": {
"header": "Delete",
"message": "Are you sure you want to proceed?"
},
"placeholder": {
"addTag": "Add tags"
}
},
"navigation": {
Expand Down
Loading