package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitor-dashboard",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",

server.ts

@@ -14,7 +14,6 @@ import axios, {AxiosHeaders} from "axios";
 import {Stakeholder} from "./src/app/openaireLibrary/monitor/entities/stakeholder";
 import {CacheIndicators} from "./src/app/openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators";
 import {Session, User} from "./src/app/openaireLibrary/login/utils/helper.class";
-import {UserManagementService} from "./src/app/openaireLibrary/services/user-management.service";
 
 var bodyParser = require('body-parser');
 var jsonParser = bodyParser.json();
@@ -73,7 +72,7 @@ export function app() {
   async function checkPermissions(req, res, access: (stakeholder, user) => void) {
     let headers: AxiosHeaders = new AxiosHeaders();
     headers.set('Cookie', req.headers.cookie);
-    let userinfoRes = (await axios.get<any>(UserManagementService.userInfoUrl(), {
+    let userinfoRes = (await axios.get<any>(properties.userInfoUrl, {
       withCredentials: true,
       headers: headers
     }).catch(error => {

src/app/monitor/monitor.component.html

@@ -301,8 +301,9 @@
       <div *ngIf="!user" class="uk-margin-top"><a class="uk-link" (click)="logIn()"> Sign in</a> to apply filters.</div>
       <ul *ngIf="user" class="uk-list uk-list-xlarge uk-list-divider  uk-margin-top">
         <li>
-          <range-filter #rangeFilter [filter]="periodFilter"[yearMin]="minYear" [yearMax]="maxYear"
-                        [mandatoryRange]="true" (onFilterChange)="filter()"></range-filter>
+          <range-filter #rangeFilter [filter]="periodFilter" yearMin="2000" [yearMax]="currentYear"
+                        [mandatoryRange]="true"
+                        (onFilterChange)="filter()"></range-filter>
         </li>
         <ng-container *ngFor="let filter of filters ">
           <li *ngIf="filter.values.length >0">

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 44e821b1f16f2edbdf58510d18fbe47a1083edd3
+Subproject commit 14cd46bdb4ee59fc887e017b1c0ee027b6da3e05

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 186e4bf732f96459a1e22b44ba172f08f0c11d48
+Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit e721fef20399f15c9dc9bee28b3d7e9b92db2021
+Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9

src/environments/environment.beta.ts

@@ -5,6 +5,9 @@ let props: EnvProperties = {
   dashboard: 'monitor',
   isDashboard: true,
   enablePiwikTrack: true,
+  useCache: false,
+  useLongCache: true,
+  showContent: true,
   monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/",
   useOldStatisticsSchema: true,
   adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",

src/environments/environment.prod.ts

@@ -5,6 +5,9 @@ let props: EnvProperties = {
   dashboard: 'monitor',
   isDashboard: true,
   enablePiwikTrack: true,
+  useCache: false,
+  useLongCache: true,
+  showContent: true,
   monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/",
   useOldStatisticsSchema: false,
   adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",

src/environments/environment.ts

@@ -11,6 +11,9 @@ let props: EnvProperties = {
   adminToolsPortalType: "monitor",
   isDashboard: true,
   enablePiwikTrack: false,
+  useCache: false,
+  useLongCache: false,
+  showContent: true,
   monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/",
   useOldStatisticsSchema: false,
   disableFrameLoad: true,
@@ -19,7 +22,8 @@ let props: EnvProperties = {
   adminToolsCommunity: "monitor",
   useHelpTexts: true,
   baseLink: "/",
-  domain: "http://mpagasas.di.uoa.gr:4600"
+  domain: "http://mpagasas.di.uoa.gr:4600",
+  reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu"
 };
 
 export let properties: EnvProperties = {