From a738d3bb49d1af38f7eaf3ce34d519c76f075e4a Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Sat, 2 Jul 2022 14:43:18 +0300
Subject: [PATCH] Sidebar: Remove active element. Pages, entities, portals,
 classes: Fix grid padding. Display-claims: disable search and
 dropdown-filter.

---
 .../displayClaims.component.html              |  6 ++---
 dashboard/divId/divIds.component.html         | 18 ++++++++-------
 dashboard/entity/entities.component.html      | 20 +++++++++--------
 dashboard/page/pages.component.html           | 22 ++++++++++---------
 dashboard/portal/portals.component.html       | 20 +++++++++--------
 .../sidebar/sideBar.component.html            |  1 -
 error/errorPage.component.ts                  |  6 ++---
 sharedComponents/input/input.component.ts     |  2 +-
 8 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html
index 395ff1a0..d862fff3 100644
--- a/claims/claim-utils/displayClaims/displayClaims.component.html
+++ b/claims/claim-utils/displayClaims/displayClaims.component.html
@@ -1,12 +1,12 @@
 <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
 <div class="uk-grid">
   <div class="uk-width-expand uk-position-relative">
-    <div *ngIf="!loading">
+    <div>
       <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
               [texts]="pageContents['top']"></helper>
       <div *ngIf="filterForm" class="uk-margin-top">
         <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle">
-          <div search-input [searchControl]="filterForm.controls.keyword" searchInputClass="outer"
+          <div search-input [disabled]="loading" [searchControl]="filterForm.controls.keyword" searchInputClass="outer"
                placeholder="Search links" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"
                (searchEmitter)="changeKeyword()" [expandable]="true"></div>
         </div>
@@ -17,7 +17,7 @@
         <div class="uk-grid uk-flex-middle uk-margin-medium-top" uk-grid>
           <div>
             <dropdown-filter #dropdownFilter dropdownClass="uk-width-medium uk-padding-small"
-                             name="Type of Entity" [count]="entities.length">
+                             name="Type of Entity" [disabled]="loading" [count]="entities.length">
               <h6 class="uk-margin-remove-bottom" title="Type of Entity">Type of Entity</h6>
               <ul class="uk-list uk-margin-remove-bottom">
                 <li *ngFor="let option of allOptions">
diff --git a/dashboard/divId/divIds.component.html b/dashboard/divId/divIds.component.html
index ddf68fda..1d493dfb 100644
--- a/dashboard/divId/divIds.component.html
+++ b/dashboard/divId/divIds.component.html
@@ -24,14 +24,16 @@
               class="title">{{type.label}}</span></a></li>
         </ul>
       </div>
