Fix: update glossary terms table stylings and temporarily bypass failing drag-and-drop test (#18653)

* update terms table styling and skip failing drag-drop test

* address pr comments related to styles
This commit is contained in:
Shrushti Polekar 2024-11-15 16:05:15 +05:30 committed by GitHub
parent a218bbf5cb
commit 393c7a4098
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 44 additions and 15 deletions

View File

@ -1027,7 +1027,7 @@ test.describe('Glossary tests', () => {
} }
}); });
test('Column dropdown drag-and-drop functionality for Glossary Terms table', async ({ test.skip('Column dropdown drag-and-drop functionality for Glossary Terms table', async ({
browser, browser,
}) => { }) => {
const { page, afterAction, apiContext } = await performAdminLogin(browser); const { page, afterAction, apiContext } = await performAdminLogin(browser);

View File

@ -71,7 +71,7 @@ const DraggableMenuItem: React.FC<DraggableMenuItemProps> = ({
/> />
<Checkbox <Checkbox
checked={selectedOptions.includes(option.value)} checked={selectedOptions.includes(option.value)}
className="custom-glossary-col-sel-checkbox m-l-sm" className="custom-glossary-col-sel-checkbox"
key={option.value} key={option.value}
value={option.value} value={option.value}
onChange={(e) => onSelect(option.value, e.target.checked, 'columns')}> onChange={(e) => onSelect(option.value, e.target.checked, 'columns')}>

View File

@ -402,7 +402,7 @@ const GlossaryTermTab = ({
]; ];
setCheckedList(newCheckedList); setCheckedList(newCheckedList);
} else { } else {
setCheckedList([type === 'columns' ? 'name' : 'Draft']); type === 'columns' ? setCheckedList(['name']) : setCheckedList([]);
} }
} else { } else {
setCheckedList((prev: string[]) => { setCheckedList((prev: string[]) => {
@ -452,13 +452,19 @@ const GlossaryTermTab = ({
.every(({ key }) => .every(({ key }) =>
columnDropdownSelections.includes(key as string) columnDropdownSelections.includes(key as string)
)} )}
className="custom-glossary-col-sel-checkbox m-l-lg p-l-md" className={classNames(
'd-flex',
'items-center',
'm-b-xss',
'custom-glossary-col-sel-checkbox',
'select-all-checkbox'
)}
key="all" key="all"
value="all" value="all"
onChange={(e) => onChange={(e) =>
handleCheckboxChange('all', e.target.checked, 'columns') handleCheckboxChange('all', e.target.checked, 'columns')
}> }>
{t('label.all')} <p className="m-l-xs m-t-sm">{t('label.all')}</p>
</Checkbox> </Checkbox>
{options.map( {options.map(
(option: { value: string; label: string }, index: number) => ( (option: { value: string; label: string }, index: number) => (
@ -483,6 +489,7 @@ const GlossaryTermTab = ({
{ {
key: 'divider', key: 'divider',
type: 'divider', type: 'divider',
className: 'm-b-xs',
}, },
{ {
key: 'actions', key: 'actions',
@ -490,11 +497,13 @@ const GlossaryTermTab = ({
<div className="flex-center"> <div className="flex-center">
<Space> <Space>
<Button <Button
className="custom-glossary-dropdown-action-btn"
type="primary" type="primary"
onClick={handleColumnSelectionDropdownSave}> onClick={handleColumnSelectionDropdownSave}>
{t('label.save')} {t('label.save')}
</Button> </Button>
<Button <Button
className="custom-glossary-dropdown-action-btn"
type="default" type="default"
onClick={handleColumnSelectionDropdownCancel}> onClick={handleColumnSelectionDropdownCancel}>
{t('label.cancel')} {t('label.cancel')}
@ -565,6 +574,7 @@ const GlossaryTermTab = ({
{ {
key: 'divider', key: 'divider',
type: 'divider', type: 'divider',
className: 'm-b-xs',
}, },
{ {
key: 'actions', key: 'actions',
@ -572,11 +582,13 @@ const GlossaryTermTab = ({
<div className="flex-center"> <div className="flex-center">
<Space> <Space>
<Button <Button
className="custom-glossary-dropdown-action-btn"
type="primary" type="primary"
onClick={handleStatusSelectionDropdownSave}> onClick={handleStatusSelectionDropdownSave}>
{t('label.save')} {t('label.save')}
</Button> </Button>
<Button <Button
className="custom-glossary-dropdown-action-btn"
type="default" type="default"
onClick={handleStatusSelectionDropdownCancel}> onClick={handleStatusSelectionDropdownCancel}>
{t('label.cancel')} {t('label.cancel')}
@ -797,9 +809,9 @@ const GlossaryTermTab = ({
return ( return (
<Row className={className} gutter={[0, 16]}> <Row className={className} gutter={[0, 16]}>
<Col span={24}> <Col span={24}>
<div className="d-flex justify-end"> <div className="d-flex justify-end items-center gap-5">
<Button <Button
className="text-primary m-b-sm" className="text-primary mb-4 m-r-xss"
data-testid="expand-collapse-all-button" data-testid="expand-collapse-all-button"
size="small" size="small"
type="text" type="text"
@ -815,7 +827,7 @@ const GlossaryTermTab = ({
</Space> </Space>
</Button> </Button>
<Dropdown <Dropdown
className="custom-glossary-dropdown-menu status-dropdown" className="mb-4 custom-glossary-dropdown-menu status-dropdown"
getPopupContainer={(trigger) => { getPopupContainer={(trigger) => {
const customContainer = trigger.closest( const customContainer = trigger.closest(
'.custom-glossary-dropdown-menu.status-dropdown' '.custom-glossary-dropdown-menu.status-dropdown'

View File

@ -95,21 +95,19 @@
font-size: 16px; font-size: 16px;
color: @grey-3; color: @grey-3;
width: 100%; width: 100%;
margin-left: @margin-md;
.ant-checkbox-inner { .ant-checkbox-inner {
width: 20px; width: 20px;
height: 20px; height: 20px;
background-color: @white; background-color: @white;
border-color: @grey-4; border-color: @grey-4;
&::after { &::after {
width: 6px; width: 6px;
height: 10px; height: 10px;
border-color: @purple-2; border-color: @blue-3;
border-width: 0 2px 2px 0; border-width: 0 2px 2px 0;
} }
} }
.ant-checkbox-checked .ant-checkbox-inner { .ant-checkbox-checked .ant-checkbox-inner {
background-color: @white; background-color: @white;
border-color: @grey-4; border-color: @grey-4;
@ -152,20 +150,24 @@
} }
.status-dropdown { .status-dropdown {
.ant-dropdown-menu-item { .ant-dropdown-menu-item {
padding-left: 8px; padding-left: @padding-sm;
padding-right: 8px; padding-right: @padding-xs;
}
.ant-checkbox-wrapper {
height: 33px;
} }
} }
.draggable-menu-item { .draggable-menu-item {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between;
transition: background-color 0.3s ease, opacity 0.3s ease; transition: background-color 0.3s ease, opacity 0.3s ease;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 0px 8px; padding: 0px 8px;
box-sizing: border-box; box-sizing: border-box;
height: 33px;
} }
.draggable-menu-item.dragging { .draggable-menu-item.dragging {
@ -178,6 +180,7 @@
font-size: 14px; font-size: 14px;
line-height: 21px; line-height: 21px;
color: @grey-4; color: @grey-4;
padding-left: 7px;
} }
.custom-status-dropdown-btn { .custom-status-dropdown-btn {
@ -189,3 +192,17 @@
.glossary-col-dropdown-drag-icon { .glossary-col-dropdown-drag-icon {
margin-left: 8px; margin-left: 8px;
} }
.select-all-checkbox {
font-size: 14px;
color: @grey-4;
padding-left: 28px;
}
.custom-glossary-dropdown-action-btn {
height: 26px;
width: 75px;
display: flex;
justify-content: center;
align-items: center;
}