Fix for app team management tab

Author: oharsta

client/src/application/AppTeamManagement.jsx

@@ -28,15 +28,19 @@ export const AppTeamManagement = ({
     const [currentUserAuthority, setCurrentUserAuthority] = useState({});
     const [loading, setLoading] = useState(true);
     const [organization, setOrganization] = useState({});
+    const [applicationMemberships, setApplicationMemberships] = useState([]);
 
     useEffect(() => {
         organizationUsersById(currentOrganization.id)
             .then(res => {
                 setOrganization(res);
-                (application.applicationMemberships || [])
-                    .forEach(membership => membership.user = res.organizationMemberships
-                        .find(m => m.id === membership.organizationMembership.id).user
-                    );
+                setApplicationMemberships((application.applicationMemberships || [])
+                    .map(membership => {
+                        membership.user = res.organizationMemberships
+                            .find(m => m.id === membership.organizationMembershipIdentifier).user;
+                        return membership;
+                    }
+                ))
                 const membership = (currentUser.organizationMemberships || []).find(membership => membership.organization.id === res.id);
                 setCurrentUserAuthority(currentUserMembershipAuthority(currentUser, membership));
                 setLoading(false);
@@ -95,7 +99,7 @@ export const AppTeamManagement = ({
             <SelectField
                 value={null}
                 options={organization.organizationMemberships
-                    .filter(member => !application.applicationMemberships.some(appMember => appMember.organizationMembership.id === member.id))
+                    .filter(member => !applicationMemberships.some(appMember => appMember.organizationMembershipIdentifier === member.id))
                     .map(organizationMemberOption)}
                 placeholder={I18n.t("appTeamManagement.addPlaceHolder")}
                 searchable={true}
@@ -110,7 +114,9 @@ export const AppTeamManagement = ({
             {
                 key: "user__name",
                 header: I18n.t("appTeamManagement.name"),
-                mapper: membership => <UserMembership user={membership.user} currentUser={currentUser}/>
+                mapper: membership => {
+                    return  <UserMembership user={membership.user} currentUser={currentUser}/>
+                }
             },
             {
                 key: "createdAt",
@@ -142,7 +148,7 @@ export const AppTeamManagement = ({
 
         return (
             <Entities
-                entities={application.applicationMemberships}
+                entities={applicationMemberships}
                 modelName="appTeamManagement"
                 defaultSort="user__name"
                 hideTitle={true}

client/src/pages/ApplicationDetail.jsx

@@ -104,13 +104,15 @@ const ApplicationDetail = () => {
                                     {!showAttributes && <a href="/" onClick={toggleShowAttributes}>
                                         {I18n.t("applicationDetail.details")}
                                     </a>}
+
                                 </div>
                                 <div className="details-panel">
                                     <p className="title">{I18n.t("applicationDetail.privacy")}</p>
                                     <p>{I18n.t("applicationDetail.privacyInfo")}</p>
-                                    {!showAttributes && <a href="/" onClick={toggleShowPrivacy}>
+                                    {!showPrivacy && <a href="/" onClick={toggleShowPrivacy}>
                                         {I18n.t("applicationDetail.details")}
                                     </a>}
+
                                 </div>
                             </div>
                             <div className="right">

client/src/pages/Applications.scss

@@ -73,7 +73,7 @@ div.applications-container {
             align-items: center;
 
             img{
-                width: 60px;
+                width: 50px;
                 height: auto;
                 border-radius: 12px;
             }

client/src/pages/Institutions.scss

@@ -37,6 +37,7 @@ div.institutions-container {
         width: 100%;
         height: 100%;
         background-color: white;
+        padding-bottom: 25px;
     }
 
     .institutions {

server/src/main/java/access/model/ApplicationMembership.java

@@ -7,6 +7,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.Hibernate;
 
 import java.time.Instant;
 
@@ -53,4 +54,11 @@ public String getName() {
         return getClass().getName().concat(application.getName()).concat(authority.name());
     }
 
+    @JsonProperty(value = "organizationMembershipIdentifier", access = JsonProperty.Access.READ_ONLY)
+    public Long getOrganizationMembershipInfo() {
+        OrganizationMembership organizationMembership = this.getOrganizationMembership();
+        Hibernate.initialize(organizationMembership);
+        return organizationMembership.getId();
+    }
+
 }

server/src/main/resources/application.yml

@@ -135,8 +135,8 @@ email:
 # configure real users / passwords and test against those. See server/src/main/java/access/manage/ManageConf.java
 # and server/src/main/java/access/manage/LocalManage.java to see how it works.
 manage:
-  #  enabled: True
-  enabled: False
+  enabled: True
+#  enabled: False
   test:
     url: "https://manage.test2.surfconext.nl"
     #  url: "http://localhost:8081"