Skip to content

Commit

Permalink
Revert "#16465: supported resize column in glossary tables" (#17878)
Browse files Browse the repository at this point in the history
* Revert "#16465: supported resize column in glossary tables (#17794)"

This reverts commit a1a8d93.

* need util changes for fix

* update machine to 4
  • Loading branch information
chirag-madlani authored Sep 17, 2024
1 parent 507efc6 commit d5507ca
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const test = base.extend<{ page: Page }>({
},
});

test.describe.fixme('Activity feed', () => {
test.describe('Activity feed', () => {
test.slow(true);

test.beforeAll('Setup pre-requests', async ({ browser }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ test.afterAll(async ({ browser }) => {
await afterAction();
});

test.fixme('Permissions', async ({ userPage, adminPage }) => {
test('Permissions', async ({ userPage, adminPage }) => {
test.slow();

await redirectToHomePage(userPage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const test = base.extend<{
entities.forEach((EntityClass) => {
const entity = new EntityClass();

test.describe.fixme(entity.getType(), () => {
test.describe(entity.getType(), () => {
test.beforeAll('Setup pre-requests', async ({ browser }) => {
const { apiContext, afterAction } = await performAdminLogin(browser);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const test = base.extend<{
entities.forEach((EntityClass) => {
const entity = new EntityClass();

test.describe.fixme(entity.getType(), () => {
test.describe(entity.getType(), () => {
test.beforeAll('Setup pre-requests', async ({ browser }) => {
const { apiContext, afterAction } = await performAdminLogin(browser);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,6 @@ test.describe('Glossary tests', () => {
});

test('Drag and Drop Glossary Term', async ({ browser }) => {
test.slow(true);

const { page, afterAction, apiContext } = await performAdminLogin(browser);
const glossary1 = new Glossary();
const glossaryTerm1 = new GlossaryTerm(glossary1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const GlossaryTermTab = ({
key: 'name',
className: 'glossary-name-column',
ellipsis: true,
width: 200,
width: '40%',
render: (_, record) => {
const name = getEntityName(record);

Expand Down Expand Up @@ -150,7 +150,7 @@ const GlossaryTermTab = ({
title: t('label.description'),
dataIndex: 'description',
key: 'description',
width: 200,
width: permissions.Create ? '21%' : '33%',
render: (description: string) =>
description.trim() ? (
<RichTextEditorPreviewer
Expand All @@ -166,14 +166,14 @@ const GlossaryTermTab = ({
title: t('label.owner'),
dataIndex: 'owners',
key: 'owners',
width: 100,
width: '17%',
render: (owners: EntityReference[]) => <OwnerLabel owners={owners} />,
},
{
title: t('label.status'),
dataIndex: 'status',
key: 'status',
width: 100,
width: '12%',
filterIcon: (filtered) => (
<FilterOutlined
style={{
Expand All @@ -200,7 +200,7 @@ const GlossaryTermTab = ({
data.push({
title: t('label.action-plural'),
key: 'new-term',
width: 100,
width: '10%',
render: (_, record) => {
const status = record.status ?? Status.Approved;
const allowAddTerm = status === Status.Approved;
Expand Down Expand Up @@ -474,7 +474,6 @@ const GlossaryTermTab = ({
<DndProvider backend={HTML5Backend}>
<Table
bordered
resizableColumns
className={classNames('drop-over-background', {
'drop-over-table': isTableHovered,
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
* limitations under the License.
*/

@import (reference) url('../variables.less');

.ant-table-wrapper {
.ant-table-thead {
tr > th {
Expand Down Expand Up @@ -138,35 +136,3 @@
gap: 8px;
}
}

// Setting the background color of the resizable column to where dragger is located
.ant-table.ant-table-bordered
> .ant-table-container
> .ant-table-content
> table
> thead
> tr
> .resizable-container::before,
.ant-table.ant-table-bordered
> .ant-table-container
> .ant-table-header
> table
> thead
> tr
> .resizable-container::before,
.ant-table.ant-table-bordered
> .ant-table-container
> .ant-table-body
> table
> thead
> tr
> .resizable-container::before,
.ant-table.ant-table-bordered
> .ant-table-container
> .ant-table-summary
> table
> thead
> tr
> .resizable-container::before {
background-color: @border-color !important;
}

0 comments on commit d5507ca

Please sign in to comment.