Skip to content

Commit

Permalink
change: invite user checkbox text for modals (#287)
Browse files Browse the repository at this point in the history
* change: invite user checkbox text for modals

* format

* cy

* add tooltips
  • Loading branch information
DaveDarsa authored Jul 12, 2024
1 parent 8fec6dc commit 4605222
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
1 change: 0 additions & 1 deletion cypress/e2e/organizations/users.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ describe('Org Users page', () => {
aliasMutation(req, 'removeUserFromGroup');
aliasMutation(req, 'addGroupToOrganization');
});

registerIdleHandler('idle');
});

Expand Down
12 changes: 10 additions & 2 deletions src/components/Organizations/AddUserToGroup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React, { useState } from 'react';
import { Mutation } from 'react-apollo';
import ReactSelect from 'react-select';

import { InfoCircleOutlined } from '@ant-design/icons';
import { Tooltip } from 'antd';
import Button from 'components/Button';
// @TODO: add this once the logic exists
import withLogic from 'components/Organizations/AddUserToGroup/logic';
import gql from 'graphql-tag';

Expand Down Expand Up @@ -116,7 +117,14 @@ export const AddUserToGroup = ({
</RoleSelect>
</label>
<label className="add-user">
Add user to Lagoon if required
Invite user to Lagoon
<Tooltip
overlayClassName="orgTooltip"
title="This will invite the user to Lagoon if the user doesn't exist. If the user already exists, it will just skip the invite."
placement="bottom"
>
<InfoCircleOutlined style={{ fontSize: '1rem' }} />
</Tooltip>
<input
data-cy="inviteUser"
className="inputCheckbox"
Expand Down
11 changes: 10 additions & 1 deletion src/components/Organizations/AddUserToGroupSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { FC, useState } from 'react';
import { Mutation } from 'react-apollo';
import ReactSelect from 'react-select';

import { InfoCircleOutlined } from '@ant-design/icons';
import { Tooltip } from 'antd';
import Button from 'components/Button';
import gql from 'graphql-tag';

Expand Down Expand Up @@ -158,7 +160,14 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
</RoleSelect>
</label>
<label className="add-user">
Add user to Lagoon if required
Invite user to Lagoon
<Tooltip
overlayClassName="orgTooltip"
title="This will invite the user to Lagoon if the user doesn't exist. If the user already exists, it will just skip the invite."
placement="bottom"
>
<InfoCircleOutlined style={{ fontSize: '1rem' }} />
</Tooltip>
<input
data-cy="inviteUser"
className="inputCheckbox"
Expand Down

0 comments on commit 4605222

Please sign in to comment.