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
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ <h3 class="text-lg">{{ 'project.metadata.addMetadata.publishedText' | translate
} @else {
<h3 class="text-lg text-red-500">{{ 'project.metadata.addMetadata.notPublishedText' | translate }}</h3>
}
<p-button
class="w-10rem flex-shrink-0 btn-full-width"
severity="secondary"
[label]="'project.metadata.addMetadata.editRecord' | translate"
(onClick)="editModeEmit()"
>
</p-button>
@if (showEditButton()) {
<p-button
class="w-10rem flex-shrink-0 btn-full-width"
severity="secondary"
[label]="'project.metadata.addMetadata.editRecord' | translate"
(onClick)="editModeEmit()"
>
</p-button>
}
</div>
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="flex justify-content-between align-items-center">
<h2>{{ 'project.overview.metadata.license' | translate }}</h2>

@if (!hideEditLicense()) {
@if (!readonly()) {
<p-button
severity="secondary"
[label]="'common.buttons.edit' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ import { LicenseModel } from '@shared/models';
})
export class MetadataLicenseComponent {
openEditLicenseDialog = output<void>();
hideEditLicense = input<boolean>(false);
readonly = input<boolean>(false);
license = input<LicenseModel | null>(null);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
<div class="flex flex-column gap-3">
<h2>{{ 'project.overview.metadata.tags' | translate }}</h2>

<osf-tags-input (tagsChanged)="tagsChanged.emit($event)" [tags]="tags()" />
@if (readonly()) {
<div class="flex flex-wrap gap-2">
@for (tag of tags(); track tag) {
<p-tag
class="cursor-pointer hover:bg-black-alpha-10"
[value]="tag"
severity="info"
(click)="tagClicked(tag)"
/>
}
</div>
} @else {
<osf-tags-input (tagsChanged)="tagsChanged.emit($event)" [tags]="tags()" />
}
</div>
</p-card>
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
import { TranslatePipe } from '@ngx-translate/core';

import { Card } from 'primeng/card';
import { Tag } from 'primeng/tag';

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

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

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

tagsChanged = output<string[]>();

private router = inject(Router);

tagClicked(tag: string) {
this.router.navigate(['/search'], { queryParams: { search: tag } });
}
}
1 change: 1 addition & 0 deletions src/app/features/metadata/mappers/metadata.mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export class MetadataMapper {
})),
provider: response.embeds?.provider?.data.id,
public: response.attributes.public,
currentUserPermissions: response.attributes.current_user_permissions,
};
}

Expand Down
29 changes: 24 additions & 5 deletions src/app/features/metadata/metadata.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<section class="flex flex-column flex-1">
<osf-sub-header
[showButton]="true"
[showButton]="hasWriteAccess()"
[buttonLabel]="'project.metadata.addCommunityMetadataRecord.title' | translate"
[isButtonDisabled]="isLoading()"
(buttonClick)="openAddRecord()"
Expand All @@ -13,50 +13,64 @@
[selectedCedarTemplate]="selectedCedarTemplate()!"
[selectedCedarRecord]="selectedCedarRecord()!"
[cedarFormReadonly]="cedarFormReadonly()"
[canEdit]="hasWriteAccess()"
(changeTab)="onTabChange($event)"
(formSubmit)="onCedarFormSubmit($event)"
(cedarFormChangeTemplate)="onCedarFormChangeTemplate()"
(cedarFormEdit)="onCedarFormEdit()"
>
<div class="flex-column flex flex-1 w-full bg-white lg:flex-row">
<div class="col-12 lg:col-6 flex flex-column gap-4">
<osf-metadata-title (openEditTitleDialog)="openEditTitleDialog()" [title]="metadata()?.title!" />
<osf-metadata-title
(openEditTitleDialog)="openEditTitleDialog()"
[title]="metadata()?.title!"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-description
(openEditDescriptionDialog)="openEditDescriptionDialog()"
[description]="metadata()?.description!"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-date-info [dateCreated]="metadata()?.dateCreated" [dateModified]="metadata()?.dateModified" />

