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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "osf",
"version": "25.2.0",
"version": "25.3.0",
"scripts": {
"ng": "ng",
"analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",
Expand Down
3 changes: 2 additions & 1 deletion src/app/features/project/wiki/wiki.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createDispatchMap, select } from '@ngxs/store';

import { TranslatePipe } from '@ngx-translate/core';
import { TranslatePipe, TranslateService } from '@ngx-translate/core';

import { Button } from 'primeng/button';
import { ButtonGroupModule } from 'primeng/buttongroup';
Expand Down Expand Up @@ -62,6 +62,7 @@ export class WikiComponent {
private readonly router = inject(Router);
private readonly destroyRef = inject(DestroyRef);
private toastService = inject(ToastService);
private readonly translateService = inject(TranslateService);

WikiModes = WikiModes;
homeWikiName = 'Home';
Expand Down
13 changes: 12 additions & 1 deletion src/app/shared/mappers/wiki/wiki.mapper.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { TranslateService } from '@ngx-translate/core';

import { UserMapper } from '@osf/shared/mappers/user/user.mapper';
import {
ComponentsWikiGetResponse,
HomeWiki,
Expand All @@ -10,6 +13,12 @@ import {
import { ComponentWiki } from '@osf/shared/stores/wiki';

export class WikiMapper {
private static translate: TranslateService;

static init(translate: TranslateService): void {
WikiMapper.translate = translate;
}

static fromCreateWikiResponse(response: WikiGetResponse): WikiModel {
return {
id: response.id,
Expand Down Expand Up @@ -47,7 +56,9 @@ export class WikiMapper {
return {
id: response.id,
createdAt: response.attributes.date_created,
createdBy: response.embeds.user.data.attributes.full_name,
createdBy:
UserMapper.getUserInfo(response.embeds.user)?.fullName ||
WikiMapper.translate.instant('project.wiki.version.unknownAuthor'),
};
}

Expand Down
11 changes: 3 additions & 8 deletions src/app/shared/models/wiki/wiki.model.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { UserDataErrorResponseJsonApi } from '@shared/models/user/user-json-api.model';

import { JsonApiResponse, JsonApiResponseWithMeta, MetaAnonymousJsonApi } from '../common/json-api.model';

export enum WikiModes {
Expand Down Expand Up @@ -78,14 +80,7 @@ export interface WikiVersionJsonApi {
date_created: string;
};
embeds: {
user: {
data: {
id: string;
attributes: {
full_name: string;
};
};
};
user: UserDataErrorResponseJsonApi;
};
}

Expand Down
3 changes: 2 additions & 1 deletion src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,8 @@
"preview": "Preview",
"current": "Current",
"successSaved": "Wiki version has been saved successfully",
"noContent": "Add important information, links, or images here to describe your project."
"noContent": "Add important information, links, or images here to describe your project.",
"unknownAuthor": "Unknown author"
},
"list": {
"header": "Project Wiki Pages",
Expand Down