Finally fixes #649

Author: oharsta

client/build.sh

@@ -7,5 +7,5 @@ source $NVM_DIR/nvm.sh
 nvm use
 yarn install --force
 CI=true yarn test
-yarn lint ./src
+yarn lint
 yarn build

client/src/api/index.js

@@ -99,6 +99,10 @@ export function institutionAdminsbyRole(roleId) {
     return fetchJson(`/api/v1/users/institution-admins/${roleId}`, {}, {}, false);
 }
 
+export function institutionAdmins() {
+    return fetchJson("/api/v1/users/institutionAdmins", {}, {}, false);
+}
+
 export function searchUsers(pagination = {}) {
     const queryPart = paginationQueryParams(pagination, {})
     return fetchJson(`/api/v1/users/search?${queryPart}`);

client/src/components/User.jsx

@@ -6,7 +6,7 @@ import {AUTHORITIES, highestAuthority} from "../utils/UserRole";
 import I18n from "../locale/I18n";
 import Logo from "./Logo";
 import {Button, ButtonType, Card, CardType} from "@surfnet/sds";
-import {isEmpty} from "../utils/Utils";
+import {isEmpty, splitListSemantically} from "../utils/Utils";
 import {deriveRemoteApplicationAttributes, reduceApplicationFromUserRoles} from "../utils/Manage";
 import SearchIcon from "@surfnet/sds/icons/functional-icons/search.svg";
 import {MoreLessText} from "./MoreLessText";
@@ -17,7 +17,7 @@ import {deleteUser} from "../api";
 import {useNavigate} from "react-router-dom";
 import {useAppStore} from "../stores/AppStore";
 
-export const User = ({user, other, config, currentUser}) => {
+export const User = ({user, other, config, currentUser, otherInstitutionAdmins}) => {
     const navigate = useNavigate();
     const {setFlash} = useAppStore(state => state);
     const searchRef = useRef();
@@ -155,6 +155,15 @@ export const User = ({user, other, config, currentUser}) => {
                             onClick={() => doDeleteUser(true)}/>
                 </div>
             }
+            {user.institutionAdmin && <div>
+                <p className="label">{isEmpty(otherInstitutionAdmins) ? I18n.t("users.onlyInstitutionAdmins") :
+                    I18n.t("users.institutionAdmins", )}</p>
+                {!isEmpty(otherInstitutionAdmins) && <ul className="admins">
+                    {otherInstitutionAdmins.map((admin, index) => <li key={index}>
+                        <span>{`${admin.name} - ${admin.email}`}</span>
+                    </li>)}
+                </ul>}
+            </div>}
             <h3 className={"title span-row "}>{I18n.t("users.roles")}</h3>
             {(highestAuthority(user, false) === AUTHORITIES.GUEST && !other) &&
                 <p className={"span-row"}

client/src/components/User.scss

@@ -15,6 +15,20 @@ section.user {
 
     }
 
+    p.label {
+        font-weight: 600;
+        margin: 20px 0 15px 0;
+    }
+
+    ul.admins {
+        list-style: circle;
+
+        li {
+            margin-left: 20px;
+        }
+
+    }
+
     p.span-row {
         margin-bottom: 25px;
     }

client/src/locale/en.js

@@ -94,7 +94,7 @@ const en = {
         name_email: "Name / email",
         name: "Name",
         email: "Email",
-        highestAuthority: "Role",
+        highestAuthority: "Function",
         createdAt: "Created",
         schacHomeOrganization: "Institution",
         lastActivity: "Last activity",
@@ -129,7 +129,9 @@ const en = {
         expiryDays: "Expiry days",
         roleExpiryTooltip: "Sort on roles to see which roles will expire the soonest",
         deleteFlash: "User {{name}} has been deleted",
-        deleteConfirmation: "Are you absolutely sure you want to delete user {{name}}? There is no undo button."
+        deleteConfirmation: "Are you absolutely sure you want to delete user {{name}}? There is no undo button.",
+        institutionAdmins: "Your fellow Institution administrators are:",
+        onlyInstitutionAdmins: "You are the only Institution admin within your organisation",
     },
     role: {
         copyUrn: "Copy urn",

client/src/locale/nl.js

@@ -94,7 +94,7 @@ const nl = {
         name_email: "Naam / e-mail",
         name: "Naam",
         email: "E-mail",
-        highestAuthority: "Rol",
+        highestAuthority: "Functie",
         createdAt: "Aangemaakt op",
         schacHomeOrganization: "Instelling",
         lastActivity: "Laatst actief",
@@ -129,8 +129,9 @@ const nl = {
         expiryDays: "Verloopdagen",
         roleExpiryTooltip: "Sorteer op rollen, om te zien welke rol het eerst zal verlopen",
         deleteFlash: "Gebruiker {{name}} is verwijderd",
-        deleteConfirmation: "Weet je heel zeker dat je gebruiker {{name}} wilt verwijderen? Er is geen undo functionaliteit."
-    },
+        deleteConfirmation: "Weet je heel zeker dat je gebruiker {{name}} wilt verwijderen? Er is geen undo functionaliteit.",
+        institutionAdmins: "Je collega-instellingsbeheerders zijn:",
+        onlyInstitutionAdmins: "Je bent de enige instellingsbeheerder binnen je organisatie",    },
     role: {
         copyUrn: "Copy urn",
         userInfo: "{{nbr}} leden & verloopt {{period}}",

client/src/locale/pt.js

@@ -128,7 +128,9 @@ const pt = {
         expiryDays: "Expiry days",
         roleExpiryTooltip: "Sort on roles to see which roles will expire the soonest",
         deleteFlash: "User {{name}} has been deleted",
-        deleteConfirmation: "Are you absolutely sure you want to delete user {{name}}? There is no undo button."
+        deleteConfirmation: "Are you absolutely sure you want to delete user {{name}}? There is no undo button.",
+        institutionAdmins: "Your fellow Institution administrators are:",
+        onlyInstitutionAdmins: "You are the only Institution admin within your organisation",
     },
     role: {
         copyUrn: "Copy urn",

client/src/pages/Profile.jsx

@@ -1,5 +1,5 @@
 import React, {useEffect, useState} from "react";
-import {other} from "../api";
+import {institutionAdmins, other} from "../api";
 import I18n from "../locale/I18n";
 import "./Profile.scss";
 import {Loader} from "@surfnet/sds";
@@ -10,12 +10,16 @@ import {UnitHeader} from "../components/UnitHeader";
 import Logo from "@surfnet/sds/icons/functional-icons/id-1.svg";
 import {dateFromEpoch} from "../utils/Date";
 import {isEmpty} from "../utils/Utils";
+import {AUTHORITIES, highestAuthority} from "../utils/UserRole";
 
 export const Profile = () => {
     const {id} = useParams();
     const {user: currentUser, config} = useAppStore(state => state);
     const [user, setUser] = useState(currentUser);
-    const [loading, setLoading] = useState(!isEmpty(id));
+    const [otherInstitutionAdmins,setOtherInstitutionAdmins] = useState([]);
+
+    const [loading, setLoading] = useState(!isEmpty(id) || user.institutionAdmin);
+
     const navigate = useNavigate();
 
     useEffect(() => {
@@ -26,6 +30,12 @@ export const Profile = () => {
                     setLoading(false);
                 })
                 .catch(() => navigate("/404"))
+        } else if (user.institutionAdmin) {
+            institutionAdmins()
+                .then(res => {
+                    setOtherInstitutionAdmins(res);
+                    setLoading(false);
+                })
         }
 
     }, [id, currentUser]);// eslint-disable-line react-hooks/exhaustive-deps
@@ -62,7 +72,11 @@ export const Profile = () => {
                 })}</p>
             </UnitHeader>
             <div className="profile-container">
-                <User user={user} other={!isEmpty(id)} config={config} currentUser={currentUser}/>
+                <User user={user}
+                      other={!isEmpty(id)}
+                      otherInstitutionAdmins={otherInstitutionAdmins}
+                      config={config}
+                      currentUser={currentUser}/>
             </div>
         </div>);
 };

server/src/main/java/invite/api/UserController.java

@@ -118,6 +118,17 @@ public ResponseEntity<User> me(@Parameter(hidden = true) User user) {
         return ResponseEntity.ok(user);
     }
 
+    @GetMapping("institutionAdmins")
+    @Transactional(readOnly = true)
+    public ResponseEntity<List<Map<String, String>>> institutionAdmins(@Parameter(hidden = true) User user) {
+        LOG.debug(String.format("/institutionAdmins for user %s", user.getEduPersonPrincipalName()));
+
+        UserPermissions.assertAuthority(user, Authority.INSTITUTION_ADMIN);
+        List<Map<String, String>> users = userRepository.findInstitutionAdminsPerOrganizationGUID(user.getId(), user.getOrganizationGUID());
+
+        return ResponseEntity.ok(users);
+    }
+
     @GetMapping("other/{id}")
     @Transactional(readOnly = true)
     public ResponseEntity<User> details(@PathVariable("id") Long id, @Parameter(hidden = true) User user) {

server/src/main/java/invite/repository/UserRepository.java

@@ -134,6 +134,13 @@ SELECT distinct(u.id), u.email, u.name, u.schac_home_organization, u.created_at,
             nativeQuery = true)
     List<User> findInstitutionAdminsPerRole(Long roleId);
 
+    @Query(value = """
+            SELECT u.name, u.email FROM users u
+                    WHERE u.id <> ?1 AND u.organization_guid = ?2 AND u.institution_admin = 1
+            """,
+            nativeQuery = true)
+    List<Map<String, String>> findInstitutionAdminsPerOrganizationGUID(Long id, String organizationGUID);
+
     @Override
     default String rewrite(String query, Sort sort) {
         Sort.Order authoritySort = sort.getOrderFor("authority");