From 7081b6c9145efc7881cbfe49460dc33e96eadcd1 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 27 Nov 2018 12:28:20 +0000
Subject: [PATCH] 1. pages.component: Reinitialize keyword in search form when
 changing page type. 2. communities.component & divIds.component &
 div-help-contents.component & entities.component &
 page-help-contents.component & pages.component: 	Bug fix: Change search
 forms to search on 'search' button click or enter.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@53984 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/pages/community/communities.component.html   | 10 ++++++++--
 src/app/pages/community/communities.component.ts     |  2 ++
 src/app/pages/divId/divIds.component.html            | 10 ++++++++--
 src/app/pages/divId/divIds.component.ts              |  1 +
 .../divhelpcontent/div-help-contents.component.html  | 12 +++++++++---
 .../divhelpcontent/div-help-contents.component.ts    |  1 +
 src/app/pages/entity/entities.component.html         | 10 ++++++++--
 src/app/pages/entity/entities.component.ts           |  1 +
 .../helpcontent/page-help-contents.component.html    | 10 ++++++++--
 .../helpcontent/page-help-contents.component.ts      |  1 +
 src/app/pages/page/pages.component.html              | 10 ++++++++--
 src/app/pages/page/pages.component.ts                |  3 +++
 12 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/community/communities.component.html b/src/app/pages/community/communities.component.html
index 4961adb..bf5a7d5 100644
--- a/src/app/pages/community/communities.component.html
+++ b/src/app/pages/community/communities.component.html
@@ -6,8 +6,14 @@
               {{updateErrorMessage}}
             </div>
             <form target="BSFormPanel_Admin_1" class="search">
-                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Community name..." type="text" class="uk-input uk-width-medium"/>
-                <button class="uk-button" type="submit">Search</button>
+                <!-- <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Community name..." type="text" class="uk-input uk-width-medium"/>
+                <button class="uk-button" type="submit">Search</button> -->
+                <input type="text" class="uk-input uk-width-medium" placeholder="Community name..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                   <span class="uk-icon">
+                   <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                   </span>Search
+                 </button>
             </form>
             <!-- <a (click)="showModal()" class="uk-button uk-button-primary uk-float-right"><i></i> New Community </a> -->
         </div>
