datasets: accept new test outputs

riganti · Apr 28, 2024 · 4fbe3cb · 4fbe3cb
1 parent 24fc658
commit 4fbe3cb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/Tests/ControlTests/DataPagerTests.cs b/src/Tests/ControlTests/DataPagerTests.cs
@@ -78,21 +78,6 @@ public async Task StaticCommandApendablePager()
             );
 
             check.CheckString(r.FormattedHtml, fileExtension: "html");
-
-            var commandExpressions = r.Commands
-                .Select(c => (c.control, c.command, str: c.command.GetProperty<ParsedExpressionBindingProperty>().Expression.ToCSharpString().Trim().TrimEnd(';')))
-                .OrderBy(c => c.str)
-                .ToArray();
-            check.CheckLines(commandExpressions.GroupBy(c => c.command).Select(c => c.First().str), checkName: "command-bindings", fileExtension: "txt");
-
-            var nextPage = commandExpressions.Single(c => c.str.Contains(".GoToNextPage()"));
-            var prevPage = commandExpressions.Single(c => c.str.Contains(".GoToPreviousPage()"));
-            var firstPage = commandExpressions.Single(c => c.str.Contains(".GoToFirstPage()"));
-            var lastPage = commandExpressions.Single(c => c.str.Contains(".GoToLastPage()"));
-
-            await r.RunCommand((CommandBindingExpression)nextPage.command, nextPage.control);
-            Assert.AreEqual(1, (int)r.ViewModel.Customers.PagingOptions.PageIndex);
-
         }
 
         public class GridViewModel: DotvvmViewModelBase

diff --git a/src/Tests/ControlTests/testoutputs/DataPagerTests.StaticCommandApendablePager.html b/src/Tests/ControlTests/testoutputs/DataPagerTests.StaticCommandApendablePager.html
@@ -1,25 +1,25 @@
 <html>
 	<head></head>
 	<body>
-		<div data-bind="dotvvm-gridviewdataset: {
+		<div data-bind="dotvvm-appendable-data-pager: {
 dataSet: Customers(),
 loadNextPage: (...args)=>(dotvvm.applyPostbackHandlers(async (options) => {
 	let cx = $context;
 	return await dotvvm.dataSet.loadDataSet(options.viewModel.Customers, (options) => dotvvm.dataSet.translations.PagingOptions.goToNextPage(ko.unwrap(options).PagingOptions), ((...args)=>(dotvvm.applyPostbackHandlers(async (options) => await dotvvm.staticCommandPostback(&quot;WARNING/NOT/ENCRYPTED+++WyJEb3RWVk0uRnJhbWV3b3JrLlRlc3RzLkNvbnRyb2xUZXN0cy5EYXRhUGFnZXJUZXN0cytHcmlkVmlld01vZGVsLCBEb3RWVk0uRnJhbWV3b3JrLlRlc3RzIiwiTG9hZEN1c3RvbWVycyIsW10sMSxudWxsLCJBQT09Il0=&quot;, [args[0]], options),$element,[],args,$context))), dotvvm.dataSet.postProcessors.append);
 },$element,[],args,$context)),
-postProcessor: dotvvm.dataSet.postProcessors.append
+autoLoadWhenInViewport: false
 }">
-
+			<!-- ko if: $appendableDataPager.canLoadNextPage -->         
 			<!-- ko with: 1 -->
 			<div>
 				<input onclick="dotvvm.applyPostbackHandlers(async (options) => {
-	await options.knockoutContext.$parentContext.$gridViewDataSetHelper.loadNextPage();
+	await options.knockoutContext.$parentContext.$appendableDataPager.loadNextPage();
 },this).catch(dotvvm.log.logPostBackScriptError);event.stopPropagation();return false;" type="button" value="Load more">
 			</div>
+			<!-- /ko -->     
+			<!-- /ko -->
+			<!-- ko if: Customers()?.PagingOptions()?.IsLastPage --> end 
 			<!-- /ko -->
-			<div data-bind="visible: Customers()?.PagingOptions()?.IsLastPage" style="display:none">
-				end
-			</div>
 		</div>
 	</body>
 </html>
diff --git a/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json b/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json
@@ -378,6 +378,19 @@
         "required": true,
         "onlyBindings": true
       },
+      "LoadingTemplate": {
+        "type": "DotVVM.Framework.Controls.ITemplate, DotVVM.Framework",
+        "dataContextChange": [
+          {
+            "$type": "DotVVM.Framework.Binding.HelperNamespace.DataPagerApi+AddParameterDataContextChangeAttribute, DotVVM.Framework",
+            "Name": "_dataPager",
+            "NestDataContext": false,
+            "TypeId": "DotVVM.Framework.Binding.HelperNamespace.DataPagerApi+AddParameterDataContextChangeAttribute, DotVVM.Framework"
+          }
+        ],
+        "mappingMode": "InnerElement",
+        "onlyHardcoded": true
+      },
       "LoadTemplate": {
         "type": "DotVVM.Framework.Controls.ITemplate, DotVVM.Framework",
         "dataContextChange": [