Change new login/logout/userInfo properties in development. Search stakeholders: make request only in first load
This commit is contained in:
parent
7a6221e568
commit
0da51e2356
|
@ -1 +1 @@
|
||||||
Subproject commit 104c54a3e861d65817aac59c56640457664eeaab
|
Subproject commit 0aa44646b1c57974569aadcaa4ba67a8a5028ef4
|
|
@ -21,7 +21,7 @@ import {Subscriber} from "rxjs";
|
||||||
<new-search-page pageTitle="OpenAIRE-Monitor | Browse"
|
<new-search-page pageTitle="OpenAIRE-Monitor | Browse"
|
||||||
[hasPrefix]=false [piwikSiteId]="piwikSiteId"
|
[hasPrefix]=false [piwikSiteId]="piwikSiteId"
|
||||||
[formPlaceholderText]="'Search profiles'"
|
[formPlaceholderText]="'Search profiles'"
|
||||||
type="organizations" entityType="stakeholder"
|
[type]="(results.length > 1)?'organizations':'organization'" entityType="stakeholder"
|
||||||
[results]="results" [searchUtils]="searchUtils"
|
[results]="results" [searchUtils]="searchUtils"
|
||||||
[showResultCount]=true
|
[showResultCount]=true
|
||||||
[disableForms]="disableForms"
|
[disableForms]="disableForms"
|
||||||
|
@ -37,7 +37,7 @@ export class SearchStakeholdersComponent {
|
||||||
private errorCodes: ErrorCodes;
|
private errorCodes: ErrorCodes;
|
||||||
private errorMessages: ErrorMessagesComponent;
|
private errorMessages: ErrorMessagesComponent;
|
||||||
public results: StakeholderInfo[] = [];
|
public results: StakeholderInfo[] = [];
|
||||||
public totalResults: StakeholderInfo[] = [];
|
public totalResults: StakeholderInfo[];
|
||||||
public subscriptions = [];
|
public subscriptions = [];
|
||||||
public filters = [];
|
public filters = [];
|
||||||
public searchFields: SearchFields = new SearchFields();
|
public searchFields: SearchFields = new SearchFields();
|
||||||
|
@ -117,24 +117,29 @@ export class SearchStakeholdersComponent {
|
||||||
* @param params
|
* @param params
|
||||||
*/
|
*/
|
||||||
private initFunders(params) {
|
private initFunders(params) {
|
||||||
this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe(
|
if(this.totalResults) {
|
||||||
data => {
|
this._getResults(params);
|
||||||
if (!data) {
|
} else {
|
||||||
return;
|
this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe(
|
||||||
|
data => {
|
||||||
|
if (!data) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.totalResults = [];
|
||||||
|
for (let i = 0; i < data.length; i++) {
|
||||||
|
this.totalResults[i] = data[i];
|
||||||
|
this.totalResults[i].isManager = this.isManager(data[i]);
|
||||||
|
this.totalResults[i].isMember = this.isMember(data[i]);
|
||||||
|
}
|
||||||
|
this._getResults(params);
|
||||||
|
},
|
||||||
|
err => {
|
||||||
|
this.handleError('Error getting stakeholders', err);
|
||||||
|
this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
|
||||||
|
this.disableForms = false;
|
||||||
}
|
}
|
||||||
for (let i = 0; i < data.length; i++) {
|
));
|
||||||
this.totalResults[i] = data[i];
|
}
|
||||||
this.totalResults[i].isManager = this.isManager(data[i]);
|
|
||||||
this.totalResults[i].isMember = this.isMember(data[i]);
|
|
||||||
}
|
|
||||||
this._getResults(params);
|
|
||||||
},
|
|
||||||
err => {
|
|
||||||
this.handleError('Error getting stakeholders', err);
|
|
||||||
this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
|
|
||||||
this.disableForms = false;
|
|
||||||
}
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -457,7 +462,7 @@ export class SearchStakeholdersComponent {
|
||||||
originalFilterId: this.refineFields[i],
|
originalFilterId: this.refineFields[i],
|
||||||
values: values,
|
values: values,
|
||||||
countSelectedValues: 0,
|
countSelectedValues: 0,
|
||||||
"filterOperator": 'or',
|
filterOperator: 'or',
|
||||||
valueIsExact: true,
|
valueIsExact: true,
|
||||||
filterType: "checkbox"
|
filterType: "checkbox"
|
||||||
};
|
};
|
||||||
|
|
|
@ -40,9 +40,9 @@ export let properties: EnvProperties = {
|
||||||
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
|
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
|
||||||
piwikSiteId: "298",
|
piwikSiteId: "298",
|
||||||
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
|
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
|
||||||
loginUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
|
loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service//openid_connect_login",
|
||||||
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
|
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo",
|
||||||
logoutUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_logout",
|
logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout",
|
||||||
cookieDomain: ".di.uoa.gr",
|
cookieDomain: ".di.uoa.gr",
|
||||||
feedbackmail: "openaire.test@gmail.com",
|
feedbackmail: "openaire.test@gmail.com",
|
||||||
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
|
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
|
||||||
|
|
Loading…
Reference in New Issue