fix(InviteUsers): fix invite users bugs.

client/src/containers/Alerts/Users/UserActivateAlert.js

@@ -1,6 +1,69 @@
+import React from 'react';
+import { FormattedMessage as T, useIntl } from 'react-intl';
+import { Alert, Intent } from '@blueprintjs/core';
+import { AppToaster } from 'components';
+import { useActivateUser } from 'hooks/query';
 
+import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
+import withAlertActions from 'containers/Alert/withAlertActions';
 
+import { compose } from 'utils';
 
-function UserActivateAlert() {
-  
-}
+/**
+ * User inactivate alert.
+ */
+function UserActivateAlert({
+  // #ownProps
+  name,
+
+  // #withAlertStoreConnect
+  isOpen,
+  payload: { userId },
+
+  // #withAlertActions
+  closeAlert,
+}) {
+  const { formatMessage } = useIntl();
+
+  const { mutateAsync: userActivateMutate } = useActivateUser();
+
+  const handleConfirmActivate = () => {
+    userActivateMutate(userId)
+      .then(() => {
+        AppToaster.show({
+          message: formatMessage({
+            id: 'the_user_has_been_activated_successfully',
+          }),
+          intent: Intent.SUCCESS,
+        });
+        closeAlert(name);
+      })
+      .catch((error) => {
+        closeAlert(name);
+      });
+  };
+
+  const handleCancel = () => {
+    closeAlert(name);
+  };
+
+  return (
+    <Alert
+      cancelButtonText={<T id={'cancel'} />}
+      confirmButtonText={<T id={'activate'} />}
+      intent={Intent.WARNING}
+      isOpen={isOpen}
+      onCancel={handleCancel}
+      onConfirm={handleConfirmActivate}
+    >
+      <p>
+        <T id={'are_sure_to_activate_this_account'} />
+      </p>
+    </Alert>
+  );
+}
+
+export default compose(
+  withAlertStoreConnect(),
+  withAlertActions,
+)(UserActivateAlert);

client/src/containers/Alerts/Users/UserDeleteAlert.js

@@ -40,6 +40,7 @@ function UserDeleteAlert({
           }),
           intent: Intent.SUCCESS,
         });
+        closeAlert(name);
       })
       .catch(({ response: { data: { errors } } }) => {
         if (errors.find(e => e.type === 'CANNOT_DELETE_LAST_USER')) {

client/src/containers/Alerts/Users/UserInactivateAlert.js

@@ -36,9 +36,16 @@ function UserInactivateAlert({
           }),
           intent: Intent.SUCCESS,
         });
+        closeAlert(name);
       })
