Project

General

Profile

« Previous | Next » 

Revision 60326

[Library | Trunk]: 1. Fix chips css. 2. Stakeholder Service: Init is Upload after request

View differences:

stakeholder.service.ts
7 7
import {ActivatedRoute} from "@angular/router";
8 8
import {properties} from "../../../../environments/environment";
9 9
import {CustomOptions} from "../../services/servicesUtils/customOptions.class";
10
import {StringUtils} from "../../utils/string-utils.class";
11
import {el} from "@angular/platform-browser/testing/src/browser_util";
10 12

  
11 13
let maps: string[] = ['parameters', 'filters'];
12 14

  
......
43 45
    if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias) {
44 46
      this.promise = new Promise<any>((resolve, reject) => {
45 47
        this.sub = this.http.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(alias), CustomOptions.registryOptions()).pipe(map(stakeholder => {
46
          return this.formalize(stakeholder);
48
          return this.formalize(this.checkIsUpload(stakeholder));
47 49
        })).subscribe(stakeholder => {
48 50
          this.stakeholderSubject.next(stakeholder);
49 51
          resolve();
......
70 72
  
71 73
  getStakeholders(url: string, type: string = null): Observable<(Stakeholder & StakeholderInfo)[]> {
72 74
    return this.http.get<Stakeholder[]>(url + '/stakeholder' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => {
73
      return this.formalize(stakeholders);
75
      return this.formalize(this.checkIsUpload(stakeholders));
74 76
    }));
75 77
  }
76 78
  
77 79
  getMyStakeholders(url: string, type: string = null): Observable<Stakeholder[]> {
78 80
    return this.http.get<Stakeholder[]>(url + '/my-stakeholder' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => {
79
      return this.formalize(stakeholders);
81
      return this.formalize(this.checkIsUpload(stakeholders));
80 82
    }));
81 83
  }
82 84
  
83 85
  getDefaultStakeholders(url: string, type: string = null): Observable<Stakeholder[]> {
84 86
    return this.http.get<Stakeholder[]>(url + '/stakeholder/default' + ((type) ? ('?type=' + type) : ''), CustomOptions.registryOptions()).pipe(map(stakeholders => {
85
      return this.formalize(stakeholders);
87
      return this.formalize(this.checkIsUpload(stakeholders));
86 88
    }));
87 89
  }
88 90
  
89 91
  buildStakeholder(url: string, stakeholder: Stakeholder): Observable<Stakeholder> {
90 92
    return this.http.post<Stakeholder>(url + '/build-stakeholder', stakeholder, CustomOptions.registryOptions()).pipe(map(stakeholder => {
91
      return this.formalize(stakeholder);
93
      return this.formalize(this.checkIsUpload(stakeholder));
92 94
    }));
93 95
  }
94 96
  
......
100 102
    path = HelperFunctions.encodeArray(path);
101 103
    return this.http.post<any>(url + ((path.length > 0) ? '/' : '') + path.join('/') +
102 104
      '/save', element, CustomOptions.registryOptions()).pipe(map(element => {
103
      return this.formalize(element);
105
        if(path.length === 0) {
106
          return this.formalize(this.checkIsUpload(element));
107
        } else {
108
          this.formalize(element);
109
        }
104 110
    }));
105 111
  }
106 112
  
......
136 142
    this.stakeholderSubject.next(stakeholder);
137 143
  }
138 144
  
145
  private checkIsUpload(response: Stakeholder | Stakeholder[]): any | any[] {
146
    if(Array.isArray(response)) {
147
      response.forEach(value => {
148
        value.isUpload = !StringUtils.isValidUrl(value.logoUrl);
149
      });
150
    } else {
151
      response.isUpload =  !StringUtils.isValidUrl(response.logoUrl);
152
    }
153
    return response;
154
  }
155
  
139 156
  private formalize(element: any) {
140 157
    return HelperFunctions.copy(element);
141 158
  }

Also available in: Unified diff