From 3acd9a6c29cd54699f27ea58fd9664e07526d589 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 26 Jan 2023 12:35:05 +0200
Subject: [PATCH] Portals: Add piwik as a column. Add pid in search

---
 dashboard/portal/portals.component.html | 8 ++++++--
 dashboard/portal/portals.component.ts   | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html
index 9f57de8c..6910431c 100644
--- a/dashboard/portal/portals.component.html
+++ b/dashboard/portal/portals.component.html
@@ -55,11 +55,11 @@
                   Bulk Actions ({{getSelectedPortals().length}})
                 </button>
                 <div uk-dropdown="mode: click">
-                  <ul class="uk-nav uk-dropdown-nav"
+                  <ul class="uk-nav uk-dropdown-nav uk-text-capitalize"
                       [attr.uk-tooltip]="getSelectedPortals().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
                       title="Select at least one entity">
                     <li>
-                      <a (click)="confirmDeleteSelectedPortals()"><i></i>Delete</a>
+                      <a (click)="confirmDeleteSelectedPortals()">Delete</a>
                     </li>
                   </ul>
                 </div>
@@ -67,6 +67,7 @@
             </th>
             <th>Name</th>
             <th>Type</th>
+            <th>Piwik</th>
             <th>Actions</th>
           </tr>
           </thead>
@@ -81,6 +82,9 @@
               <td>
                 <div class="type" href="#">{{check.portal.type}}</div>
               </td>
+              <td>
+                <div class="name" href="#">{{check.portal.piwik}}</div>
+              </td>
               <td>
                 <div class="uk-flex uk-flex-middle">
                   <icon class="clickable" [flex]="true" name="edit" [customClass]="'uk-text-primary'" (click)="editPortal(i)"></icon>
diff --git a/dashboard/portal/portals.component.ts b/dashboard/portal/portals.component.ts
index be2ed599..d9dec3ec 100644
--- a/dashboard/portal/portals.component.ts
+++ b/dashboard/portal/portals.component.ts
@@ -229,11 +229,11 @@ export class PortalsComponent implements OnInit {
   
   public filterByType(portal: Portal): boolean {
     let type = this.filterForm.get("type").value;
-    return type == "all" || (type == portal.type);
+    return type == "all" || (type === portal.type);
   }
   
   public filterPortals(portal: Portal): boolean {
-    return this.searchText.toString() === '' || (portal.name || portal.type).match(this.searchText) != null;
+    return this.searchText.toString() === '' || (portal.name + portal.type + portal.pid).match(this.searchText) != null;
   }
   
   handleUpdateError(message: string, error = null) {