MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[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.
This commit is contained in:
Konstantina Galouni 2023-07-24 19:19:26 +03:00
parent a275a4d0bf
commit 216cf172bd
7 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/community/community.component.html
View File

@ -156,21 +156,34 @@
<h1 *ngIf="community.title" class="uk-text-center uk-h2 uk-margin-remove"> <h1 *ngIf="community.title" class="uk-text-center uk-h2 uk-margin-remove">
{{community.shortTitle}} {{community.shortTitle}}
</h1> </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}} {{community.title}}
</div> </div>
<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top"> <!-- <div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top">-->
<advanced-search-input #advanced (searchEmitter)="goTo(true)"> <!-- <advanced-search-input #advanced (searchEmitter)="goTo(true)">-->
<entities-selection [simpleView]="true" currentEntity="result" [selectedEntity]="selectedEntity" [customFilter]="customFilter" <!-- <entities-selection [simpleView]="true" currentEntity="result" [selectedEntity]="selectedEntity" [customFilter]="customFilter"-->
(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)" <!-- (selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"-->
[onChangeNavigate]="false"></entities-selection> <!-- [onChangeNavigate]="false"></entities-selection>-->
<div input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div> <!-- <div input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>-->
</advanced-search-input> <!-- </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 *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"> <!-- <div class="uk-padding-small">-->
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections> <!-- <quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>-->
</div> <!-- </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>
<div search-input [(value)]="keyword"
[placeholder]="'Search'+(portal && portal.name ? (' in '+portal.name) : '')"
(searchEmitter)="goTo(true)"
[searchInputClass]="'inner background'"></div>
</div> </div>
</div> </div>
</div> </div>

3
src/app/community/community.module.ts
View File

@ -34,6 +34,7 @@ import {InputModule} from '../openaireLibrary/sharedComponents/input/input.modul
import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module'; import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module';
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module'; import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module';
import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
@NgModule({ @NgModule({
imports: [ imports: [
@ -43,7 +44,7 @@ import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-p
SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
SEOServiceModule, MatSelectModule, EntitiesSelectionModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule, TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule,
AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, SearchInputModule
], ],
declarations: [ declarations: [
CommunityComponent CommunityComponent

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 4700cc82c866ed86158234f706fc52360bc34637 Subproject commit 901855daa9cddefad13a94acc9edb09f2500dc96

8
src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -21,15 +21,15 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
selector: 'openaire-search-dataproviders', selector: 'openaire-search-dataproviders',
template: ` template: `
<new-search-page <new-search-page
pageTitle="Search Content Providers" pageTitle="Search Content Providers"
entityType="dataprovider" entityType="dataprovider"
type=" Content provider" type=" Content provider"
[results]="results" [results]="results"
[searchUtils]="searchUtils" [searchUtils]="searchUtils"
[sortedByChanged]="searchUtils.sortBy" [sortedByChanged]="searchUtils.sortBy"
[fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
[simpleSearchLink]="properties.searchLinkToDataProviders" [simpleSearchLink]="properties.searchLinkToDataProviders"
[disableForms]="disableForms" [disableForms]="disableForms"
[disableRefineForms]="disableRefineForms" [disableRefineForms]="disableRefineForms"
[loadPaging]="loadPaging" [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'" [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/dataproviders'"
[includeOnlyResultsAndFilter]="false" [includeOnlyResultsAndFilter]="false"
[hasPrefix]="false" [hasPrefix]="false"
searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="true" [showSwitchSearchLink]="false" searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="false" [showSwitchSearchLink]="false"
[filters]="filters" [filters]="filters"
[simpleView]="true" formPlaceholderText="Search by name..." [simpleView]="true" formPlaceholderText="Search by name..."
[showResultCount]="false" [showIndexInfo]="false" [showDownload]="false" [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false"

44
src/app/searchPages/simple/searchProjects.component.ts
View File

@ -19,29 +19,29 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
selector: 'openaire-search-projects', selector: 'openaire-search-projects',
template: ` template: `
<new-search-page <new-search-page
pageTitle="Search Projects" pageTitle="Search Projects"
entityType="project" entityType="project"
type="project" type="project"
[results]="results" [results]="results"
[searchUtils]="searchUtils" [searchUtils]="searchUtils"
[sortedByChanged]="searchUtils.sortBy" [sortedByChanged]="searchUtils.sortBy"
[fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
[simpleSearchLink]="properties.searchLinkToProjects" [simpleSearchLink]="properties.searchLinkToProjects"
[disableForms]="disableForms" [disableForms]="disableForms"
[disableRefineForms]="disableRefineForms" [disableRefineForms]="disableRefineForms"
[loadPaging]="loadPaging" [loadPaging]="loadPaging"
[oldTotalResults]="oldTotalResults" [oldTotalResults]="oldTotalResults"
[openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'" [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'"
[includeOnlyResultsAndFilter]="false" [includeOnlyResultsAndFilter]="false"
[hasPrefix]="false" [hasPrefix]="false"
searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="true" [showSwitchSearchLink]="false" searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="false" [showSwitchSearchLink]="false"
[filters]="filters" [filters]="filters"
[simpleView]="true" formPlaceholderText="Search by name..." [simpleView]="true" formPlaceholderText="Search by name..."
[showResultCount]="false" [showIndexInfo]="false" [showDownload]="false" [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false"
[sort]="false" [showBreadcrumb]="true" [sort]="false" [showBreadcrumb]="true"
[customFilter]=customFilter [searchForm]="{dark: false, class: 'search-form'}"> [customFilter]=customFilter [searchForm]="{dark: false, class: 'search-form'}">
</new-search-page> </new-search-page>
` `
}) })

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10 Subproject commit 2fd57843f85125e54adfb95b35776755037ea359

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848 Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780