Do not allow for application memberships for ADMIN invites

Author: oharsta

client/src/application/AppTeamManagement.jsx

@@ -107,6 +107,7 @@ export const AppTeamManagement = ({
                 value={null}
                 options={organization.organizationMemberships
                     .filter(member => !applicationMemberships.some(appMember => appMember.organizationMembershipIdentifier === member.id))
+                    .filter(member => member.authority !== authorities.ADMIN)
                     .map(organizationMemberOption)}
                 placeholder={I18n.t("appTeamManagement.addPlaceHolder")}
                 searchable={true}

client/src/components/Impersonating.jsx

@@ -23,7 +23,6 @@ export const Impersonating = () => {
     const endImpersonation = () => {
         stopImpersonation();
         setFlash(I18n.t("impersonate.flash.clearedImpersonation"));
-        navigate("/");
         setTimeout(() => navigate("/", {replace: true}), 375);
     }
 

client/src/locale/en.js

@@ -636,7 +636,7 @@ const en = {
             admin: "Admin",
             adminRights: "Admins can control all features and manage members and guests.",
             member: "Member",
-            memberRights: "Members belong to the organisation. They can manage applications and invite application users.",
+            memberRights: "Members belong to the organisation. They can manage their own applications and invite application users.",
             guest: "Guest",
             guestRights: "Guests are users who do not belong to the organisation but are involved in managing certain applications."
         }

client/src/pages/Organizations.jsx

@@ -67,7 +67,8 @@ export const Organizations = ({pendingApproval, tab}) => {
     }, [openOrganizationId]);
 
     const search = (query, sorted, reverse, page) => {
-        const paginationQueryParamsChanged = sorted !== paginationQueryParams.sort || reverse !== paginationQueryParams.sortDirection ||
+        const isSortReversed = paginationQueryParams.sortDirection !== "DESC";
+        const paginationQueryParamsChanged = sorted !== paginationQueryParams.sort || reverse !== isSortReversed ||
             page !== paginationQueryParams.pageNumber;
         if ((!isEmpty(query) && query.trim().length > 2) || paginationQueryParamsChanged) {
             delayedAutocomplete(query, sorted, reverse, page);

client/src/pages/Users.jsx

@@ -42,7 +42,8 @@ export const Users = () => {
         [paginationQueryParams]);
 
     const search = (query, sorted, reverse, page) => {
-        const paginationQueryParamsChanged = sorted !== paginationQueryParams.sort || reverse !== paginationQueryParams.sortDirection ||
+        const isSortReversed = paginationQueryParams.sortDirection !== "DESC";
+        const paginationQueryParamsChanged = sorted !== paginationQueryParams.sort || reverse !== isSortReversed ||
             page !== paginationQueryParams.pageNumber;
         if ((!isEmpty(query) && query.trim().length > 2) || paginationQueryParamsChanged) {
             delayedAutocomplete(query, sorted, reverse, page);
@@ -106,9 +107,9 @@ export const Users = () => {
 
     const impersonate = user => {
         setLoading(true);
-        startImpersonation(user);
+        navigate("/", {replace: true});
         setFlash(I18n.t("impersonate.flash.startedImpersonation", {name: user.name}));
-        setTimeout(() => navigate("/", {replace: true}), 375);
+        setTimeout(() => startImpersonation(user), 375);
     }
 
     if (showImpersonation) {