-      <div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
-        <div search-input [disabled]="showLoading" [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search class" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
-        <div>
-          <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newDivId()"
-                  [disabled]="showLoading" [class.uk-disabled]="showLoading">
-            <icon name="add" [flex]="true"></icon>
-            <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add class</span>
-          </button>
+      <div class="uk-width-1-1">
+        <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+          <div search-input [disabled]="showLoading" [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search class" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
+          <div>
+            <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newDivId()"
+                    [disabled]="showLoading" [class.uk-disabled]="showLoading">
+              <icon name="add" [flex]="true"></icon>
+              <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add class</span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html
index 2da29d85..cda470a8 100644
--- a/dashboard/entity/entities.component.html
+++ b/dashboard/entity/entities.component.html
@@ -26,15 +26,17 @@
 							(click)="filterForm.get('status').setValue('disabled')"><span class="title">Disabled</span></a></li>
 				</ul>
 			</div>
-			<div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
-				<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search entity"
-						 [disabled]="showLoading" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
-				<div *ngIf="isPortalAdministrator">
-					<button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newEntity()"
-									[disabled]="showLoading" [class.uk-disabled]="showLoading">
-						<icon name="add" [flex]="true"></icon>
-						<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add entity</span>
-					</button>
+			<div class="uk-width-1-1">
+				<div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+					<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search entity"
+							 [disabled]="showLoading" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
+					<div *ngIf="isPortalAdministrator">
+						<button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newEntity()"
+										[disabled]="showLoading" [class.uk-disabled]="showLoading">
+							<icon name="add" [flex]="true"></icon>
+							<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add entity</span>
+						</button>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html
index 92a751b9..150d324a 100644
--- a/dashboard/page/pages.component.html
+++ b/dashboard/page/pages.component.html
@@ -15,16 +15,17 @@
   </div>
   <div inner>
     <div class="uk-grid uk-flex-middle uk-margin-top" uk-grid>
-        <div class="uk-width-1-1">
-          <ul class="uk-subnav uk-subnav-pill">
-            <li [class.uk-active]="filterForm.get('type').value === 'all'"><a
-                (click)="filterForm.get('type').setValue('all')"><span>All pages</span></a></li>
-            <li *ngFor="let type of typeOptions; let i=index"
-                [class.uk-active]="filterForm.get('type').value === type.value"><a
-                (click)="filterForm.get('type').setValue(type.value)"><span>{{type.label}}</span></a></li>
-          </ul>
-        </div>
-        <div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+      <div class="uk-width-1-1">
+        <ul class="uk-subnav uk-subnav-pill">
+          <li [class.uk-active]="filterForm.get('type').value === 'all'"><a
+              (click)="filterForm.get('type').setValue('all')"><span>All pages</span></a></li>
+          <li *ngFor="let type of typeOptions; let i=index"
+              [class.uk-active]="filterForm.get('type').value === type.value"><a
+              (click)="filterForm.get('type').setValue(type.value)"><span>{{type.label}}</span></a></li>
+        </ul>
+      </div>
+      <div class="uk-width-1-1">
+        <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
           <div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer"
                placeholder="Search page" [disabled]="showLoading"
                class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
@@ -37,6 +38,7 @@
           </div>
         </div>
       </div>
+    </div>
     <div class="uk-section uk-section-small uk-position-relative" style="min-height: 60vh">
       <div *ngIf="showLoading" class="uk-position-center">
         <loading></loading>
diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html
index fe3ef3b7..4a175407 100644
--- a/dashboard/portal/portals.component.html
+++ b/dashboard/portal/portals.component.html
@@ -24,15 +24,17 @@
               class="title">{{type.label}}</span></a></li>
         </ul>
       </div>
-      <div class="uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
-        <div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer"  placeholder="Search portal"
-             [disabled]="showLoading" colorClass="uk-text-secondary" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
-        <div>
-          <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newPortal()"
-                  [disabled]="showLoading" [class.uk-disabled]="showLoading">
-            <icon name="add" [flex]="true"></icon>
-            <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add portal</span>
-          </button>
+      <div class="uk-width-1-1">
+        <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+          <div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer"  placeholder="Search portal"
+               [disabled]="showLoading" colorClass="uk-text-secondary" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
+          <div>
+            <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newPortal()"
+                    [disabled]="showLoading" [class.uk-disabled]="showLoading">
+              <icon name="add" [flex]="true"></icon>
+              <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add portal</span>
+            </button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html
index effe727c..29c6e004 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.html
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.html
@@ -1,7 +1,6 @@
 <aside id="sidebar_main">
   <div id="sidebar_content">
     <div *ngIf="items.length > 0" class="menu_section uk-margin-xlarge-top" style="min-height: 30vh">
-      <div *ngIf="items[activeIndex]" class="active" [style]="'--index: ' + activeIndex + '; --size: ' + (items[activeIndex].icon?'40px':0)"></div>
       <ul class="uk-list uk-nav uk-nav-default" uk-nav>
         <ng-template ngFor [ngForOf]="items" let-item let-i="index">
           <li [class.uk-active]="isTheActiveMenuItem(item)"
diff --git a/error/errorPage.component.ts b/error/errorPage.component.ts
index 92b1ceaf..afddac90 100644
--- a/error/errorPage.component.ts
+++ b/error/errorPage.component.ts
@@ -11,9 +11,9 @@ import {OpenaireEntities} from "../utils/properties/searchFields";
 @Component({
     selector: 'error',
     template: `
-    <div id="tm-main" class=" uk-section tm-middle">
-      <div uk-grid class="uk-margin-small-top">
-       <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
+    <div class="uk-section">
+      <div class="uk-margin-small-top uk-grid">
+       <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first">
         <div class="uk-container">
             <h3>
               <span  *ngIf="page !='-1'">Bad karma: we can't find that page!</span>
diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts
index fcaa0014..2c841b0f 100644
--- a/sharedComponents/input/input.component.ts
+++ b/sharedComponents/input/input.component.ts
@@ -100,7 +100,7 @@ declare var UIkit;
                   <div class="uk-label uk-label-small uk-flex uk-flex-middle"
                        [attr.uk-tooltip]="(tooltip)?('title: ' + getLabel(chip.value) + '; delay: 500; pos: bottom-left'):null">
                     <span class="uk-text-truncate uk-width-expand">{{getLabel(chip.value)}}</span>
-                    <icon [class.uk-invisible]="!focused" (click)="remove(i, $event)" class="uk-link-text uk-margin-small-left clickable" [flex]="true"
+                    <icon *ngIf="focused" (click)="remove(i, $event)" class="uk-link-text uk-margin-small-left clickable" [flex]="true"
                           name="close" ratio="0.7"></icon>
                   </div>
                 </div>