[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.
2023-07-24 19:19:26 +03:00 · 2023-07-24 19:19:26 +03:00 · 216cf172bd
parent a275a4d0bf
commit 216cf172bd
7 changed files with 56 additions and 42 deletions
--- 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>
--- 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
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit 4700cc82c866ed86158234f706fc52360bc34637
+Subproject commit 901855daa9cddefad13a94acc9edb09f2500dc96
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@ -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"
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@ -35,7 +35,7 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
   [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'"
   [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"
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@ -1 +1 @@
-Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10
+Subproject commit 2fd57843f85125e54adfb95b35776755037ea359
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848
+Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780