<osf-metadata-contributors
(openEditContributorDialog)="openEditContributorDialog()"
[contributors]="bibliographicContributors()"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-resource-information
(openEditResourceInformationDialog)="openEditResourceInformationDialog()"
(showResourceInfo)="onShowResourceInfo()"
[customItemMetadata]="customItemMetadata()!"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-funding
(openEditFundingDialog)="openEditFundingDialog()"
[funders]="customItemMetadata()?.funders!"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-affiliated-institutions
(openEditAffiliatedInstitutionsDialog)="openEditAffiliatedInstitutionsDialog()"
[affiliatedInstitutions]="affiliatedInstitutions()"
[readonly]="!hasWriteAccess()"
/>
</div>

<div class="col-12 lg:col-6 flex flex-column gap-4">
<osf-metadata-license (openEditLicenseDialog)="openEditLicenseDialog()" [license]="metadata()?.license!" />
<osf-metadata-license
(openEditLicenseDialog)="openEditLicenseDialog()"
[license]="metadata()?.license!"
[readonly]="!hasWriteAccess()"
/>

<osf-metadata-publication-doi
(openEditPublicationDoiDialog)="handleEditDoi()"
[hideEditDoi]="hideEditDoi()"
[hideEditDoi]="hideEditDoi() || !hasWriteAccess()"
[identifiers]="metadata()?.identifiers!"
[publicationDoi]="metadata()?.publicationDoi || null"
[resourceType]="resourceType()"
Expand All @@ -66,14 +80,19 @@
<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-tags
[tags]="metadata()?.tags || []"
(tagsChanged)="onTagsChanged($event)"
[readonly]="!hasWriteAccess()"
></osf-metadata-tags>

<osf-metadata-subjects
(getSubjectChildren)="getSubjectChildren($event)"
(searchSubjects)="searchSubjects($event)"
(updateSelectedSubjects)="updateSelectedSubjects($event)"
[isSubjectsUpdating]="isSubjectsUpdating()!"
[selectedSubjects]="selectedSubjects()"
[readonly]="!hasAdminAccess()"
/>
</div>
</div>
Expand Down
14 changes: 13 additions & 1 deletion src/app/features/metadata/metadata.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ActivatedRoute, Router } from '@angular/router';

