feat: groups filtering(#271860)

eea · Aug 5, 2024 · 6da2e21 · 6da2e21
1 parent 1833532
commit 6da2e21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tabs/src/components/my_country/MyCountry.jsx b/tabs/src/components/my_country/MyCountry.jsx
@@ -30,6 +30,7 @@ import GroupsIcon from '@mui/icons-material/Groups';
 import GroupWorkIcon from '@mui/icons-material/GroupWork';
 import CustomDrawer from '../CustomDrawer';
 import { CountryMembers } from './CountryMembers';
+import Constants from '../../data/constants.json';
 
 import { useAppInsightsContext } from '@microsoft/applicationinsights-react-js';
 
@@ -60,7 +61,11 @@ export function MyCountry({ userInfo, selectedCountry, configuration, drawerOpen
       loadedOrganisations && setOrganisations(loadedOrganisations);
     });
     getAvailableGroups().then((loadedGroups) => {
-      setAvailableGroups(loadedGroups);
+      setAvailableGroups(
+        loadedGroups.filter(
+          (gr) => gr && !gr.toLowerCase().startsWith(Constants.WorkingGroupPrefix),
+        ),
+      );
     });
     getCountryCodeMappingsList().then((loadedCountries) => {
       selectedCountry &&

diff --git a/tabs/src/data/sharepointProvider.js b/tabs/src/data/sharepointProvider.js
@@ -10,6 +10,7 @@ import {
 import { format, differenceInDays, addDays } from 'date-fns';
 import { sendEmail } from './provider';
 import { createIcs } from './icsHelper';
+import Constants from './constants.json';
 
 function wrapError(err, message) {
   return {
@@ -279,6 +280,7 @@ export async function getMeetings(fromDate, country, userInfo) {
           MeetingStart: new Date(fields.Meetingstart),
           MeetingEnd: new Date(fields.Meetingend),
           MeetingType: fields.MeetingType,
+          EventCategory: fields.EventCategory,
 
           Year: parseInt(fields.Year.replace(',', '')),
           Linktofolder: fields.Linktofolder,
@@ -471,7 +473,9 @@ export function getGroups(users, removeWorkingGroups = false) {
   }
 
   if (removeWorkingGroups) {
-    groups = groups.filter((gr) => gr && gr.toLowerCase().startsWith('wg-'));
+    groups = groups.filter(
+      (gr) => gr && !gr.toLowerCase().startsWith(Constants.WorkingGroupPrefix),
+    );
   }
   return [...new Set(groups)];
 }