From 7b74f83bf8ebd94af9867ec4a44c4bc09eb108ce Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Thu, 25 Jul 2019 14:09:29 +0000
Subject: [PATCH] [Trunk | Admin]: 1. dashboard.component.html: Show class help
 texts link only when community is 'openaire' or 'connect'. 2.
 div-help-contents.component & page-help-contents.component: As preview of
 content, strip html tags and show 200 first characters | show help texts by
 increasing order.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56767 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/pages/dashboard/dashboard.component.html           | 3 ++-
 .../pages/divhelpcontent/div-help-contents.component.html  | 3 ++-
 .../pages/divhelpcontent/div-help-contents.component.ts    | 7 ++++++-
 .../pages/helpcontent/page-help-contents.component.html    | 3 ++-
 src/app/pages/helpcontent/page-help-contents.component.ts  | 7 ++++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
index cab176f..eb15630 100644
--- a/src/app/pages/dashboard/dashboard.component.html
+++ b/src/app/pages/dashboard/dashboard.component.html
@@ -65,7 +65,8 @@
                   </div>
                   <div>
                     <a routerLink="/pageContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Help texts in pages</a><br>
-                    <a routerLink="/classContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Help texts in classes</a>
+                    <a *ngIf="communityId === 'openaire' || communityId === 'connect'"
+                       routerLink="/classContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Help texts in classes</a>
                   </div>
                   </div>
                 <div   *ngIf="communityType && communityType == 'ri' && communityId!='openaire' && this.communityId !== 'connect'"  class="uk-card uk-card-default uk-card-body uk-card-hover">
diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.html b/src/app/pages/divhelpcontent/div-help-contents.component.html
index ee85b5f..b2a26a9 100644
--- a/src/app/pages/divhelpcontent/div-help-contents.component.html
+++ b/src/app/pages/divhelpcontent/div-help-contents.component.html
@@ -118,7 +118,8 @@
                                                 <div class="divId" href="#">{{check.divHelpContent.divId.name}}</div>
                                             </td>
                                             <td>
-                                                <div class="content" [innerHTML]="check.divHelpContent.content | safeHtml"></div>
+<!--                                              <div class="content" [innerHTML]="check.divHelpContent.content | safeHtml"></div>-->
+                                              <div class="content">{{check.divHelpContent.content}}</div>
                                             </td>
                                             <td>
                                               <mat-slide-toggle [checked]="check.divHelpContent.isActive"
diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.ts b/src/app/pages/divhelpcontent/div-help-contents.component.ts
index 43cc7cd..c4b299c 100644
--- a/src/app/pages/divhelpcontent/div-help-contents.component.ts
+++ b/src/app/pages/divhelpcontent/div-help-contents.component.ts
@@ -143,12 +143,17 @@ export class DivHelpContentsComponent implements OnInit {
                 this.counter.all = this.divHelpContents.length;
                 this.checkboxes = [];
 
-                for (let i = this.divHelpContents.length - 1; i >= 0; i -= 1) {
+                //for (let i = this.divHelpContents.length - 1; i >= 0; i -= 1) {
+                for (let i = 0; i < this.divHelpContents.length; i++) {
                   let divId: DivId = this.divHelpContents[i].divId as DivId;
                   let pages: Page[] =  divId.pages as Page[];
                   const pageIds = pages.map(x => x._id);
 
                   if(!this.selectedPageId || pageIds.includes(this.selectedPageId)) {
+                    this.divHelpContents[i].content = this.divHelpContents[i].content.replace(/<[^>]*>/g, '');
+                    if(this.divHelpContents[i].content.length > 200) {
+                      this.divHelpContents[i].content = this.divHelpContents[i].content.substr(0, 200) + "...";
+                    }
                     this.checkboxes.push(<CheckDivHelpContent>{divHelpContent : this.divHelpContents[i], checked : false});
                   } else {
                     this.divHelpContents.splice(i, 1);
diff --git a/src/app/pages/helpcontent/page-help-contents.component.html b/src/app/pages/helpcontent/page-help-contents.component.html
index 4a9f833..9c378ca 100644
--- a/src/app/pages/helpcontent/page-help-contents.component.html
+++ b/src/app/pages/helpcontent/page-help-contents.component.html
@@ -106,7 +106,8 @@
                                                 <div class="community" href="#">{{check.pageHelpContent.community.name}}</div>
                                             </td>
                                             <td>
-                                                <div class="content" [innerHtml]="check.pageHelpContent.content | safeHtml"></div>
+<!--                                          <div class="content" [innerHtml]="check.pageHelpContent.content | safeHtml"></div>-->
+                                              <div class="content">{{check.pageHelpContent.content}}</div>
                                             </td>
                                             <td>
                                                 <div class="placement" href="#">{{check.pageHelpContent.placement}}</div>
diff --git a/src/app/pages/helpcontent/page-help-contents.component.ts b/src/app/pages/helpcontent/page-help-contents.component.ts
index 330f59e..8140943 100644
--- a/src/app/pages/helpcontent/page-help-contents.component.ts
+++ b/src/app/pages/helpcontent/page-help-contents.component.ts
@@ -156,9 +156,14 @@ export class PageHelpContentsComponent implements OnInit {
                 this.counter.all = this.pageHelpContents.length;
                 this.checkboxes = [];
 
-                for (let i = this.pageHelpContents.length - 1; i >= 0; i -= 1) {
+                //for (let i = this.pageHelpContents.length - 1; i >= 0; i -= 1) {
+                for (let i = 0; i < this.pageHelpContents.length; i++) {
                   let page: Page =  this.pageHelpContents[i].page as Page;
                   if(!this.selectedPageId || (page._id == this.selectedPageId)) {
+                    this.pageHelpContents[i].content = this.pageHelpContents[i].content.replace(/<[^>]*>/g, '');
+                    if(this.pageHelpContents[i].content.length > 200) {
+                      this.pageHelpContents[i].content = this.pageHelpContents[i].content.substr(0, 200) + "...";
+                    }
                     this.checkboxes.push(<CheckPageHelpContent>{pageHelpContent : this.pageHelpContents[i], checked : false});
                   } else {
                     this.pageHelpContents.splice(i, 1);