Merge pull request #776 from bodintsov/fix/make-mappers-use-fix-bad-ecoding

[ENG-9736] Fix(mappers): make mappers use format bad encoding

Author: nsemets

src/app/features/files/mappers/file-custom-metadata.mapper.ts

@@ -1,13 +1,14 @@
 import { ApiData } from '@osf/shared/models/common/json-api.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { FileCustomMetadata, OsfFileCustomMetadata } from '../models';
 
 export function MapFileCustomMetadata(data: ApiData<FileCustomMetadata, null, null, null>): OsfFileCustomMetadata {
   return {
     id: data.id,
-    description: data.attributes.description,
+    description: replaceBadEncodedChars(data.attributes.description),
     language: data.attributes.language,
     resourceTypeGeneral: data.attributes.resource_type_general,
-    title: data.attributes.title,
+    title: replaceBadEncodedChars(data.attributes.title),
   };
 }

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

@@ -1,5 +1,6 @@
 import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { ResourceMetadata } from '@osf/shared/models/resource-metadata.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model';
 import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model';
@@ -9,8 +10,8 @@ export function MapResourceMetadata(
   customMetadata: GetResourceCustomMetadataResponse
 ): ResourceMetadata {
   return {
-    title: shortInfo.data.attributes.title,
-    description: shortInfo.data.attributes.description,
+    title: replaceBadEncodedChars(shortInfo.data.attributes.title),
+    description: replaceBadEncodedChars(shortInfo.data.attributes.description),
     dateCreated: new Date(shortInfo.data.attributes.date_created),
     dateModified: new Date(shortInfo.data.attributes.date_modified),
     funders:

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

@@ -1,4 +1,5 @@
 import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
   MeetingGetResponseJsonApi,
@@ -28,7 +29,7 @@ export class MeetingsMapper {
     return {
       data: response.data.map((item) => ({
         id: item.id,
-        title: item.attributes.title,
+        title: replaceBadEncodedChars(item.attributes.title),
         dateCreated: item.attributes.date_created,
         authorName: item.attributes.author_name,
         downloadCount: item.attributes.download_count || 0,

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

@@ -13,6 +13,6 @@ <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
   </div>
 
   <p data-test-display-node-description class="mt-4">
-    {{ (description() | fixSpecialChar) || ('project.overview.metadata.noDescription' | translate) }}
+    {{ description() || ('project.overview.metadata.noDescription' | translate) }}
   </p>
 </p-card>

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

@@ -5,11 +5,9 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { FixSpecialCharPipe } from '@osf/shared/pipes/fix-special-char.pipe';
-
 @Component({
   selector: 'osf-metadata-description',
-  imports: [Card, Button, FixSpecialCharPipe, TranslatePipe],
+  imports: [Card, Button, TranslatePipe],
   templateUrl: './metadata-description.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })

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

@@ -13,6 +13,6 @@ <h2>{{ 'common.labels.title' | translate }}</h2>
   </div>
 
   <p data-test-display-node-title class="mt-4 word-break-word">
-    {{ title() | fixSpecialChar }}
+    {{ title() }}
   </p>
 </p-card>

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

@@ -5,11 +5,9 @@ import { Card } from 'primeng/card';
 
 import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
 
-import { FixSpecialCharPipe } from '@osf/shared/pipes/fix-special-char.pipe';
-
 @Component({
   selector: 'osf-metadata-title',
-  imports: [Card, Button, FixSpecialCharPipe, TranslatePipe],
+  imports: [Card, Button, TranslatePipe],
   templateUrl: './metadata-title.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })

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

@@ -1,14 +1,15 @@
 import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { LicensesMapper } from '@osf/shared/mappers/licenses.mapper';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { CustomItemMetadataRecord, CustomMetadataJsonApi, MetadataJsonApi, MetadataModel } from '../models';
 
 export class MetadataMapper {
   static fromMetadataApiResponse(response: MetadataJsonApi): MetadataModel {
     return {
       id: response.id,
-      title: response.attributes.title,
-      description: response.attributes.description,
+      title: replaceBadEncodedChars(response.attributes.title),
+      description: replaceBadEncodedChars(response.attributes.description),
       tags: response.attributes.tags,
       dateCreated: response.attributes.date_created,
       dateModified: response.attributes.date_modified,

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

@@ -1,6 +1,7 @@
 import { UserMapper } from '@osf/shared/mappers/user';
 import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
   PreprintProviderModerationInfo,
@@ -64,7 +65,7 @@ export class PreprintModerationMapper {
     return {
       data: response.data.map((x) => ({
         id: x.id,
-        title: x.attributes.title,
+        title: replaceBadEncodedChars(x.attributes.title),
         public: x.attributes.public,
         reviewsState: x.attributes.reviews_state,
         actions: [],
@@ -86,7 +87,7 @@ export class PreprintModerationMapper {
     return {
       data: response.data.map((x) => ({
         id: x.id,
-        title: x.embeds.target.data.attributes.title,
+        title: replaceBadEncodedChars(x.embeds.target.data.attributes.title),
         preprintId: x.embeds.target.data.id,
         actions: [],
         contributors: [],

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

@@ -1,5 +1,6 @@
 import { UserMapper } from '@osf/shared/mappers/user';
 import { PaginatedData } from '@osf/shared/models/paginated-data.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
   RegistryDataJsonApi,
@@ -13,7 +14,7 @@ export class RegistryModerationMapper {
   static fromResponse(response: RegistryDataJsonApi): RegistryModeration {
     return {
       id: response.id,
-      title: response.attributes.title,
+      title: replaceBadEncodedChars(response.attributes.title),
       reviewsState: response.attributes.reviews_state,
       revisionStatus: response.attributes.revision_state,
       public: response.attributes.public,