Accepted join request results in ORG member #337

Author: oharsta

client/src/components/TabHeader.jsx

@@ -14,7 +14,6 @@ export const TabHeader = ({tabNames, tab, setTab, children, fullWidth = false})
         <div className={`tab-header-container ${fullWidth ? "full-width" : ""}`}>
             {children}
             <div className="tabs-menu">
-
                 {tabNames.map(tabName => <a key={tabName}
                                             href={`/${tabName}`}
                                             className={tabName === tab ? "active" : ""}

client/src/icons/check-plain.svg

@@ -71,7 +71,6 @@
             }
 
             svg {
-                fill: white;
                 margin: 0 6px 0 16px;
                 width: 22px;
                 height: auto;

client/src/index.scss

@@ -12,6 +12,8 @@ import MenuIcon from "../icons/menu.svg";
 import {MoreLessToggle} from "@surfnet/sds";
 import {isEmpty} from "../utils/Utils.js";
 import {useShallow} from "zustand/react/shallow";
+import CheckIcon from "@surfnet/sds/icons/functional-icons/checkbox-check.svg";
+import TrashIcon from "@surfnet/sds/icons/functional-icons/bin.svg";
 
 export const JoinRequestManagement = ({organization, currentUserAuthority, setRefresh}) => {
 
@@ -68,13 +70,13 @@ export const JoinRequestManagement = ({organization, currentUserAuthority, setRe
     const renderMenu = joinRequest => {
         return (
             <div className="sds--user-info--dropdown">
-                <ul>
+                <ul className="join-request-actions">
                     <li onClick={() => doApprove(joinRequest, true, true)}>
-                        <span className="svg">✅</span>
+                        <CheckIcon/>
                         <span>{I18n.t("joinRequestManagement.approve")}</span>
                     </li>
                     <li onClick={() => doApprove(joinRequest, false, true)}>
-                        <span className="svg">⛔️</span>
+                        <TrashIcon/>️
                         <span>{I18n.t("joinRequestManagement.deny")}</span>
                     </li>
                 </ul>

client/src/organization/JoinRequestManagement.jsx

@@ -9,8 +9,10 @@
 
     @include index.menu-header;
 
-    ul li {
+    ul.join-request-actions li {
         padding: 12px 0 12px 0;
+        display: flex;
+        align-items: center;
     }
 
     .mod-entities {

client/src/organization/JoinRequestManagement.scss

@@ -128,7 +128,7 @@ export const TeamManagement = ({organization, currentUserAuthority, setRefresh})
                 mapper: membership => I18n.t(`roles.${membership.authority.toLowerCase()}`)
             },
             {
-                key: "created",
+                key: "createdAt",
                 header: I18n.t("teamManagement.active"),
                 mapper: membership => dateFromEpoch(membership.createdAt)
             },

client/src/organization/TeamManagement.jsx

@@ -35,7 +35,7 @@
                 width: 20%;
             }
 
-            th.created {
+            th.createdAt {
                 width: 20%;
             }
 

client/src/organization/TeamManagement.scss

@@ -93,7 +93,7 @@ public ResponseEntity<Map<String, Object>> approval(User user, @RequestBody Join
 
         if (joinRequestApproval.isApproved()) {
             OrganizationMembership organizationMembership = new OrganizationMembership(
-                    joinRequest.getUser(), organization, Authority.GUEST);
+                    joinRequest.getUser(), organization, Authority.MEMBER);
             organizationMembershipRepository.save(organizationMembership);
 
             mailBox.sendJoinRequestAcceptedMail(joinRequest);

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

@@ -95,7 +95,7 @@ void approval() {
         User user = userRepository.findDetailsById(seedIdentifiers.get("Peter Doe")).get();
         Optional<OrganizationMembership> optionalOrganizationMembership = user.getOrganizationMemberships().stream()
                 .filter(membership -> membership.getOrganization().getName().equalsIgnoreCase(SHARE_LOGICS) &&
-                        membership.getAuthority().equals(Authority.GUEST))
+                        membership.getAuthority().equals(Authority.MEMBER))
                 .findFirst();
         assertTrue(optionalOrganizationMembership.isPresent());
     }