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: 1 addition & 0 deletions src/app/features/metadata/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export { MetadataDescriptionComponent } from './metadata-description/metadata-de
export { MetadataFundingComponent } from './metadata-funding/metadata-funding.component';
export { MetadataLicenseComponent } from './metadata-license/metadata-license.component';
export { MetadataPublicationDoiComponent } from './metadata-publication-doi/metadata-publication-doi.component';
export { MetadataRegistrationDoiComponent } from './metadata-registration-doi/metadata-registration-doi.component';
export { MetadataResourceInformationComponent } from './metadata-resource-information/metadata-resource-information.component';
export { MetadataSubjectsComponent } from './metadata-subjects/metadata-subjects.component';
export { MetadataTagsComponent } from './metadata-tags/metadata-tags.component';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<p-card>
<h2>{{ 'project.overview.metadata.registrationDOI' | translate }}</h2>

<div class="mt-4">
<a class="font-bold" [href]="registrationDoi()" target="_blank">
{{ registrationDoi() }}
</a>
</div>
</p-card>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { TranslateServiceMock } from '@osf/shared/mocks';

import { MetadataRegistrationDoiComponent } from './metadata-registration-doi.component';

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

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

fixture = TestBed.createComponent(MetadataRegistrationDoiComponent);
component = fixture.componentInstance;
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { TranslatePipe } from '@ngx-translate/core';

import { Card } from 'primeng/card';

import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';

import { Identifier } from '@osf/shared/models';

@Component({
selector: 'osf-metadata-registration-doi',
imports: [Card, TranslatePipe],
templateUrl: './metadata-registration-doi.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MetadataRegistrationDoiComponent {
identifiers = input<Identifier[]>([]);
doiHost = 'https://doi.org/';

registrationDoi = computed(() => (this.identifiers() ? this.doiHost + this.identifiers()[0]?.value : ''));
}
4 changes: 4 additions & 0 deletions src/app/features/metadata/metadata.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
[resourceType]="resourceType()"
/>

@if (showRegistrationDoi()) {
<osf-metadata-registration-doi [identifiers]="metadata()?.identifiers!"></osf-metadata-registration-doi>
}

<osf-metadata-tags [tags]="metadata()?.tags || []" (tagsChanged)="onTagsChanged($event)"></osf-metadata-tags>

<osf-metadata-subjects
Expand Down
4 changes: 4 additions & 0 deletions src/app/features/metadata/metadata.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
MetadataFundingComponent,
MetadataLicenseComponent,
MetadataPublicationDoiComponent,
MetadataRegistrationDoiComponent,
MetadataResourceInformationComponent,
MetadataSubjectsComponent,
MetadataTagsComponent,
Expand Down Expand Up @@ -96,6 +97,7 @@ import {
MetadataFundingComponent,
MetadataDateInfoComponent,
MetadataTagsComponent,
MetadataRegistrationDoiComponent,
],
templateUrl: './metadata.component.html',
styleUrl: './metadata.component.scss',
Expand Down Expand Up @@ -182,6 +184,8 @@ export class MetadataComponent implements OnInit {
);
});

showRegistrationDoi = computed(() => this.resourceType() === ResourceType.Registration);

bibliographicContributors = computed(() => this.contributors().filter((contributor) => contributor.isBibliographic));

