eionet2-dashboard 1.8.3 → 1.8.4

package/CHANGELOG.md

@@ -4,6 +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.4](https://github.com/eea/eionet2-dashboard/compare/1.8.3...1.8.4) - 7 February 2024
+
+#### :bug: Bug Fixes
+
+- fix: correct link display(#262918) [Mihai Nicolae - [`7618693`](https://github.com/eea/eionet2-dashboard/commit/7618693abd56f4cb6d556b159e18b0714dbf80f4)]
+- fix: correct loading of statistics(#264598) [Mihai Nicolae - [`9ca7094`](https://github.com/eea/eionet2-dashboard/commit/9ca7094213fe0644d84bd399705693d153289ecb)]
+- fix: avoid redundant logging (#263854) [Mihai Nicolae - [`d6abb98`](https://github.com/eea/eionet2-dashboard/commit/d6abb98f6d1173ac44c78bbcd03dd850e20ae3af)]
+
+#### :house: Internal changes
+
+- chore: dependency resolution [Mihai Nicolae - [`88d3540`](https://github.com/eea/eionet2-dashboard/commit/88d35408310667b318ad0ab70768fb273ebcaba6)]
+- chore: dependency resolution [Mihai Nicolae - [`0fa1983`](https://github.com/eea/eionet2-dashboard/commit/0fa1983d51ab1d98debda7d114e6c0c48bf1b9e0)]
+- chore: remove undefined initialization [Mihai Nicolae - [`715aa2d`](https://github.com/eea/eionet2-dashboard/commit/715aa2df0ff2057e58f99a57c38d0b01c2de83f7)]
+- chore: small corrections [Mihai Nicolae - [`feddfb6`](https://github.com/eea/eionet2-dashboard/commit/feddfb6b1d53dddae98beb67f2dcf45b4f2f457e)]
+- chore: version update [Mihai Nicolae - [`b6bc895`](https://github.com/eea/eionet2-dashboard/commit/b6bc895938b977267c4410875330ccb65ad64b0b)]
+
 ### [1.8.3](https://github.com/eea/eionet2-dashboard/compare/1.8.2...1.8.3) - 26 January 2024
 
 #### :rocket: New Features

package/README.md

@@ -35,8 +35,8 @@ In its country the user have access to  information regarding:
 ### Account self-service
 
 This functionality offers users the option to manage/update their data themselves:
-- View current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP).
-- Update current user account data (with the exception of the attributes that can be updated only by an user with a higher authority - Admin or NFP).
+- View current user account data (with the exception of the attributes that can be updated only by a user with a higher authority - Admin or NFP).
+- Update current user account data (with the exception of the attributes that can be updated only by a user with a higher authority - Admin or NFP).
 
 ### Publications
 

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, enquiries 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.3",
+    "version": "1.8.4",
     "description": "",
     "author": "",
     "scripts": {

package/tabs/package-lock.json

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

package/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "license": "SEE LICENSE IN LICENSE.md",
   "description": "MS Teams app for accessing Eionet activity and managing account information.",
   "dependencies": {
@@ -86,7 +86,12 @@
     ]
   },
   "resolutions": {
-    "@azure/core-rest-pipeline": "1.12.1"
+    "@azure/core-rest-pipeline": "1.12.1",
+    "@azure/core-util": "1.5.0",
+    "@azure/core-auth": "1.4.0",
+    "@azure/core-client": "1.5.0",
+    "@azure/core-lro": "2.2.0",
+    "workbox-webpack-plugin": "6.4.1"
   },
   "homepage": "."
-}
+}

package/tabs/src/components/Tab.jsx

@@ -135,6 +135,7 @@ export default function Tab() {
     (async () => {
       setLoading(true);
       let me = await getMe();
+      setSelectedCountry(me.country);
       setUserInfo({
         isAdmin: me.isAdmin,
         isNFP: me.isNFP,
@@ -148,8 +149,6 @@ export default function Tab() {
         surname: me.surname,
       });
 
-      setSelectedCountry(me.country);
-
       if (me.isAdmin || !me.isEionetUser) {
         setCanChangeCountry(true);
         const loadedCountries = await getCountries();

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

@@ -45,7 +45,6 @@ export function IndicatorCard({ labelText, valueText, url, infoText }) {
         <Link
           sx={{ color: 'text.main' }}
           className="card-details"
-          color="secondary"
           component="button"
           variant="body1"
           onClick={() => {

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

@@ -19,7 +19,6 @@ import {
 } from '../../data/sharepointProvider';
 import { GroupsBoard } from './GroupsBoard';
 import './my_country.scss';
-import { getConfiguration } from '../../data/apiProvider';
 import { ScientificCommittee } from './ScientificCommittee';
 import { DataReporters } from './DataReporters';
 import TabPanel from '../TabPanel';
@@ -32,15 +31,14 @@ import GroupWorkIcon from '@mui/icons-material/GroupWork';
 import CustomDrawer from '../CustomDrawer';
 import { CountryMembers } from './CountryMembers';
 
-export function MyCountry({ userInfo, selectedCountry, drawerOpen }) {
+export function MyCountry({ userInfo, selectedCountry, configuration, drawerOpen }) {
   const [tabsValue, setTabsValue] = useState(0),
     [users, setUsers] = useState([]),
     [mappings, setMappings] = useState([]),
     [loading, setloading] = useState(false),
     [organisations, setOrganisations] = useState([]),
     [selectedCountryInfo, setSelectedCountryInfo] = useState({}),
-    [availableGroups, setAvailableGroups] = useState([]),
-    [configuration, setConfiguration] = useState({});
+    [availableGroups, setAvailableGroups] = useState([]);
 
   const loadData = (country) => {
     setloading(true);
@@ -70,11 +68,6 @@ export function MyCountry({ userInfo, selectedCountry, drawerOpen }) {
     (async () => {
       setloading(true);
 
-      const loadedConfiguration = await getConfiguration();
-      if (loadedConfiguration) {
-        setConfiguration(loadedConfiguration);
-      }
-
       loadData(selectedCountry);
 
       let loadedMappings = await getMappingsList();

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

@@ -90,7 +90,10 @@ export function ProgressGauge({ totalCount, responseCount, label, infoText, url
             width: '150px',
             height: '1rem',
             fontSize: '20px',
+            color: 'text.main',
           }}
+          component="button"
+          variant="body1"
           onClick={() => {
             url && window.open(url, '_blank');
           }}

package/tabs/src/data/apiProvider.js

@@ -33,7 +33,7 @@ export async function apiGet(path, credentialType = 'app', skipLog) {
   }
 }
 
-export async function apiPost(path, data, credentialType = 'app') {
+export async function apiPost(path, data, credentialType = 'app', skipLog) {
   try {
     return await callApiFunction('graphData', 'post', {
       credentialType: credentialType,
@@ -41,7 +41,7 @@ export async function apiPost(path, data, credentialType = 'app') {
       path: path,
     });
   } catch (err) {
-    logError(err, path, data);
+    !skipLog && logError(err, path, data);
     throw err;
   }
 }
@@ -72,7 +72,7 @@ export async function apiDelete(path, credentialType = 'app') {
   }
 }
 
-let _userMail = undefined;
+let _userMail;
 export async function getUserMail() {
   if (!_userMail) {
     const response = await apiGet('me?$select=id,displayName,mail,mobilePhone,country', 'user');
@@ -87,7 +87,7 @@ export async function getUserMail() {
 const sharepointSiteId = process.env.REACT_APP_SHAREPOINT_SITE_ID,
   configurationListId = process.env.REACT_APP_CONFIGURATION_LIST_ID;
 
-let _configuration = undefined;
+let _configuration;
 export async function getConfiguration() {
   try {
     if (!_configuration) {
@@ -108,8 +108,7 @@ export async function getConfiguration() {
 }
 
 export async function logError(err, apiPath, data) {
-  const spConfig = await getConfiguration(),
-    userMail = await getUserMail();
+  const userMail = await getUserMail();
 
   const title = err.response?.data?.error?.body || err.message;
 
@@ -125,9 +124,16 @@ export async function logError(err, apiPath, data) {
     },
   };
 
-  let graphURL =
-    '/sites/' + spConfig.SharepointSiteId + '/lists/' + spConfig.LoggingListId + '/items';
-  await apiPost(graphURL, fields);
+  if (_configuration) {
+    await apiPost(
+      `/sites/${_configuration.SharepointSiteId}/lists/${_configuration.LoggingListId}/items`,
+      fields,
+      'app',
+      true,
+    );
+  } else {
+    console.log('Configuration not loaded cannot proceed');
+  }
 }
 
 export async function logInfo(message, apiPath, data, action) {

package/tabs/src/data/icsHelper.js

@@ -2,8 +2,7 @@ import { createEvent } from 'ics';
 import { differenceInMinutes, format } from 'date-fns';
 
 export function createIcs(meeting) {
-  let result = undefined,
-    duration = undefined;
+  let result, duration;
   const meetingStart = new Date(meeting.MeetingStart);
   const durationInMinutes = differenceInMinutes(new Date(meeting.MeetingEnd), meetingStart);
   if (durationInMinutes >= 60) {

package/tabs/src/data/messages.json

@@ -9,8 +9,8 @@
       "JoiningTeam": "The user could not be added to the Eionet teams. Please use the Manage user tab to update the user Membership(s)",
       "TagsCreation": "The tags could not be updated. Please use the Manage user tab to update the user Membership(s)",
       "SharepointUser": "User details could not be updated in the SharePoint Users list.",
-      "Mail": "An error has occured during the sending invitation email.",
-      "Error": "An error has occured during the invitation process."
+      "Mail": "An error has occurred during the sending invitation email.",
+      "Error": "An error has occurred during the invitation process."
     }
   },
   "UserList": {
@@ -22,13 +22,13 @@
     "MissingMembership": "At least one the following fields must be selected Eionet groups, Other memberships or NFP.",
     "Errors": {
       "ADUserCreation": "Could not update the user contact data.",
-      "Mail": "An error has occured during the sending inviation email.",
+      "Mail": "An error has occurred during the sending invitation email.",
       "Invitation": "Could not create the user invitation.",
       "ADUser": "Could not update the user contact data.",
       "JoiningTeam": "The user could not be added to the Eionet teams. Please use the Manage user tab to update the user Membership(s)",
       "TagsCreation": "The tags could not be updated. Please use the Manage user tab to update the user Membership(s)",
       "SharepointUser": "User details could not be updated in the SharePoint Users list.",
-      "Error": "An error has occured when saving user information."
+      "Error": "An error has occurred when saving user information."
     }
   },
   "UserDelete": {

package/tabs/src/data/provider.js

@@ -1,7 +1,7 @@
 import { apiGet, getConfiguration, apiPost, logInfo, logError } from './apiProvider';
 import { getSPUserByMail, getMeetingManager, getOrganisationList } from './sharepointProvider';
 
-let _profile = undefined;
+let _profile;
 export async function getMe() {
   if (!_profile) {
     const config = await getConfiguration(),
@@ -149,7 +149,7 @@ export async function sendEmail(subject, text, emails, attachment) {
 
     const attachments = [];
     if (attachment) {
-      let buffer = undefined;
+      let buffer;
       const reader = new FileReader();
 
       const promise = new Promise((resolve) => {

package/tabs/src/data/sharepointProvider.js

@@ -39,7 +39,7 @@ export async function getOrganisationList(country) {
   }
 }
 
-let mappingsList = undefined;
+let mappingsList;
 export async function getMappingsList() {
   const config = await getConfiguration();
   try {
@@ -850,7 +850,6 @@ export async function postRating(event, participant, value) {
       await apiPost(ratingGraphURL, ratingData);
       success = true;
     } catch (err) {
-      //await logError(err);
       success = false;
     }
   }