Merge pull request #32 from eea/develop

Develop

CHANGELOG.md

@@ -4,6 +4,16 @@ 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.2.4](https://github.com/eea/eionet2-user-management/compare/1.2.3...1.2.4) - 14 December 2023
+
+#### :bug: Bug Fixes
+
+- fix: filter and user removal [Mihai Nicolae - [`027bafb`](https://github.com/eea/eionet2-user-management/commit/027bafbe881b8da7c417bb4c88685a66c38c7375)]
+
+#### :house: Internal changes
+
+- chore: prettier [Mihai Nicolae - [`4685342`](https://github.com/eea/eionet2-user-management/commit/46853428f6964cdf623f60d2d1c1a5d11e039982)]
+
 ### [1.2.3](https://github.com/eea/eionet2-user-management/compare/1.2.2...1.2.3) - 13 December 2023
 
 #### :bug: Bug Fixes
@@ -237,6 +247,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Fix test [Mihai Nicolae - [`94aa600`](https://github.com/eea/eionet2-user-management/commit/94aa600db6189e795bbdfe3a7a32700086af6ba4)]
 - Update Jenkinsfile [valentinab25 - [`41315e5`](https://github.com/eea/eionet2-user-management/commit/41315e5fcd6bb192b3e830e55dd2b56e31ff96ee)]
 - Add missing packages for testing [valentinab25 - [`63eac6a`](https://github.com/eea/eionet2-user-management/commit/63eac6a3d2c84995c9556bbc3403df29c63058c5)]
+- [JENKINSFILE] add job [valentinab25 - [`7b2cbef`](https://github.com/eea/eionet2-user-management/commit/7b2cbefd71cd34007ba373640ebfef6a4858c4d8)]
 ### 0.0.1 - 21 July 2022
 
 #### :hammer_and_wrench: Others

package.json

@@ -1,6 +1,6 @@
 {
     "name": "eionet2-user-management",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "",
     "author": "",
     "scripts": {
@@ -22,4 +22,4 @@
         "@fluentui/react-teams": "^6.0.0",
         "@mui/material": "^5.5.1"
     }
-}
+}

tabs/src/components/UserList.jsx

@@ -300,6 +300,7 @@ export function UserList({ userInfo }) {
                 u.Country.toLowerCase().includes(value.toLowerCase()) ||
                 u.Organisation.toLowerCase().includes(value.toLowerCase()) ||
                 (u.Title && u.Title.toLowerCase().includes(value.toLowerCase())) ||
+                (u.NFP && u.NFP.toLowerCase().includes(value.toLowerCase())) ||
                 (u.Membership &&
                   u.Membership.some((m) => m.toLowerCase().includes(value.toLowerCase()))) ||
                 (u.OtherMemberships &&

tabs/src/data/provider.js

@@ -482,9 +482,16 @@ export async function editUser(user, mappings, oldValues) {
     }
 
     if (user.NFP && !oldValues.NFP) {
-      await postUserGroup(config.NFPGroupId, user.ADUserId);
+      const nfpGroupIds = [
+        ...new Set([config.NFPGroupId, config.MainEionetGroupId].filter((g) => !!g)),
+      ];
 
-      if (!newGroups.includes(config.MainEionetGroupId)) {
+      const existingNFPGroups = await getExistingGroups(user.ADUserId, nfpGroupIds);
+
+      if (!existingNFPGroups?.includes(config.NFPGroupId)) {
+        await postUserGroup(config.NFPGroupId, user.ADUserId);
+      }
+      if (!existingNFPGroups?.includes(config.MainEionetGroupId)) {
         await postUserGroup(config.MainEionetGroupId, user.ADUserId);
       }