constructor() {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { RegistriesContributorsComponent } from './registries-contributors.component';

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

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

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

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ import {
} from '@osf/shared/stores';

@Component({
selector: 'osf-contributors',
selector: 'osf-registries-contributors',
imports: [FormsModule, TableModule, ContributorsListComponent, TranslatePipe, Card, Button],
templateUrl: './contributors.component.html',
styleUrl: './contributors.component.scss',
templateUrl: './registries-contributors.component.html',
styleUrl: './registries-contributors.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
providers: [DialogService],
})
export class ContributorsComponent implements OnInit {
export class RegistriesContributorsComponent implements OnInit {
control = input.required<FormControl>();

readonly destroyRef = inject(DestroyRef);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,30 @@
<h2 class="mb-2">{{ 'registries.metadata.title' | translate }}</h2>
<p class="mb-4">{{ 'registries.metadata.description' | translate }}</p>
</div>

<form [formGroup]="metadataForm" (ngSubmit)="submitMetadata()" class="flex flex-column gap-4">
<section data-test-registration-title-section>
<p-card class="w-full">
<label for="registration-title-id">
<h2 class="mb-2">{{ 'common.labels.title' | translate }}</h2>
</label>

<p class="mb-1">{{ 'shared.title.description' | translate }}</p>
<osf-text-input
[inputId]="'registration-title-id'"
[control]="metadataForm.controls['title']"
[maxLength]="inputLimits.fullName.maxLength"
>

<osf-text-input [inputId]="'registration-title-id'" [control]="metadataForm.controls['title']">
</osf-text-input>
</p-card>
</section>

<section data-test-registration-description-section>
<p-card>
<div class="mt-2">
<label for="registration-description-id" class="mb-2">
<h2>{{ 'common.labels.description' | translate }}</h2>
</label>

<p class="mb-1">{{ 'shared.description.message' | translate }}</p>

<textarea
data-test-metadata-description
id="project-description-id"
Expand All @@ -47,14 +49,17 @@ <h2>{{ 'common.labels.description' | translate }}</h2>
<div class="flex justify-content-end"></div>
</p-card>
</section>
<osf-contributors [control]="metadataForm.controls['contributors']"></osf-contributors>

<osf-registries-contributors [control]="metadataForm.controls['contributors']"></osf-registries-contributors>
<osf-registries-affiliated-institution></osf-registries-affiliated-institution>
<osf-registries-license [control]="metadataForm.controls['license']"></osf-registries-license>
<osf-registries-subjects [control]="metadataForm.controls['subjects']"></osf-registries-subjects>
<osf-registries-tags></osf-registries-tags>

<div class="flex justify-content-end">
<p-button [label]="'registries.deleteDraft' | translate" severity="danger" (click)="deleteDraft()" class="mr-2">
<p-button [label]="'registries.deleteDraft' | translate" severity="danger" (onClick)="deleteDraft()" class="mr-2">
</p-button>

<p-button data-test-goto-next-page [label]="'common.buttons.next' | translate" type="submit"></p-button>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,23 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';

import { RegistriesSelectors } from '@osf/features/registries/store';
import { TextInputComponent } from '@osf/shared/components';
import { MOCK_STORE } from '@osf/shared/mocks';
import { ContributorsSelectors, SubjectsSelectors } from '@osf/shared/stores';

import { RegistriesSelectors } from '../../store';

import { ContributorsComponent } from './contributors/contributors.component';
import { RegistriesContributorsComponent } from './registries-contributors/registries-contributors.component';
import { RegistriesLicenseComponent } from './registries-license/registries-license.component';
import { RegistriesSubjectsComponent } from './registries-subjects/registries-subjects.component';
import { RegistriesTagsComponent } from './registries-tags/registries-tags.component';
import { MetadataComponent } from './metadata.component';
import { RegistriesMetadataStepComponent } from './registries-metadata-step.component';

import { MOCK_DRAFT_REGISTRATION } from '@testing/mocks/draft-registration.mock';
import { OSFTestingModule } from '@testing/osf.testing.module';

describe('MetadataComponent', () => {
let component: MetadataComponent;
let fixture: ComponentFixture<MetadataComponent>;
describe('RegistriesMetadataStepComponent', () => {
let component: RegistriesMetadataStepComponent;
let fixture: ComponentFixture<RegistriesMetadataStepComponent>;
const mockRoute = {
snapshot: {
params: of({ id: 'someId' }),
Expand All @@ -53,8 +52,8 @@ describe('MetadataComponent', () => {
imports: [
OSFTestingModule,
ReactiveFormsModule,
MetadataComponent,
MockComponent(ContributorsComponent),
RegistriesMetadataStepComponent,
MockComponent(RegistriesContributorsComponent),
MockComponent(RegistriesLicenseComponent),
MockComponent(RegistriesSubjectsComponent),
MockComponent(RegistriesTagsComponent),
Expand All @@ -68,7 +67,7 @@ describe('MetadataComponent', () => {
],
}).compileComponents();

fixture = TestBed.createComponent(MetadataComponent);
fixture = TestBed.createComponent(RegistriesMetadataStepComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,47 @@ import { ChangeDetectionStrategy, Component, effect, inject, OnDestroy } from '@
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';

import {
ClearState,
DeleteDraft,
RegistriesSelectors,
UpdateDraft,
UpdateStepValidation,
} from '@osf/features/registries/store';
import { TextInputComponent } from '@osf/shared/components';
import { INPUT_VALIDATION_MESSAGES, InputLimits } from '@osf/shared/constants';
import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
import { CustomValidators, findChangedFields } from '@osf/shared/helpers';
import { ContributorModel, DraftRegistrationModel, SubjectModel } from '@osf/shared/models';
import { CustomConfirmationService } from '@osf/shared/services';
import { ContributorsSelectors, SubjectsSelectors } from '@osf/shared/stores';

import { ClearState, DeleteDraft, RegistriesSelectors, UpdateDraft, UpdateStepValidation } from '../../store';

import { ContributorsComponent } from './contributors/contributors.component';
import { RegistriesAffiliatedInstitutionComponent } from './registries-affiliated-institution/registries-affiliated-institution.component';
import { RegistriesContributorsComponent } from './registries-contributors/registries-contributors.component';
import { RegistriesLicenseComponent } from './registries-license/registries-license.component';
import { RegistriesSubjectsComponent } from './registries-subjects/registries-subjects.component';
import { RegistriesTagsComponent } from './registries-tags/registries-tags.component';

@Component({
selector: 'osf-metadata',
selector: 'osf-registries-metadata-step',
imports: [
Card,
TextInputComponent,
ReactiveFormsModule,
Button,
TranslatePipe,
TextareaModule,
ContributorsComponent,
RegistriesContributorsComponent,
RegistriesSubjectsComponent,
RegistriesTagsComponent,
RegistriesLicenseComponent,
RegistriesAffiliatedInstitutionComponent,
Message,
],
templateUrl: './metadata.component.html',
styleUrl: './metadata.component.scss',
templateUrl: './registries-metadata-step.component.html',
styleUrl: './registries-metadata-step.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MetadataComponent implements OnDestroy {
export class RegistriesMetadataStepComponent implements OnDestroy {
private readonly fb = inject(FormBuilder);
private readonly route = inject(ActivatedRoute);
private readonly router = inject(Router);
Expand All @@ -66,7 +71,7 @@ export class MetadataComponent implements OnDestroy {
updateStepValidation: UpdateStepValidation,
clearState: ClearState,
});
inputLimits = InputLimits;

readonly INPUT_VALIDATION_MESSAGES = INPUT_VALIDATION_MESSAGES;

metadataForm = this.fb.group({
Expand Down
4 changes: 3 additions & 1 deletion src/app/features/registries/registries.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ export const registriesRoutes: Routes = [
{
path: ':id/metadata',
loadComponent: () =>
import('./components/metadata/metadata.component').then((mod) => mod.MetadataComponent),
import('./components/registries-metadata-step/registries-metadata-step.component').then(
(mod) => mod.RegistriesMetadataStepComponent
),
},
{
path: ':id/review',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[type]="type()"
[formControl]="control()"
[attr.aria-describedby]="helpText() ? helpId : null"
[minLength]="minLength()"
[maxLength]="maxLength()"
[attr.minLength]="minLength()"
[attr.maxLength]="maxLength()"
[placeholder]="placeholder() | translate"
/>

Expand Down
1 change: 1 addition & 0 deletions src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@
"dateUpdated": "Date Updated",
"license": "License",
"publication": "Publication DOI",
"registrationDOI": "Registration DOI",
"subjects": "Subjects",
"tags": "Tags",
"citation": "Citation",
Expand Down
Loading