Skip to content

Commit 07fa94e

Browse files
committed
fix(fix_some_wiki_pages_never_load): fix WikiMapper to handle missing user embeds in WikiVersion response
1 parent f282841 commit 07fa94e

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

‎src/app/shared/mappers/wiki/wiki.mapper.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { UserMapper } from '@osf/shared/mappers/user/user.mapper';
12
import {
23
ComponentsWikiGetResponse,
34
HomeWiki,
@@ -44,13 +45,10 @@ export class WikiMapper {
4445
}
4546

4647
static fromGetWikiVersionResponse(response: WikiVersionJsonApi): WikiVersion {
47-
const createdBy =
48-
response.embeds?.user?.data?.attributes?.full_name || response.embeds?.user?.data?.id || 'Unknown author';
49-
5048
return {
5149
id: response.id,
52-
createdAt: response.attributes?.date_created ?? '',
53-
createdBy,
50+
createdAt: response.attributes.date_created,
51+
createdBy: UserMapper.getUserInfo(response.embeds.user)?.fullName || 'Unknown author',
5452
};
5553
}
5654

‎src/app/shared/models/wiki/wiki.model.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { UserDataErrorResponseJsonApi } from '@shared/models/user/user-json-api.model';
2+
13
import { JsonApiResponse, JsonApiResponseWithMeta, MetaAnonymousJsonApi } from '../common/json-api.model';
24

35
export enum WikiModes {
@@ -78,14 +80,7 @@ export interface WikiVersionJsonApi {
7880
date_created: string;
7981
};
8082
embeds: {
81-
user: {
82-
data: {
83-
id: string;
84-
attributes: {
85-
full_name: string;
86-
};
87-
};
88-
};
83+
user: UserDataErrorResponseJsonApi;
8984
};
9085
}
9186

0 commit comments

Comments
 (0)