Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change: invite user checkbox text for modals #287

Merged
merged 5 commits into from
Jul 12, 2024
Merged

change: invite user checkbox text for modals #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46cd476
change: invite user checkbox text for modals
DaveDarsa Jul 10, 2024
746e264
format
DaveDarsa Jul 10, 2024
d126db5
cy
DaveDarsa Jul 10, 2024
acddc6c
add tooltips
DaveDarsa Jul 12, 2024
56f4ab4
Merge branch 'main' into invite-user-text
DaveDarsa Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cypress/e2e/organizations/users.cy.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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