Merged in task/ux-plus-cris-2024_02_x/UXP-305 (pull request #88)

[UXP-305] fix grid link fallback, prevent p wrapping in quill

Approved-by: Andrea Barbasso

Author: FrancescoMolinaro

src/app/shared/explore/section-component/grid-section/grid-section.component.ts

@@ -53,7 +53,10 @@ import {
 } from '../../../../core/shared/operators';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { Site } from '../../../../core/shared/site.model';
-import { hasValue } from '../../../../shared/empty.util';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../shared/empty.util';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
@@ -159,7 +162,10 @@ export class GridSectionComponent implements OnInit {
     this.maincontentTitle = this.maincontentTitle ?? this.translateService.instant('grid.component.title');
     this.maincontentSubtitle = this.maincontentSubtitle ?? this.translateService.instant('grid.component.subtitle');
     this.maincontentAbstract = this.maincontentAbstract ?? this.translateService.instant('grid.component.abstract');
-    this.maincontentLink = this.maincontentLink ?? this.translateService.instant('grid.component.link');
+
+    if (isEmpty(this.maincontentLink)) {
+      this.maincontentLink = this.gridSection.mainContentLink ?? this.translateService.instant('grid.component.link');
+    }
   }
 
   private getSearchResults() {

src/app/shared/markdown-editor/markdown-editor.component.ts

@@ -79,7 +79,11 @@ export class MarkdownEditorComponent {
    */
   updateContent(content: ContentChange) {
     const sanitizedContent = this.sanitizer.sanitize(SecurityContext.HTML, content.html);
-    const normalizedContent = sanitizedContent?.replace(/ /g, ' ');
+    let normalizedContent = sanitizedContent?.replace(/ /g, ' ');
+    // Remove outer <p>...</p> if present as quill wraps around p by default
+    if (normalizedContent) {
+      normalizedContent = normalizedContent.replace(/^<p>([\s\S]*)<\/p>$/i, '$1');
+    }
     this.editValueChange.emit(normalizedContent);
   }
 }