N°902 Portal: Add support for columns sorting in ManageBrick's "lazy" mode

datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php

@@ -401,6 +401,9 @@ class ManageBrickController extends BrickController
 		// - Adding search clause if necessary
 		$this->ManageSearchValue($aData, $oQuery, $sClass, $aColumnsAttrs);
 
+		// - Transforming search sort params to OQL format
+		$aSortedParams = $this->ExtractSortParams($aColumnsAttrs);
+
 		// Preparing areas
 		// - We need to retrieve distinct values for the grouping attribute
 		// Note : Will have to be changed when we consider grouping on something else than the finalclass
@@ -522,6 +525,16 @@ class ManageBrickController extends BrickController
 						$oSet = new DBObjectSet($oQuery);
 					}
 
+					// Setting specified column sort, setting default datamodel one otherwise
+					if (!empty($aSortedParams))
+					{
+						$oSet->SetOrderBy($aSortedParams);
+					}
+					else
+					{
+						$oSet->SetOrderByClasses();
+					}
+
 					// Adding always_in_tables attributes
 					$aColumnsToLoad = array($oQuery->GetClassAlias() => $aColumnsAttrs);
 					foreach ($oQuery->GetSelectedClasses() as $sAlias => $sClassSelected)
@@ -535,9 +548,8 @@ class ManageBrickController extends BrickController
 							}
 						}
 					}
-
 					$oSet->OptimizeColumnLoad($aColumnsToLoad);
-					$oSet->SetOrderByClasses();
+
 					$oSecurityHelper->PreloadForCache($oSet->GetFilter(),
 						$aColumnsToLoad[$oQuery->GetClassAlias()] /* preloading only extkeys from the main class */);
 					$aSets[$sKey] = $oSet;
@@ -866,6 +878,36 @@ class ManageBrickController extends BrickController
 		$aData['sSearchValue'] = $sSearchValue;
 	}
 
+	/**
+	 * Extract sort params from request and convert them to iTop OQL format
+	 *
+	 * @param array $aColumnsAttrs
+	 *
+	 * @return array
+	 *
+	 * @since 2.7.0
+	 */
+	protected function ExtractSortParams($aColumnsAttrs = array())
+	{
+		/** @var \Combodo\iTop\Portal\Helper\RequestManipulatorHelper $oRequestManipulator */
+		$oRequestManipulator = $this->get('request_manipulator');
+
+		// Getting sort params
+		$aSortParams = $oRequestManipulator->ReadParam('aSortParams', array());
+		$aFormattedSortParams = array();
+
+		// - Adding possible multiple sort params on displayed columns
+		foreach ($aSortParams as $sKey => $aSortParam)
+		{
+			if (array_key_exists($aSortParam['column'], $aColumnsAttrs))
+			{
+				$aFormattedSortParams[$aColumnsAttrs[$aSortParam['column']]] = ($aSortParam['dir'] === 'asc');
+			}
+		}
+
+		return $aFormattedSortParams;
+	}
+
 	/**
 	 * Get the groups using a given attribute code.
 	 * If a limit is given, the remaining groups are aggregated (group by result and search request).

datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig

@@ -101,7 +101,7 @@
                     columnsDefinition.push({
                         "width": "auto",
                         "searchable": true,
-                        "sortable": (sDataLoading === '{{ constant('Combodo\\iTop\\Portal\\Brick\\AbstractBrick::ENUM_DATA_LOADING_FULL') }}'),
+                        "sortable": true,
                         "title": tableProperties[key].title,
                         "defaultContent": "",
                         "type": "html",
@@ -294,8 +294,7 @@
                         "data": function (d) {
                             d.iPageNumber = Math.floor(d.start / d.length) + 1;
                             d.iListLength = d.length;
-                            d.columns = null;
-                            d.orders = null;
+                            d.aSortParams = d.order;
 
                             {% if sSearchValue is not null %}
                             // Sets default filter value