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:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/new-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
5
import {NewPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
6
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
7

  
8

  
9
@NgModule({
10
    imports: [
11
        CommonModule,  RouterModule,
12
         NewPageHelpContentRoutingModule, NewPageHelpContentModule
13
    ],
14
    providers: [AdminDashboardGuard],
15
})
16
export class MonitorNewPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/page-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PageHelpContentsComponent} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [AdminDashboardGuard], component: PageHelpContentsComponent}
10
        ])
11
    ]
12
})
13
export class PageHelpContentsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/edit-page-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EditPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminDashboardGuard], component: EditPageHelpContentComponent}
11
        ])
12
    ]
13
})
14
export class EditPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/new-page-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {NewPageHelpContentComponent} from "../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminDashboardGuard], component: NewPageHelpContentComponent}
11
        ])
12
    ]
13
})
14
export class NewPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/page-help-contents.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
4
import {PageHelpContentsModule} from "../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule,  PageHelpContentsRoutingModule,  PageHelpContentsModule
10
  ],
11
    providers: [AdminDashboardGuard],
12
 })
13
export class MonitorPageHelpContentsModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/helpTexts/edit-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
5
import {EditPageHelpContentModule} from "../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
6
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule,  RouterModule,
11
         EditPageHelpContentRoutingModule, EditPageHelpContentModule
12
    ],
13
    providers: [AdminDashboardGuard]
14
})
15
export class MonitorEditPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/new-div-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
4
import {NewDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6

  
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule
11
    ],
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorNewDivHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/edit-div-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EditDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminDashboardGuard], component: EditDivHelpContentComponent}
11
        ])
12
    ]
13
})
14
export class EditDivHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/div-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {DivHelpContentsComponent} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent}
10
        ])
11
    ]
12
})
13
export class DivHelpContentsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/new-div-help-content-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {NewDivHelpContentComponent} from "../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.component";
4
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [AdminDashboardGuard], component: NewDivHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class NewDivHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/edit-div-help-content.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3

  
4
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
5
import {EditDivHelpContentModule} from "../openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module";
6
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule, EditDivHelpContentRoutingModule, EditDivHelpContentModule
11
    ],
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorEditDivHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classHelpTexts/div-help-contents.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module';
4
import {DivHelpContentsModule} from "../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module";
5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule,  DivHelpContentsRoutingModule, DivHelpContentsModule
10
  ],
11

  
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorDivHelpContentsModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/entities/entities.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {EntitiesRoutingModule} from "./entities-routing.module";
4
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
5
import {EntitiesModule} from "../openaireLibrary/dashboard/entity/entities.module";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule, EntitiesModule, EntitiesRoutingModule
10
  ],
11
  providers: [AdminLoginGuard],
12
})
13
export class MonitorEntitiesModule {
14
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/entities/entities-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
4
import {EntitiesComponent} from "../openaireLibrary/dashboard/entity/entities.component";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '', canActivate: [AdminLoginGuard], component: EntitiesComponent}
10
    ])
11
  ]
12
})
13
export class EntitiesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/portals/portals.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PortalModule} from "../openaireLibrary/dashboard/portal/portals.module";
4
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
5
import {PortalsRoutingModule} from "./portals-routing.module";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule, PortalModule, PortalsRoutingModule
10
  ],
11
  declarations: [],
12
  providers: [AdminLoginGuard],
13
  exports: []
14
})
15
export class PortalsModule {
16
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/portals/portals-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PortalsComponent} from "../openaireLibrary/dashboard/portal/portals.component";
4
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '', canActivate: [AdminLoginGuard], component: PortalsComponent}
10
    ])
11
  ]
12
})
13
export class PortalsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/pages/pages.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PagesRoutingModule} from './pages-routing.module';
4
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {PagesModule} from "../openaireLibrary/dashboard/page/pages.module";
6
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
7

  
8
@NgModule({
9
  imports: [
10
    CommonModule, PagesRoutingModule, PagesModule
11
  ],
12
    providers: [IsCommunityOrAdmin, AdminDashboardGuard],
13

  
14
})
15
export class MonitorPagesModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/pages/pages-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PagesComponent} from "../openaireLibrary/dashboard/page/pages.component";
4
import {IsCommunityOrAdmin} from "../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
7

  
8
@NgModule({
9
    imports: [
10
        RouterModule.forChild([
11
            { path: '', canActivate: [LoginGuard,IsCommunityOrAdmin, AdminDashboardGuard], component: PagesComponent}
12
        ])
13
    ]
14
})
15
export class PagesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classes/classes.module.ts
1
import { NgModule } from '@angular/core';
2
import {ClassesRoutingModule} from "./classes-routing.module";
3
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
4
import {DivIdsModule} from "../openaireLibrary/dashboard/divId/divIds.module";
5
import {CommonModule} from "@angular/common";
6

  
7

  
8

  
9
@NgModule({
10
    imports: [
11
        CommonModule, ClassesRoutingModule, DivIdsModule
12
    ],
13
    providers: [AdminLoginGuard],
14
})
15
export class ClassesModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/classes/classes-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
4
import {DivIdsComponent} from "../openaireLibrary/dashboard/divId/divIds.component";
5

  
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent}
11
        ])
