From 41f5a6fc991960d8df2c7802adc58d0cc61eaf8d Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Mon, 27 Jun 2022 15:02:16 +0300
Subject: [PATCH] start on dashboard's initial page

---
 src/app/community/community.component.html | 84 ++++++++--------------
 src/app/community/community.component.ts   | 20 +++++-
 src/app/community/community.module.ts      |  7 +-
 3 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 1e3bb22..6bbd9c3 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -191,60 +191,33 @@
   </ng-template>
 
   <div *ngIf="communityInfo && community && !isPrivate()" >
-  <div *ngIf="communityInfo && community" class="generalSearchForm ">
-    <div class="uk-container uk-container-large">
-      <div class="uk-margin-large-top">
-        <h1 *ngIf="community.title" class="title uk-margin-remove">
-          {{community.title}}
-        </h1>
-        <div *ngIf="community.shortTitle && community.title != community.shortTitle"
-             class="subtitle uk-margin-remove">
-          {{community.shortTitle}}
-        </div>
-      </div>
-    </div>
-    <div class="uk-flex uk-flex-middle uk-flex-center">
+		<div *ngIf="communityInfo && community" class="generalSearchForm uk-background-primary"> <!-- this div will have the customized color or image -->
+			<div class="uk-container uk-container-large">
+				<div class="uk-width-1-2@m uk-margin-large-top uk-margin-large-bottom">
+					<div *ngIf="community.shortTitle && community.title != community.shortTitle" class="uk-margin-remove">
+						{{community.shortTitle}}
+					</div>
+					<h1 *ngIf="community.title" class="uk-margin-remove">
+						{{community.title}}
+					</h1>
+					<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-4-5@m">
+						<advanced-search-input #advanced (searchEmitter)="goTo(true)">
+							<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
+																	(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
+																	[onChangeNavigate]="false"></entities-selection>
+							<div input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
+						</advanced-search-input>
+						<div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
+							<div class="uk-padding-small">
+								<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
 
-      <form class=" uk-margin-large uk-margin-large-top ">
-        <div class="uk-grid uk-margin-small-left">
-          <div class="uk-margin-small-top uk-padding-remove-left">
-            <entities-selection [simpleView]="true" currentEntity="result" selectedEntity="result"
-                                [customFilter]="customFilter"
-                                [properties]="properties" [onChangeNavigate]="false"
-                                (selectionChange)="entityChanged($event)"
-            ></entities-selection>
-          </div>
-          <!--        [class]="((selectedEntity == 'result')?'quickSelectionsBox':'')+' uk-padding-remove-left uk-margin-small-top'" -->
-          <div class=" uk-padding-remove-left uk-margin-small-top">
-            <div class="uk-inline">
-              <a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip" (click)="keyword = ''"
-                 uk-icon="icon: close"></a>
-              <input type="text" class="uk-input   uk-width-xlarge@l uk-width-large@m uk-width-medium"
-                     [placeholder]="placeholderText"
-                     [(ngModel)]="keyword"
-                     name="keyword">
-            </div>
-            <!-- <div>
-               <quick-selections *ngIf="selectedEntity == 'result'" [resultTypes]="resultTypes"
-                                 [quickFilter]="resultsQuickFilter" [QFselected]="(resultsQuickFilter)?resultsQuickFilter.selected:null" [properties]="properties">
-               </quick-selections>
-             </div>-->
-          </div>
-          <div class="uk-padding-remove-left uk-margin-small-top">
-
-            <button (click)="goTo(true)" type="submit"
-                    class="uk-button portal-button uk-text-bold  uk-padding uk-padding-remove-vertical uk-margin-small-left">
-              Search
-            </button>
-            <div class="uk-margin-small-top  uk-margin-left"><a *ngIf="selectedEntity== 'result'" (click)="goTo(false)"
-                                                                class="portal-link">Advanced Search</a></div>
-          </div>
-        </div>
-      </form>
-    </div>
-  </div>
-
-  <div *ngIf="communityInfo && community" class="uk-section uk-padding-remove-top uk-padding-remove-bottom">
+  <div *ngIf="communityInfo && community" class="uk-section uk-section-small">
     <div class="uk-padding-small">
       <div class="uk-container uk-container-large uk-margin-top"
            *ngIf="communityId">
@@ -674,9 +647,8 @@
 			</div>
 		</div>
 	</ng-container>
-  <!--<statistics-for-dashboard [currentMode]="'showInDashboard'"></statistics-for-dashboard>-->
-  <div class="uk-section tm-middle uk-container uk-margin-top uk-padding-remove-top" id=""
-       *ngIf="communityId && communityInfo">
+
+  <div *ngIf="communityId && communityInfo">
     <ng-container *ngIf=" isRouteEnabled('/organizations')">
       <div class="uk-container  uk-margin-bottom">
         <div class="uk-width-expand uk-padding-remove">
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts
index 17b8a75..fade2b9 100644
--- a/src/app/community/community.component.ts
+++ b/src/app/community/community.component.ts
@@ -1,4 +1,4 @@
-import {Component, ElementRef, Inject, Input, Renderer2, ViewChild} from '@angular/core';
+import {ChangeDetectorRef, Component, ElementRef, Inject, Input, Renderer2, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {DOCUMENT, Location} from '@angular/common';
 import {Meta, Title} from '@angular/platform-browser';
@@ -94,6 +94,17 @@ export class CommunityComponent {
   selectedEntity;
   selectedEntitySimpleUrl;
   selectedEntityAdvancedUrl;
+	resultTypes: Filter = {
+    values: [],
+    filterId: "type",
+    countSelectedValues: 0,
+    filterType: 'checkbox',
+    originalFilterId: "",
+    valueIsExact: true,
+    title: "Type",
+    filterOperator: "or"
+  };
+	
   keyword: string = "";
   customFilter;
   placeholderText = "Search by title, author, abstract, DOI, orcid... ";
@@ -103,6 +114,7 @@ export class CommunityComponent {
     filterId: "resultbestaccessright",
     value: "Open Access"
   };
+	disableSelect: boolean = true;
 
   constructor(
     private element: ElementRef,
@@ -122,6 +134,7 @@ export class CommunityComponent {
     private seoService: SEOService,
     private userManagementService: UserManagementService,
 		private _renderer2: Renderer2,
+		private cdr: ChangeDetectorRef,
 		@Inject(DOCUMENT) private _document: Document) {
 
     var description = "OpenAIRE - Connect, Community Dashboard, research community";
@@ -560,5 +573,10 @@ export class CommunityComponent {
   }
   isPrivate(){
     return ConnectHelper.isPrivate(this.community, this.user);
+  }
+
+	disableSelectChange(event: boolean) {
+    this.disableSelect = event;
+    this.cdr.detectChanges();
   }
 }
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts
index d6f48f8..dfbe8ec 100644
--- a/src/app/community/community.module.ts
+++ b/src/app/community/community.module.ts
@@ -29,6 +29,9 @@ import {SearchTabModule} from "../openaireLibrary/utils/tabs/contents/search-tab
 import {ErrorMessagesModule} from "../openaireLibrary/utils/errorMessages.module";
 import {SafeHtmlPipeModule} from '../openaireLibrary/utils/pipes/safeHTMLPipe.module';
 import {ErrorModule} from "../openaireLibrary/error/error.module";
+import {AdvancedSearchInputModule} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module';
+import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module';
+import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module';
 
 @NgModule({
   imports: [
@@ -37,8 +40,8 @@ import {ErrorModule} from "../openaireLibrary/error/error.module";
     SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule,
     SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
     SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
-    TabsModule, SearchTabModule, ErrorMessagesModule
-    , SafeHtmlPipeModule, ErrorModule
+    TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule,
+		AdvancedSearchInputModule, InputModule, QuickSelectionsModule
   ],
   declarations: [
     CommunityComponent