Fixes #411

Author: oharsta

client/src/components/ContactPersons.jsx

@@ -17,6 +17,7 @@ export const ContactPersons = ({
                                    setFocusedId,
                                    inputRef,
                                    initial,
+                                   readOnly = false
                                }) => {
 
 
@@ -53,7 +54,8 @@ export const ContactPersons = ({
         <section className="inner-right">
             <h3>{I18n.t("connection.contacts.label")}</h3>
             <p>{I18n.t("connection.contacts.info", {
-                example: emailPlaceholder("support", application?.organization?.name || application.name, I18n.t("forms.or"))})}</p>
+                example: emailPlaceholder("support", application?.organization?.name || application.name, I18n.t("forms.or"))
+            })}</p>
             {Object.keys(contactPersonsGrouped).map((contactType, index) =>
                 <section key={index} className="contact-person-section">
                     <h4>{I18n.t(`connection.contacts.${contactType}`)}</h4>
@@ -68,9 +70,10 @@ export const ContactPersons = ({
                                             I18n.t(`connection.contacts.${contactPerson.type}Placeholder`), application?.organization?.name || application.name,
                                             I18n.t("forms.or")
                                         )}
+                                        disabled={readOnly}
                                         onChange={e => updateContactPerson(contactPerson.id, e)}
                                         onRef={el => contactPerson.id === focusedId && (inputRef.current = el)}
-                                        button={(contactPerson.type === contactPersonTypes.technical && innerIndex > 0) ?
+                                        button={(contactPerson.type === contactPersonTypes.technical && innerIndex > 0 && !readOnly) ?
                                             <Button onClick={() => removeContactPerson(contactPerson.id)}
                                                     type={ButtonType.Delete}/> : null}
                             />

client/src/locale/en.js

@@ -1000,8 +1000,14 @@ const en = {
         delete: "Delete",
         deleteConfirmation: "Are you sure you want to remove your account? This action is not reversible.",
         attributes: "Attributes",
-        organization: "Organization(s)",
-
+        organization: "Organization membership",
+        application: "Application membership",
+        organizationMultiple: "Organization memberships",
+        applicationMultiple: "Application memberships",
+        externalUser: "External user",
+        externalUserTooltip: "An external user - as opposed to an internal user - is a user who only has an eduID account and not an institutional account.",
+        internalUser: "Internal user",
+        internalUserTooltip: "An internal user - as opposed to an external user - is a user who has logged in with an institutional account."
     }
 }
 

client/src/organization/UserManagement.jsx

@@ -5,7 +5,6 @@ import I18n from "../locale/I18n";
 import {Loader} from "@surfnet/sds";
 import {useNavigate, useParams} from "react-router-dom";
 import {organizationUserManagementById} from "../api/index.js";
-import {convertServerApplicationToClient} from "../utils/Application.js";
 import {TeamManagement} from "./TeamManagement.jsx";
 import {currentUserMembershipAuthority} from "../utils/Permissions.js";
 import {JoinRequestManagement} from "./JoinRequestManagement.jsx";
@@ -35,7 +34,6 @@ export const UserManagement = () => {
         } else {
             organizationUserManagementById(organizationId)
                 .then(res => {
-                    res.applications = res.applications.map(application => convertServerApplicationToClient(application))
                     setOrganization(res);
                     useAppStore.setState({
                         currentOrganization: res,

client/src/pages/MyOrganization.jsx

@@ -12,7 +12,7 @@ import "./MyOrganization.scss";
 import I18n from "../locale/I18n";
 import ConfirmationDialog from "../components/ConfirmationDialog.jsx";
 import DOMPurify from "dompurify";
-import {isOrganizationAdmin} from "../utils/Permissions.js";
+import {authorities, isOrganizationAdmin} from "../utils/Permissions.js";
 import {Button, ButtonType, Loader} from "@surfnet/sds";
 import {ContactPersons} from "../components/ContactPersons.jsx";
 import {contactSectionValid, convertServerApplicationToClient} from "../utils/Application.js";
@@ -46,6 +46,11 @@ const MyOrganization = ({refreshUser}) => {
 
     const navigate = useNavigate();
 
+    const adminUser = useMemo(() => {
+        return user.superUser || user.organizationMemberships
+            .some(om => om.authority === authorities.ADMIN && om.organization.id === organizationId);
+    }, [user, organizationId]);
+
     useEffect(() => {
         if (isEmpty(organizationId)) {
             navigate("/home");
@@ -114,7 +119,8 @@ const MyOrganization = ({refreshUser}) => {
                                setFocusedId={setFocusedId}
                                focusedId={focusedId}
                                inputRef={inputRef}
-                               initial={initial}/>
+                               initial={initial}
+                               readOnly={!adminUser}/>
     }
 
     const changeKeyWords = options => {
@@ -141,6 +147,7 @@ const MyOrganization = ({refreshUser}) => {
                              }))}
                              onChange={changeKeyWords}
                              isMulti={true}
+                             disabled={!adminUser}
                              creatable={true}
                 />
                 <p className="info">{I18n.t("myOrganization.keyWordsInfo")}</p>
@@ -154,6 +161,7 @@ const MyOrganization = ({refreshUser}) => {
                 <h3>{I18n.t("myOrganization.generalInformation")}</h3>
                 <InputField name={I18n.t("myOrganization.name")}
                             value={organization.name}
+                            disabled={!adminUser}
                             onChange={e => setOrganization({...organization, name: e.target.value})}/>
             </section>
         )
@@ -203,10 +211,8 @@ const MyOrganization = ({refreshUser}) => {
                 });
 
         }
-
     }
 
-
     const renderCurrentSection = () => {
         switch (section) {
             case sections.contactPersons: {
@@ -253,7 +259,7 @@ const MyOrganization = ({refreshUser}) => {
                         {renderCurrentSection()}
                     </div>
                 </div>
-                {section !== sections.delete &&
+                {(section !== sections.delete && adminUser) &&
                     <div className="actions proceed">
                         <Button onClick={() => externalUser ? saveExternalOrganization() : saveInternalOrganization()}
                                 disabled={!initial && !contactSectionValid(organization) && isEmpty(organization.name)}

client/src/pages/Profile.jsx

@@ -4,7 +4,7 @@ import "./Profile.scss";
 import I18n from "../locale/I18n";
 import ConfirmationDialog from "../components/ConfirmationDialog.jsx";
 import DOMPurify from "dompurify";
-import {Button, ButtonType} from "@surfnet/sds";
+import {Button, ButtonType, Checkbox, Tooltip} from "@surfnet/sds";
 import {dateFromEpoch} from "../utils/Date.js";
 import {isEmpty, stopEvent} from "../utils/Utils.js";
 import {deleteUser, logout} from "../api/index.js";
@@ -61,6 +61,10 @@ const Profile = ({setIsAuthenticated}) => {
     }
 
     const {open, cancel, action, question, okButton} = confirmation;
+    const applicationMemberships = (user.organizationMemberships || [])
+        .map(orgMembership => orgMembership.applicationMemberships)
+        .flat();
+    const externalUser = user.externalUser;
     return (
         <div
             className="profile-outer-container">
@@ -104,10 +108,49 @@ const Profile = ({setIsAuthenticated}) => {
                         )}
 
                     {!isEmpty(user.organizationMemberships) &&
-                        <InputField name={I18n.t("profile.organization")}
-                                    value={user.organizationMemberships.map(m => m.organization.name).join(", ")}
-                                    noInput={true}
-                        />}
+                        <div className="multi-list">
+                            <p>{I18n.t(`profile.organization${user.organizationMemberships.length > 1 ? "Multiple" : ""}`)}</p>
+                            <ul>
+                                {user.organizationMemberships.map((orgMembership, index) =>
+                                    <li key={index}>
+                                        <span> {`${orgMembership.organization.name}`}
+                                            <em> {" - " + I18n.t(`roles.${orgMembership.authority.toLowerCase()}`)}</em>
+                                        </span>
+                                    </li>
+                                )}
+                            </ul>
+                        </div>}
+                    {!isEmpty(applicationMemberships) &&
+                        <div className="multi-list">
+                            <p>{I18n.t(`profile.application${applicationMemberships.length > 1 ? "Multiple" : ""}`)}</p>
+                            <ul>
+                                {applicationMemberships.map((appMembership, index) =>
+                                    <li key={index}>
+                                        <span> {`${appMembership.applicationName}`}
+                                            <em> {" - " + I18n.t(`roles.${appMembership.authority.toLowerCase()}`)}</em>
+                                        </span>
+                                    </li>
+                                )}
+                            </ul>
+                        </div>}
+                    {externalUser &&
+                        <div className="multi-list">
+                        <div className="external-user-container">
+                            <p>{I18n.t("profile.externalUser")}</p>
+                            <Tooltip tip={I18n.t("profile.externalUserTooltip")}/>
+                        </div>
+                        <Checkbox value={externalUser}
+                                  readOnly={true}/>
+                    </div>}
+                    {!externalUser &&
+                        <div className="multi-list">
+                            <div className="external-user-container">
+                                <p>{I18n.t("profile.internalUser")}</p>
+                                <Tooltip tip={I18n.t("profile.internalUserTooltip")}/>
+                            </div>
+                            <Checkbox value={!externalUser}
+                                      readOnly={true}/>
+                        </div>}
                 </div>
                 <div className="delete-container">
                     <Button onClick={e => doDelete(e, true)}

client/src/pages/Profile.scss

@@ -23,6 +23,25 @@ div.profile-outer-container {
 
     }
 
+    div.multi-list {
+        p {
+            font-weight: 600;
+            margin: 12px 0 var(--sds--space--1);
+        }
+        ul {
+            list-style: initial;
+            li {
+                margin-left: 15px;
+            }
+        }
+        .external-user-container {
+            display: flex;
+        }
+        .sds--checkbox-container {
+            margin-left: 4px;
+        }
+    }
+
     div.user-container {
         background-color: white;
         display: grid;
@@ -32,7 +51,7 @@ div.profile-outer-container {
         grid-template-columns: [first] 1fr [second] 1fr;
 
         h5 {
-                grid-column: 1 / -1;
+            grid-column: 1 / -1;
         }
     }
 

client/src/utils/Connection.js

@@ -1,4 +1,6 @@
 //Deliberate design choice to have a different format on the server to have all complex data in the metaData attribute
+import {isEmpty} from "./Utils.js";
+
 export const convertClientConnectionToServer = (application, connection, arpInfo) => {
 
     const {motivations, additionalAttributes, profile, profileMotivation} = connection;
@@ -58,7 +60,8 @@ export const convertServerConnectionToClient = (connection, protocolOptions, pro
     const motivations = additionalAttributesUrns
         .reduce((acc, urn) => {
             const attribute = additionalAttributes.find(attr => attr.urn === urn);
-            acc[attribute.name] = attributes[urn][0].motivation;
+            const attrMotivation = attributes[urn][0].motivation;
+            acc[attribute.name] = isEmpty(attrMotivation) ? `Need ${attribute.name}` : attrMotivation;
             return acc;
         }, {})
     const profileOption = profileOptions.find(option => option.value === profile);

client/src/utils/MenuItems.js

@@ -25,21 +25,24 @@ export const mainMenuItems = {
 }
 
 export const menuItemsForUser = user => {
-    //Every user has access to the help menu items
+    //Every user has access to the home, catalogue and help menu items
     const newMenuItems = [mainMenuItems.home, mainMenuItems.catalogue, mainMenuItems.serviceDesk, mainMenuItems.feedback];
     const noOrganizationMemberships = isEmpty(user.organizationMemberships);
     if (noOrganizationMemberships) {
         return newMenuItems;
     }
-    //Guest with no application membership
-    newMenuItems.push(mainMenuItems.idp);
-    const emptyGuests = user.organizationMemberships.every(m => m.autority === authorities.GUEST && isEmpty(m.applicationMemberships));
-    if (emptyGuests) {
+    //If there is at least one organizationMembership, then we show yourApps
+    newMenuItems.push(mainMenuItems.yourApps);
+    const onlyGuest = user.organizationMemberships.every(m => m.authority === authorities.GUEST);
+    if (onlyGuest) {
         return newMenuItems;
     }
-    newMenuItems.push(mainMenuItems.yourApps, mainMenuItems.users, mainMenuItems.accessibleApps, );
+    const isMember = user.organizationMemberships.some(m => m.authority === authorities.MEMBER);
+    if (isMember) {
+        newMenuItems.push(mainMenuItems.users);
+    }
     if (!user.externalUser) {
-        newMenuItems.push(mainMenuItems.invite, mainMenuItems.sram);
+        newMenuItems.push(mainMenuItems.accessibleApps, mainMenuItems.idp, mainMenuItems.invite, mainMenuItems.sram);
     }
     return newMenuItems;
 }

server/src/main/java/access/api/OrganizationController.java

@@ -203,9 +203,8 @@ public ResponseEntity<Organization> light(@PathVariable("id") Long id) {
     @GetMapping("/invitation/{id}")
     public ResponseEntity<Organization> name(@PathVariable("id") Long id) {
         LOG.debug("/name");
-        Organization organization = organizationRepository.findById(id)
+        Organization organization = organizationRepository.findApplicationsOrganizationById(id)
                 .orElseThrow(() -> new NotFoundException("Organisation not found"));
-        Hibernate.initialize(organization.getApplications());
         return ResponseEntity.ok(organization);
     }
 

server/src/main/java/access/manage/ConnectionProviderConverter.java

@@ -11,8 +11,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static access.manage.ManageData.getData;
-import static access.manage.ManageData.getMetaDataFields;
+import static access.manage.ManageData.*;
 
 @SuppressWarnings("unchecked")
 public class ConnectionProviderConverter {
@@ -298,7 +297,7 @@ private void mergeAttributeReleasePolicies(Map<String, Object> connectionMetaDat
     }
 
     private void putIf(Map<String, Object> result, String key, Object value) {
-        if ((value instanceof String && StringUtils.hasText((String) value)) || value != null) {
+        if (!isEmpty(value)) {
             result.put(key, value);
         }
     }