eionet2-dashboard 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -4,7 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [1.8.0](https://github.com/eea/eionet2-dashboard/compare/1.7.1...1.8.0) - 8 December 2023
+### [1.8.2](https://github.com/eea/eionet2-dashboard/compare/1.8.1...1.8.2) - 23 January 2024
+
+#### :rocket: New Features
+
+- feat: misc changes [Mihai Nicolae - [`ddaeb45`](https://github.com/eea/eionet2-dashboard/commit/ddaeb4545741d9137d064ed7167d5a0c1235be0b)]
+- feat: small changes(#262918) [Mihai Nicolae - [`bba1224`](https://github.com/eea/eionet2-dashboard/commit/bba122453a863f66d1d8aadf6aab2ea3e65913a1)]
+
+#### :house: Internal changes
+
+- chore: node version fix [Mihai Nicolae - [`2b79d49`](https://github.com/eea/eionet2-dashboard/commit/2b79d493e2fa6625c4629cc3d81afa7be0c2a96a)]
+- chore: new version [Mihai Nicolae - [`b0baa55`](https://github.com/eea/eionet2-dashboard/commit/b0baa55a3545b36a2be4f552423d243501d4bcf2)]
+- chore: new config key [Mihai Nicolae - [`d1bcf33`](https://github.com/eea/eionet2-dashboard/commit/d1bcf3353c2a3ec63a7b668cd4013d25757a7d22)]
+
+### [1.8.1](https://github.com/eea/eionet2-dashboard/compare/1.8.0...1.8.1) - 11 December 2023
+
+### [1.8.0](https://github.com/eea/eionet2-dashboard/compare/1.7.1...1.8.0) - 11 December 2023
 
 #### :rocket: New Features
 

package/CONFIGURATION.md

@@ -9,4 +9,12 @@ Configuration keys
     - ObligationsListId - Id of the sharepoint list that stores the obligations
     - ReportingClientsUrl - URL to the reporting obligations database site for client list
     - ReportingInstrumentsUrl - URL to the reporting obligations database site for instrument list
-    - ReportingObligationsUrl - URL to the reporting obligations database site for obligation list. Used in dashboard and azure-jobs.
+    - ReportingObligationsUrl - URL to the reporting obligations database site for obligation list. Used in dashboard and azure-jobs.
+
+### [1.8.1]
+Configuration keys
+    - InquiryListUrl - The link the consultations list filtered to display only enquiries. Used in the bottom bar buttons. 
+
+### [1.8.2]
+Configuration keys
+    - DashboardNoOfDisplayedYears - The numbers of years used in the Country overview to display information about progress.

package/README.md

@@ -18,7 +18,7 @@ The data displayed is retrieved from the EEA Azure tenant and from an internal E
 This functionality is available for all users. In this tab, the users can find information about (and register to):
 - Events (that can be rated).
 - Consultations.
-- Inquiries.
+- Enquiries.
 - Reports.
 
 The displayed information is a selected sub-type of the full information list, ordered by (expiration/closing) date. The full list can be accessed from the tab through a link, which will point the user to the corresponding repository folder(s) stored in SharePoint.

package/appPackage/manifest.json

@@ -20,7 +20,7 @@
     },
     "description": {
         "short": "Eionet Dashboard",
-        "full": "Available to all EEA and Eionet users. The Eionet Dashboard shows shows relevant country statistics and information about all Eionet Groups and ETCs. It includes a list of all events, consultations, inquiries and other relevant information. It is needed by EIonet users to manage their registrations for Eionet events."
+        "full": "Available to all EEA and Eionet users. The Eionet Dashboard shows shows relevant country statistics and information about all Eionet Groups and ETCs. It includes a list of all events, consultations, enquiries and other relevant information. It is needed by EIonet users to manage their registrations for Eionet events."
     },
     "accentColor": "#FFFFFF",
     "bots": [],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eionet2-dashboard",
-    "version": "1.8.0",
+    "version": "1.8.2",
     "description": "",
     "author": "",
     "scripts": {
@@ -22,4 +22,4 @@
         "@fluentui/react-teams": "^6.0.0",
         "@mui/material": "^5.5.0"
     }
-}
+}

package/tabs/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "license": "SEE LICENSE IN LICENSE.md",
   "description": "MS Teams app for accessing Eionet activity and managing account information.",
   "dependencies": {
@@ -85,5 +85,8 @@
       "node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)"
     ]
   },
+  "resolutions": {
+    "@azure/core-rest-pipeline": "1.12.1"
+  },
   "homepage": "."
-}
+}

package/tabs/src/components/ResizableGrid.jsx

@@ -34,6 +34,11 @@ export default function ResizableGrid(props) {
       components={{
         ColumnResizeIcon: ColumnResizeIcon,
       }}
+      componentsProps={{
+        panel: {
+          placement: 'auto',
+        },
+      }}
       columns={dataColumns}
       getRowHeight={() => {
         return Constants.GridRowHeight;

package/tabs/src/components/Tab.jsx

@@ -150,7 +150,7 @@ export default function Tab() {
 
       setSelectedCountry(me.country);
 
-      if (me.isAdmin) {
+      if (me.isAdmin || !me.isEionetUser) {
         setCanChangeCountry(true);
         const loadedCountries = await getCountries();
         loadedCountries && setCountries(loadedCountries);
@@ -459,10 +459,10 @@ export default function Tab() {
                 variant="outlined"
                 endIcon={<OpenInNewIcon color="primary" />}
                 onClick={() => {
-                  window.open(configuration.ConsultationListUrl, '_blank');
+                  window.open(configuration.InquiryListUrl, '_blank');
                 }}
               >
-                All inquiries
+                All enquiries
               </Button>
               <Button
                 className="bottom-button"

package/tabs/src/components/activity/Activity.jsx

@@ -153,7 +153,7 @@ export function Activity({
       <ListItem disablePadding className="list-item" key={9}>
         <ListItemText
           className="list-item-text"
-          primary={'INQUIRIES'}
+          primary={'ENQUIRIES'}
           sx={{ color: 'primary.main' }}
         />
       </ListItem>

package/tabs/src/components/activity/ConsultationList.jsx

@@ -143,13 +143,13 @@ export function ConsultationList({
       renderCell: renderStartDate,
     },
     titleColumn = {
-      field: 'Closed',
+      field: 'Title',
       headerName: type,
       flex: 0.75,
       renderCell: renderConsultationTitle,
     },
     documentColumn = {
-      field: 'Title',
+      field: 'Closed',
       headerName: 'Details',
       width: '100',
       align: 'center',

package/tabs/src/components/my_country/AtAGlance.jsx

@@ -33,14 +33,15 @@ export function AtAGlance({
       setLoading(true);
 
       //get meetings from last two years
-      const fromDate = new Date(new Date().getFullYear() - 2, 0, 1);
+      const noOfYears = configuration.DashboardNoOfDisplayedYears || 2;
+      const fromDate = new Date(new Date().getFullYear() - noOfYears, 0, 1);
       let loadedMeetings = await getMeetings(fromDate, country, userInfo),
         loadedConsultations = await getConsultations(undefined, fromDate);
 
       const current = new Date().getFullYear();
       let years = [];
-      for (let i = current; i >= current - 1; i--) {
-        const allMeetings = loadedMeetings.filter((m) => m.Year == i),
+      for (let i = current; i >= current - noOfYears + 1; i--) {
+        const allMeetings = loadedMeetings.filter((m) => m.Year == i && m.IsPast),
           allConsultations = loadedConsultations.filter(
             (c) => c.Year == i && c.ConsultationType == 'Consultation',
           ),
@@ -48,19 +49,25 @@ export function AtAGlance({
             (c) => c.Year == i && c.ConsultationType == 'Inquiry',
           );
 
+        const yearFilter = `&FilterField2=Year&FilterValue2=${i}&FilterType2=Number`;
         const result = {
           year: i,
           meetingsCount: allMeetings.length,
-          consultationsCount: allConsultations.length,
-          surveysCount: allSurveys.length,
+          meetingsUrl: `${configuration.MeetingListUrl}?FilterField1=Countries&FilterValue1=${country}${yearFilter}`,
           attendedMeetingsCount: allMeetings.filter((meeting) => {
             return meeting.Participants.some(
               (participant) => participant.Country == country && participant.Participated,
             );
           }).length,
+          consultationsCount: allConsultations.length,
+          //!!! ConsultationListUrl already contains a filter in configuration
+          consultationsUrl: `${configuration.ConsultationListUrl}${yearFilter}&FilterField3=Respondants&FilterValue3=${country}`,
           responseConsultationsCount: allConsultations.filter((c) => {
             return c.Respondants.includes(country);
           }).length,
+          surveysCount: allSurveys.length,
+          //!!! InquiryListUrl already contains a filter in configuration
+          surveysUrl: `${configuration.InquiryListUrl}${yearFilter}&FilterField3=Respondants&FilterValue3=${country}`,
           responseSurveysCount: allSurveys.filter((c) => {
             return c.Respondants.includes(country);
           }).length,
@@ -71,7 +78,7 @@ export function AtAGlance({
       setLoading(false);
     };
     fetchData();
-  }, [country, userInfo]);
+  }, [country, userInfo, configuration]);
 
   return (
     <div className="">

package/tabs/src/components/my_country/CountryProgress.jsx

@@ -69,16 +69,7 @@ export function CountryProgress({ lastYears, configuration }) {
           {lastYears.map((year, index) => {
             return (
               <TabPanel className="year-panel" key={index} value={tabsValue} index={index}>
-                <YearlyProgress
-                  allMeetingsCount={year.meetingsCount}
-                  allConsultationsCount={year.consultationsCount}
-                  allSurveysCount={year.surveysCount}
-                  attendedMeetingsCount={year.attendedMeetingsCount}
-                  responseConsultationsCount={year.responseConsultationsCount}
-                  responseSurveysCount={year.responseSurveysCount}
-                  year={year.year}
-                  configuration={configuration}
-                ></YearlyProgress>
+                <YearlyProgress yearData={year} configuration={configuration}></YearlyProgress>
               </TabPanel>
             );
           })}

package/tabs/src/components/my_country/ProgressGauge.jsx

@@ -1,10 +1,19 @@
 import { React, useState } from 'react';
-import { Box, Button, Card, CardContent, Typography, IconButton, Dialog } from '@mui/material';
+import {
+  Box,
+  Button,
+  Card,
+  CardContent,
+  Typography,
+  IconButton,
+  Dialog,
+  Link,
+} from '@mui/material';
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 
 import { FullCircularProgress } from './FullCircularProgress';
 
-export function ProgressGauge({ totalCount, responseCount, label, infoText }) {
+export function ProgressGauge({ totalCount, responseCount, label, infoText, url }) {
   const [infoOpen, setInfoOpen] = useState(false),
     handleInfoOpen = () => {
       infoText && setInfoOpen(true);
@@ -74,7 +83,7 @@ export function ProgressGauge({ totalCount, responseCount, label, infoText }) {
             </Typography>
           </Box>
         </Box>
-        <Typography
+        <Link
           sx={{
             textAlign: 'center',
             marginTop: '1rem',
@@ -82,9 +91,12 @@ export function ProgressGauge({ totalCount, responseCount, label, infoText }) {
             height: '1rem',
             fontSize: '20px',
           }}
+          onClick={() => {
+            url && window.open(url, '_blank');
+          }}
         >
           {label}
-        </Typography>
+        </Link>
       </CardContent>
     </Card>
   );

package/tabs/src/components/my_country/YearlyProgress.jsx

@@ -2,15 +2,7 @@ import { React } from 'react';
 import { Box, Typography } from '@mui/material';
 import { ProgressGauge } from './ProgressGauge';
 
-export function YearlyProgress({
-  allMeetingsCount,
-  attendedMeetingsCount,
-  allConsultationsCount,
-  responseConsultationsCount,
-  allSurveysCount,
-  responseSurveysCount,
-  configuration,
-}) {
+export function YearlyProgress({ yearData, configuration }) {
   return (
     <div className="">
       <Typography className="subtitle" color="text.secondary">
@@ -19,21 +11,24 @@ export function YearlyProgress({
       <Box className="cards-container" sx={{ border: '0px' }}>
         <ProgressGauge
           label="Consultations"
-          totalCount={allConsultationsCount}
-          responseCount={responseConsultationsCount}
+          totalCount={yearData.consultationsCount}
+          responseCount={yearData.responseConsultationsCount}
           infoText={configuration.YearlyConsultationsCountInfo}
+          url={yearData.consultationsUrl}
         ></ProgressGauge>
         <ProgressGauge
-          label="Inquiries"
-          totalCount={allSurveysCount}
-          responseCount={responseSurveysCount}
+          label="Enquiries"
+          totalCount={yearData.surveysCount}
+          responseCount={yearData.responseSurveysCount}
           infoText={configuration.YearlySurveysCountInfo}
+          url={yearData.surveysUrl}
         ></ProgressGauge>
         <ProgressGauge
           label="Events"
-          totalCount={allMeetingsCount}
-          responseCount={attendedMeetingsCount}
+          totalCount={yearData.meetingsCount}
+          responseCount={yearData.attendedMeetingsCount}
           infoText={configuration.YearlyEventsCountInfo}
+          url={yearData.meetingsUrl}
         ></ProgressGauge>
       </Box>
     </div>

package/tabs/src/data/sharepointProvider.js

@@ -159,35 +159,37 @@ export async function getConsultations(consultationType, fromDate, userCountry)
 
     const itemLinkOperator = config.ConsultationListItemUrl.includes('?') ? '&' : '?';
     return consultations.value.map(function (consultation) {
-      const respondants = consultation.fields.Respondants || [],
+      const fields = consultation.fields,
+        respondants = fields.Respondants || [],
         hasUserCountryResponded = userCountry && respondants.includes(userCountry);
+
       return {
-        id: consultation.fields.id,
+        id: fields.id,
 
-        Title: consultation.fields.Title,
-        ConsultationType: consultation.fields.ConsultationType,
-        Description: consultation.fields.Description,
+        Title: fields.Title,
+        ConsultationType: fields.ConsultationType,
+        Description: fields.Description,
 
-        Startdate: new Date(consultation.fields.Startdate),
-        Closed: new Date(consultation.fields.Closed),
-        Deadline: new Date(consultation.fields.Deadline),
-        Year: new Date(consultation.fields.Startdate).getFullYear(),
-        DaysLeft: differenceInDays(new Date(consultation.fields.Closed), currentDate),
-        DaysFinalised: differenceInDays(new Date(consultation.fields.Deadline), currentDate),
+        Startdate: new Date(fields.Startdate),
+        Closed: new Date(fields.Closed),
+        Deadline: new Date(fields.Deadline),
+        Year: parseInt(fields.Year.replace(',', '')),
+        DaysLeft: differenceInDays(new Date(fields.Closed), currentDate),
+        DaysFinalised: differenceInDays(new Date(fields.Deadline), currentDate),
 
-        Linktofolder: consultation.fields.LinktoFolder,
+        Linktofolder: fields.LinktoFolder,
         Respondants: respondants,
         HasUserCountryResponded: hasUserCountryResponded,
-        Countries: consultation.fields.Countries,
+        Countries: fields.Countries,
 
-        ConsulationmanagerLookupId: consultation.fields.ConsulationmanagerLookupId,
-        EionetGroups: consultation.fields.EionetGroups,
-        LinkToResults: consultation.fields.LinkToResults,
+        ConsulationmanagerLookupId: fields.ConsulationmanagerLookupId,
+        EionetGroups: fields.EionetGroups,
+        LinkToResults: fields.LinkToResults,
         ItemLink:
           config.ConsultationListItemUrl +
           itemLinkOperator +
           'FilterField1=ID&FilterValue1=' +
-          consultation.fields.id,
+          fields.id,
       };
     });
   } catch (err) {
@@ -217,7 +219,8 @@ export async function getMeetings(fromDate, country, userInfo) {
 
     return await Promise.all(
       meetings.map(async (meeting) => {
-        const meetingId = meeting.fields.id,
+        const fields = meeting.fields,
+          meetingId = fields.id,
           participants = allParticipants.filter((p) => p.MeetingId == meetingId),
           participantsCount = participants.filter((p) => {
             return p.Participated;
@@ -227,16 +230,17 @@ export async function getMeetings(fromDate, country, userInfo) {
           }).length;
 
         const currentDate = new Date(),
-          meetingStart = new Date(meeting.fields.Meetingstart),
-          meetingEnd = new Date(meeting.fields.Meetingend),
-          meetingTitle = meeting.fields.Title,
+          meetingStart = new Date(fields.Meetingstart),
+          meetingEnd = new Date(fields.Meetingend),
+          meetingTitle = fields.Title,
           isPast = meetingEnd < currentDate;
 
         const countryFilterSuffix = country
           ? '&FilterField3=Countries&FilterValue3=' + country
           : '';
         const meetingFilterSuffix =
-          '?FilterField1=Meetingtitle&FilterType1=Lookup&FilterValue1=' + meetingTitle;
+          '?FilterField1=Meetingtitle&FilterType1=Lookup&FilterValue1=' +
+          encodeURIComponent(meetingTitle);
 
         let currentParticipant =
           participants && participants.length && participants.find((p) => p.Email == userInfo.mail);
@@ -253,24 +257,24 @@ export async function getMeetings(fromDate, country, userInfo) {
           id: meetingId,
 
           Title: meetingTitle,
-          MeetingLink: meeting.fields.MeetingLink,
-          MeetingRegistrationLink: meeting.fields.MeetingRegistrationLink,
-          Group: meeting.fields.Group,
+          MeetingLink: fields.MeetingLink,
+          MeetingRegistrationLink: fields.MeetingRegistrationLink,
+          Group: fields.Group,
 
-          MeetingStart: new Date(meeting.fields.Meetingstart),
-          MeetingEnd: new Date(meeting.fields.Meetingend),
-          MeetingType: meeting.fields.MeetingType,
+          MeetingStart: new Date(fields.Meetingstart),
+          MeetingEnd: new Date(fields.Meetingend),
+          MeetingType: fields.MeetingType,
 
-          Year: meetingStart.getFullYear(),
-          Linktofolder: meeting.fields.Linktofolder,
+          Year: parseInt(fields.Year.replace(',', '')),
+          Linktofolder: fields.Linktofolder,
 
-          NoOfParticipants: country ? participantsCount : meeting.fields.NoOfParticipants,
+          NoOfParticipants: country ? participantsCount : fields.NoOfParticipants,
           ParticipantsUrl:
             config.MeetingParticipantsListUrl +
             meetingFilterSuffix +
             '&FilterField2=Participated&FilterValue2=1&FilterType2=Boolean' +
             countryFilterSuffix,
-          NoOfRegistered: country ? registerCount : meeting.fields.NoOfRegistered,
+          NoOfRegistered: country ? registerCount : fields.NoOfRegistered,
           RegisteredUrl:
             config.MeetingParticipantsListUrl +
             meetingFilterSuffix +
@@ -282,10 +286,10 @@ export async function getMeetings(fromDate, country, userInfo) {
           IsUpcoming: meetingStart > new Date(),
           IsPast: isPast,
 
-          IsOnline: meeting.fields.MeetingType && meeting.fields.MeetingType == 'Online',
-          IsOffline: meeting.fields.MeetingType && meeting.fields.MeetingType != 'Online',
+          IsOnline: fields.MeetingType && fields.MeetingType == 'Online',
+          IsOffline: fields.MeetingType && fields.MeetingType != 'Online',
 
-          CustomMeetingRequest: meeting.fields.CustomMeetingRequests,
+          CustomMeetingRequest: fields.CustomMeetingRequests,
 
           HasRegistered: !!currentParticipant?.Registered,
           HasVoted: !!currentParticipant?.Voted,
@@ -477,7 +481,7 @@ export async function getPublications() {
             ExtraCommsProducts: p.fields.Extra_x0020_comms_x0020_products,
             Status: p.fields.Status,
             Date: publicationDate,
-            Link: p.fields.Link,
+            Link: p.fields.Link?.Url,
             IsPast: publicationDate < currentDate,
           });
         });
@@ -767,7 +771,7 @@ export async function getADUser(lookupId) {
         const adResponse = await apiGet(
           "/users/?$filter=mail eq '" + userInfo.EMail?.replace("'", "''") + "'",
         );
-        return adResponse?.graphClientMessage?.value.length
+        return adResponse?.graphClientMessage?.value?.length
           ? adResponse?.graphClientMessage?.value[0]
           : undefined;
       }
@@ -788,7 +792,7 @@ async function loadRating(eventId) {
       ratingGraphURL + '?$expand=fields&$filter=fields/EventLookupId eq ' + eventId,
     );
 
-  if (response.graphClientMessage?.value.length) {
+  if (response.graphClientMessage?.value?.length) {
     return response.graphClientMessage.value[0];
   }
   return undefined;