eionet2-dashboard 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.6.0](https://github.com/eea/eionet2-dashboard/compare/1.5.0...1.6.0) - 3 November 2023
+
+#### :rocket: New Features
+
+- feat: filter publications(#257970) [Mihai Nicolae - [`79764e2`](https://github.com/eea/eionet2-dashboard/commit/79764e24badc8b3c25821a37344f4dc549a3c30b)]
+- feat: various ui improvements [Mihai Nicolae - [`4134ced`](https://github.com/eea/eionet2-dashboard/commit/4134ced67667448267ab9bd615dfe23a7222397a)]
+
+#### :house: Internal changes
+
+- chore: manifest updates (#260093) [Mihai Nicolae - [`49a31fd`](https://github.com/eea/eionet2-dashboard/commit/49a31fdbc22188febad9fe17914bdefa6f75f949)]
+- chore: changes after prod deployment [Mihai Nicolae - [`ee787a6`](https://github.com/eea/eionet2-dashboard/commit/ee787a61b4f56666d8d2141869a6fc28b9181bfa)]
+- chore: readme updates [Mihai Nicolae - [`bd96a66`](https://github.com/eea/eionet2-dashboard/commit/bd96a66cb811827db5fa983220d1c775cb4b82a2)]
+
+### [1.5.0](https://github.com/eea/eionet2-dashboard/compare/1.4.2...1.5.0) - 26 October 2023
+
+#### :house: Internal changes
+
+- chore: version update [Mihai Nicolae - [`a1815e7`](https://github.com/eea/eionet2-dashboard/commit/a1815e787e3692c906c717c34ad737d909582d26)]
+- chore: version upgrade [Mihai Nicolae - [`87a9f98`](https://github.com/eea/eionet2-dashboard/commit/87a9f98af5396a60f9f2a7f1a03c47988126b496)]
+
 ### [1.4.2](https://github.com/eea/eionet2-dashboard/compare/1.4.1...1.4.2) - 26 October 2023
 
 #### :rocket: New Features

package/CONFIGURATION.md

@@ -0,0 +1,3 @@
+### [1.6.0]
+Configuration keys
+    - PublicationsText - contains values used the filter the displayed publications. Use semicolon to separate values. Check is not case sensitive.

package/README.md

@@ -2,43 +2,58 @@
 
 [![GitHub release](https://img.shields.io/github/v/release/eea/eionet2-dashboard)](https://github.com/eea/eionet2-dashboard/releases)
 
-This (MS Teams) application implements dashboard type (view-at-a-glance) functionalities for Eionet 2.0.
-Through this application, the user have access to information regarding:
+Through this application, the users have access to information regarding:
 - General Eionet activity (events, consultations, surveys, reports)
 - Specific country information (management board, NFPs, ETCs, Eionet groups etc.) - Eionet in my country
+- User account self management
 - Publications
+- Reporting
 
 The application is available to all Eionet 2.0 users.
 The data displayed is retrieved from the EEA Azure tenant and from an internal EEA SharePoint Online instance.
 
 ### General Eionet activity
 
-This tab is available for all users. In this tab, the users can find information about:
-- Events.
+This functionality is available for all users. In this tab, the users can find information about (and register):
+- Events (that can be rated).
 - Consultations.
 - The (Admin or NFP) user enters the user attributes (contact data, roles, organizations etc.).
 - Inquiries.
 - Reports.
-The displayed information is a selected subtype of the full 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 folders.
+The displayed information is a selected subtype of the full 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 folders in SharePoint.
 
 ### Eionet in my country
 
-In this country the users have access to statistical information regarding:
+In its country the user have access to  information regarding:
 - Active and pending invitation users
 - The management board
 - The number of groups, organisations
 - Information about NFPs, ETCs etc.
 - Specific country information about events, consultations, surveys, reports
 
-## Publications
+### 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) 
+
+### Publications
 
 In this tab the users have access to information about Eionet publications.
 
+### Reporting
+
+_Under construction_
+
+<br/>
+
 ## Getting started
 
 The application is available as a "tab" application in the MS Teams Eionet 2.0 teams.
 When opening this tab, the users will see the Dashboard application, with two sets of tabs, corresponding to the functionalities presented above.
 
+<br/>
+
 ## Release
 
 See [RELEASE.md](https://github.com/eea/eionet2-dashboard/blob/master/RELEASE.md).
@@ -49,7 +64,7 @@ For now the contributions are not open outside the internal EEA project team.
 
 ## Copyright and license
 
-The Initial Owner of the Original Code is [European Environment Agency (EEA)](http://eea.europa.eu).
+The Initial Owner of the Original Code is the [European Environment Agency (EEA)](http://eea.europa.eu).
 All Rights Reserved.
 
 See [LICENSE.md](https://github.com/eea/eionet2-dashboard/blob/master/LICENSE.md) for details.

package/appPackage/manifest.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.11/MicrosoftTeams.schema.json",
     "manifestVersion": "1.11",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.microsoft.teams.extension",
     "developer": {
@@ -20,7 +20,7 @@
     },
     "description": {
         "short": "Eionet Dashboard",
-        "full": "Available to all Eionet users and shows relevant country information & events and consultations"
+        "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."
     },
     "accentColor": "#FFFFFF",
     "bots": [],

package/env/.env.Prod_EEA

@@ -32,6 +32,13 @@ PROVISIONOUTPUT__IDENTITYOUTPUT__IDENTITYRESOURCEID=/subscriptions/2e921569-0c14
 PROVISIONOUTPUT__IDENTITYOUTPUT__IDENTITYCLIENTID=25d0e402-1496-4255-8e13-74b7f5661aac
 PROVISIONOUTPUT__FUNCTIONOUTPUT__FUNCTIONAPPRESOURCEID=/subscriptions/2e921569-0c14-4082-ad47-bd65b64ec3d3/resourceGroups/eionet_user_management-Prod_EEA-rg/providers/Microsoft.Web/sites/eionet2dasprodf6d33eapi
 PROVISIONOUTPUT__FUNCTIONOUTPUT__FUNCTIONENDPOINT=https://eionet2dasprodf6d33eapi.azurewebsites.net
-
+ 
 REACT_APP_SHAREPOINT_SITE_ID=9ec66e9b-9f90-4796-b50b-612ae7f8a882
-REACT_APP_CONFIGURATION_LIST_ID=5fe7b50d-43cd-404c-a514-a16b665a6e69
+REACT_APP_CONFIGURATION_LIST_ID=5fe7b50d-43cd-404c-a514-a16b665a6e69
+PROVISIONOUTPUT__FRONTENDHOSTINGOUTPUT__TEAMSFXPLUGINID=fx-resource-frontend-hosting
+PROVISIONOUTPUT__IDENTITYOUTPUT__TEAMSFXPLUGINID=fx-resource-identity
+PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__TEAMSFXPLUGINID=fx-resource-simple-auth
+PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__ENDPOINT=https://eionet2dasprodf6d33esimpleauth.azurewebsites.net
+PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__WEBAPPRESOURCEID=/subscriptions/2e921569-0c14-4082-ad47-bd65b64ec3d3/resourceGroups/eionet_user_management-Prod_EEA-rg/providers/Microsoft.Web/sites/eionet2dasprodf6d33esimpleAuth
+PROVISIONOUTPUT__FUNCTIONOUTPUT__TEAMSFXPLUGINID=fx-resource-function
+DOTNET_PATH=C:\Users\Hettich\.fx\bin\dotnet

package/env/.env.dev

@@ -42,4 +42,5 @@ PROVISIONOUTPUT__FUNCTIONOUTPUT__TEAMSFXPLUGINID=fx-resource-function
 DOTNET_PATH=/usr/share/dotnet
 
 REACT_APP_SHAREPOINT_SITE_ID=7lcpdm.sharepoint.com,bf9359de-0f13-4b00-8b5a-114f6ef3bfb0,6609a994-5225-4a1d-bd05-a239c7b45f72
-REACT_APP_CONFIGURATION_LIST_ID=010b1be2-0df5-4ab1-b2a7-17e010aae775
+REACT_APP_CONFIGURATION_LIST_ID=010b1be2-0df5-4ab1-b2a7-17e010aae775
+TEAMS_APP_PUBLISHED_APP_ID=9b7ad10e-2c90-4414-9fa8-579d3792aaad

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eionet2-dashboard",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "description": "",
     "author": "",
     "scripts": {

package/tabs/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5625,6 +5625,12 @@
         }
       }
     },
+    "css-mediaquery": {
+      "version": "0.1.2",
+      "resolved": "https://nexus.dudes.local/repository/npm/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
+      "integrity": "sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q==",
+      "dev": true
+    },
     "css-minimizer-webpack-plugin": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
@@ -10591,6 +10597,15 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
       "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="
     },
+    "matchmediaquery": {
+      "version": "0.3.1",
+      "resolved": "https://nexus.dudes.local/repository/npm/matchmediaquery/-/matchmediaquery-0.3.1.tgz",
+      "integrity": "sha512-Hlk20WQHRIm9EE9luN1kjRjYXAQToHOIAHPJn9buxBwuhfTHoKUcX+lXBbxc85DVQfXYbEQ4HcwQdd128E3qHQ==",
+      "dev": true,
+      "requires": {
+        "css-mediaquery": "^0.1.2"
+      }
+    },
     "mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -12726,6 +12741,18 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
     },
+    "react-responsive": {
+      "version": "9.0.2",
+      "resolved": "https://nexus.dudes.local/repository/npm/react-responsive/-/react-responsive-9.0.2.tgz",
+      "integrity": "sha512-+4CCab7z8G8glgJoRjAwocsgsv6VA2w7JPxFWHRc7kvz8mec1/K5LutNC2MG28Mn8mu6+bu04XZxHv5gyfT7xQ==",
+      "dev": true,
+      "requires": {
+        "hyphenate-style-name": "^1.0.0",
+        "matchmediaquery": "^0.3.0",
+        "prop-types": "^15.6.1",
+        "shallow-equal": "^1.2.1"
+      }
+    },
     "react-router": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.3.tgz",

package/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-dashboard",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "license": "MIT",
   "description": "Teams app for managing Eionet users.",
   "dependencies": {
@@ -38,6 +38,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest-junit": "^14.0.0",
     "prettier": "^2.6.2",
+    "react-responsive": "^9.0.2",
     "stylelint": "^14.8.5",
     "stylelint-config-idiomatic-order": "^8.1.0",
     "stylelint-config-prettier": "^9.0.3",

package/tabs/src/components/Tab.jsx

@@ -1,4 +1,5 @@
 import { React, useState, useEffect, useCallback } from 'react';
+import { useMediaQuery } from 'react-responsive';
 
 import { getMe } from '../data/provider';
 import { useConfiguration } from '../data/hooks/useConfiguration';
@@ -25,6 +26,8 @@ import { ThemeProvider, createTheme } from '@mui/material/styles';
 
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import CloseIcon from '@mui/icons-material/Close';
+import MenuIcon from '@mui/icons-material/Menu';
+import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
 
 import './Tab.scss';
 
@@ -99,6 +102,7 @@ const theme = createTheme({
 });
 
 export default function Tab() {
+  const isMobile = useMediaQuery({ query: `(max-width: 768px)` });
   const configuration = useConfiguration();
 
   const version = process.env.REACT_APP_VERSION;
@@ -124,7 +128,8 @@ export default function Tab() {
     [selectedEvent, setSelectedEvent] = useState({}),
     [approvalVisible, setApprovalVisible] = useState(false),
     [ratingVisible, setRatingVisible] = useState(false),
-    [versionDialogOpen, setVersionDialogOpen] = useState(false);
+    [versionDialogOpen, setVersionDialogOpen] = useState(false),
+    [drawerOpen, setDraweOpen] = useState(!isMobile);
 
   useEffect(() => {
     (async () => {
@@ -236,6 +241,9 @@ export default function Tab() {
     },
     handleVersionDialogClose = () => {
       setVersionDialogOpen(false);
+    },
+    handleDrawerOpen = () => {
+      setDraweOpen(!drawerOpen);
     };
 
   const nonIsoCountryCodes = {
@@ -265,6 +273,17 @@ export default function Tab() {
           sx={{ zIndex: (theme) => theme.zIndex.drawer + 1 }}
         >
           <Toolbar>
+            {isMobile && (
+              <IconButton
+                color="inherit"
+                aria-label="open drawer"
+                onClick={handleDrawerOpen}
+                edge="start"
+              >
+                {!drawerOpen && <MenuIcon />}
+                {drawerOpen && <ChevronLeftIcon />}
+              </IconButton>
+            )}
             <MenuItem onClick={() => onMenuClick(1)}>
               <Typography
                 color="suplementary.text"
@@ -290,7 +309,17 @@ export default function Tab() {
             {canChangeCountry && (
               <Autocomplete
                 sx={{
-                  width: '5%',
+                  width: 100,
+                  [theme.breakpoints.up('sm')]: {
+                    width: 80,
+                  },
+                }}
+                componentsProps={{
+                  paper: {
+                    sx: {
+                      width: 100,
+                    },
+                  },
                 }}
                 disablePortal
                 id="country"
@@ -376,6 +405,7 @@ export default function Tab() {
               setData4Menu={setData4Menu}
               openRating={openRating}
               openApproval={openApproval}
+              drawerOpen={drawerOpen}
             />
           )}
           {myCountryVisible() && (
@@ -383,6 +413,7 @@ export default function Tab() {
               userInfo={userInfo}
               selectedCountry={selectedCountry}
               configuration={configuration}
+              drawerOpen={drawerOpen}
             />
           )}
           {selfServiceVisible() && <UserEdit user={selfInfo} />}

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

@@ -19,7 +19,7 @@ import { ConsultationList } from './ConsultationList';
 import { EventList } from './EventList';
 import { getConsultations, getMeetings, getPublications } from '../../data/sharepointProvider';
 import CustomDrawer from '../CustomDrawer';
-import { PublicatonList } from './Publications';
+import { PublicatonList } from './PublicationList';
 
 export function Activity({
   userInfo,
@@ -28,6 +28,7 @@ export function Activity({
   setData4Menu,
   openRating,
   openApproval,
+  drawerOpen,
 }) {
   const [tabsValue, setTabsValue] = useState(0),
     [pastMeetings, setPastMeetings] = useState([]),
@@ -207,8 +208,8 @@ export function Activity({
       fromDate.setMonth(fromDate.getMonth() - monthsBehind);
 
       const loadedMeetings = await getMeetings(fromDate, country, userInfo),
-        loadedConsultations = await getConsultations(undefined, fromDate, country),
-        loadedPublications = await getPublications();
+        loadedConsultations = await getConsultations(undefined, fromDate, country);
+      let loadedPublications = await getPublications();
 
       if (loadedMeetings) {
         setCurrentMeetings(
@@ -286,6 +287,12 @@ export function Activity({
       }
 
       if (loadedPublications) {
+        const typeFilter = configuration.PublicationsType
+          ? configuration.PublicationsType.split(';').map((p) => p.toLowerCase())
+          : [];
+        loadedPublications = loadedPublications.filter(
+          (p) => !p.ItemType || p.ItemType.some((it) => typeFilter.includes(it.toLowerCase())),
+        );
         setFuturePublications(loadedPublications.filter((p) => !p.IsPast));
         setPastPublications(loadedPublications.filter((p) => p.IsPast));
       }
@@ -303,7 +310,7 @@ export function Activity({
         >
           <CircularProgress color="primary" />
         </Backdrop>
-        <CustomDrawer drawerOptions={drawerOptions}></CustomDrawer>
+        {drawerOpen && <CustomDrawer drawerOptions={drawerOptions}></CustomDrawer>}
         <Box sx={{ width: '100%' }}>
           {tabsValue >= 0 && tabsValue <= 2 && (
             <EventList

package/tabs/src/components/activity/{Publications.jsx → PublicationList.jsx}

@@ -26,35 +26,43 @@ export function PublicatonList({
         </Typography>
       );
     },
-    renderChips = (params) => {
+    renderTypes = (params) => {
+      return renderChips(params.row.ItemType);
+    },
+    renderProducts = (params) => {
+      return renderChips(params.row.ExtraCommsProducts);
+    },
+    renderChips = (data) => {
       let index = 0;
-      const products = params.row.ExtraCommsProducts;
-      return (
-        <Tooltip title={products.join(', ') || ''} arrow>
-          <div id="test">
-            {products.map((m) => (
-              <Chip variant="outlined" color="primary" key={index++} label={m} />
-            ))}
-          </div>
-        </Tooltip>
-      );
+      if (data && data.length) {
+        return (
+          <Tooltip title={data.join(', ') || ''} arrow>
+            <div id="chipContainer">
+              {data.map((m) => (
+                <Chip variant="outlined" color="primary" key={index++} label={m} />
+              ))}
+            </div>
+          </Tooltip>
+        );
+      }
     };
 
   const gridColumns = [
     {
       field: 'Title',
-      headerName: 'Event',
+      headerName: 'Title',
       flex: 1,
     },
     {
       field: 'ItemType',
       headerName: 'Type',
+      renderCell: renderTypes,
       flex: 0.5,
     },
     {
       field: 'ExtraCommsProducts',
       headerName: 'Products',
-      renderCell: renderChips,
+      renderCell: renderProducts,
       flex: 0.5,
     },
     {
@@ -89,7 +97,7 @@ export function PublicatonList({
                   sortModel: [
                     {
                       field: 'Date',
-                      sort: 'desc',
+                      sort: 'asc',
                     },
                   ],
                 },

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

@@ -1,10 +1,18 @@
 import { React, useState } from 'react';
-import { Box, ListItem, ListItemButton, ListItemText } from '@mui/material';
+import { Box, ListItem, ListItemButton, ListItemText, IconButton } from '@mui/material';
+
+import MenuIcon from '@mui/icons-material/Menu';
+import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
+
+import { useMediaQuery } from 'react-responsive';
+
 import { GroupView } from './GroupView';
 import CustomDrawer from '../CustomDrawer';
 
 export function GroupsBoard({ users, mappings }) {
-  const [groupIndex, setGroupIndex] = useState(0),
+  const isMobile = useMediaQuery({ query: `(max-width: 768px)` });
+  const [drawerOpen, setDraweOpen] = useState(!isMobile),
+    [groupIndex, setGroupIndex] = useState(0),
     groups = mappings
       .map((m) => {
         const filteredUsers = users.filter((user) => {
@@ -48,6 +56,10 @@ export function GroupsBoard({ users, mappings }) {
       </div>
     );
 
+  const handleDrawerOpen = () => {
+    setDraweOpen(!drawerOpen);
+  };
+
   return (
     <Box
       sx={{
@@ -58,7 +70,15 @@ export function GroupsBoard({ users, mappings }) {
         background: 'white',
       }}
     >
-      <CustomDrawer drawerOptions={drawerOptions}></CustomDrawer>
+      <Box sx={{ display: 'flex' }}>
+        {isMobile && (
+          <IconButton sx={{ alignSelf: 'flex-start' }} onClick={handleDrawerOpen}>
+            {!drawerOpen && <MenuIcon />}
+            {drawerOpen && <ChevronLeftIcon />}
+          </IconButton>
+        )}
+        {drawerOpen && <CustomDrawer drawerOptions={drawerOptions}></CustomDrawer>}
+      </Box>
       <GroupView group={groups[groupIndex]}></GroupView>
     </Box>
   );

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

@@ -29,7 +29,7 @@ import GroupIcon from '@mui/icons-material/Group';
 import GroupWorkIcon from '@mui/icons-material/GroupWork';
 import CustomDrawer from '../CustomDrawer';
 
-export function MyCountry({ userInfo, selectedCountry }) {
+export function MyCountry({ userInfo, selectedCountry, drawerOpen }) {
   const [tabsValue, setTabsValue] = useState(0),
     [users, setUsers] = useState([]),
     [mappings, setMappings] = useState([]),
@@ -135,7 +135,7 @@ export function MyCountry({ userInfo, selectedCountry }) {
         <CircularProgress color="primary" />
       </Backdrop>
 
-      <CustomDrawer drawerOptions={drawerOptions}> </CustomDrawer>
+      {drawerOpen && <CustomDrawer drawerOptions={drawerOptions}> </CustomDrawer>}
       <Box sx={{ width: '100%' }}>
         <TabPanel value={tabsValue} index={0}>
           <AtAGlance

package/tabs/src/data/icsHelper.js

@@ -1,5 +1,5 @@
 import { createEvent } from 'ics';
-import { differenceInMinutes } from 'date-fns';
+import { differenceInMinutes, format } from 'date-fns';
 
 export function createIcs(meeting) {
   let result = undefined,
@@ -17,15 +17,10 @@ export function createIcs(meeting) {
     };
   }
   const event = {
-    start: [
-      meetingStart.getFullYear(),
-      meetingStart.getMonth(),
-      meetingStart.getDate(),
-      meetingStart.getHours(),
-      meetingStart.getMinutes(),
-    ],
+    start: format(meetingStart, 'yyyy-M-d-H-m').split('-').map(Number),
     duration: duration,
     title: meeting.Title,
+    organizer: { name: 'EEA' },
     ...(meeting.MeetingLink && { url: meeting.MeetingLink }),
   };
 

package/tabs/src/data/sharepointProvider.js

@@ -606,7 +606,7 @@ function getNotificationBody(config, event, forNFP) {
 function replacePlaceholders(property, event) {
   if (property) {
     property = property.replaceAll(MEETING_TITLE_PLACEHOLDER, event.Title);
-    property = property.replaceAll(MEETING_JOIN_URL_PLACEHOLDER, event.MeetingLink);
+    property = property.replaceAll(MEETING_JOIN_URL_PLACEHOLDER, event.MeetingLink || '');
   }
 
   //event.MeetingJoinContent && (property += event.MeetingJoinContent);
@@ -680,10 +680,10 @@ export async function getADUserInfos(lookupIds) {
         const userInfo = await getADUser(lookupId);
         if (userInfo && userInfo.id) {
           const userId = userInfo.id;
+          userInfo.lookupId = lookupId;
           try {
             const response = await apiGet('/users/' + userId + '/photos/64x64/$value', 'app', true);
             userInfo.base64Photo = response?.graphClientMessage;
-            userInfo.lookupId = lookupId;
           } catch (error) {
             console.log(error);
           }