diff --git a/package.json b/package.json index 5566341..134e5a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monitor-dashboard", - "version": "1.0.2", + "version": "1.0.3", "scripts": { "ng": "ng", "start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0", diff --git a/src/app/app.component.html b/src/app/app.component.html index d6d9230..41a60e6 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -4,6 +4,9 @@
+
+ +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a8da927..e054bed 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -27,6 +27,7 @@ import { import {SidebarBaseComponent} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-base.component"; import {Breadcrumb} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.component'; import {OpenaireEntities} from './openaireLibrary/utils/properties/searchFields'; +import {HelperService} from "./openaireLibrary/utils/helper/helper.service"; @Component({ @@ -73,6 +74,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { paramsSubscription: Subscription; openaireEntities = OpenaireEntities; activeType: StakeholderType; + divContents: any; constructor(protected _route: ActivatedRoute, protected _router: Router, @@ -82,6 +84,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { private smoothScroll: SmoothScroll, private stakeholderService: StakeholderService, private configurationService: ConfigurationService, + private helper: HelperService, private resourcesService: ResourcesService) { super(); this.initRouterParams(_route, event => { @@ -92,6 +95,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { ngOnInit() { super.ngOnInit(); + this.getDivContents(); if (typeof document !== 'undefined' && window) { this.innerWidth = window.innerWidth; } @@ -266,7 +270,13 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { this.configurationService.clearSubscriptions(); this.smoothScroll.clearSubscriptions(); } - + + private getDivContents() { + this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', '/').subscribe(contents => { + this.divContents = contents; + })); + } + private navigateToError() { this._router.navigate([this.properties.errorLink], {queryParams: {'page': this.properties.baseLink + this._router.url}}); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ca4d9aa..2c19321 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,6 +34,7 @@ import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-re import {RouteReuseStrategy} from "@angular/router"; import {LogoUrlPipeModule} from './openaireLibrary/utils/pipes/logoUrlPipe.module'; import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.module'; +import {HelperModule} from "./openaireLibrary/utils/helper/helper.module"; @NgModule({ @@ -51,7 +52,7 @@ import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs AppRoutingModule, SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule, LogoUrlPipeModule, - BreadcrumbsModule + BreadcrumbsModule, HelperModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], diff --git a/src/app/browse-stakeholders/browse-stakeholders.component.html b/src/app/browse-stakeholders/browse-stakeholders.component.html index 25de305..7858f2f 100644 --- a/src/app/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/browse-stakeholders/browse-stakeholders.component.html @@ -23,7 +23,7 @@
-
+
-
+
No {{entities.stakeholders}} available @@ -106,7 +106,7 @@
-
+
{{item.name}}
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4396999..9b1e662 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4396999ce03bb96543f258f64e64459546b86e19 +Subproject commit 9b1e662f4b64d4f4c6eb7a4d82657a0fe3ea8391 diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index a4112e2..89aa52c 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -8,7 +8,7 @@ diff --git a/src/assets/common-assets b/src/assets/common-assets index 5026b8b..014adfe 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 5026b8b38fcae493ec7bcdc272bf167798c18fa3 +Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 6524ee3..55765bf 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 6524ee362c8fc8fa6e482144920e305198e54fc8 +Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index ab113b0..ecf6338 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -3,6 +3,7 @@ import {common, commonBeta} from "../app/openaireLibrary/utils/properties/enviro let props: EnvProperties = { dashboard: 'monitor', + adminToolsPortalType: "monitor", isDashboard: true, enablePiwikTrack: true, monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 067ce80..f12c197 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,6 +3,7 @@ import {common, commonProd} from "../app/openaireLibrary/utils/properties/enviro let props: EnvProperties = { dashboard: 'monitor', + adminToolsPortalType: "monitor", isDashboard: true, enablePiwikTrack: true, monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/",