Merged in task/dspace-cris-2023_02_x/DSC-2212 (pull request DSpace#3869)

Mattia Vianelli · Andrea Barbasso · commit e422656c3d14 · 2025-12-30T10:00:47.000Z
Task/dspace cris 2023 02 x/DSC-2212

Approved-by: Andrea Barbasso
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -14,7 +14,7 @@
     </ng-template>
 
     <ng-template #activeBreadcrumb let-text="text">
-        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate"></span></div></li>
+        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate | dsEscapeHtml"></span></div></li>
     </ng-template>
 </ng-container>
 
diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
@@ -10,6 +10,7 @@ import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of as observableOf } from 'rxjs';
 import { DebugElement } from '@angular/core';
+import {EscapeHtmlPipe} from '../shared/utils/escape-html.pipe';
 
 describe('BreadcrumbsComponent', () => {
   let component: BreadcrumbsComponent;
@@ -43,6 +44,7 @@ describe('BreadcrumbsComponent', () => {
       declarations: [
         BreadcrumbsComponent,
         VarDirective,
+        EscapeHtmlPipe
       ],
       imports: [
         RouterTestingModule.withRoutes([]),
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component.html
@@ -2,7 +2,7 @@
    <div class="{{field.styleValue}}">
     <ds-truncatable [id]="truncableId">
       <ds-truncatable-part [id]="truncableId" [minLines]="3">
-        <span [innerHTML]="formatText(metadataValue.value)" data-test="formatted-text"></span>
+        <span [innerHTML]="metadataValue.value | dsEscapeHtml" data-test="formatted-text"></span>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component.spec.ts
@@ -9,6 +9,7 @@ import { Item } from '../../../../../../../core/shared/item.model';
 import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate-loader.mock';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
+import {EscapeHtmlPipe} from '../../../../../../../shared/utils/escape-html.pipe';
 
 describe('LongtextComponent', () => {
   let component: LongtextComponent;
@@ -60,7 +61,7 @@ describe('LongtextComponent', () => {
         { provide: 'renderingSubTypeProvider', useValue: '' },
         { provide: 'tabNameProvider', useValue: '' },
       ],
-      declarations: [LongtextComponent]
+      declarations: [LongtextComponent, EscapeHtmlPipe]
     })
       .compileComponents();
   }));
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/inline/inline.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/inline/inline.component.spec.ts
@@ -13,6 +13,7 @@ import { LayoutField } from '../../../../../../../../core/layout/models/box.mode
 import { TextComponent } from '../../text/text.component';
 import { DsDatePipe } from '../../../../../../../pipes/ds-date.pipe';
 import { MetadataRenderComponent } from '../../../row/metadata-container/metadata-render/metadata-render.component';
+import {EscapeHtmlPipe} from '../../../../../../../../shared/utils/escape-html.pipe';
 
 describe('InlineComponent', () => {
   let component: InlineComponent;
@@ -90,7 +91,8 @@ describe('InlineComponent', () => {
         DsDatePipe,
         MetadataRenderComponent,
         InlineComponent,
-        TextComponent
+        TextComponent,
+        EscapeHtmlPipe,
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(InlineComponent, {
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.spec.ts
@@ -12,6 +12,7 @@ import { FieldRenderingType } from '../../metadata-box.decorator';
 import { MetadataRenderComponent } from '../../../row/metadata-container/metadata-render/metadata-render.component';
 import { DsDatePipe } from '../../../../../../../pipes/ds-date.pipe';
 import { TextComponent } from '../../text/text.component';
+import {EscapeHtmlPipe} from '../../../../../../../../shared/utils/escape-html.pipe';
 
 describe('TableComponent', () => {
   let component: TableComponent;
@@ -95,7 +96,8 @@ describe('TableComponent', () => {
         DsDatePipe,
         MetadataRenderComponent,
         TableComponent,
-        TextComponent
+        TextComponent,
+        EscapeHtmlPipe,
       ]
     }).overrideComponent(TableComponent, {
       set: { changeDetection: ChangeDetectionStrategy.OnPush }
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component.html
@@ -1,3 +1,3 @@
 <div [class]="field.styleValue">
-    <span class="text-value" [attr.lang]="metadataValue.language" [innerHTML]="formatText(metadataValue.value)"></span>
+    <span class="text-value" [attr.lang]="metadataValue.language" [innerHTML]="metadataValue.value | dsEscapeHtml"></span>
 </div>
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component.spec.ts
@@ -10,6 +10,7 @@ import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate
 import { DsDatePipe } from '../../../../../../pipes/ds-date.pipe';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
+import { EscapeHtmlPipe } from 'src/app/shared/utils/escape-html.pipe';
 
 describe('TextComponent', () => {
   let component: TextComponent;
@@ -61,7 +62,7 @@ describe('TextComponent', () => {
         { provide: 'renderingSubTypeProvider', useValue: '' },
         { provide: 'tabNameProvider', useValue: '' },
       ],
-      declarations: [TextComponent, DsDatePipe]
+      declarations: [TextComponent, DsDatePipe, EscapeHtmlPipe]
     })
       .compileComponents();
   }));
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component.spec.ts
@@ -13,6 +13,7 @@ import { FieldRenderingType } from '../../../rendering-types/metadata-box.decora
 import { LayoutField } from '../../../../../../../../core/layout/models/box.model';
 import { TableComponent } from '../../../rendering-types/metadataGroup/table/table.component';
 import { PLACEHOLDER_PARENT_METADATA } from '../../../../../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import {EscapeHtmlPipe} from '../../../../../../../../shared/utils/escape-html.pipe';
 
 describe('MetadataRenderComponent', () => {
   let component: MetadataRenderComponent;
@@ -128,7 +129,8 @@ describe('MetadataRenderComponent', () => {
         DsDatePipe,
         MetadataRenderComponent,
         TableComponent,
-        TextComponent
+        TextComponent,
+        EscapeHtmlPipe,
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(TableComponent, {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -9,7 +9,7 @@
         <ds-themed-badges *ngIf="showLabel" [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-themed-badges>
       </div>
       <ds-truncatable [id]="item.id">
-        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
+        <h2 [innerHTML]="dsoTitle | dsEscapeHtml" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
         <ds-in-workflow-statistics *ngIf="showWorkflowStatistics" [item]="item" ></ds-in-workflow-statistics>
         <div>
           <span class="text-muted">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -13,6 +13,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { VarDirective } from '../../../utils/var.directive';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
+import {EscapeHtmlPipe} from '../../../utils/escape-html.pipe';
 
 let component: ItemListPreviewComponent;
 let fixture: ComponentFixture<ItemListPreviewComponent>;
@@ -97,7 +98,7 @@ describe('ItemListPreviewComponent', () => {
         }),
         NoopAnimationsModule
       ],
-      declarations: [ItemListPreviewComponent, TruncatePipe, VarDirective],
+      declarations: [ItemListPreviewComponent, TruncatePipe, VarDirective, EscapeHtmlPipe],
       providers: [
         { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate }},
         { provide: APP_CONFIG, useValue: environmentUseThumbs },
@@ -245,7 +246,7 @@ describe('ItemListPreviewComponent', () => {
         }),
         NoopAnimationsModule
       ],
-      declarations: [ItemListPreviewComponent, TruncatePipe],
+      declarations: [ItemListPreviewComponent, TruncatePipe, EscapeHtmlPipe],
       providers: [
         {provide: 'objectElementProvider', useValue: {mockItemWithAuthorAndDate}},
         {provide: APP_CONFIG, useValue: enviromentNoThumbs},
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -23,9 +23,9 @@
         <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
           <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
                  [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-                 [innerHTML]="dsoTitle"></a>
+                 [innerHTML]="dsoTitle | dsEscapeHtml"></a>
           <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
-                [innerHTML]="dsoTitle"></span>
+                [innerHTML]="dsoTitle | dsEscapeHtml"></span>
           <ds-in-workflow-statistics  *ngIf="showWorkflowStatistics" [item]="dso"></ds-in-workflow-statistics>
           <span class="text-muted">
             <ds-truncatable-part [id]="dso.id" [minLines]="1">
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -12,6 +12,7 @@ import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-nam
 import { VarDirective } from '../../../../../utils/var.directive';
 import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
 import { TranslateModule } from '@ngx-translate/core';
+import { EscapeHtmlPipe } from '../../../../../utils/escape-html.pipe';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
@@ -194,7 +195,7 @@ describe('ItemSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ItemSearchResultListElementComponent, TruncatePipe, VarDirective],
+      declarations: [ItemSearchResultListElementComponent, TruncatePipe, VarDirective, EscapeHtmlPipe],
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
@@ -357,7 +358,7 @@ describe('ItemSearchResultListElementComponent', () => {
 
     it('should show highlighted title', () => {
       const titleField = fixture.debugElement.query(By.css('.item-list-title'));
-      expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
+      expect(titleField.nativeNode.innerHTML).toEqual('This is just another &lt;em&gt;title&lt;/em&gt;');
     });
   });
 
@@ -369,7 +370,7 @@ describe('ItemSearchResultListElementComponent', () => {
 
     it('should show highlighted title', () => {
       const titleField = fixture.debugElement.query(By.css('.item-list-title'));
-      expect(titleField.nativeNode.innerHTML).toEqual('<em>Michel</em>');
+      expect(titleField.nativeNode.innerHTML).toEqual('&lt;em&gt;Michel&lt;/em&gt;');
     });
   });
 
@@ -381,7 +382,7 @@ describe('ItemSearchResultListElementComponent', () => {
 
     it('should show highlighted title', () => {
       const titleField = fixture.debugElement.query(By.css('.item-list-title'));
-      expect(titleField.nativeNode.innerHTML).toEqual('<em>Science</em>');
+      expect(titleField.nativeNode.innerHTML).toEqual('&lt;em&gt;Science&lt;/em&gt;');
     });
   });
 
@@ -403,7 +404,7 @@ describe('ItemSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ItemSearchResultListElementComponent, TruncatePipe],
+      declarations: [ItemSearchResultListElementComponent, TruncatePipe, EscapeHtmlPipe],
       providers: [
         {provide: TruncatableService, useValue: truncatableServiceStub},
         {provide: DSONameService, useClass: DSONameServiceMock},
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
@@ -365,6 +365,7 @@ import { SwitchComponent } from './switch/switch.component';
 import {StickyPopoverDirective} from './metadata-link-view/sticky-popover.directive';
 import { SortPipe } from './utils/sort.pipe';
 import { BrowserOnlyDirective } from './utils/browser-only.directive';
+import {EscapeHtmlPipe} from './utils/escape-html.pipe';
 
 const MODULES = [
   CommonModule,
@@ -413,6 +414,7 @@ const PIPES = [
   BrowserOnlyPipe,
   ShortNumberPipe,
   SortPipe,
+  EscapeHtmlPipe,
 ];
 
 const COMPONENTS = [
diff --git a/src/app/shared/utils/escape-html.pipe.ts b/src/app/shared/utils/escape-html.pipe.ts
@@ -0,0 +1,18 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+@Pipe({
+  name: 'dsEscapeHtml',
+})
+export class EscapeHtmlPipe implements PipeTransform {
+  /**
+   * Escape HTML special characters and convert newlines to <br>
+   * @param text
+   */
+  transform(text: string): string {
+    const newlineRegex = /\n/g;
+    return text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(newlineRegex, '<br>');
+  }
+}
