Resolve v1.0.2 PR

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",

src/app/app.component.html

@@ -4,6 +4,9 @@
 <div *ngIf="!loading" [class.monitor]="isFrontPage">
     <div id="modal-container"></div>
     <ng-container *ngIf="!isHidden">
+        <div *ngIf="divContents && divContents['banner']" class="uk-tile uk-tile-default uk-padding uk-border-bottom">
+            <helper [texts]="divContents['banner']"></helper>
+        </div>
         <navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems
                 [menuItems]="menuItems" [user]="user"
                 [notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>

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;
     }
@@ -267,6 +271,12 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
     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}});
   }

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],

src/app/browse-stakeholders/browse-stakeholders.component.html

@@ -23,7 +23,7 @@
       </div>
     </div>
   </div>
-  <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">
+  <div class="uk-grid uk-flex-middle uk-flex-between@m uk-flex-center uk-margin-large-top" [id]="id" uk-grid>
     <div class="uk-flex uk-flex-middle">
       <div *ngIf="sortOptions?.length > 0" class="uk-width-small uk-margin-medium-right">
         <div input
@@ -46,7 +46,7 @@
       </paging-no-load>
     </div>
   </div>
-  <div class="uk-margin-large-top" id="target">
+  <div class="uk-margin-large-top">
     <div *ngIf="!filteredStakeholders || filteredStakeholders?.length == 0" class="uk-flex uk-flex-center">
       <div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
         No {{entities.stakeholders}} available
@@ -106,7 +106,7 @@
                 </div>
               </td>
               <td>
-                <div class="uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
+                <div class="uk-width-large uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
                   {{item.name}}
                 </div>
               </td>

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 4396999ce03bb96543f258f64e64459546b86e19
+Subproject commit 9b1e662f4b64d4f4c6eb7a4d82657a0fe3ea8391

src/app/users/users.component.html

@@ -8,7 +8,7 @@
 	<ul class="uk-tab uk-margin-remove-bottom uk-margin-medium-top">
 		<li [class.uk-active]="tab === 'manager'"><a routerLink="../manager">Managers</a></li>
 		<li [class.uk-active]="tab === 'member'"><a routerLink="../member">Members</a></li>
-		<li *ngIf="properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
+		<li *ngIf="stakeholder.type == 'organization' && properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
 	</ul>
 </role-users>
 

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 5026b8b38fcae493ec7bcdc272bf167798c18fa3
+Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 6524ee362c8fc8fa6e482144920e305198e54fc8
+Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298

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/",

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/",