Merge pull request #43 from skbkontur/filter-paging-bugfix

Discard offset when filtering

Author: Dm17r1y

DbViewer.Tests/FrontTests/BusinessObjectsTableFiltrationTest.cs

@@ -132,6 +132,36 @@ public void TestTableSettingField()
             userBusinessObjectPage.BusinessObjectItems[0].ScopeId.WaitText(scopeId);
         }
 
+        /// <summary>
+        ///     Проверяем, что при фильтрации не с первой страницы пейджинга сбрасывается offset и находятся бизнес объекты
+        /// </summary>
+        [Test]
+        public void TestFiltrationWhenNotFirstPage()
+        {
+            var scopeId = Guid.NewGuid().ToString();
+            CreateUsers(20, scopeId);
+
+            var userId = Guid.NewGuid();
+            CreateUsers(1, scopeId, userId);
+
+            using var browser = new BrowserForTests();
+
+            var userBusinessObjectPage = browser.SwitchTo<BusinessObjectTablePage>("UsersTable");
+            userBusinessObjectPage.OpenFilter.Click();
+            userBusinessObjectPage.FilterModal.ScopeId.ClearAndInputText(scopeId);
+            userBusinessObjectPage.FilterModal.Apply.Click();
+
+            userBusinessObjectPage.Paging[1].Click();
+            userBusinessObjectPage.BusinessObjectItems.WaitCount(1);
+
+            userBusinessObjectPage.OpenFilter.Click();
+            userBusinessObjectPage.FilterModal.Id.ClearAndInputText(userId.ToString());
+            userBusinessObjectPage.FilterModal.Apply.Click();
+
+            userBusinessObjectPage.ItemsCountInfo.WaitText("Записи с 0 по 1\r\n|\r\nВсего 1");
+            userBusinessObjectPage.BusinessObjectItems.WaitCount(1);
+        }
+
         private static void CreateUsers(int count, string scopeId, Guid? id = null)
         {
             if (count > 1 && id != null)

db-viewer-ui/src/Components/ObjectTableLayoutHeader/ObjectTableLayoutHeader.tsx

@@ -157,6 +157,7 @@ export class ObjectTableLayoutHeader extends React.Component<
     private readonly handleApplyFilter = () => {
         this.props.onChange({
             conditions: this.state.modalEditingConditions.filter(x => x.value != null && x.value.trim() !== ""),
+            offset: 0,
         });
         this.setState({ showFilterModal: false });
     };