Skip to content

Minor fixes related to line breaks & Markdown in metadata fields #1925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdonohue merged 3 commits into from
Oct 28, 2022
Merged

Minor fixes related to line breaks & Markdown in metadata fields #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c659e73
96078: Fix space in metadata value span and fix comma separator
YanaDePauw Oct 18, 2022
8204481
96078: Support enableMarkdown in generic item page field component
YanaDePauw Oct 19, 2022
6918239
Don't use .preserve-line-breaks for Markdown content
ybnd Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/app/item-page/field-components/metadata-values/metadata-values.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<ds-metadata-field-wrapper [label]="label | translate">
<ng-container *ngFor="let mdValue of mdValues; let last=last;">
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value, classes: 'dont-break-out preserve-line-breaks'}">
<ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value}">
</ng-container>
<span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
</ng-container>
</ds-metadata-field-wrapper>

<ng-template #markdown let-value="value" let-classes="classes">
<span class="{{classes}}" [innerHTML]="value | dsMarkdown | async">
<ng-template #markdown let-value="value">
<span class="dont-break-out" [innerHTML]="value | dsMarkdown | async">
</span>
</ng-template>

<ng-template #simple let-value="value" let-classes="classes">
<span class="{{classes}}">
{{value}}
</span>
<ng-template #simple let-value="value">
<span class="dont-break-out preserve-line-breaks">{{value}}</span>
</ng-template>
6 changes: 6 additions & 0 deletions ...-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,10 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
*/
@Input() label: string;

/**
* Whether the {@link MarkdownPipe} should be used to render this metadata.
*/
@Input() enableMarkdown = false;


}
2 changes: 1 addition & 1 deletion src/app/item-page/simple/item-types/publication/publication.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[separator]="','"
[separator]="', '"
[label]="'item.page.subject'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
Expand Down
2 changes: 1 addition & 1 deletion src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

<ds-generic-item-page-field [item]="object"
[fields]="['dc.subject']"
[separator]="','"
[separator]="', '"
[label]="'item.page.subject'">
</ds-generic-item-page-field>
<ds-generic-item-page-field [item]="object"
Expand Down