Do not allow for application memberships for ADMIN invites

Author: oharsta

client/src/pages/InvitationForm.jsx

@@ -50,7 +50,11 @@ export const InvitationForm = () => {
                 useAppStore.setState({
                     breadcrumbPaths: [
                         {path: "/home", value: I18n.t("breadCrumb.access"), menuItemName: mainMenuItems.home},
-                        {path: `/users/${organizationId}/team`, value: I18n.t("navigation.users"), menuItemName: mainMenuItems.users},
+                        {
+                            path: `/users/${organizationId}/team`,
+                            value: I18n.t("navigation.users"),
+                            menuItemName: mainMenuItems.users
+                        },
                         {value: I18n.t("breadCrumb.invitations")}
                     ]
                 });
@@ -98,7 +102,8 @@ export const InvitationForm = () => {
     const authorityChanged = option => {
         setInvitation({
             ...invitation,
-            intendedAuthority: option.value
+            intendedAuthority: option.value,
+            applicationIdentifiers: option.value === authorities.ADMIN ? [] : invitation.applicationIdentifiers
         });
     }
 
@@ -146,7 +151,7 @@ export const InvitationForm = () => {
                         className={"small"}
                     />}
 
-                {organization.applications.length > 0 &&
+                {(organization.applications.length > 0 && invitation.intendedAuthority !== authorities.ADMIN) &&
                     <SelectField
                         value={organization.applications
                             .filter(app => invitation.applicationIdentifiers.includes(app.id))

client/src/pages/Policies.jsx

@@ -38,7 +38,7 @@ const Policies = () => {
             && !isEmpty(currentOrganization.manageIdentifier));
     }, [user, currentOrganization]);
 
-    const toPolicyDetail = (policyIdentifier, allPolicies = policies, policyType = policyTypes.reg) => {
+    const toPolicyDetail = (policyIdentifier, allPolicies = policies, policyType = null) => {
         setShowPolicyOverview(false);
         let newCurrentPolicy;
         if (policyIdentifier === "new") {

client/src/utils/MenuItems.js

@@ -60,9 +60,9 @@ const doMenuItemsForUser = (user, currentOrganization, feedbackWidgetEnabled = u
     if (!user.externalUser) {
         newMenuItems.push(mainMenuItems.accessibleApps, mainMenuItems.idp, mainMenuItems.invite, mainMenuItems.sram);
     }
-    // if ((isAdmin || user.superUser) && !isEmpty(currentOrganization.manageIdentifier)) {
-    //     newMenuItems.push(mainMenuItems.policies);
-    // }
+    if ((isAdmin || user.superUser) && !isEmpty(currentOrganization.manageIdentifier)) {
+        newMenuItems.push(mainMenuItems.policies);
+    }
     return newMenuItems;
 }