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 @@ -6,7 +6,7 @@ import { InputText } from 'primeng/inputtext';
import { Select } from 'primeng/select';

import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';

import { languageCodes, resourceTypes } from '@osf/shared/constants';

Expand All @@ -29,8 +29,8 @@ export class EditFileMetadataDialogComponent {
fileMetadataForm = new FormGroup({
title: new FormControl<string | null>(null),
description: new FormControl<string | null>(null),
resourceType: new FormControl<string | null>(null),
resourceLanguage: new FormControl<string | null>(null),
resourceType: new FormControl<string | null>(null, Validators.required),
resourceLanguage: new FormControl<string | null>(null, Validators.required),
});

constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export class ProjectOverviewComponent implements OnInit {
isAnonymous = select(ProjectOverviewSelectors.isProjectAnonymous);
hasWriteAccess = select(ProjectOverviewSelectors.hasWriteAccess);
hasAdminAccess = select(ProjectOverviewSelectors.hasAdminAccess);
isWikiEnabled = select(ProjectOverviewSelectors.isWikiEnabled);

private readonly actions = createDispatchMap({
getProject: GetProjectById,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,9 @@ export class ProjectOverviewSelectors {
static hasNoPermissions(state: ProjectOverviewStateModel): boolean {
return !state.project.data?.currentUserPermissions.length;
}

@Selector([ProjectOverviewState])
static isWikiEnabled(state: ProjectOverviewStateModel): boolean {
return !!state.project.data?.wikiEnabled;
}
}
8 changes: 7 additions & 1 deletion src/app/shared/stores/wiki/wiki.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,15 @@ export class WikiState {

return this.wikiService.getWikiList(action.resourceType, action.resourceId).pipe(
tap((response) => {
const wiki = response.wikis.sort((a, b) => {
if (a.name === 'Home') return -1;
if (b.name === 'Home') return 1;
return a.name.localeCompare(b.name);
});

ctx.patchState({
wikiList: {
data: [...response.wikis],
data: [...wiki],
isLoading: false,
error: null,
},
Expand Down
Loading