From 95692785d47cff6a4d027e9c7444f830b8b924fc Mon Sep 17 00:00:00 2001 From: suryakant Date: Sat, 12 Jan 2019 12:06:21 +0530 Subject: [PATCH 1/5] Backend: User Role Checkbox alignement. --- .../backend/Magento_Ui/web/css/source/module/_data-grid.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less index d55608ade4a05..dcead31b793e0 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less +++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less @@ -1074,7 +1074,7 @@ body._in-resize { } .data-grid-checkbox-cell-inner { - margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem; + margin: 0 @data-grid-checkbox-cell-inner__padding-horizontal 0; padding: 0; } From 926ba336a2156e2b4e3a9b01e966835bdccdd502 Mon Sep 17 00:00:00 2001 From: suryakant Date: Sat, 12 Jan 2019 12:25:28 +0530 Subject: [PATCH 2/5] Backend: User Role Checkbox alignement. --- .../backend/Magento_Ui/web/css/source/module/_data-grid.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less index dcead31b793e0..0296010fd84e1 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less +++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less @@ -393,6 +393,7 @@ body._in-resize { padding: 0; vertical-align: top; width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2; + vertical-align: middle; &:hover { cursor: default; @@ -1076,6 +1077,7 @@ body._in-resize { .data-grid-checkbox-cell-inner { margin: 0 @data-grid-checkbox-cell-inner__padding-horizontal 0; padding: 0; + text-align: center; } // Content Hierarchy specific From fc3a1a6e5c18bf772d7ddbaaf135e9b70a2e1cc3 Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Thu, 17 Jan 2019 12:18:03 +0200 Subject: [PATCH 3/5] ENGCOM-3870: Static test fix. --- .../backend/Magento_Ui/web/css/source/module/_data-grid.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less index 0296010fd84e1..b0c44e127a454 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less +++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less @@ -392,8 +392,8 @@ body._in-resize { overflow: hidden; padding: 0; vertical-align: top; - width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2; vertical-align: middle; + width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2; &:hover { cursor: default; From c7e0a409e0b0cb3f7753c27a142b027c65b2c71f Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Fri, 18 Jan 2019 15:23:25 +0200 Subject: [PATCH 4/5] ENGCOM-3870: MFTF test fix. --- app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml index 717022322698f..b716047a39008 100644 --- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml +++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml @@ -19,7 +19,7 @@ - + From 9eaa5fc3ada1c4f0ff0327be79aaab9064d58adf Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 13 Feb 2019 14:36:14 +0200 Subject: [PATCH 5/5] Fix functional test. --- .../app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php index 235b0d096533f..c6ff9377d1247 100644 --- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php +++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php @@ -162,6 +162,11 @@ class DataGrid extends Grid */ protected $currentPage = ".//*[@data-ui-id='current-page-input'][not(ancestor::*[@class='sticky-header'])]"; + /** + * Top page element to implement a scrolling in case of grid element not visible. + */ + private $topElementToScroll = 'header.page-header'; + /** * Clear all applied Filters. * @@ -368,6 +373,10 @@ public function selectItems(array $items, $isSortable = true) $this->sortGridByField('ID'); } foreach ($items as $item) { + //Scroll to the top of the page in case current page input is not visible. + if (!$this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->isVisible()) { + $this->browser->find($this->topElementToScroll)->hover(); + } $this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->setValue(''); $this->waitLoader(); $selectItem = $this->getRow($item)->find($this->selectItem);