Skip to content

Commit f54d5bd

Browse files
authored
fix(preregistration): fixed breaks in registration (#665)
1 parent 9aea27c commit f54d5bd

File tree

6 files changed

+43
-6
lines changed

6 files changed

+43
-6
lines changed

src/app/features/preprints/pages/preprint-details/preprint-details.component.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="flex-column xl:mt-6 flex-1">
1+
<div class="flex flex-column xl:mt-6 flex-1">
22
<section class="flex flex-column py-5 px-3 gap-4 md:py-6 md:px-4">
33
<div class="flex flex-column justify-content-between md:flex-row">
44
@if (isPreprintProviderLoading() || isPreprintLoading()) {
@@ -11,8 +11,13 @@
1111
class="flex flex-column gap-3 custom-light-hover dark-blue-link md:flex-row"
1212
[routerLink]="['/preprints', preprintProvider()?.id, 'discover']"
1313
>
14-
<img class="fit-contain" alt="Provider Logo" height="36" [src]="preprintProvider()!.brand.heroLogoImageUrl" />
15-
<h1>{{ preprint()!.title }}</h1>
14+
<img
15+
class="fit-contain"
16+
alt="Provider Logo"
17+
height="36"
18+
[src]="preprintProvider()?.brand?.heroLogoImageUrl"
19+
/>
20+
<h1>{{ preprint()?.title }}</h1>
1621
</a>
1722
}
1823

src/app/shared/components/registration-blocks-data/registration-blocks-data.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@for (question of questions(); track question.responseKey) {
1+
@for (question of questions(); track question.id) {
22
<div [class.mb-4]="!$last">
33
<h4 class="mb-2" [class.text-lg]="isOverviewPage()">
44
{{ question.displayText }}
@@ -11,7 +11,7 @@ <h4 class="mb-2" [class.text-lg]="isOverviewPage()">
1111
@if (reviewData()[question.responseKey!]) {
1212
@switch (question.fieldType) {
1313
@case (FieldType.Text) {
14-
<p>{{ reviewData()[question.responseKey!] }}</p>
14+
<p class="preserve-whitespace">{{ reviewData()[question.responseKey!] }}</p>
1515
}
1616
@case (FieldType.Checkbox) {
1717
@for (option of reviewData()[question.responseKey!]; track option) {
@@ -36,7 +36,7 @@ <h4 class="mb-2" [class.text-lg]="isOverviewPage()">
3636
}
3737
}
3838
@default {
39-
<p>{{ reviewData()[question.responseKey!] }}</p>
39+
<p class="preserve-whitespace">{{ reviewData()[question.responseKey!] }}</p>
4040
}
4141
}
4242
} @else {

src/app/shared/pipes/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ export { FileSizePipe } from './file-size.pipe';
55
export { FixSpecialCharPipe } from './fix-special-char.pipe';
66
export { InterpolatePipe } from './interpolate.pipe';
77
export { MonthYearPipe } from './month-year.pipe';
8+
export { SafeHtmlPipe } from './safe-html.pipe';
9+
export { SafeUrlPipe } from './safe-url.pipe';
810
export { SortByDatePipe } from './sort-by-date.pipe';
911
export { WrapFnPipe } from './wrap-fn.pipe';
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { inject, Pipe, PipeTransform } from '@angular/core';
2+
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
3+
4+
@Pipe({
5+
name: 'safeHtml',
6+
})
7+
export class SafeHtmlPipe implements PipeTransform {
8+
private sanitizer = inject(DomSanitizer);
9+
10+
transform(value: string): SafeHtml {
11+
return this.sanitizer.bypassSecurityTrustHtml(value);
12+
}
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { inject, Pipe, PipeTransform } from '@angular/core';
2+
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
3+
4+
@Pipe({
5+
name: 'safeUrl',
6+
})
7+
export class SafeUrlPipe implements PipeTransform {
8+
private sanitizer = inject(DomSanitizer);
9+
10+
transform(url: string): SafeResourceUrl {
11+
return this.sanitizer.bypassSecurityTrustResourceUrl(url);
12+
}
13+
}

src/styles/_common.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
word-break: break-word;
8585
}
8686

87+
.preserve-whitespace {
88+
white-space: pre-wrap;
89+
}
90+
8791
// ------------------------- Universal custom hover state -------------------------
8892

8993
.custom-dark-hover:hover:not(:disabled) {

0 commit comments

Comments
 (0)