12
    ]
13
})
14
export class ClassesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/landingPages/organization/organization.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-organization',
8 9
  template: `
9 10
    <div id="page_content">
10
      <organization *ngIf="initialized"></organization>
11
      <organization *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></organization>
11 12
    </div>`,
12 13
})
13 14
export class MonitorOrganizationComponent {
14 15
  initialized: boolean = false;
15
  
16
  communityId;
17
  piwikSiteId;
16 18
  constructor(private route: ActivatedRoute,
17 19
              private router: Router,
18
              private stakeholderService: StakeholderService) {
20
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
19 21
  }
20 22
  subscriptions = [];
21 23
  ngOnDestroy() {
......
31 33
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
32 34
          if (stakeholder) {
33 35
            this.initialized = true;
36
            this.communityId = stakeholder.alias;
37
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
38
              if (portal) {
39
                this.piwikSiteId = portal.piwik;
40
              }
41
            }));
34 42
          }
35 43
        }));
36 44
      }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/landingPages/publication/publication.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-publication',
8 9
  template: `
9 10
    <div id="page_content">
10
      <result-landing *ngIf="initialized" type="publication"></result-landing>
11
      <result-landing *ngIf="initialized" type="publication" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
11 12
    </div>
12 13
  `,
13 14
})
14 15
export class MonitorPublicationComponent {
15 16
  initialized: boolean = false;
16
  
17
  communityId;
18
  piwikSiteId;
17 19
  constructor(private route: ActivatedRoute,
18 20
              private router: Router,
19
              private stakeholderService: StakeholderService) {
21
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
20 22
  }
21 23
  subscriptions = [];
22 24
  ngOnDestroy() {
......
32 34
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
33 35
          if (stakeholder) {
34 36
            this.initialized = true;
37
            this.communityId = stakeholder.alias;
38
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
39
              if (portal) {
40
                console.debug(portal)
41
                this.piwikSiteId = portal.piwik;
42
              }
43
            }));
35 44
          }
36 45
        }));
37 46
      }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.html
90 90
          <div class="uk-text-large "></div>
91 91
        </div>
92 92
      </div>
93
      <div *ngIf="!privateStakeholder">
93
      <div *ngIf="!privateStakeholder && stakeholder">
94 94
        <div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 ||
95 95
          (activeSubCategory.charts.length == 1 && countIndicatorsToShow(activeSubCategory.charts[0].indicators) == 0)))
96 96
          &&  ((activeSubCategory &&
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/searchPages/advanced/searchOrganizations.component.ts
3 3
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
4 4
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
5 5
import {Subscriber} from "rxjs";
6
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
6 7

  
7 8
@Component({
8 9
  selector: 'monitor-advanced-search-organizations',
9 10
  template: `
10 11
    <div id="page_content">
11
      <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter">
12
      <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter"
13
      [piwikSiteId]="piwikSiteId">
12 14
      </search-organizations>
13 15
    </div>
14 16
  `
......
16 18
export class MonitorAdvancedSearchOrganizationsComponent {
17 19
  initialized: boolean = false;
18 20
  customFilter: SearchCustomFilter = null;
19

  
21
  piwikSiteId;
20 22
  constructor(private route: ActivatedRoute,
21 23
              private router: Router,
22
              private stakeholderService: StakeholderService) {
24
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
23 25
  }
24 26
  subscriptions = [];
25 27
  ngOnDestroy() {
......
48 50
              this.customFilter = new SearchCustomFilter("Community", "community", value,  stakeholder.name);
49 51
              this.customFilter.isHiddenFilter = false;
50 52
            }
53
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
54
              if (portal) {
55
                this.piwikSiteId = portal.piwik;
56
              }
57
            }));
51 58
            this.initialized = true;
52 59
          }
53 60
        }));
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.ts
31 31
import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class";
32 32
import {properties} from "../../environments/environment";
33 33
import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
34
import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service";
34 35

  
35 36
@Component({
36 37
  selector: 'monitor',
......
40 41
export class MonitorComponent implements OnInit, OnDestroy {
41 42
  public user: User;
42 43
  public subscriptions: any[] = [];
43
  public piwiksub: any;
44
  piwikSiteId;
45
  title;
46
  description;
44 47
  public pageContents = null;
45 48
  public divContents = null;
46 49
  public status: number;
......
87 90
    private seoService: SEOService,
88 91
    private cdr: ChangeDetectorRef,
89 92
    private indexInfoService: IndexInfoService,
90
    private sanitizer: DomSanitizer, private _fb: FormBuilder, private router: Router) {
93
    private sanitizer: DomSanitizer, private _fb: FormBuilder, private router: Router,
94
    private configurationService: ConfigurationService) {
91 95
    this.errorCodes = new ErrorCodes();
92 96
    this.errorMessages = new ErrorMessagesComponent();
93 97
    this.status = this.errorCodes.LOADING;
......
164 168
              this.initializeFilters();
165 169
              this.seoService.createLinkForCanonicalURL(url, false);
166 170
              this._meta.updateTag({content: url}, "property='og:url'");
167
              var description = "Monitor Dashboard | " + this.stakeholder.name;
168
              var title = "Monitor Dashboard | " + this.stakeholder.name;
169
              this._meta.updateTag({content: description}, "name='description'");
170
              this._meta.updateTag({content: description}, "property='og:description'");
171
              this._meta.updateTag({content: title}, "property='og:title'");
172
              this._title.setTitle(title);
171
              this.description = "Monitor Dashboard | " + this.stakeholder.name;
172
              this.title =  "Monitor Dashboard | " + this.stakeholder.name;
173
              this._meta.updateTag({content: this.description}, "name='description'");
174
              this._meta.updateTag({content: this.description}, "property='og:description'");
175
              this._meta.updateTag({content: this.title}, "property='og:title'");
176
              this._title.setTitle(this.title);
173 177
              if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
174
                this.subscriptions.push(this._piwikService.trackView(this.properties, title, this.properties.piwikSiteId).subscribe());
178
                this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
179
                  if (portal && portal.piwik) {
180
                    console.debug(portal)
181
                    this.piwikSiteId = portal.piwik;
182
                    console.debug(this.piwikSiteId)
183
                    this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
184
                  }
185
                }));
