Merge branch 'dspace-cris-7' of bitbucket.org:4Science/dspace-angular into dspace-cris-7

Author: atarix83

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">
-        {{metadataValue.value}}
+        <div [innerHTML]="formatText(metadataValue.value)"></div>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/rendering-type-value.model.ts

@@ -33,4 +33,14 @@ export abstract class RenderingTypeValueModelComponent extends RenderingTypeMode
     this.renderingSubType = renderingSubTypeProvider;
   }
 
+  /**
+   * Purge all HTML tags, then replace newline character with <br>
+   * @param text
+   */
+  formatText(text: string): string {
+    const htmlTagRegex = /<.*?>/;
+    const newlineRegex = /\n/g;
+    return text.replace(htmlTagRegex, '').replace(newlineRegex, '<br>');
+  }
+
 }

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component.html

@@ -1,5 +1,3 @@
 <div [class]="field.styleValue">
-    <span class="text-value">
-      {{ metadataValue.value }}
-    </span>
+    <span class="text-value" [innerHTML]="formatText(metadataValue.value)"></span>
 </div>