import { ENVIRONMENT } from '@core/provider/environment.provider';
import { MetadataTabsComponent, SubHeaderComponent } from '@osf/shared/components';
import { MetadataResourceEnum, ResourceType } from '@osf/shared/enums';
import { MetadataResourceEnum, ResourceType, UserPermissions } from '@osf/shared/enums';
import { IS_MEDIUM } from '@osf/shared/helpers';
import { MetadataTabsModel, SubjectModel } from '@osf/shared/models';
import { CustomConfirmationService, ToastService } from '@osf/shared/services';
Expand Down Expand Up @@ -191,6 +191,18 @@ export class MetadataComponent implements OnInit {

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

hasWriteAccess = computed(() => {
const metadata = this.metadata();
if (!metadata) return false;
return metadata.currentUserPermissions.includes(UserPermissions.Write);
});

hasAdminAccess = computed(() => {
const metadata = this.metadata();
if (!metadata) return false;
return metadata.currentUserPermissions.includes(UserPermissions.Admin);
});

constructor() {
effect(() => {
const records = this.cedarRecords();
Expand Down
2 changes: 2 additions & 0 deletions src/app/features/metadata/models/metadata-json-api.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ApiData, InstitutionsJsonApiResponse, LicenseDataJsonApi, LicenseRecordJsonApi } from '@osf/shared/models';
import { UserPermissions } from '@shared/enums';

export interface MetadataJsonApiResponse {
data: MetadataJsonApi;
Expand All @@ -17,6 +18,7 @@ export interface MetadataAttributesJsonApi {
category?: string;
node_license?: LicenseRecordJsonApi;
public?: boolean;
current_user_permissions: UserPermissions[];
}

interface MetadataEmbedsJsonApi {
Expand Down
2 changes: 2 additions & 0 deletions src/app/features/metadata/models/metadata.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Identifier, Institution, LicenseModel } from '@osf/shared/models';
import { UserPermissions } from '@shared/enums';

export interface Metadata {
id: string;
Expand All @@ -20,6 +21,7 @@ export interface Metadata {
year: string;
};
public?: boolean;
currentUserPermissions: UserPermissions[];
}

export interface CustomItemMetadataRecord {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[isCollectionsRoute]="isCollectionsRoute()"
[currentResource]="currentResource()"
[projectDescription]="project.description"
[canEdit]="isAdmin"
[canEdit]="isAdmin()"
/>
</div>

Expand Down Expand Up @@ -47,7 +47,7 @@
}

<div class="flex flex-column gap-4 left-section">
@if (isAdmin || canWrite) {
@if (canWrite()) {
<osf-overview-wiki [resourceId]="currentProject()!.id" />
}

Expand All @@ -57,8 +57,8 @@
[areComponentsLoading]="areComponentsLoading()"
/>

<osf-project-components [canEdit]="canWrite && !isCollectionsRoute()" />
<osf-linked-resources [canEdit]="canWrite && !isCollectionsRoute()" />
<osf-project-components [canEdit]="canWrite() && !isCollectionsRoute()" />
<osf-linked-resources [canEdit]="canWrite() && !isCollectionsRoute()" />
<osf-recent-activity-list [pageSize]="activityPageSize" />
</div>

Expand All @@ -67,7 +67,7 @@
[currentResource]="resourceOverview()"
(customCitationUpdated)="onCustomCitationUpdated($event)"
[isCollectionsRoute]="isCollectionsRoute()"
[canEdit]="canWrite"
[canEdit]="canWrite()"
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@ export class ProjectOverviewComponent implements OnInit {
userPermissions = computed(() => this.currentProject()?.currentUserPermissions || []);
hasViewOnly = computed(() => hasViewOnlyParam(this.router));

get isAdmin(): boolean {
isAdmin = computed(() => {
return this.userPermissions().includes(UserPermissions.Admin);
}
});

get canWrite(): boolean {
canWrite = computed(() => {
return this.userPermissions().includes(UserPermissions.Write);
}
});

resourceOverview = computed(() => {
const project = this.currentProject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/>
}

@if (!readonly()) {
@if (canEdit()) {
@if (registryAcceptedUnapproved) {
<p-button
class="w-full"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class RegistryRevisionsComponent {
selectedRevisionIndex = input.required<number>();
isSubmitting = input<boolean>(false);
isModeration = input<boolean>(false);
readonly = input<boolean>(false);
canEdit = input<boolean>(false);
openRevision = output<number>();

readonly updateRegistration = output<string>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ <h3 class="font-normal">{{ 'registry.overview.statuses.' + registry()?.status +
'registry.overview.statuses.' + registry()?.status + '.long' | translate: { embargoEndDate: embargoEndDate }
}}
</p>
@if (!readonly()) {
@if (canWithdraw) {
@if (canEdit()) {
@if (canWithdraw()) {
<p-button
(onClick)="openWithdrawDialog()"
[label]="'registry.overview.withdrawRegistration' | translate"
severity="danger"
styleClass="w-full mt-2"
></p-button>
}
@if (registry()?.status === RegistryStatus.Embargo) {
@if (isEmbargo()) {
<p-button
(onClick)="openEndEmbargoDialog()"
severity="danger"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'pr
import { Button } from 'primeng/button';
import { DialogService } from 'primeng/dynamicdialog';

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

import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@osf/shared/enums';
import { CustomConfirmationService } from '@osf/shared/services';
Expand All @@ -28,21 +28,21 @@ export class RegistryStatusesComponent {
private readonly translateService = inject(TranslateService);

registry = input.required<RegistryOverview | null>();
readonly = input<boolean>(false);
canEdit = input<boolean>(false);
isModeration = input<boolean>(false);

readonly RegistryStatus = RegistryStatus;
readonly RevisionReviewStates = RevisionReviewStates;
readonly customConfirmationService = inject(CustomConfirmationService);
readonly actions = createDispatchMap({ makePublic: MakePublic });

get canWithdraw(): boolean {
canWithdraw = computed(() => {
return this.registry()?.reviewsState === RegistrationReviewStates.Accepted && !this.isModeration();
}
});

get isEmbargo(): boolean {
isEmbargo = computed(() => {
return this.registry()?.status === RegistryStatus.Embargo;
}
});

get embargoEndDate() {
const embargoEndDate = this.registry()?.embargoEndDate;
Expand Down
Loading
Loading