Skip to content

Commit 7d4056e

Browse files
committed
fix(mappers): make mappers use format bad encoding
1 parent 9aaf880 commit 7d4056e

27 files changed

+92
-71
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { ApiData } from '@osf/shared/models/common/json-api.model';
2+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
23

34
import { FileCustomMetadata, OsfFileCustomMetadata } from '../models';
45

56
export function MapFileCustomMetadata(data: ApiData<FileCustomMetadata, null, null, null>): OsfFileCustomMetadata {
67
return {
78
id: data.id,
8-
description: data.attributes.description,
9+
description: replaceBadEncodedChars(data.attributes.description),
910
language: data.attributes.language,
1011
resourceTypeGeneral: data.attributes.resource_type_general,
11-
title: data.attributes.title,
12+
title: replaceBadEncodedChars(data.attributes.title),
1213
};
1314
}

src/app/features/files/mappers/resource-metadata.mapper.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
22
import { ResourceMetadata } from '@osf/shared/models/resource-metadata.model';
3+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
34

45
import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model';
56
import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model';
@@ -9,8 +10,8 @@ export function MapResourceMetadata(
910
customMetadata: GetResourceCustomMetadataResponse
1011
): ResourceMetadata {
1112
return {
12-
title: shortInfo.data.attributes.title,
13-
description: shortInfo.data.attributes.description,
13+
title: replaceBadEncodedChars(shortInfo.data.attributes.title),
14+
description: replaceBadEncodedChars(shortInfo.data.attributes.description),
1415
dateCreated: new Date(shortInfo.data.attributes.date_created),
1516
dateModified: new Date(shortInfo.data.attributes.date_modified),
1617
funders:

src/app/features/meetings/mappers/meetings.mapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
2+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
23

34
import {
45
MeetingGetResponseJsonApi,
@@ -28,7 +29,7 @@ export class MeetingsMapper {
2829
return {
2930
data: response.data.map((item) => ({
3031
id: item.id,
31-
title: item.attributes.title,
32+
title: replaceBadEncodedChars(item.attributes.title),
3233
dateCreated: item.attributes.date_created,
3334
authorName: item.attributes.author_name,
3435
downloadCount: item.attributes.download_count || 0,

src/app/features/metadata/components/metadata-description/metadata-description.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
1313
</div>
1414

1515
<p data-test-display-node-description class="mt-4">
16-
{{ (description() | fixSpecialChar) || ('project.overview.metadata.noDescription' | translate) }}
16+
{{ description() || ('project.overview.metadata.noDescription' | translate) }}
1717
</p>
1818
</p-card>

src/app/features/metadata/components/metadata-description/metadata-description.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ import { Card } from 'primeng/card';
55

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

8-
import { FixSpecialCharPipe } from '@osf/shared/pipes/fix-special-char.pipe';
9-
108
@Component({
119
selector: 'osf-metadata-description',
12-
imports: [Card, Button, FixSpecialCharPipe, TranslatePipe],
10+
imports: [Card, Button, TranslatePipe],
1311
templateUrl: './metadata-description.component.html',
1412
changeDetection: ChangeDetectionStrategy.OnPush,
1513
})

src/app/features/metadata/components/metadata-title/metadata-title.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ <h2>{{ 'common.labels.title' | translate }}</h2>
1313
</div>
1414

1515
<p data-test-display-node-title class="mt-4 word-break-word">
16-
{{ title() | fixSpecialChar }}
16+
{{ title() }}
1717
</p>
1818
</p-card>

src/app/features/metadata/components/metadata-title/metadata-title.component.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ import { Card } from 'primeng/card';
55

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

8-
import { FixSpecialCharPipe } from '@osf/shared/pipes/fix-special-char.pipe';
9-
108
@Component({
119
selector: 'osf-metadata-title',
12-
imports: [Card, Button, FixSpecialCharPipe, TranslatePipe],
10+
imports: [Card, Button, TranslatePipe],
1311
templateUrl: './metadata-title.component.html',
1412
changeDetection: ChangeDetectionStrategy.OnPush,
1513
})

src/app/features/metadata/mappers/metadata.mapper.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
22
import { LicensesMapper } from '@osf/shared/mappers/licenses.mapper';
3+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
34

45
import { CustomItemMetadataRecord, CustomMetadataJsonApi, MetadataJsonApi, MetadataModel } from '../models';
56

67
export class MetadataMapper {
78
static fromMetadataApiResponse(response: MetadataJsonApi): MetadataModel {
89
return {
910
id: response.id,
10-
title: response.attributes.title,
11-
description: response.attributes.description,
11+
title: replaceBadEncodedChars(response.attributes.title),
12+
description: replaceBadEncodedChars(response.attributes.description),
1213
tags: response.attributes.tags,
1314
dateCreated: response.attributes.date_created,
1415
dateModified: response.attributes.date_modified,

src/app/features/moderation/mappers/preprint-moderation.mapper.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { UserMapper } from '@osf/shared/mappers/user';
22
import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
33
import { PaginatedData } from '@osf/shared/models/paginated-data.model';
4+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
45

56
import {
67
PreprintProviderModerationInfo,
@@ -64,7 +65,7 @@ export class PreprintModerationMapper {
6465
return {
6566
data: response.data.map((x) => ({
6667
id: x.id,
67-
title: x.attributes.title,
68+
title: replaceBadEncodedChars(x.attributes.title),
6869
public: x.attributes.public,
6970
reviewsState: x.attributes.reviews_state,
7071
actions: [],
@@ -86,7 +87,7 @@ export class PreprintModerationMapper {
8687
return {
8788
data: response.data.map((x) => ({
8889
id: x.id,
89-
title: x.embeds.target.data.attributes.title,
90+
title: replaceBadEncodedChars(x.embeds.target.data.attributes.title),
9091
preprintId: x.embeds.target.data.id,
9192
actions: [],
9293
contributors: [],

src/app/features/moderation/mappers/registry-moderation.mapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { UserMapper } from '@osf/shared/mappers/user';
22
import { PaginatedData } from '@osf/shared/models/paginated-data.model';
3+
import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
34

45
import {
56
RegistryDataJsonApi,
@@ -13,7 +14,7 @@ export class RegistryModerationMapper {
1314
static fromResponse(response: RegistryDataJsonApi): RegistryModeration {
1415
return {
1516
id: response.id,
16-
title: response.attributes.title,
17+
title: replaceBadEncodedChars(response.attributes.title),
1718
reviewsState: response.attributes.reviews_state,
1819
revisionStatus: response.attributes.revision_state,
1920
public: response.attributes.public,

0 commit comments

Comments
 (0)