Fixes #605

Author: oharsta

client/src/locale/en.js

@@ -131,7 +131,7 @@ const en = {
     },
     role: {
         copyUrn: "Copy urn",
-        userInfo: "{{nbr}} member(s) & valid for {{valid}} days",
+        userInfo: "{{nbr}} member(s) & invalid {{period}}",
         roleInfo: "Role valid for <strong>{{days}} days</strong>",
         roleInfoNoEndDate: "Role has <strong>no end date</strong>",
         contactAdmin: "Contact role manager(s)"

client/src/locale/nl.js

@@ -131,7 +131,7 @@ const nl = {
     },
     role: {
         copyUrn: "Copy urn",
-        userInfo: "{{nbr}} leden & geldig voor {{valid}} dagen",
+        userInfo: "{{nbr}} leden & ongeldig {{period}}",
         roleInfo: "Rol geldig voor <strong>{{days}} dagen</strong>",
         roleInfoNoEndDate: "Rol heeft <strong>geen einddatum</strong>",
         contactAdmin: "Contact rolmanager(s)"

client/src/locale/pt.js

@@ -131,7 +131,7 @@ const pt = {
     },
     role: {
         copyUrn: "Copy urn",
-        userInfo: "{{nbr}} member(s) & valid for {{valid}} days",
+        userInfo: "{{nbr}} member(s) & invalid {{period}}",
         roleInfo: "Role valid for <strong>{{days}} days</strong>",
         roleInfoNoEndDate: "Role has <strong>no end date</strong>",
         contactAdmin: "Contact role manager(s)"

client/src/pages/InvitationForm.jsx

@@ -33,6 +33,7 @@ import {deriveExpirationDate, displayExpiryDate, futureDate} from "../utils/Date
 import SwitchField from "../components/SwitchField";
 import {InvitationRoleCard} from "../components/InvitationRoleCard";
 import DOMPurify from "dompurify";
+import {applicationName} from "../utils/Manage";
 
 
 export const InviterContainer = ({isInviter, children}) => {
@@ -287,9 +288,10 @@ export const InvitationForm = () => {
             ...invitation,
             intendedAuthority: option.value,
             roleExpiryDate: defaultRoleExpiryDate(selectedRoles),
-            organizationGUID: option.value !== AUTHORITIES.INSTITUTION_ADMIN ? null : invitation.organizationGUID
+            organizationGUID: option.value !== AUTHORITIES.INSTITUTION_ADMIN ? null :
+                (user.institutionAdmin ? user.organizationGUID : null)
         });
-        if (option.value === AUTHORITIES.SUPER_USER) {
+        if (option.value === AUTHORITIES.SUPER_USER || option.value === AUTHORITIES.INSTITUTION_ADMIN) {
             setSelectedRoles([]);
         }
         if (option.value !== AUTHORITIES.INSTITUTION_ADMIN) {
@@ -360,6 +362,13 @@ export const InvitationForm = () => {
                 {!isEmpty(organizationGUIDIdentityProvider.institutionGuid) &&
                     <em className="info">{I18n.t("roles.organizationGUIDValue", {guid: organizationGUIDIdentityProvider.institutionGuid})}</em>}
 
+                {(user.institutionAdmin && AUTHORITIES.INSTITUTION_ADMIN === invitation.intendedAuthority) &&
+                    <InputField name={I18n.t("roles.identityProvider")}
+                                toolTip={I18n.t("tooltips.invitationIdentityProvider")}
+                                disabled={true}
+                                value={applicationName(user.institution)}
+                    />}
+
                 {(!isInviter && !skipRoles) && <>
                     <SelectField value={selectedRoles}
                                  options={roles.filter(role => !selectedRoles.find(r => r.value === role.value))}

client/src/pages/Role.jsx

@@ -18,6 +18,7 @@ import {deriveApplicationAttributes} from "../utils/Manage";
 import DOMPurify from "dompurify";
 import {UnitHeaderInviter} from "../components/UnitHeaderInviter";
 import {isEmpty} from "../utils/Utils";
+import {displayExpiryDate, futureDate} from "../utils/Date";
 
 export const Role = () => {
     const {id, tab = "users"} = useParams();
@@ -177,7 +178,9 @@ export const Role = () => {
                             <span dangerouslySetInnerHTML={{
                                 __html: DOMPurify.sanitize(I18n.t("role.userInfo", {
                                     nbr: role.userRoleCount,
-                                    valid: role.defaultExpiryDays
+                                    period: displayExpiryDate(
+                                        !isEmpty(role.defaultExpiryDate) ? new Date(role.defaultExpiryDate * 1000) :
+                                        futureDate(role.defaultExpiryDays))
                                 }))
                             }}/>
                         </div>

client/src/pages/RoleForm.scss

@@ -15,6 +15,10 @@
             grid-column-start: first;
         }
 
+        section.copy-to-clipboard {
+            display: flex;
+        }
+
         .application-container {
             grid-column: 1/-1;
             display: flex;
@@ -64,6 +68,7 @@
                     margin-left: 0;
                 }
             }
+
         }
 
         .application-actions {