Skip to content

Commit f4f95d6

Browse files
Andrea Barbassoatarix83
authored andcommitted
Merged in task/dspace-cris-2024_02_x/DSC-2724 (pull request DSpace#4106)
[DSC-2724] add whitelist to DsEscapeHtml, adopt it where needed Approved-by: Giuseppe Digilio
2 parents 8ebaef6 + 2cbafe3 commit f4f95d6

File tree

49 files changed

+150
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+150
-65
lines changed

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle | dsEscapeHtml"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.datePublished')"
2727
class="item-date card-text text-muted">

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16+
import { EscapeHtmlPipe } from '../../../../../shared/utils/escape-html.pipe';
1617
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1718

1819
@listableObjectComponent('JournalIssueSearchResult', ViewMode.GridElement)
@@ -22,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
2223
templateUrl: './journal-issue-search-result-grid-element.component.html',
2324
animations: [focusShadow],
2425
standalone: true,
25-
imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
26+
imports: [EscapeHtmlPipe, TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
2627
})
2728
/**
2829
* The component for displaying a grid element for an item search result of the type Journal Issue

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle | dsEscapeHtml"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.datePublished')"
2727
class="item-date card-text text-muted">

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16+
import { EscapeHtmlPipe } from '../../../../../shared/utils/escape-html.pipe';
1617
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1718

1819
@listableObjectComponent('JournalVolumeSearchResult', ViewMode.GridElement)
@@ -22,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
2223
templateUrl: './journal-volume-search-result-grid-element.component.html',
2324
animations: [focusShadow],
2425
standalone: true,
25-
imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
26+
imports: [EscapeHtmlPipe, TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
2627
})
2728
/**
2829
* The component for displaying a grid element for an item search result of the type Journal Volume

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<div class="card-body">
2222
<ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
2323
<ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
24-
<h4 class="card-title" [innerHTML]="dsoTitle"></h4>
24+
<h4 class="card-title" [innerHTML]="dsoTitle | dsEscapeHtml"></h4>
2525
</ds-truncatable-part>
2626
<p *ngIf="dso.hasMetadata('creativework.editor')"
2727
class="item-publisher card-text text-muted">

src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16+
import { EscapeHtmlPipe } from '../../../../../shared/utils/escape-html.pipe';
1617
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1718

1819
@listableObjectComponent('JournalSearchResult', ViewMode.GridElement)
@@ -22,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
2223
templateUrl: './journal-search-result-grid-element.component.html',
2324
animations: [focusShadow],
2425
standalone: true,
25-
imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
26+
imports: [EscapeHtmlPipe, TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
2627
})
2728
/**
2829
* The component for displaying a grid element for an item search result of the type Journal

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row">
2-
<div *ngIf="showThumbnails" class="col-3 col-xl-2 pr-sm-0">
2+
<div *ngIf="showThumbnails" class="col-3 col-md-2 pr-sm-0">
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
44
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
55
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="-1">
@@ -17,10 +17,10 @@
1717
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
1818
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
1919
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
20-
[innerHTML]="dsoTitle" role="link" tabindex="0"></a>
20+
[innerHTML]="dsoTitle | dsEscapeHtml" role="link" tabindex="0"></a>
2121
<span *ngIf="linkType === linkTypes.None"
2222
class="lead item-list-title dont-break-out"
23-
[innerHTML]="dsoTitle"></span>
23+
[innerHTML]="dsoTitle | dsEscapeHtml"></span>
2424
<span class="text-muted">
2525
<ds-truncatable-part [id]="dso.id" [minLines]="1">
2626
<span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16+
import { EscapeHtmlPipe } from '../../../../../shared/utils/escape-html.pipe';
1617
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1718

1819
@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
@@ -21,7 +22,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
2122
styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
2223
templateUrl: './journal-issue-search-result-list-element.component.html',
2324
standalone: true,
24-
imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
25+
imports: [EscapeHtmlPipe, NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
2526
})
2627
/**
2728
* The component for displaying a list element for an item search result of the type Journal Issue

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row">
2-
<div *ngIf="showThumbnails" class="col-3 col-xl-2 pr-sm-0">
2+
<div *ngIf="showThumbnails" class="col-3 col-md-2 pr-sm-0">
33
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
44
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
55
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out" role="link" tabindex="-1">
@@ -17,10 +17,10 @@
1717
<a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
1818
[attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
1919
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
20-
[innerHTML]="dsoTitle" role="link" tabindex="0"></a>
20+
[innerHTML]="dsoTitle | dsEscapeHtml" role="link" tabindex="0"></a>
2121
<span *ngIf="linkType === linkTypes.None"
2222
class="lead item-list-title dont-break-out"
23-
[innerHTML]="dsoTitle"></span>
23+
[innerHTML]="dsoTitle | dsEscapeHtml"></span>
2424
<span class="text-muted">
2525
<ds-truncatable-part [id]="dso.id" [minLines]="1">
2626
<span *ngIf="dso.allMetadata(['journal.title']).length > 0"

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
1313
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
1414
import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
1515
import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
16+
import { EscapeHtmlPipe } from '../../../../../shared/utils/escape-html.pipe';
1617
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
1718

1819
@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
@@ -21,7 +22,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
2122
styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
2223
templateUrl: './journal-volume-search-result-list-element.component.html',
2324
standalone: true,
24-
imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
25+
imports: [EscapeHtmlPipe, NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
2526
})
2627
/**
2728
* The component for displaying a list element for an item search result of the type Journal Volume

0 commit comments

Comments
 (0)