diff --git a/src/app/pages/community/communities.component.ts b/src/app/pages/community/communities.component.ts
index 756582a..04a8b44 100644
--- a/src/app/pages/community/communities.component.ts
+++ b/src/app/pages/community/communities.component.ts
@@ -47,6 +47,8 @@ export class CommunitiesComponent implements OnInit {
     public formGroup : FormGroup;
 
     private searchText : RegExp = new RegExp('');
+    public  keyword: string = "";
+    
     public properties:EnvProperties = null;
 
     public showLoading: boolean = true;
diff --git a/src/app/pages/divId/divIds.component.html b/src/app/pages/divId/divIds.component.html
index a15494b..6bfb504 100644
--- a/src/app/pages/divId/divIds.component.html
+++ b/src/app/pages/divId/divIds.component.html
@@ -6,8 +6,14 @@
               {{updateErrorMessage}}
             </div>
             <form target="BSFormPanel_Admin_1" class="search">
-                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Class name..." type="text" class="uk-input uk-width-medium"/>
-                <button class="uk-button" type="submit">Search</button>
+                <!-- <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Class name..." type="text" class="uk-input uk-width-medium"/>
+                <button class="uk-button" type="submit">Search</button> -->
+                <input type="text" class="uk-input uk-width-medium" placeholder="Class name..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                   <span class="uk-icon">
+                   <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                   </span>Search
+                 </button>
             </form>
             <!-- <a (click)="showModal()" class="uk-button uk-button-primary uk-float-right"><i></i> New Class </a> -->
         </div>
diff --git a/src/app/pages/divId/divIds.component.ts b/src/app/pages/divId/divIds.component.ts
index e807e7a..3eee495 100644
--- a/src/app/pages/divId/divIds.component.ts
+++ b/src/app/pages/divId/divIds.component.ts
@@ -46,6 +46,7 @@ export class DivIdsComponent implements OnInit {
     public formGroup : FormGroup;
 
     private searchText : RegExp = new RegExp('');
+    public  keyword: string = "";
 
     public pages: Page[] = [];
     public properties:EnvProperties = null;
diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.html b/src/app/pages/divhelpcontent/div-help-contents.component.html
index 70a5a2d..dbfb67d 100644
--- a/src/app/pages/divhelpcontent/div-help-contents.component.html
+++ b/src/app/pages/divhelpcontent/div-help-contents.component.html
@@ -30,8 +30,14 @@
             <!-- <a *ngIf="selectedPageId" [queryParams]="{communityId: selectedCommunityPid, pageId: selectedPageId}" routerLink="/classContents/new" class="uk-button uk-button-primary uk-float-right"><i></i> New class help text </a> -->
             <div class="uk-grid uk-margin-bottom">
             <form target="BSFormPanel_Admin_1" class="search">
-                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Class Help text..." type="text" class="uk-input uk-width-medium"/>
-                <button class="uk-button" type="submit">Search</button>
+                <!-- <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Class Help text..." type="text" class="uk-input uk-width-medium"/>
+                <button class="uk-button" type="submit">Search</button> -->
+                <input type="text" class="uk-input uk-width-medium" placeholder="Class Help text..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                   <span class="uk-icon">
+                   <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                   </span>Search
+                 </button>
             </form>
             <div *ngIf="!selectedPageId" class="filters marginBottom20">
                 <div class="links form-group form-inline">
@@ -67,7 +73,7 @@
                                   <div class="uk-alert uk-alert-primary uk-margin-top-large">
                                        <span class="uk-margin-small-right uk-icon" uk-icon="info"></span>
                                       Enable or disable help text to show or hide it from the dashboard
- 
+
                                     </div>
 
                                   <ul uk-tab class="links">
diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.ts b/src/app/pages/divhelpcontent/div-help-contents.component.ts
index ecce306..455bd8e 100644
--- a/src/app/pages/divhelpcontent/div-help-contents.component.ts
+++ b/src/app/pages/divhelpcontent/div-help-contents.component.ts
@@ -37,6 +37,7 @@ export class DivHelpContentsComponent implements OnInit {
     public checkboxAll : boolean = false;
 
     public filters : DivHelpContentFilterOptions = {id : '', active : null, text : new RegExp('')};
+    public keyword: string = "";
 
     public counter = {all : 0, active : 0, inactive : 0};
 
diff --git a/src/app/pages/entity/entities.component.html b/src/app/pages/entity/entities.component.html
index 13e10ac..b7ad306 100644
--- a/src/app/pages/entity/entities.component.html
+++ b/src/app/pages/entity/entities.component.html
@@ -25,8 +25,14 @@
             </div>
             <!-- <a (click)="showModal()" *ngIf="isPortalAdministrator" class="uk-button uk-button-primary uk-float-right"><i></i> New Entity </a> -->
             <form target="BSFormPanel_Admin_1" class="search">
-                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Entity name..." type="text" class="uk-input uk-width-medium"/>
-                <button class="uk-button" type="submit">Search</button>
+                <!-- <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Entity name..." type="text" class="uk-input uk-width-medium"/>
+                <button class="uk-button" type="submit">Search</button> -->
+                <input type="text" class="uk-input uk-width-medium" placeholder="Entity name..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                   <span class="uk-icon">
+                   <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                   </span>Search
+                 </button>
             </form>
         </div>
 
diff --git a/src/app/pages/entity/entities.component.ts b/src/app/pages/entity/entities.component.ts
index deff8fb..906dd00 100644
--- a/src/app/pages/entity/entities.component.ts
+++ b/src/app/pages/entity/entities.component.ts
@@ -39,6 +39,7 @@ export class EntitiesComponent implements OnInit {
     public formGroup : FormGroup;
 
     private searchText : RegExp = new RegExp('');
+    public  keyword: string = "";
 
     public communities: Community[] = [];
     public selectedCommunityPid: string;
diff --git a/src/app/pages/helpcontent/page-help-contents.component.html b/src/app/pages/helpcontent/page-help-contents.component.html
index b4dde56..6a27903 100644
--- a/src/app/pages/helpcontent/page-help-contents.component.html
+++ b/src/app/pages/helpcontent/page-help-contents.component.html
@@ -28,8 +28,14 @@
             </div>
             <div class="uk-grid uk-margin-bottom">
               <form target="BSFormPanel_Admin_1" class="search">
-                  <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Page Help Text..." type="text" class="uk-input uk-width-medium"/>
-                  <button class="uk-button" type="submit">Search</button>
+                  <!-- <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Page Help Text..." type="text" class="uk-input uk-width-medium"/>
+                  <button class="uk-button" type="submit">Search</button> -->
+                  <input type="text" class="uk-input uk-width-medium" placeholder="Page name..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                  <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                     <span class="uk-icon">
+                     <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                     </span>Search
+                   </button>
               </form>
               <div *ngIf="!selectedPageId" class="filters marginBottom20">
                   <div class="links form-group form-inline">
diff --git a/src/app/pages/helpcontent/page-help-contents.component.ts b/src/app/pages/helpcontent/page-help-contents.component.ts
index c25d47c..1994456 100644
--- a/src/app/pages/helpcontent/page-help-contents.component.ts
+++ b/src/app/pages/helpcontent/page-help-contents.component.ts
@@ -50,6 +50,7 @@ export class PageHelpContentsComponent implements OnInit {
     public checkboxAll : boolean = false;
 
     public filters : PageHelpContentFilterOptions = {id : '', active : null, text : new RegExp('')};
+    public keyword: string = "";
 
     public counter = {all : 0, active : 0, inactive : 0};
 
diff --git a/src/app/pages/page/pages.component.html b/src/app/pages/page/pages.component.html
index e94400c..2f4ea09 100644
--- a/src/app/pages/page/pages.component.html
+++ b/src/app/pages/page/pages.component.html
@@ -24,8 +24,14 @@
             </div>
             <!-- <a  *ngIf="isPortalAdministrator" (click)="showModal()" class="uk-button uk-button-primary uk-float-right"><i></i> New Page </a> -->
             <form target="BSFormPanel_Admin_1" class="search">
-                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Page name..." type="text" class="uk-input uk-width-medium"/>
-                <button class="uk-button" type="submit">Search</button>
+                <!-- <input [(ngModel)]="inputstring" (keyup.enter)="filterBySearch(inputstring)" placeholder="Page name..." type="text" name="searchForm" class="uk-input uk-width-medium"/>
+                <button class="uk-button" type="submit">Search</button> -->
+                <input type="text" class="uk-input uk-width-medium" placeholder="Page name..." aria-describedby="sizing-addon2"  [(ngModel)]="keyword"  name="keyword" >
+                <button (click)="filterBySearch(keyword)"  type="submit" class=" uk-button">
+                   <span class="uk-icon">
+                   <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="search" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9" cy="9" r="7"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M14,14 L18,18 L14,14 Z"></path></svg>
+                   </span>Search
+                 </button>
             </form>
         </div>
 
diff --git a/src/app/pages/page/pages.component.ts b/src/app/pages/page/pages.component.ts
index 772c0e5..ac378fa 100644
--- a/src/app/pages/page/pages.component.ts
+++ b/src/app/pages/page/pages.component.ts
@@ -49,6 +49,7 @@ export class PagesComponent implements OnInit {
     public formGroup : FormGroup;
 
     private searchText : RegExp = new RegExp('');
+    public  keyword: string = "";
 
     public communities: Community[] = [];
 
@@ -75,6 +76,8 @@ export class PagesComponent implements OnInit {
                  this.pagesType = params['type'];
                }
 
+               this.keyword = "";
+
                this.selectedCommunityPid = params['communityId'];
                this.applyCommunityFilter(this.selectedCommunityPid);
                this.isPortalAdministrator = Session.isPortalAdministrator();