Merge from develop into angular-18

This commit is contained in:
Konstantinos Triantafyllou 2024-09-24 12:29:25 +03:00
commit 75b501f4fa
4 changed files with 4 additions and 4 deletions

View File

@ -249,7 +249,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
public getStakeholders() { public getStakeholders() {
this.loading = true; this.loading = true;
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;
this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe( this.subscriptions.push(this._stakeholderService.getStakeholders().subscribe(
stakeholders => { stakeholders => {
if (!stakeholders || stakeholders.length == 0) { if (!stakeholders || stakeholders.length == 0) {
this.status = this.errorCodes.NONE; this.status = this.errorCodes.NONE;

View File

@ -101,7 +101,7 @@ export class MyStakeholdersComponent {
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;
this.subscriberErrorMessage = ""; this.subscriberErrorMessage = "";
this.stakeholders = []; this.stakeholders = [];
this.subscriptions.push(this.stakeholderService.getMyStakeholders(properties.monitorServiceAPIURL).subscribe( this.subscriptions.push(this.stakeholderService.getMyStakeholders().subscribe(
stakeholders => { stakeholders => {
this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders.standalone.concat(stakeholders.umbrella), this.user); this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders.standalone.concat(stakeholders.umbrella), this.user);
this.sort(this.stakeholders); this.sort(this.stakeholders);

@ -1 +1 @@
Subproject commit f4b9104ae17c8d6df0371c6bf01393528c491299 Subproject commit cd782d4a68a67dcba4d5d1bbce7ee737ad1f3871

View File

@ -136,7 +136,7 @@ export class SearchStakeholdersComponent {
this.totalResults = StakeholderInfo.toStakeholderInfo(this.totalResults, this.user); this.totalResults = StakeholderInfo.toStakeholderInfo(this.totalResults, this.user);
this._getResults(params); this._getResults(params);
} else { } else {
this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe( this.subscriptions.push(this._stakeholderService.getStakeholders().subscribe(
data => { data => {
this.totalResults = StakeholderInfo.toStakeholderInfo(data, this.user); this.totalResults = StakeholderInfo.toStakeholderInfo(data, this.user);
this._getResults(params); this._getResults(params);