From 4605222c70341e21e05ad8f0583894e7d770df1b Mon Sep 17 00:00:00 2001 From: Davit Darsavelidze <76407236+DaveDarsa@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:06:35 +0400 Subject: [PATCH] change: invite user checkbox text for modals (#287) * change: invite user checkbox text for modals * format * cy * add tooltips --- cypress/e2e/organizations/users.cy.ts | 1 - src/components/Organizations/AddUserToGroup/index.js | 12 ++++++++++-- .../Organizations/AddUserToGroupSelect/index.tsx | 11 ++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/organizations/users.cy.ts b/cypress/e2e/organizations/users.cy.ts index 45678d36..936b3b61 100644 --- a/cypress/e2e/organizations/users.cy.ts +++ b/cypress/e2e/organizations/users.cy.ts @@ -17,7 +17,6 @@ describe('Org Users page', () => { aliasMutation(req, 'removeUserFromGroup'); aliasMutation(req, 'addGroupToOrganization'); }); - registerIdleHandler('idle'); }); diff --git a/src/components/Organizations/AddUserToGroup/index.js b/src/components/Organizations/AddUserToGroup/index.js index 1fd0521d..cc8f82e6 100644 --- a/src/components/Organizations/AddUserToGroup/index.js +++ b/src/components/Organizations/AddUserToGroup/index.js @@ -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'; @@ -116,7 +117,14 @@ export const AddUserToGroup = ({