MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

[Monitor Dashboard |Trunk] 

Search pages: 
- update name and pass showSwitchSearchLink choice. 
- Remove error navigation for advanced pages for some types of stakeholder. links from landing should work
- set promptToAddFilter to true where needed


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59268 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2020-08-13 13:21:07 +00:00
parent 7d57db25e0
commit e1f8a5fe00
7 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/search/searchPages/advanced/searchDataproviders.component.ts
View File

@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<div id="page_content"> <div id="page_content">
<search-dataproviders *ngIf="initialized" [simpleView]="false" <search-dataproviders *ngIf="initialized" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"> [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
</search-dataproviders> </search-dataproviders>
</div> </div>
` `
@ -17,7 +17,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
export class MonitorAdvancedSearchDataprovidersComponent { export class MonitorAdvancedSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null; customFilter: SearchCustomFilter = null;
initialized: boolean = false; initialized: boolean = false;
showSwitchSearchLink:boolean = false;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private stakeholderService: StakeholderService) { private stakeholderService: StakeholderService) {
@ -28,18 +28,16 @@ export class MonitorAdvancedSearchDataprovidersComponent {
if (params['stakeholder']) { if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) { if (stakeholder) {
if (stakeholder.type === "funder") { if (stakeholder.type === "organization") {
this.navigateToError(); let value = stakeholder.index_id;
} else if (stakeholder.type === "organization") { this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
let value = stakeholder.index_id; this.customFilter.isHiddenFilter = false;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); this.customFilter.promptToAddFilter = true;
this.customFilter.isHiddenFilter = false; this.showSwitchSearchLink = true;
} else if (stakeholder.type === "ri") {
this.navigateToError();
} }
this.initialized = true; this.initialized = true;
} }
}); });
} }
}); });
} }

2
src/app/search/searchPages/advanced/searchOrganizations.component.ts
View File

@ -6,7 +6,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
selector: 'monitor-advanced-search-organizations', selector: 'monitor-advanced-search-organizations',
template: ` template: `
<div id="page_content"> <div id="page_content">
<search-organizations *ngIf="initialized" [simpleView]="false"> <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false">
</search-organizations> </search-organizations>
</div> </div>
` `

10
src/app/search/searchPages/advanced/searchProjects.component.ts
View File

@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<div id="page_content"> <div id="page_content">
<search-projects *ngIf="initialized" [simpleView]="false" <search-projects *ngIf="initialized" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"> [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
</search-projects> </search-projects>
</div> </div>
` `
@ -18,7 +18,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
export class MonitorAdvancedSearchProjectsComponent { export class MonitorAdvancedSearchProjectsComponent {
customFilter: SearchCustomFilter = null; customFilter: SearchCustomFilter = null;
initialized: boolean = false; initialized: boolean = false;
showSwitchSearchLink:boolean = false;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private stakeholderService: StakeholderService) { private stakeholderService: StakeholderService) {
@ -33,12 +33,14 @@ export class MonitorAdvancedSearchProjectsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName; let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
this.customFilter = new SearchCustomFilter("Funder", "funder", value, ""); this.customFilter = new SearchCustomFilter("Funder", "funder", value, "");
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
this.showSwitchSearchLink = true;
} else if (stakeholder.type === "organization") { } else if (stakeholder.type === "organization") {
let value = stakeholder.index_id; let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
} else if (stakeholder.type === "ri") { this.customFilter.promptToAddFilter = true;
this.navigateToError(); this.showSwitchSearchLink = true;
} }
this.initialized = true; this.initialized = true;
} }

5
src/app/search/searchPages/advanced/searchResearchResults.component.ts
View File

@ -10,7 +10,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<search-research-results *ngIf="initialized" resultType="result" [simpleView]="false" <search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [includeOnlyResultsAndFilter]="false"
[showAdvancedSearchLink]="true"></search-research-results> [showSwitchSearchLink]="true"></search-research-results>
</div> </div>
` `
}) })
@ -32,14 +32,17 @@ export class MonitorAdvancedSearchResearchResultsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName; let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
this.customFilter = new SearchCustomFilter("Funder", "relfunder", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Funder", "relfunder", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "organization") { } else if (stakeholder.type === "organization") {
let value = stakeholder.index_id; let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "ri") { } else if (stakeholder.type === "ri") {
let value = stakeholder.index_id+"||"+stakeholder.index_name; let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} }
this.initialized = true; this.initialized = true;
} }

5
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<div id="page_content"> <div id="page_content">
<search-dataproviders *ngIf="initialized" <search-dataproviders *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"> [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink">
</search-dataproviders> </search-dataproviders>
</div> </div>
` `
@ -17,7 +17,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
export class MonitorSearchDataprovidersComponent { export class MonitorSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null; customFilter: SearchCustomFilter = null;
initialized: boolean = false; initialized: boolean = false;
showSwitchSearchLink:boolean = false;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private stakeholderService: StakeholderService) { private stakeholderService: StakeholderService) {
@ -34,6 +34,7 @@ export class MonitorSearchDataprovidersComponent {
let value = stakeholder.index_id; let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.showSwitchSearchLink = true;
} else if (stakeholder.type === "ri") { } else if (stakeholder.type === "ri") {
this.navigateToError(); this.navigateToError();
} }

6
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -9,7 +9,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<div id="page_content"> <div id="page_content">
<search-projects *ngIf="initialized" <search-projects *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"> [includeOnlyResultsAndFilter]="false" >
</search-projects> </search-projects>
</div> </div>
` `
@ -18,7 +18,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
export class MonitorSearchProjectsComponent { export class MonitorSearchProjectsComponent {
customFilter: SearchCustomFilter = null; customFilter: SearchCustomFilter = null;
initialized: boolean = false; initialized: boolean = false;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router, private router: Router,
private stakeholderService: StakeholderService) { private stakeholderService: StakeholderService) {
@ -33,10 +33,12 @@ export class MonitorSearchProjectsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName; let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
this.customFilter = new SearchCustomFilter("Funder", "funder", value, ""); this.customFilter = new SearchCustomFilter("Funder", "funder", value, "");
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "organization") { } else if (stakeholder.type === "organization") {
let value = stakeholder.index_id; let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "ri") { } else if (stakeholder.type === "ri") {
this.navigateToError(); this.navigateToError();
} }

5
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -10,7 +10,7 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
<search-research-results *ngIf="initialized" resultType="result" <search-research-results *ngIf="initialized" resultType="result"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [includeOnlyResultsAndFilter]="false"
[showAdvancedSearchLink]="true"></search-research-results> [showSwitchSearchLink]="true"></search-research-results>
</div> </div>
`, `,
}) })
@ -32,14 +32,17 @@ export class MonitorSearchResearchResultsComponent {
let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName; let value = stakeholder.index_id+"||"+stakeholder.index_name+"||"+stakeholder.index_shortName;
this.customFilter = new SearchCustomFilter("Funder", "relfunder", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Funder", "relfunder", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "organization") { } else if (stakeholder.type === "organization") {
let value = stakeholder.index_id; let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} else if (stakeholder.type === "ri") { } else if (stakeholder.type === "ri") {
let value = stakeholder.index_id+"||"+stakeholder.index_name; let value = stakeholder.index_id+"||"+stakeholder.index_name;
this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name); this.customFilter = new SearchCustomFilter("Community", "community", value, stakeholder.name);
this.customFilter.isHiddenFilter = false; this.customFilter.isHiddenFilter = false;
this.customFilter.promptToAddFilter = true;
} }
this.initialized = true; this.initialized = true;
} }