From 216cf172bdbb04eb7e2a420f6e6a9399e2e98726 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 24 Jul 2023 19:19:26 +0300
Subject: [PATCH] [Connect | develop]: In search bars, set in placeholder the
 portal name according to the configuration name | Removed stepper from search
 bars in community home page, search projects and search datasources pages. 1.
 community.component: Get portalName by config.portalAsObservable>name and set
 placeholder to "Search "+portalName | Replaced input directive with
 search-input to remove stepper from search bar in community home page. 2.
 searchDataproviders.component.ts & searchProjects.component.ts: In
 <new-search-page> set [entitiesSelection]="false" to remove stepper from
 search bar in search projects and search datasources pages.

---
 src/app/community/community.component.html    | 37 +++++++++++-----
 src/app/community/community.module.ts         |  3 +-
 src/app/openaireLibrary                       |  2 +-
 .../simple/searchDataproviders.component.ts   |  8 ++--
 .../simple/searchProjects.component.ts        | 44 +++++++++----------
 src/assets/common-assets                      |  2 +-
 src/assets/openaire-theme                     |  2 +-
 7 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index bc043a7..3483acb 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -156,21 +156,34 @@
           <h1 *ngIf="community.title" class="uk-text-center uk-h2 uk-margin-remove">
             {{community.shortTitle}}
           </h1>
-          <div *ngIf="community.shortTitle && community.title != community.shortTitle" class="uk-text-center uk-margin-top">
+          <div *ngIf="community.shortTitle && community.title != community.shortTitle"
+               class="uk-text-center uk-margin-top">
             {{community.title}}
           </div>
-          <div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top">
-            <advanced-search-input #advanced (searchEmitter)="goTo(true)">
-              <entities-selection [simpleView]="true" currentEntity="result" [selectedEntity]="selectedEntity" [customFilter]="customFilter"
-                (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 [class.uk-invisible]="disableSelect" class="uk-margin-medium-top">-->
+          <!--            <advanced-search-input #advanced (searchEmitter)="goTo(true)">-->
+          <!--              <entities-selection [simpleView]="true" currentEntity="result" [selectedEntity]="selectedEntity" [customFilter]="customFilter"-->
+          <!--                (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 class="uk-margin-medium-top" uk-scrollspy-class>
+            <div class="uk-flex uk-flex-right uk-text-small">
+              <a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
+                Advanced search
+              </a>
             </div>
+            <div search-input [(value)]="keyword"
+                 [placeholder]="'Search'+(portal && portal.name ? (' in '+portal.name) : '')"
+                 (searchEmitter)="goTo(true)"
+                 [searchInputClass]="'inner background'"></div>
           </div>
         </div>
       </div>
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts
index 3e7e4b8..6762dff 100644
--- a/src/app/community/community.module.ts
+++ b/src/app/community/community.module.ts
@@ -34,6 +34,7 @@ import {InputModule} from '../openaireLibrary/sharedComponents/input/input.modul
 import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module';
 import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
 import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module';
+import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
 
 @NgModule({
   imports: [
@@ -43,7 +44,7 @@ import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-p
     SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
     SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
     TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule,
-		AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging
+    AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, SearchInputModule
   ],
   declarations: [
     CommunityComponent
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 4700cc8..901855d 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 4700cc82c866ed86158234f706fc52360bc34637
+Subproject commit 901855daa9cddefad13a94acc9edb09f2500dc96
diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts
index 534bebe..7f49746 100644
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -21,15 +21,15 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
     selector: 'openaire-search-dataproviders',
     template: `
       
-    <new-search-page  
+    <new-search-page
       pageTitle="Search Content Providers"
       entityType="dataprovider"
       type=" Content provider"
       [results]="results"
       [searchUtils]="searchUtils"
-      [sortedByChanged]="searchUtils.sortBy" 
+      [sortedByChanged]="searchUtils.sortBy"
       [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
-      [simpleSearchLink]="properties.searchLinkToDataProviders"  
+      [simpleSearchLink]="properties.searchLinkToDataProviders"
       [disableForms]="disableForms"
       [disableRefineForms]="disableRefineForms"
       [loadPaging]="loadPaging"
@@ -37,7 +37,7 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
       [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/dataproviders'"
       [includeOnlyResultsAndFilter]="false"
       [hasPrefix]="false"
-      searchFormClass="datasourcesTableSearchForm"      [entitiesSelection]="true"  [showSwitchSearchLink]="false"
+      searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="false" [showSwitchSearchLink]="false"
       [filters]="filters"
       [simpleView]="true" formPlaceholderText="Search by name..."
       [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false"
diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts
index 1dadae2..aa3ba8b 100644
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@@ -19,29 +19,29 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
     selector: 'openaire-search-projects',
     template: `
  <new-search-page
-  pageTitle="Search Projects"
-  entityType="project"
-  type="project"
-  [results]="results"
-  [searchUtils]="searchUtils"
-  [sortedByChanged]="searchUtils.sortBy" 
-  [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
+   pageTitle="Search Projects"
+   entityType="project"
+   type="project"
+   [results]="results"
+   [searchUtils]="searchUtils"
+   [sortedByChanged]="searchUtils.sortBy"
+   [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
 
-  [simpleSearchLink]="properties.searchLinkToProjects"
-  [disableForms]="disableForms"
-  [disableRefineForms]="disableRefineForms"
-  [loadPaging]="loadPaging"
-  [oldTotalResults]="oldTotalResults"
-  [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'"
-  [includeOnlyResultsAndFilter]="false"
-  [hasPrefix]="false"
-  searchFormClass="datasourcesTableSearchForm"      [entitiesSelection]="true"  [showSwitchSearchLink]="false"
-  [filters]="filters"
-  [simpleView]="true" formPlaceholderText="Search by name..."
-  [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false"
-  [sort]="false" [showBreadcrumb]="true"
-  [customFilter]=customFilter [searchForm]="{dark: false, class: 'search-form'}">
-</new-search-page>
+   [simpleSearchLink]="properties.searchLinkToProjects"
+   [disableForms]="disableForms"
+   [disableRefineForms]="disableRefineForms"
+   [loadPaging]="loadPaging"
+   [oldTotalResults]="oldTotalResults"
+   [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'"
+   [includeOnlyResultsAndFilter]="false"
+   [hasPrefix]="false"
+   searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="false" [showSwitchSearchLink]="false"
+   [filters]="filters"
+   [simpleView]="true" formPlaceholderText="Search by name..."
+   [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false"
+   [sort]="false" [showBreadcrumb]="true"
+   [customFilter]=customFilter [searchForm]="{dark: false, class: 'search-form'}">
+ </new-search-page>
     `
 
 })
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 39cb4e5..2fd5784 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10
+Subproject commit 2fd57843f85125e54adfb95b35776755037ea359
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 1e06310..cf3dab8 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848
+Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780