186

  
175 187
              }
176 188
              if (this.isPublicOrIsMember(stakeholder.visibility)) {
177 189
                //this.getDivContents();
......
185 197
                  subscription.unsubscribe();
186 198
                }
187 199
              }
200
            }else{
201
              this.navigateToError();
202
              if (subscription) {
203
                subscription.unsubscribe();
204
              }
188 205
            }
189 206
          });
190 207
          this.subscriptions.push(subscription);
191 208
        } else {
209
          if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
210
            if (this.piwikSiteId) {
211
              console.debug(this.piwikSiteId)
212
              this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
213
            }
214
          }
192 215
          this.initializeFilters();
193 216
          this.setView(params);
194 217
        }
......
287 310
  }
288 311
  
289 312
  private getPageContents() {
290
    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
313
    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.properties.adminToolsCommunity, this._router.url).subscribe(contents => {
291 314
      this.pageContents = contents;
292 315
    }));
293 316
  }
294 317
  
295 318
  private getDivContents() {
296
    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
319
    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, this.properties.adminToolsCommunity, this._router.url).subscribe(contents => {
297 320
      this.divContents = contents;
298 321
    }));
299 322
  }
......
486 509
  }
487 510
  
488 511
  public ngOnDestroy() {
489
    if (this.piwiksub) {
490
      this.piwiksub.unsubscribe();
491
    }
492 512
    this.subscriptions.forEach(subscription => {
493 513
      if (subscription instanceof Subscriber) {
494 514
        subscription.unsubscribe();
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.module.ts
23 23
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
24 24
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
25 25
import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
26
import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
27
import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
26 28

  
27 29
@NgModule({
28 30
  
......
44 46
  declarations: [AppComponent, OpenaireErrorPageComponent],
45 47
  exports: [AppComponent],
46 48
  providers: [
47
    EnvironmentSpecificResolver,
49
    EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard,
48 50
    {
49 51
      provide: HTTP_INTERCEPTORS,
50 52
      useClass: HttpInterceptorService,
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/searchPages/advanced/searchResearchResults.component.ts
4 4
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
5 5
import {Subscriber} from "rxjs";
6 6
import {properties} from "../../../../environments/environment";
7
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
7 8

  
8 9
@Component({
9 10
  selector: 'monitor-advanced-search-results',
......
14 15
                               [includeOnlyResultsAndFilter]="false"
15 16
                               [showSwitchSearchLink]="true"
16 17
                               [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
18
                               [piwikSiteId]="piwikSiteId"
17 19
      ></search-research-results>
18 20
    </div>
19 21
  `
......
22 24
  customFilter: SearchCustomFilter = null;
23 25
  initialized: boolean = false;
24 26
  properties;
27
  piwikSiteId;
25 28
  constructor(private route: ActivatedRoute,
26 29
              private router: Router,
27
              private stakeholderService: StakeholderService) {
30
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
28 31
  }
29 32
  subscriptions = [];
30 33
  ngOnDestroy() {
......
51 54
              let value =  stakeholder.index_id+"||"+stakeholder.index_name;
52 55
              this.customFilter = new SearchCustomFilter("Community", "community", value,  stakeholder.name);
53 56
            }
57
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
58
              if (portal) {
59
                this.piwikSiteId = portal.piwik;
60
              }
61
            }));
54 62
            this.initialized = true;
55 63
          }
56 64
        }));
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/searchPages/simple/searchOrganizations.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-search-organizations',
8 9
  template: `
9 10
    <div id="page_content">
10
      <search-organizations *ngIf="initialized">
11
      <search-organizations *ngIf="initialized" [piwikSiteId]="piwikSiteId">
11 12
      </search-organizations>
12 13
    </div>
13 14
  `
14 15
})
15 16
export class MonitorSearchOrganizationsComponent {
16 17
  initialized: boolean = false;
17
  
18
  piwikSiteId;
18 19
  constructor(private route: ActivatedRoute,
19 20
              private router: Router,
20
              private stakeholderService: StakeholderService) {
21
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
21 22
  }
22 23
  subscriptions = [];
23 24
  ngOnDestroy() {
......
33 34
      if (params['stakeholder']) {
34 35
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
35 36
          if (stakeholder) {
37
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
38
              if (portal) {
39
                this.piwikSiteId = portal.piwik;
40
              }
41
            }));
36 42
            this.initialized = true;
37 43
          }
38 44
        }));
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/pages/pages.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PagesRoutingModule} from './pages-routing.module';
4
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {PagesModule} from "../../openaireLibrary/dashboard/page/pages.module";
6
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
7

  
8
@NgModule({
9
  imports: [
10
    CommonModule, PagesRoutingModule, PagesModule
11
  ],
12
    providers: [LoginGuard,IsCommunityOrAdmin],
13

  
14
})
15
export class MonitorPagesModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/searchPages/simple/searchResearchResults.component.ts
4 4
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
5 5
import {Subscriber} from "rxjs";
6 6
import {properties} from "../../../../environments/environment";
7
import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service";
7 8

  
8 9
@Component({
9 10
  selector: 'monitor-search-results',
......
14 15
                               [includeOnlyResultsAndFilter]="false"
15 16
                               [showSwitchSearchLink]="true"
16 17
                               [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/research-outcomes'"
18
                               [piwikSiteId]="piwikSiteId"
17 19
      ></search-research-results>
18 20
    </div>
19 21
  `,
......
22 24
  customFilter: SearchCustomFilter = null;
23 25
  initialized: boolean = false;
24 26
  properties;
27
  piwikSiteId;
25 28
  constructor(private route: ActivatedRoute,
26 29
              private router: Router,
27
              private stakeholderService: StakeholderService) {
30
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
28 31
  }
29 32
  subscriptions = [];
30 33
  ngOnDestroy() {
......
51 54
              let value =  stakeholder.index_id+"||"+stakeholder.index_name;
52 55
              this.customFilter = new SearchCustomFilter("Community", "community", value,  stakeholder.name);
53 56
            }
57
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
58
              if (portal) {
59
                this.piwikSiteId = portal.piwik;
60
              }
61
            }));
54 62
            this.initialized = true;
55 63
          }
56 64
        }));
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/pages/pages-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PagesComponent} from "../../openaireLibrary/dashboard/page/pages.component";
4
import {IsCommunityOrAdmin} from "../../openaireLibrary/connect/communityGuard/isCommunityOrAdmin";
5
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
6

  
7
@NgModule({
8
    imports: [
9
        RouterModule.forChild([
10
            { path: '', canActivate: [LoginGuard,IsCommunityOrAdmin], component: PagesComponent}
11
        ])
12
    ]
13
})
14
export class PagesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/landingPages/dataProvider/dataProvider.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-dataprovider',
8 9
  template: `
9 10
    <div id="page_content">
10
      <dataprovider *ngIf="initialized"></dataprovider>
11
      <dataprovider *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></dataprovider>
11 12
    </div>`,
12 13
})
13 14
export class MonitorDataProviderComponent {
14 15
  initialized: boolean = false;
15
  
16
  communityId;
17
  piwikSiteId;
16 18
  constructor(private route: ActivatedRoute,
17 19
              private router: Router,
18
              private stakeholderService: StakeholderService) {
20
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
19 21
  }
20 22
  subscriptions = [];
21 23
  ngOnDestroy() {
......
31 33
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
32 34
          if (stakeholder) {
33 35
            this.initialized = true;
36
            this.communityId = stakeholder.alias;
37
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
38
              if (portal) {
39
                this.piwikSiteId = portal.piwik;
40
              }
41
            }));
34 42
          }
