Datatables redesign client side cache mechanism

formats/datatables/Api.php

@@ -36,10 +36,6 @@
 		$datatableData = $data['datatableData'];
 		$settings = $data['settings'];
 
-		if ( empty( $datatableData['length'] ) ) {
-			$datatableData['length'] = $settings['defer-each'];
-		}
-
 		if ( empty( $datatableData['start'] ) ) {
 			$datatableData['start'] = 0;
 		}
@@ -68,18 +64,17 @@
 			[
 				// *** important !!
 				'format' => 'datatables',
-				"apicall" => "apicall",
-				// @see https://datatables.net/manual/server-side
-				// array length will be sliced client side if greater
-				// than the required datatables length
-				"limit" => max( $datatableData['length'], $settings['defer-each'] ),
-				"offset" => $datatableData['start'],
-
-				"sort" => implode( ',', array_map( static function ( $value ) use( $datatableData ) {
+				'apicall' => 'apicall',
+
+				// @TODO limit taking into account PreloaData
+				'limit' => max( $datatableData['length'], $settings['limit'] ),
+				'offset' => $datatableData['start'],
+
+				'sort' => implode( ',', array_map( static function ( $value ) use( $datatableData ) {
 					return $datatableData['columns'][$value['column']]['name'];
 				}, $datatableData['order'] ) ),
 
-				"order" => implode( ',', array_map( static function ( $value ) {
+				'order' => implode( ',', array_map( static function ( $value ) {
 					return $value['dir'];
 				}, $datatableData['order'] ) )
 
@@ -298,7 +293,8 @@
 			'recordsTotal' => $settings['count'],
 			'recordsFiltered' => $count,
 			'cacheKey' => $data['cacheKey'],
-			'datalength' => $datatableData['length']
+			'datalength' => $datatableData['length'],
+			'start' => $datatableData['start']
 		];
 
 		if ( $settings['displayLog'] ) {

formats/datatables/DataTables.php

@@ -99,11 +99,10 @@ public function getParamDefinitions( array $definitions ) {
 			'values' => [ 'all', 'subject', 'none', 'auto' ],
 		];
 
-		$params['defer-each'] = [
+		$params['limit'] = [
 			'type' => 'integer',
-			'message' => 'smw-paramdesc-defer-each',
-			// $GLOBALS['smwgQMaxLimit']
-			'default' => 0,
+			'message' => 'smw-paramdesc-limit',
+			'default' => 100,
 		];
 
 		// *** only used internally, do not use in query

formats/datatables/Hooks.php

@@ -34,12 +34,11 @@
 		}
 
 		$inlineLimit = $query->getLimit();
+
 		$count = self::getCount( $query, $queryEngine );
-		// $limit = ( !empty( $params['defer-each'] ) ? $params['defer-each'] : $inlineLimit );
 
 		if ( empty( $params['noajax'] ) ) {
-			// $lengthmenuMax = max( $params['datatables-lengthmenu'] );
-			$limit = max( $params['datatables-pagelength'], $params['defer-each'], $inlineLimit );
+			$limit = max( $params['datatables-pagelength'], $inlineLimit );
 
 		} else {
 			$limit = $count;