chore: version

eea · Sep 8, 2023 · 9754048 · 9754048
1 parent d28dbf3
commit 9754048
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 100 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "eionet2-user-management",
-    "version": "1.1.6",
+    "version": "1.1.7",
     "description": "",
     "author": "",
     "scripts": {

diff --git a/tabs/package-lock.json b/tabs/package-lock.json
diff --git a/tabs/package.json b/tabs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/eionet2-user-management",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "license": "MIT",
   "description": "Teams app for managing Eionet users.",
   "dependencies": {
@@ -85,4 +85,4 @@
     ]
   },
   "homepage": "."
-}
+}
diff --git a/tabs/src/components/UserInvite.jsx b/tabs/src/components/UserInvite.jsx
@@ -49,11 +49,11 @@ export function UserInvite({ userInfo, refreshList, configuration }) {
   }, [selectedUser, userInfo]);
 
   const onInputEmailChange = (e) => {
-    setInputEmail(e.target.value);
-    setSelectedUser(defaultUser);
-    setWarningVisible(false);
-    setFormVisible(false);
-  },
+      setInputEmail(e.target.value);
+      setSelectedUser(defaultUser);
+      setWarningVisible(false);
+      setFormVisible(false);
+    },
     onCheckEmail = async () => {
       setFormVisible(false);
       setLoading(true);

diff --git a/tabs/src/components/UserList.jsx b/tabs/src/components/UserList.jsx
@@ -39,7 +39,6 @@ import DeleteDialog from './DeleteDialog';
 import ResizableGrid from './ResizableGrid';
 import { HtmlBox } from './HtmlBox';
 
-
 export function UserList({ userInfo }) {
   const isMobile = useMediaQuery({ query: `(max-width: 760px)` });
   const [users, setUsers] = useState([]),
@@ -60,101 +59,101 @@ export function UserList({ userInfo }) {
     [snackbarOpen, setSnackbarOpen] = useState(false);
 
   const renderButtons = (params) => {
-    const user = params.row;
-    const showEdit = user && (!userInfo.isNFP || (userInfo.isNFP && !user.EEANominated)),
-      showRemoveMemberships =
-        user &&
-        userInfo.isNFP &&
-        !user.EEANominated &&
-        (user.OtherMemberships?.length > 0 || user.NFP) &&
-        user.Membership?.length > 0,
-      showRemoveUser =
-        user &&
-        ((userInfo.isNFP && !user.OtherMemberships?.length && !user.NFP && !user.EEANominated) ||
-          userInfo.isAdmin);
-    return (
-      <div className="row">
-        <strong>
-          {showEdit && (
-            <Tooltip title="Edit">
-              <IconButton
-                variant="contained"
-                color="secondary"
-                size="small"
-                onClick={async () => {
-                  setFormVisible(false);
-                  let missingUser = user.ADUserId === undefined;
-                  if (user.ADUserId) {
-                    const userDetails = await getUser(user.ADUserId);
-                    missingUser = userDetails === undefined;
-                    if (userDetails) {
+      const user = params.row;
+      const showEdit = user && (!userInfo.isNFP || (userInfo.isNFP && !user.EEANominated)),
+        showRemoveMemberships =
+          user &&
+          userInfo.isNFP &&
+          !user.EEANominated &&
+          (user.OtherMemberships?.length > 0 || user.NFP) &&
+          user.Membership?.length > 0,
+        showRemoveUser =
+          user &&
+          ((userInfo.isNFP && !user.OtherMemberships?.length && !user.NFP && !user.EEANominated) ||
+            userInfo.isAdmin);
+      return (
+        <div className="row">
+          <strong>
+            {showEdit && (
+              <Tooltip title="Edit">
+                <IconButton
+                  variant="contained"
+                  color="secondary"
+                  size="small"
+                  onClick={async () => {
+                    setFormVisible(false);
+                    let missingUser = user.ADUserId === undefined;
+                    if (user.ADUserId) {
+                      const userDetails = await getUser(user.ADUserId);
+                      missingUser = userDetails === undefined;
+                      if (userDetails) {
+                        user.FirstName = userDetails.givenName;
+                        user.LastName = userDetails.surname;
+                        setSelectedUser(user);
+                        setFormVisible(true);
+                      }
+                    }
+                    setAlertOpen(missingUser);
+                    missingUser && logInfo(messages.UserList.MissingADUser, '', user, 'Edit user');
+                  }}
+                >
+                  <CreateIcon />
+                </IconButton>
+              </Tooltip>
+            )}
+            {showRemoveUser && (
+              <Tooltip title="Remove">
+                <IconButton
+                  variant="contained"
+                  color="secondary"
+                  size="small"
+                  onClick={async () => {
+                    setFormVisible(false);
+                    if (user.ADUserId) {
+                      const userDetails = await getUser(user.ADUserId),
+                        groupsString = await getUserGroups(user.ADUserId);
+
                       user.FirstName = userDetails.givenName;
                       user.LastName = userDetails.surname;
-                      setSelectedUser(user);
-                      setFormVisible(true);
+                      user.groupsString = groupsString;
                     }
-                  }
-                  setAlertOpen(missingUser);
-                  missingUser && logInfo(messages.UserList.MissingADUser, '', user, 'Edit user');
-                }}
-              >
-                <CreateIcon />
-              </IconButton>
-            </Tooltip>
-          )}
-          {showRemoveUser && (
-            <Tooltip title="Remove">
-              <IconButton
-                variant="contained"
-                color="secondary"
-                size="small"
-                onClick={async () => {
-                  setFormVisible(false);
-                  if (user.ADUserId) {
-                    const userDetails = await getUser(user.ADUserId),
-                      groupsString = await getUserGroups(user.ADUserId);
-
-                    user.FirstName = userDetails.givenName;
-                    user.LastName = userDetails.surname;
-                    user.groupsString = groupsString;
-                  }
-                  setSelectedUser(user);
-                  setDeleteAlertOpen(true);
-                }}
-              >
-                <DeleteIcon />
-              </IconButton>
-            </Tooltip>
-          )}
+                    setSelectedUser(user);
+                    setDeleteAlertOpen(true);
+                  }}
+                >
+                  <DeleteIcon />
+                </IconButton>
+              </Tooltip>
+            )}
 
-          {showRemoveMemberships && (
-            <Tooltip title="Remove Eionet memberships">
-              <IconButton
-                variant="contained"
-                color="secondary"
-                size="small"
-                onClick={async () => {
-                  setFormVisible(false);
-                  if (user.ADUserId) {
-                    const userDetails = await getUser(user.ADUserId),
-                      groupsString = await getUserGroups(user.ADUserId);
+            {showRemoveMemberships && (
+              <Tooltip title="Remove Eionet memberships">
+                <IconButton
+                  variant="contained"
+                  color="secondary"
+                  size="small"
+                  onClick={async () => {
+                    setFormVisible(false);
+                    if (user.ADUserId) {
+                      const userDetails = await getUser(user.ADUserId),
+                        groupsString = await getUserGroups(user.ADUserId);
 
-                    user.FirstName = userDetails.givenName;
-                    user.LastName = userDetails.surname;
-                    user.groupsString = groupsString;
-                  }
-                  setSelectedUser(user);
-                  setDeleteMembershipAlertOpen(true);
-                }}
-              >
-                <PersonRemove />
-              </IconButton>
-            </Tooltip>
-          )}
-        </strong>
-      </div>
-    );
-  },
+                      user.FirstName = userDetails.givenName;
+                      user.LastName = userDetails.surname;
+                      user.groupsString = groupsString;
+                    }
+                    setSelectedUser(user);
+                    setDeleteMembershipAlertOpen(true);
+                  }}
+                >
+                  <PersonRemove />
+                </IconButton>
+              </Tooltip>
+            )}
+          </strong>
+        </div>
+      );
+    },
     handleAlertClose = (_event, reason) => {
       if (reason === 'clickaway') {
         return;