35 43
        }));
36 44
      }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.ts
13 13
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
14 14
import {arrow_left} from "./openaireLibrary/utils/icons/icons";
15 15
import {properties} from "../environments/environment";
16
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
16 17

  
17 18

  
18 19
@Component({
......
59 60
              private userManagementService: UserManagementService,
60 61
              private layoutService: LayoutService,
61 62
              private stakeholderService: StakeholderService,
62
              private cdr: ChangeDetectorRef) {
63
              private cdr: ChangeDetectorRef,  private configurationService: ConfigurationService) {
63 64
    this.subscriptions.push(this.router.events.subscribe(event => {
64 65
      if (event instanceof NavigationEnd) {
65 66
        let r = this.route;
......
128 129
              if (stakeholder) {
129 130
                this.stakeholder = stakeholder;
130 131
                LinksResolver.setProperties(this.stakeholder.alias);
132
                this.setProperties(this.stakeholder.type, this.stakeholder.alias);
131 133
                if (isSearch) {
132 134
                  this.activeTopic = null;
133 135
                } else if (params && params['topic'] && !this.activeTopic) {
......
141 143
              } else {
142 144
                this.stakeholder = null;
143 145
                LinksResolver.resetProperties();
146
                this.resetProperties();
144 147
                this.navigateToError();
145 148
                this.buildMenu();
146 149
                this.loading = false;
......
148 151
            }, error => {
149 152
              this.stakeholder = null;
150 153
              LinksResolver.resetProperties();
151
              if (error.status === 404) {
154
              this.resetProperties();
155
              if (error && error.status && error.status === 404) {
152 156
                this.navigateToError();
153 157
              }
154 158
              this.buildMenu();
......
172 176
          this.stakeholder = null;
173 177
          this.buildMenu();
174 178
          this.loading = false;
179
          this.resetProperties();
175 180
        }
176 181
      }
177 182
    }));
......
195 200
    this.userManagementService.clearSubscriptions();
196 201
    this.layoutService.clearSubscriptions();
197 202
    this.stakeholderService.clearSubscriptions();
203
    this.configurationService.clearSubscriptions();
198 204
  }
199 205
  
200 206
  private navigateToError() {
......
320 326
        this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, "<i uk-icon=\"image\"></i>"));
321 327
        this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, "<i uk-icon=\"image\"></i>"));
