Skip to content

Commit 0515600

Browse files
authored
test(acceptance): Revert disabling CSS transforms for grid layout (#31754)
Reverting the change to get back stable acceptance test runs
1 parent 33f3f5a commit 0515600

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

static/app/views/dashboardsV2/addWidget.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ function AddWidget({onAddWidget, onOpenWidgetBuilder, orgFeatures}: Props) {
5656
duration: 0.25,
5757
}}
5858
>
59-
<InnerWrapper onClick={onClick} data-test-id="widget-add">
59+
<InnerWrapper onClick={onClick}>
6060
<AddButton
61+
data-test-id="widget-add"
6162
icon={<IconAdd size="lg" isCircled color="inactive" />}
6263
aria-label={t('Add widget')}
6364
/>

static/app/views/dashboardsV2/dashboard.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ class Dashboard extends Component<Props, State> {
548548
<IconResize />
549549
</ResizeHandle>
550550
}
551-
useCSSTransforms={false}
552551
isBounded
553552
>
554553
{widgetsWithLayout.map((widget, index) => this.renderWidget(widget, index))}
@@ -645,9 +644,14 @@ const GridItem = styled('div')`
645644
}
646645
`;
647646

647+
// HACK: to stack chart tooltips above other grid items
648648
const GridLayout = styled(WidthProvider(Responsive))`
649649
margin: -${space(2)};
650650
651+
.react-grid-item:hover {
652+
z-index: 10;
653+
}
654+
651655
.react-resizable-handle {
652656
background-image: none;
653657
}

tests/acceptance/page_objects/dashboard_detail.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ def enter_edit_state(self):
3939
self.wait_until_loaded()
4040

4141
def click_dashboard_add_widget_button(self):
42-
# TODO(nar): This clickable check is causing flake when CSS Transforms are
43-
# disabled for the grid library
44-
# self.browser.wait_until_clickable('[data-test-id="widget-add"]')
42+
self.browser.wait_until_clickable('[data-test-id="widget-add"]')
4543
button = self.browser.element('[data-test-id="widget-add"]')
4644
button.click()
4745
self.wait_until_loaded()

tests/js/spec/views/dashboardsV2/detail.spec.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ describe('Dashboards > Detail', function () {
495495
// Enter edit mode.
496496
wrapper.find('Controls Button[data-test-id="dashboard-edit"]').simulate('click');
497497
wrapper.update();
498-
wrapper.find('InnerWrapper[data-test-id="widget-add"]').simulate('click');
498+
wrapper.find('AddButton[data-test-id="widget-add"]').simulate('click');
499499
expect(openEditModal).toHaveBeenCalledTimes(1);
500500
});
501501

@@ -528,7 +528,7 @@ describe('Dashboards > Detail', function () {
528528
// Enter edit mode.
529529
wrapper.find('Controls Button[data-test-id="dashboard-edit"]').simulate('click');
530530
wrapper.update();
531-
wrapper.find('InnerWrapper[data-test-id="widget-add"]').simulate('click');
531+
wrapper.find('AddButton[data-test-id="widget-add"]').simulate('click');
532532
expect(openEditModal).toHaveBeenCalledTimes(1);
533533
expect(openEditModal).toHaveBeenCalledWith(
534534
expect.objectContaining({

tests/js/spec/views/dashboardsV2/gridLayout/detail.spec.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ describe('Dashboards > Detail', function () {
376376
// Enter edit mode.
377377
wrapper.find('Controls Button[data-test-id="dashboard-edit"]').simulate('click');
378378
wrapper.update();
379-
wrapper.find('InnerWrapper[data-test-id="widget-add"]').simulate('click');
379+
wrapper.find('AddButton[data-test-id="widget-add"]').simulate('click');
380380
expect(openEditModal).toHaveBeenCalledTimes(1);
381381
});
382382

@@ -409,7 +409,7 @@ describe('Dashboards > Detail', function () {
409409
// Enter edit mode.
410410
wrapper.find('Controls Button[data-test-id="dashboard-edit"]').simulate('click');
411411
wrapper.update();
412-
wrapper.find('InnerWrapper[data-test-id="widget-add"]').simulate('click');
412+
wrapper.find('AddButton[data-test-id="widget-add"]').simulate('click');
413413
expect(openEditModal).toHaveBeenCalledTimes(1);
414414
expect(openEditModal).toHaveBeenCalledWith(
415415
expect.objectContaining({

0 commit comments

Comments
 (0)