Fixes Incorrect http requests after sending an invite

OpenConext · Oct 3, 2023 · 6ec6ddf · 6ec6ddf
1 parent 5b6123a
commit 6ec6ddf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/client/src/components/ErrorIndicator.jsx b/client/src/components/ErrorIndicator.jsx
@@ -3,8 +3,8 @@ import "./ErrorIndicator.scss";
 import {ReactComponent as CriticalIcon} from "../icons/critical.svg";
 import DOMPurify from "dompurify";
 
-export default function ErrorIndicator({msg, standalone = false, decode = true}) {
-    const className = `error-indication ${standalone ? "standalone" : ""}`;
+export default function ErrorIndicator({msg, standalone = false, decode = true, adjustMargin = false}) {
+    const className = `error-indication ${standalone ? "standalone" : ""} ${adjustMargin? "adjust-margin" : ""}`;
     msg = msg.replaceAll("?", "");
     return decode ? <span className={className}><CriticalIcon/>{msg}</span> :
         <span className={className}>

diff --git a/client/src/components/ErrorIndicator.scss b/client/src/components/ErrorIndicator.scss
@@ -9,6 +9,10 @@ span.error-indication {
         margin-bottom: 15px;
     }
 
+    &.adjust-margin {
+        margin-top: -15px;
+    }
+
     span.error-message {
         word-break: keep-all;
     }

diff --git a/client/src/pages/InvitationForm.js b/client/src/pages/InvitationForm.js
@@ -31,7 +31,7 @@ export const InvitationForm = () => {
     const [guest, setGuest] = useState(false);
     const [roles, setRoles] = useState([]);
     const [selectedRoles, setSelectedRoles] = useState([]);
-    const [originalRoleId, setOriginalRoleId] = useState(-1);
+    const [originalRoleId, setOriginalRoleId] = useState(null);
     const [invitation, setInvitation] = useState({
         expiryDate: futureDate(30),
         roleExpiryDate: futureDate(365),
@@ -196,6 +196,10 @@ export const InvitationForm = () => {
                                   }}/>)
                     }
                 </div>}
+                {(!initial && isEmpty(selectedRoles)) &&
+                    <ErrorIndicator msg={I18n.t("invitations.requiredRole")} adjustMargin={true}/>
+                }
+
                 <EmailField
                     name={I18n.t("invitations.invitees")}
                     addEmails={addEmails}
@@ -267,15 +271,15 @@ export const InvitationForm = () => {
                                   value={invitation.enforceEmailEquality || false}
                                   onChange={e => setInvitation({...invitation, enforceEmailEquality: e.target.checked})}
                                   info={I18n.t("invitations.enforceEmailEquality")}
-                                  readOnly={selectedRoles.some(role => !role.overrideSettingsAllowed )}
+                                  readOnly={selectedRoles.some(role => !role.overrideSettingsAllowed)}
                                   tooltip={I18n.t("tooltips.enforceEmailEqualityTooltip")}
                         />
 
                         <Checkbox name={I18n.t("invitations.eduIDOnly")}
                                   value={invitation.eduIDOnly || false}
                                   onChange={e => setInvitation({...invitation, eduIDOnly: e.target.checked})}
                                   info={I18n.t("invitations.eduIDOnly")}
-                                  readOnly={selectedRoles.some(role => !role.overrideSettingsAllowed )}
+                                  readOnly={selectedRoles.some(role => !role.overrideSettingsAllowed)}
                                   tooltip={I18n.t("tooltips.eduIDOnlyTooltip")}
                         />