Project

General

Profile

« Previous | Next » 

Revision 60171

[Monitor dashboard | Trunk]
Admin tools:
- move amdin tool components underadmin-tool folder
- create admin tool routing module
- remove guard from each module and put it in admin tool routing module

Piwik:
- add piwik from configuration service and pass it in search, landing, monitor

App component:
- when stakeholder changes: update or reset properties adminToolsCommunity, adminToolsPortalType and init community information

View differences:

orp.component.ts
2 2
import {ActivatedRoute, Router} from "@angular/router";
3 3
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
4 4
import {Subscriber} from "rxjs";
5
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
5 6

  
6 7
@Component({
7 8
  selector: 'monitor-orp',
8 9
  template: `
9 10
    <div id="page_content">
10
      <result-landing *ngIf="initialized" type="orp"></result-landing>
11
      <result-landing *ngIf="initialized" type="orp" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
11 12
    </div>
12 13
  `,
13 14
})
14 15

  
15 16
export class MonitorOrpComponent {
16 17
  initialized: boolean = false;
17
  
18
  communityId;
19
  piwikSiteId;
18 20
  constructor(private route: ActivatedRoute,
19 21
              private router: Router,
20
              private stakeholderService: StakeholderService) {
22
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
21 23
  }
22 24
  subscriptions = [];
23 25
  ngOnDestroy() {
......
33 35
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
34 36
          if (stakeholder) {
35 37
            this.initialized = true;
38
            this.communityId = stakeholder.alias;
39
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
40
              if (portal) {
41
                this.piwikSiteId = portal.piwik;
42
              }
43
            }));
36 44
          }
37 45
        }));
38 46
      }

Also available in: Unified diff