322 328
        this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, "<i uk-icon=\"users\"></i>"));
329
        if(Session.isPortalAdministrator(this.user) ) {
330
          let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
331
          monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/" + this.stakeholder.alias +  "/pages", false, [], [], {communityId:this.stakeholder.alias}));
332
          monitorOptions.items.push(new MenuItem("entities", "Entities", "","/admin-tools/" + this.stakeholder.alias +  "/entities", false, [], [], {communityId:this.stakeholder.alias}));
333
          // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "","/admin-tools/" + this.stakeholder.alias +  "/classContents", false, [], [], {}));
334
          monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "","/admin-tools/" + this.stakeholder.alias +  "/helptexts", false, [], [], {communityId:this.stakeholder.alias}));
335
          this.adminMenuItems.push(monitorOptions);
336
        }
323 337
        this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {});
324 338
        this.specialSideBarMenuItem.icon = '<span class="uk-icon-button small uk-icon uk-button-secondary">' + arrow_left.data + '</span>'; // '<span class="uk-icon-button uk-icon portal-button  " uk-icon="chevron-left"></span>';
325 339
        this.specialSideBarMenuItem.customClass = 'uk-text-uppercase uk-text-bold uk-text-secondary';
......
365 379
        this.adminMenuItems = [];
366 380
        this.specialSideBarMenuItem = null;
367 381
        this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, "<i uk-icon=\"cog\"></i>"));
368
        /*let adminOptions = new MenuItem("adminOptions", "Admin Options", "", null, false, [], [], {})
369
        adminOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {}));
370
        adminOptions.items.push(new MenuItem("portals", "Portals", "", "/portals", false, [], [], {}));
371
        adminOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {}));
372
        adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classes", false, [], [], {}));
373
        this.adminMenuItems.push(adminOptions);
374
        let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", null, false, [], [], {})
375
        monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/pages", false, [], [], {communityId: 'monitor'}));
376
        monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/entities", false, [], [], {communityId: 'monitor'}));
377
        monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/classContents", false, [], [], {communityId: 'monitor'}));
378
        monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/helptexts", false, [], [], {communityId: 'monitor'}));
379
        this.adminMenuItems.push(monitorOptions);*/
382
       if(Session.isPortalAdministrator(this.user) ) {
383
         let adminOptions = new MenuItem("adminOptions", "Admin Options", "", "", false, [], [], {})
384
         adminOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {}));
385
         adminOptions.items.push(new MenuItem("portals", "Portals", "", "/admin-tools/portals", false, [], [], {}));
386
         adminOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {}));
387
         // adminOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classes", false, [], [], {}));
388
         this.adminMenuItems.push(adminOptions);
389
         let monitorOptions = new MenuItem("monitorOptions", "Monitor Options", "", "", false, [], [], {});
390
         monitorOptions.items.push(new MenuItem("pages", "Pages", "", "/admin-tools/pages", false, [], [], {communityId: 'monitor'}));
391
         monitorOptions.items.push(new MenuItem("entities", "Entities", "", "/admin-tools/entities", false, [], [], {communityId: 'monitor'}));
392
         // monitorOptions.items.push(new MenuItem("classes", "Class help texts", "", "/admin-tools/classContents", false, [], [], {communityId: 'monitor'}));