-      .catch((error) => {
-        
+      .catch(({ response: { data: { errors } } }) => {
+        if (errors.find(e => e.type === 'CANNOT.TOGGLE.ACTIVATE.AUTHORIZED.USER')) {
+          AppToaster.show({
+            message: 'You could not activate/inactivate the same authorized user.',
+            intent: Intent.DANGER,
+          });
+        }
+        closeAlert(name);
       });
   };
 

client/src/containers/Preferences/Users/UsersAlerts.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import UserDeleteAlert from 'containers/Alerts/Users/UserDeleteAlert';
 import UserInactivateAlert from 'containers/Alerts/Users/UserInactivateAlert';
-// import UserActivateAlert from 'containers/Alerts/UserActivateAlert';
+import UserActivateAlert from 'containers/Alerts/Users/UserActivateAlert';
 
 export default function UsersAlerts() {
   return (
     <>
       <UserDeleteAlert name={'user-delete'} />
       <UserInactivateAlert name={'user-inactivate'} />
-      {/* <UserActivateAlert name={'user-activate'} /> */}
+      <UserActivateAlert name={'user-activate'} />
     </>
   );
 }

client/src/containers/Preferences/Users/UsersDataTable.js

@@ -2,6 +2,8 @@ import React, { useCallback } from 'react';
 
 import { compose } from 'utils';
 import { DataTable } from 'components';
+import { useResendInvitation } from 'hooks/query';
+import AppToaster from 'components/AppToaster';
 
 import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 
@@ -10,6 +12,7 @@ import withAlertActions from 'containers/Alert/withAlertActions';
 
 import { ActionsMenu, useUsersListColumns } from './components';
 import { useUsersListContext } from './UsersProvider';
+import { Intent } from '@blueprintjs/core';
 
 /**
  * Users datatable.
@@ -49,6 +52,26 @@ function UsersDataTable({
     },
     [openAlert]
   );
+
+  const { mutateAsync: resendInviation } = useResendInvitation();
+
+  const handleResendInvitation = useCallback(
+    (user) => {
+      resendInviation(user.id).then(() => {
+        AppToaster.show({
+          message: 'User invitation has been re-sent to the user.',
+          intent: Intent.SUCCESS
+        });
+      }).catch(({ response: { data: { errors } } }) => {
+        if (errors.find(e => e.type === 'USER_RECENTLY_INVITED')) {
+          AppToaster.show({
+            message: 'This person was recently invited. No need to invite them again just yet.',
+            intent: Intent.DANGER
+          });
+        }
+      });
+    }
+  )
   // Users list columns.
   const columns = useUsersListColumns();
 
@@ -67,9 +90,10 @@ function UsersDataTable({
       ContextMenu={ActionsMenu}
       payload={{
         onEdit: handleEditUserAction,
-        onActivate: handleInactivateUser,
-        onInactivate: handleActivateuser,
-        onDelete: handleDeleteUser
+        onActivate: handleActivateuser,
+        onInactivate: handleInactivateUser,
+        onDelete: handleDeleteUser,
+        onResendInvitation: handleResendInvitation
       }}
     />
   );

client/src/containers/Preferences/Users/components.js

@@ -25,12 +25,7 @@ function AvatarCell(row) {
  */
 export function ActionsMenu({
   row: { original },
-  payload: {
-    onEdit,
-    onInactivate,
-    onActivate,
-    onDelete
-  }
+  payload: { onEdit, onInactivate, onActivate, onDelete, onResendInvitation },
 }) {
   const { formatMessage } = useIntl();
 
@@ -44,9 +39,26 @@ export function ActionsMenu({
         />
         <MenuDivider />
 
+        {original.active ? (
+          <MenuItem
+            text={formatMessage({ id: 'inactivate_user' })}
+            onClick={safeCallback(onInactivate, original)}
+            icon={<Icon icon="pause-16" iconSize={16} />}
+          />
+        ) : (
+          <MenuItem
+            text={formatMessage({ id: 'activate_user' })}
+            onClick={safeCallback(onActivate, original)}
+            icon={<Icon icon="play-16" iconSize={16} />}
+          />
+        )}
+      </If>
+
+      <If condition={!original.invite_accepted_at}>
         <MenuItem
-          text={formatMessage({ id: 'inactivate_user' })}
-          onClick={safeCallback(onInactivate, original)}
+          text={'Resend invitation'}
+          onClick={safeCallback(onResendInvitation, original)}
+          icon={<Icon icon="send" iconSize={16} />}
         />
       </If>
 
@@ -64,7 +76,7 @@ export function ActionsMenu({
  * Status accessor.
  */
 function StatusAccessor(user) {
-  return !user.invite_accepted_at ? (
+  return !user.is_invite_accepted ? (
     <Tag minimal={true}>
       <T id={'inviting'} />
     </Tag>
@@ -93,6 +105,10 @@ function ActionsCell(props) {
   );
 }
 
+function FullNameAccessor(user) {
+  return user.is_invite_accepted ? user.full_name : user.email;
+}
+
 export const useUsersListColumns = () => {
   const { formatMessage } = useIntl();
 
@@ -107,7 +123,7 @@ export const useUsersListColumns = () => {
       {
         id: 'full_name',
         Header: formatMessage({ id: 'full_name' }),
-        accessor: 'full_name',
+        accessor: FullNameAccessor,
         width: 150,
       },
       {

client/src/hooks/query/invite.js

@@ -27,4 +27,14 @@ export const useInviteMetaByToken = (token, props) => {
       ...props
     }
   );
+}
+
+
+export const useResendInvitation = (props) => {
+  const apiRequest = useApiRequest();
+
+  return useMutation(
+    (userId) => apiRequest.post(`invite/resend/${userId}`),
+    props
+  )
 }

client/src/hooks/query/users.js

@@ -47,10 +47,30 @@ export function useInactivateUser(props) {
   const queryClient = useQueryClient();
 
   return useMutation(
-    ([id, values]) => apiRequest.post(`users/${id}/inactivate`, values),
+    (userId) => apiRequest.put(`users/${userId}/inactivate`),
     {
-      onSuccess: (res, [id, values]) => {
-        queryClient.invalidateQueries([t.USER, id]);
+      onSuccess: (res, userId) => {
+        queryClient.invalidateQueries([t.USER, userId]);
+
+        // Common invalidate queries.
+        commonInvalidateQueries(queryClient);
+      },
+      ...props,
+    },
+  );
+}
+
+
+
+export function useActivateUser(props) {
+  const apiRequest = useApiRequest();
+  const queryClient = useQueryClient();
+
+  return useMutation(
+    (userId) => apiRequest.put(`users/${userId}/activate`),
+    {
+      onSuccess: (res, userId) => {
+        queryClient.invalidateQueries([t.USER, userId]);
 
         // Common invalidate queries.
         commonInvalidateQueries(queryClient);

client/src/lang/en/index.js

@@ -318,6 +318,7 @@ export default {
   edit_user: 'Edit User',
   edit_invite: 'Edit Invite',
   inactivate_user: 'Inactivate User',
+  activate_user: 'Activate User',
   delete_user: 'Delete User',
   full_name: 'Full Name',
   the_user_has_been_inactivated_successfully: