Merge branch 'master' of code-repo.d4science.org:MaDgIK/irish-monitor

server.ts

@@ -108,7 +108,7 @@ function getFileName(year, month){
   return 'actions' + (year && month ? "_" + year + "_" + month : "")+".log";
 }
 function formatPrettyLog(log){
-  return "On " + (log.date ? formatDateAndTime(log.date) : "") + " "  /*+ logs[i].action + " "*/ + log.message + "<br>";
+  return "On " + (log.date ? formatDateAndTime(log.date) : "") + " "  /*+ logs[i].action + " "*/ + log.message;
 }
 function formatDateAndTime(dateStr){
   let date = new Date(dateStr);

src/app/claims/myClaims/myClaims.component.ts

@@ -5,19 +5,11 @@ import {properties} from "../../../environments/environment";
 @Component({
   selector: 'openaire-my-claims',
   template: `
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
+    <my-claims>
     </my-claims>
   `
   
 })
-export class OpenaireMyClaimsComponent implements OnInit {
+export class OpenaireMyClaimsComponent {
-  claimsInfoURL: string;
+
-  userInfoURL: string;
-  
-  constructor() {
-  }
-  
-  public ngOnInit() {
-    this.claimsInfoURL = properties.claimsInformationLink;
-  }
 }

src/app/public-logs/public-logs.component.ts

@@ -9,15 +9,18 @@ import {LogService} from "../openaireLibrary/utils/log/log.service";
 @Component({
   selector: 'public-logs',
   template: `
-<div class="uk-container uk-container-large uk-margin-top">
+    <div class="uk-banner">
-  <h3>Web statistics & Activity Logs </h3>
+      <div class="uk-container uk-container-large uk-section uk-section-small uk-text-center">
-  
+        <h1 class="uk-h2">Web Statistics & Activity Logs</h1>
-      <ul class="uk-tab " uk-switcher>
+      </div>
+    </div>
+    <div class="uk-container uk-container-small uk-section">
+      <ul class="uk-tab uk-flex uk-flex-center uk-flex-middle uk-flex-nowrap uk-text-large" uk-switcher>
         <li><a href="#">Web statistics</a></li>
         <li><a href="#">Monitor logs</a></li>
         <li><a href="#">OpenOrgs logs</a></li>
       </ul>
-      <ul class="uk-switcher uk-margin">
+      <ul class="uk-switcher uk-margin-medium-top">
         <li>
           <div>Explore analytics detailing the user engagement on the National Monitor. This section offers insights into traffic patterns, visitor demographics, page views, and other key metrics that help understand National Monitor usage and effectiveness.</div>
           <div class="uk-alert uk-alert-warning">Current month web statistics will be available at the beginning of next month!</div>
@@ -70,15 +73,13 @@ import {LogService} from "../openaireLibrary/utils/log/log.service";
         </li>
         
       </ul>
-   
+    </div>
-</div>
     <ng-template #formattedLogs let-logs="logs">
-      <div *ngIf="logs && logs.length > 0" class="uk-text-meta "> Viewing last  {{logs.length}} actions.</div>
+      <div *ngIf="logs && logs.length > 0" class="uk-text-meta">Viewing last  {{logs.length}} actions.</div>
-      <div *ngIf="!logs || logs.length == 0" class="uk-text-meta "> No logs yet.</div>
+      <div *ngIf="!logs || logs.length == 0" class="uk-text-meta">No logs yet.</div>
       <div *ngFor="let log of logs">
         On {{log.date | date: 'd/M/yyyy, hh:mm':'GMT'  }} {{log.message}}
       </div>
-      
     </ng-template>
     
   `
@@ -96,7 +97,7 @@ export class PublicLogsComponent extends BaseComponent implements OnInit {
               protected _piwikService: PiwikService,
               protected _title: Title,
               protected _meta: Meta,
-              private _logService:LogService) {
+              private _logService: LogService) {
     super();
     this.startDate.setFullYear(2024,0,10)
     this.months = Array.from({ length:12  }, (_, index) => 12 - index);

src/app/resources/how-it-works/the-five-monitors.component.html

@@ -110,7 +110,7 @@
               <div class="uk-card-body">
                 <span class="uk-text-primary">Step 1a</span>
                 <p class="uk-text-large uk-margin-xsmall-top">Assign a Primary Dashboard Manager</p>
-                <p>Nominate a primary dashboard manager by completing <a href="https://app.onlinesurveys.jisc.ac.uk/s/maynoothuniversity/national-open-access-monitor-dashboard-manager-application-form" target="_blank">our application form</a>... If you already have a primary dashboard manager or prefer not to be one, proceed to step 2.</p>
+                <p>Nominate a primary dashboard manager by completing <a href="https://app.onlinesurveys.jisc.ac.uk/s/maynoothuniversity/national-open-access-monitor-dashboard-manager-application-form" target="_blank">our application form</a>. If you already have a primary dashboard manager or prefer not to be one, proceed to step 2.</p>
               </div>
             </div>
             <div class="uk-card uk-card-default uk-card-body uk-position-relative uk-margin-large-bottom">

src/app/resources/how-it-works/user-actions.component.html

@@ -23,26 +23,33 @@
         </div>
         <div class="uk-width-expand uk-margin-top">
           <div id="adding" class="uk-width-xlarge uk-margin-large-bottom">
-            <h3>Adding research products to your ORCID record</h3>
+            <h3>Adding research products to your ORCID record via ~ My ORCID LINKS  ~</h3>
             <p>Researchers who log in using their ORCID ID have the ability to claim additional research outputs as their own. Once claimed, this information synchronizes with their ORCID profile and will be reflected in both the ORCID system and this portal following the next update of the OpenAIRE Graph, which occurs approximately monthly. This integration ensures that researchers can see their claimed research outputs in both places, maintaining consistency and visibility of their work.</p>
-            <h5 class="uk-text-italic">How to Claim research products as my own?</h5>
+            <p>To claim your research products in OpenAIRE and synchronize them with your ORCID profile, you will need to follow a few simple steps. Once logged in with your ORCID iD, navigate to the top right corner of any page and click on your initials. From there, select “My ORCiD links.” This action will prompt you to grant OpenAIRE permission to access (once) and update your ORCID works.</p>
-            <p>After signing in, click on your initials on the top right corner of any page and then click on “My ORCiD links” after granting permission to OpenAIRE to access and update your ORCID works...</p>
+            <p>After you have granted permission, you will see a list of all your works associated with your ORCID ID. You can then view, update, or remove these works from both your ORCID record and the National Open Access Monitor, Ireland. To expand your record, use the “Discover research products related to you” link, located at the top right of the page. This feature allows you to use the search function to find your Irish publications and other research products. Once you find them, you can easily add them to your ORCID record by clicking on “link”.</p>
           </div>
           <div id="linking" class="uk-width-xlarge uk-margin-large-bottom">
-            <h3>Linking research products</h3>
+            <h3>Linking research products via ~ Link ~</h3>
-            <p>‘Linking’ is a functionality provided by OpenAIRE enabling users to connect research results with projects, research communities, or other research outcomes. This linked information is subsequently integrated into the OpenAIRE Graph and, consequently, becomes accessible in the National Open Access Monitor, Ireland.</p>
+            <p>'Linking' is a functionality provided by OpenAIRE enabling users to connect research results with projects, research communities, or other research outcomes. This linked information is subsequently integrated into the OpenAIRE Graph and, consequently, becomes accessible in the National Open Access Monitor, Ireland.</p>
             <h5 class="uk-text-italic">Where to Find the Linking Feature?</h5>
-            <p>To access the Linking feature, sign in to your account, click on the circle with your initials in the top right corner, and select ‘Link’. Additionally, the linking option is available under any research product while browsing. Each Monitor includes a ‘Browse Research Products’ tab at the top for easy navigation and access.</p>
+            <p>To access the Linking feature, sign in to your account, click on the circle with your initials in the top right corner, and select 'Link'. Additionally, the linking option is available under any research product while browsing. Each Monitor includes a 'Browse Research Products' tab at the top for easy navigation and access.</p>
             <h5 class="uk-text-italic">Types of Research Results for Linking</h5>
             <p>Users have two options for linking research results:</p>
+            <p><span class="uk-text-bold">1. Existing OpenAIRE Results:</span> Link to research results already present within OpenAIRE.</p>
+            <p><span class="uk-text-bold">2. External Content Providers:</span> Link to research results hosted on external platforms like Crossref, Datacite, or ORCID. </p>
             <h5 class="uk-text-italic">Visibility of New Links</h5>
             <p>The visibility of newly created links depends on their origin:</p>
+            <p><span class="uk-text-bold">1. Links to Existing OpenAIRE Results:</span> These will be visible on the portal after the next OpenAIRE Graph update, which occurs nearly monthly.</p>
+            <p><span class="uk-text-bold">2. Links to Results on External Platforms:</span> Links to research results on platforms like Crossref, Datacite, or ORCID will be immediately visible through the portal.</p>
             <h5 class="uk-text-italic">Managing ‘My Links’</h5>
-            <p>All users can manage their links through the ‘My Links’ page. After linking results, users can view and manage their list of created links, including the option to delete them if needed.</p>
+            <p>All users can manage their links through the 'My Links' page. After linking results, users can view and manage their list of created links, including the option to delete them if needed.</p>
           </div>
           <div id="upload" class="uk-width-xlarge uk-margin-large-bottom">
             <h3>Upload DOIs</h3>
-            <p>To access the Upload DOIs feature, sign in to your account, click on the circle with your initials in the top right corner, and select ‘Upload DOIs’. In this page, users can upload a CSV file containing a list of DOI identifiers. After uploading the CSV file, a report will be available showing information about the publications of the given DOIs found in the OA Monitor. The information includes the publication title, the access mode (Open, Closed, Embargo or Restricted), the access routes (gold, hybrid, bronze), if the publication is green and if it is published in OA diamond Journal. Additionally, it shows reports given the list of DOIs on number of valid DOIs, total number for each OA Mode, total number of each OA route, number green and diamond, number of DOIs found and if there are duplicates or invalid DOIs in the given list.</p>
+            <p>Accessing the "Upload DOIs" feature on the OA Monitor platform is a straightforward process that allows users to obtain detailed information about their publications. Here's how you can use this feature:</p>
+            <p>First, sign in to your account. Once you are logged in, locate the circle with your initials at the top right corner of the page and click on it. In the dropdown menu, select 'Upload DOIs'. This will take you to a page specifically designed for uploading Digital Object Identifiers (DOIs).</p>
+            <p>On this page, you have the option to upload a CSV file that contains a list of DOIs. Once your CSV file is uploaded, the system will process the information and generate a comprehensive report. This report includes a wealth of details about the publications associated with the given DOIs.</p>
+            <p>The information provided in the report covers various aspects such as the publication title, its access mode (which could be Open, Closed, Embargo, or Restricted), and the access routes (like gold, hybrid, or bronze). It also indicates whether the publication is green (self-archived) and if it is published in an OA (Open Access) diamond Journal. The report also highlights the total number of DOIs found in your list and identifies if there are any duplicates or invalid DOIs.</p>
           </div>
         </div>
       </div>

src/app/shared/irish.ts

@@ -19,12 +19,17 @@ export class Irish {
     StakeholderConfiguration.ENTITIES.organizations = 'RPOs';
     StakeholderConfiguration.ENTITIES.datasource = 'Repository';
     StakeholderConfiguration.ENTITIES.datasources = 'Repositories';
+    StakeholderConfiguration.ENTITIES.datasource = 'Repository';
+    StakeholderConfiguration.ENTITIES.researcher = 'Researcher';
+    StakeholderConfiguration.ENTITIES.researchers = 'Researchers';
 
     StakeholderConfiguration.TYPES = [
       {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder},
       {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization},
       {value: 'country', label: StakeholderConfiguration.ENTITIES.country},
-      {value: 'datasource', label: StakeholderConfiguration.ENTITIES.datasource}
+      {value: 'datasource', label: StakeholderConfiguration.ENTITIES.datasource},
+      {value: 'researcher', label: StakeholderConfiguration.ENTITIES.researcher}
+
     ];
 
     StakeholderConfiguration.FUNDER_TYPES = [