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
2 changes: 1 addition & 1 deletion src/app/core/components/topnav/topnav.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<section class="nav-container flex align-items-center justify-content-between">
<img ngSrc="assets/images/logo.svg" alt="OSF Logo" height="36" width="106" />
<img ngSrc="assets/images/logo.svg" alt="OSF Logo" height="36" width="106" priority />

<p-drawer
[modal]="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';

import { SENTRY_TOKEN } from '@core/factory/sentry.factory';
import { CollectionsMainContentComponent } from '@osf/features/collections/components';
import { CollectionsSearchResultCardComponent } from '@osf/features/collections/components/collections-search-result-card/collections-search-result-card.component';
import { LoadingSpinnerComponent, SearchInputComponent } from '@shared/components';
Expand Down Expand Up @@ -44,6 +45,7 @@ describe('CollectionsDiscoverComponent', () => {
provideHttpClientTesting(),
MockProvider(DialogService),
MockProvider(ToastService),
{ provide: SENTRY_TOKEN, useValue: { captureException: jest.fn() } },
{
provide: ActivatedRoute,
useValue: {
Expand Down
2 changes: 2 additions & 0 deletions src/app/features/metadata/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
export { CedarTemplateFormComponent } from './cedar-template-form/cedar-template-form.component';
export { MetadataAffiliatedInstitutionsComponent } from './metadata-affiliated-institutions/metadata-affiliated-institutions.component';
export { MetadataContributorsComponent } from './metadata-contributors/metadata-contributors.component';
export { MetadataDateInfoComponent } from './metadata-date-info/metadata-date-info.component';
export { MetadataDescriptionComponent } from './metadata-description/metadata-description.component';
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 { 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,23 @@
<p-card>
<div class="flex justify-content-between flex-wrap gap-4">
<div class="flex flex-column gap-2 flex-1">
<h2>
{{ 'project.overview.metadata.dateCreated' | translate }}
</h2>

<p class="m-0">
{{ dateCreated() | date: dateFormat }}
</p>
</div>

<div class="flex flex-column gap-2 flex-1">
<h2>
{{ 'project.overview.metadata.dateUpdated' | translate }}
</h2>

<p class="m-0">
{{ dateModified() | date: dateFormat }}
</p>
</div>
</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 { MetadataDateInfoComponent } from './metadata-date-info.component';

import { OSFTestingModule } from '@testing/osf.testing.module';

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

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

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

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 { DatePipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, input } from '@angular/core';

@Component({
selector: 'osf-metadata-date-info',
imports: [Card, DatePipe, TranslatePipe],
templateUrl: './metadata-date-info.component.html',
styleUrl: './metadata-date-info.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MetadataDateInfoComponent {
dateCreated = input<string | undefined>('');
dateModified = input<string | undefined>('');

readonly dateFormat = 'MMM d, y, h:mm a';
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<p-card>
<div class="flex flex-column gap-3">
<h2>{{ 'project.overview.metadata.tags' | translate }}</h2>

<osf-tags-input (tagsChanged)="tagsChanged.emit($event)" [tags]="tags()" />
</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 { MetadataTagsComponent } from './metadata-tags.component';

import { OSFTestingModule } from '@testing/osf.testing.module';

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

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

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

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

import { Card } from 'primeng/card';

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

import { TagsInputComponent } from '@osf/shared/components/tags-input/tags-input.component';

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

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions src/app/features/metadata/mappers/metadata.mapper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ContributorsMapper, LicensesMapper } from '@osf/shared/mappers';
import { LicensesMapper } from '@osf/shared/mappers';

import { CustomItemMetadataRecord, CustomMetadataJsonApi, Metadata, MetadataJsonApi } from '../models';

Expand All @@ -12,7 +12,6 @@ export class MetadataMapper {
dateCreated: response.attributes.date_created,
dateModified: response.attributes.date_modified,
publicationDoi: response.attributes.article_doi,
contributors: ContributorsMapper.fromResponse(response.embeds?.bibliographic_contributors?.data),
license: LicensesMapper.fromLicenseDataJsonApi(response.embeds?.license?.data),
nodeLicense: response.attributes.node_license
? {
Expand Down
Loading
Loading