393
         monitorOptions.items.push(new MenuItem("helptexts", "Help texts", "", "/admin-tools/helptexts", false, [], [], {communityId: 'monitor'}));
394
         this.adminMenuItems.push(monitorOptions);
395
       }
380 396
        
381 397
      }
382 398
    }
......
409 425
    }
410 426
    return true;
411 427
  }
428
  setProperties(type, communityId){
429
    this.properties.adminToolsCommunity = communityId;
430
    this.properties.adminToolsPortalType = type;
431
    this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
432
  }
433
  resetProperties(){
434
    this.properties.adminToolsCommunity = "monitor";
435
    this.properties.adminToolsPortalType = "monitor";
436
    this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
437
  }
412 438
  
413 439
  /*  createSearchParameters() {
414 440
      if (!this.stakeholder) {
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/landingPages/project/project.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-project',
8 9
  template: `
9 10
    <div id="page_content">
10
      <project *ngIf="initialized"></project>
11
      <project *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></project>
11 12
    </div>`,
12 13
})
13 14
export class MonitorProjectComponent {
14 15
  initialized: boolean = false;
15
  
16
  communityId;
17
  piwikSiteId;
16 18
  constructor(private route: ActivatedRoute,
17 19
              private router: Router,
18
              private stakeholderService: StakeholderService) {
20
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
19 21
  }
20 22
  subscriptions = [];
21 23
  ngOnDestroy() {
......
31 33
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
32 34
          if (stakeholder) {
33 35
            this.initialized = true;
36
            this.communityId = stakeholder.alias;
37
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
38
              if (portal) {
39
                this.piwikSiteId = portal.piwik;
40
              }
41
            }));
34 42
          }
35 43
        }));
36 44
      }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/new-page-help-content-routing.module.ts
1
import {NgModule} from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {NewPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.component";
4

  
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', component: NewPageHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class NewPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/edit-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {EditPageHelpContentRoutingModule} from "./edit-page-help-content-routing.module";
5
import {EditPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module";
6

  
7
@NgModule({
8
    imports: [
9
        CommonModule,  RouterModule,
10
         EditPageHelpContentRoutingModule, EditPageHelpContentModule
11
    ],
12
    providers: []
13
})
14
export class MonitorEditPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/search/landingPages/result/result.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-result',
8 9
  template: `
9 10
    <div id="page_content">
10
      <result-landing *ngIf="initialized" type="result"></result-landing>
11
      <result-landing *ngIf="initialized" type="result" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
11 12
    </div>`,
12 13
})
13 14
export class MonitorResultComponent {
14 15
  initialized: boolean = false;
15
  
16
  communityId;
17
  piwikSiteId;
16 18
  constructor(private route: ActivatedRoute,
17 19
              private router: Router,
18
              private stakeholderService: StakeholderService) {
20
              private stakeholderService: StakeholderService,  private configurationService: ConfigurationService) {
19 21
  }
20 22
  subscriptions = [];
21 23
  ngOnDestroy() {
......
31 33
        this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
32 34
          if (stakeholder) {
33 35
            this.initialized = true;
36
            this.communityId = stakeholder.alias;
37
            this.subscriptions.push(this.configurationService.communityInformationState.subscribe(portal => {
38
              if (portal) {
39
                this.piwikSiteId = portal.piwik;
40
              }
41
            }));
34 42
          }
35 43
        }));
36 44
      }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/page-help-contents.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
4
import {PageHelpContentsModule} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.module";
5

  
6
@NgModule({
7
  imports: [
8
    CommonModule,  PageHelpContentsRoutingModule,  PageHelpContentsModule
9
  ],
10
    providers: [],
11
 })
12
export class MonitorPageHelpContentsModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/new-page-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {CommonModule} from '@angular/common';
4
import {NewPageHelpContentRoutingModule} from "./new-page-help-content-routing.module";
5
import {NewPageHelpContentModule} from "../../openaireLibrary/dashboard/helpTexts/new-page-help-content.module";
6

  
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule,  RouterModule,
11
         NewPageHelpContentRoutingModule, NewPageHelpContentModule
12
    ],
13
    providers: [],
14
})
15
export class MonitorNewPageHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/edit-page-help-content-routing.module.ts
1
import {NgModule} from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EditPageHelpContentComponent} from "../../openaireLibrary/dashboard/helpTexts/edit-page-help-content.component";
4

  
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', component: EditPageHelpContentComponent}
10
        ])
11
    ]
12
})
13
export class EditPageHelpContentRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/helpTexts/page-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PageHelpContentsComponent} from "../../openaireLibrary/dashboard/helpTexts/page-help-contents.component";
4

  
5
@NgModule({
6
    imports: [
7
        RouterModule.forChild([
8
            { path: '',  component: PageHelpContentsComponent}
9
        ])
10
    ]
11
})
12
export class PageHelpContentsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/admin-tool-routing.module.ts
1
import {NgModule} from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
4
import {AdminLoginGuard} from "../openaireLibrary/login/adminLoginGuard.guard";
5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6

  
7
@NgModule({
8
  imports: [
9
    RouterModule.forChild([
10
      {path: '', redirectTo: '/admin', pathMatch: 'full'},
11
      {
12
        path: 'portals',
13
        loadChildren: './portals/portals.module#PortalsModule',
14
        canActivate:[AdminLoginGuard],
15
        resolve: { envSpecific: EnvironmentSpecificResolver  },
16
        data: {hasAdminMenu: true}
17
      },
18
      {
19
        path: 'entities',
20
        loadChildren: './entities/entities.module#MonitorEntitiesModule',
21
        canActivate:[AdminLoginGuard],
22
        resolve: { envSpecific: EnvironmentSpecificResolver  },
23
        data: {hasAdminMenu: true}
24
      },
25

  
26
      {
27
        path: 'classContents',
28
        loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
29
        canActivate:[AdminLoginGuard],
30
        resolve: { envSpecific: EnvironmentSpecificResolver  },
31
        data: {hasAdminMenu: true}
32
      },
33
      {
34
        path: 'classContents/new',
35
        loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
36
        canActivate:[AdminLoginGuard],
37
        resolve: { envSpecific: EnvironmentSpecificResolver  },
38
        data: {hasAdminMenu: true}
39
      },
40
      {
41
        path: 'classContents/edit',
42
        loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
43
        canActivate:[AdminLoginGuard],
44
        resolve: { envSpecific: EnvironmentSpecificResolver  },
45
        data: {hasAdminMenu: true}
46
      },
47
      {
48
        path: 'helptexts',
49
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
50
        canActivate:[AdminLoginGuard],
51
        resolve: { envSpecific: EnvironmentSpecificResolver  },
52
        data: {hasAdminMenu: true}
53
      },
54
      {
55
        path: 'helptexts/new',
56
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
57
        canActivate:[AdminLoginGuard],
58
        resolve: { envSpecific: EnvironmentSpecificResolver  },
59
        data: {hasAdminMenu: true}
60
      },
61
      {
62
        path: 'helptexts/edit',
63
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
64
        canActivate:[AdminLoginGuard],
65
        resolve: { envSpecific: EnvironmentSpecificResolver  },
66
        data: {hasAdminMenu: true}
67
      },
68
      {
69
        path: 'pages',
70
        loadChildren: './pages/pages.module#MonitorPagesModule',
71
        canActivate:[AdminLoginGuard],
72
        resolve: { envSpecific: EnvironmentSpecificResolver  },
73
        data: {hasAdminMenu: true}
74
      },
75
      {
76
        path: 'pageContents',
77
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
78
        canActivate:[AdminLoginGuard],
79
        resolve: { envSpecific: EnvironmentSpecificResolver  },
80
        data: {hasAdminMenu: true}
81
      },
82
      {
83
        path: 'pageContents/new',
84
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
85
        canActivate:[AdminLoginGuard],
86
        resolve: { envSpecific: EnvironmentSpecificResolver  },
87
        data: {hasAdminMenu: true}
88
      },
89
      {
90
        path: 'pageContents/edit',
91
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
92
        canActivate:[AdminLoginGuard],
93
        resolve: { envSpecific: EnvironmentSpecificResolver  },
94
        data: {hasAdminMenu: true}
95
      },
96

  
97

  
98
    //  stakeholder:
99

  
100
      {
101
        path: ':stakeholder/entities',
102
        loadChildren: './entities/entities.module#MonitorEntitiesModule',
103
        canActivate:[AdminDashboardGuard],
104
        resolve: { envSpecific: EnvironmentSpecificResolver  },
105
        data: {hasAdminMenu: true}
106
      },
107
      {
108
        path: ':stakeholder/classContents',
109
        loadChildren: './classHelpTexts/div-help-contents.module#MonitorDivHelpContentsModule',
110
        canActivate:[AdminDashboardGuard],
111
        resolve: { envSpecific: EnvironmentSpecificResolver  },
112
        data: {hasAdminMenu: true}
113
      },
114
      {
115
        path: ':stakeholder/classContents/new',
116
        loadChildren: './classHelpTexts/new-div-help-content.module#MonitorNewDivHelpContentModule',
117
        canActivate:[AdminDashboardGuard],
118
        resolve: { envSpecific: EnvironmentSpecificResolver  },
119
        data: {hasAdminMenu: true}
120
      },
121
      {
122
        path: ':stakeholder/classContents/edit',
123
        loadChildren: './classHelpTexts/edit-div-help-content.module#MonitorEditDivHelpContentModule',
124
        canActivate:[AdminDashboardGuard],
125
        resolve: { envSpecific: EnvironmentSpecificResolver  },
126
        data: {hasAdminMenu: true}
127
      },
128
      {
129
        path: ':stakeholder/helptexts',
130
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
131
        canActivate:[AdminDashboardGuard],
132
        resolve: { envSpecific: EnvironmentSpecificResolver  },
133
        data: {hasAdminMenu: true}
134
      },
135
      {
136
        path: ':stakeholder/helptexts/new',
137
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
138
        canActivate:[AdminDashboardGuard],
139
        resolve: { envSpecific: EnvironmentSpecificResolver  },
140
        data: {hasAdminMenu: true}
141
      },
142
      {
143
        path: ':stakeholder/helptexts/edit',
144
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
145
        canActivate:[AdminDashboardGuard],
146
        resolve: { envSpecific: EnvironmentSpecificResolver  },
147
        data: {hasAdminMenu: true}
148
      },
149
      {
150
        path: ':stakeholder/pages',
151
        loadChildren: './pages/pages.module#MonitorPagesModule',
152
        canActivate:[AdminDashboardGuard],
153
        resolve: { envSpecific: EnvironmentSpecificResolver  },
154
        data: {hasAdminMenu: true}
155
      },
156
      {
157
        path: ':stakeholder/pageContents',
158
        loadChildren: './helpTexts/page-help-contents.module#MonitorPageHelpContentsModule',
159
        canActivate:[AdminDashboardGuard],
160
        resolve: { envSpecific: EnvironmentSpecificResolver  },
161
        data: {hasAdminMenu: true}
162
      },
163
      {
164
        path: ':stakeholder/pageContents/new',
165
        loadChildren: './helpTexts/new-page-help-content.module#MonitorNewPageHelpContentModule',
166
        canActivate:[AdminDashboardGuard],
167
        resolve: { envSpecific: EnvironmentSpecificResolver  },
168
        data: {hasAdminMenu: true}
169
      },
170
      {
171
        path: ':stakeholder/pageContents/edit',
172
        loadChildren: './helpTexts/edit-page-help-content.module#MonitorEditPageHelpContentModule',
173
        canActivate:[AdminDashboardGuard],
174
        resolve: { envSpecific: EnvironmentSpecificResolver  },
175
        data: {hasAdminMenu: true}
176
      }
177
    ])
178
  ]
179
})
180
export class AdminToolRoutingModule {
181
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/entities/entities-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
4
import {EntitiesComponent} from "../../openaireLibrary/dashboard/entity/entities.component";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '', canActivate: [AdminLoginGuard], component: EntitiesComponent}
10
    ])
11
  ]
12
})
13
export class EntitiesRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/entities/entities.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {EntitiesRoutingModule} from "./entities-routing.module";
4
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
5
import {EntitiesModule} from "../../openaireLibrary/dashboard/entity/entities.module";
6

  
7
@NgModule({
8
  imports: [
9
    CommonModule, EntitiesModule, EntitiesRoutingModule
10
  ],
11
  providers: [AdminLoginGuard],
12
})
13
export class MonitorEntitiesModule {
14
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/portals/portals-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {PortalsComponent} from "../../openaireLibrary/dashboard/portal/portals.component";
4
import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
5

  
6
@NgModule({
7
  imports: [
8
    RouterModule.forChild([
9
      { path: '',  component: PortalsComponent}
10
    ])
11
  ]
12
})
13
export class PortalsRoutingModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/portals/portals.module.ts
1
import {NgModule} from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {PortalModule} from "../../openaireLibrary/dashboard/portal/portals.module";
4
import {PortalsRoutingModule} from "./portals-routing.module";
5

  
6
@NgModule({
7
  imports: [
8
    CommonModule, PortalModule, PortalsRoutingModule
9
  ],
10
  declarations: [],
11
  providers: [],
12
  exports: []
13
})
14
export class PortalsModule {
15
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/new-div-help-content.module.ts
1
import { NgModule } from '@angular/core';
2
import {CommonModule} from '@angular/common';
3
import {NewDivHelpContentRoutingModule} from "./new-div-help-content-routing.module";
4
import {NewDivHelpContentModule} from "../../openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module";
5
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
6

  
7

  
8
@NgModule({
9
    imports: [
10
        CommonModule, NewDivHelpContentRoutingModule, NewDivHelpContentModule
11
    ],
12
    providers: [AdminDashboardGuard],
13
})
14
export class MonitorNewDivHelpContentModule { }
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/admin-tool/classHelpTexts/div-help-contents-routing.module.ts
1
import { NgModule } from '@angular/core';
2
import {RouterModule} from '@angular/router';
3
import {DivHelpContentsComponent} from "../../openaireLibrary/dashboard/divhelpcontent/div-help-contents.component";
4
import {AdminDashboardGuard} from "../../utils/adminDashboard.guard";
5

  
6
@NgModule({
7
    imports: [
8
        RouterModule.forChild([
9
            { path: '', canActivate: [ AdminDashboardGuard], component: DivHelpContentsComponent}
10
        ])
11
    ]
12
})
13
export class DivHelpContentsRoutingModule { }
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff