From 94d53575ae0a24065fd6daa8dfe1bb4590aee067 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Fri, 10 Sep 2021 18:01:41 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03685=20-=20Front-end=20performances:=20I?=
 =?UTF-8?q?nclude=20dataTables=20lib.=20only=20when=20necessary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Base/Component/DataTable/DataTable.php   |  2 ++
 .../DataTable/StaticTable/StaticTable.php       |  1 +
 sources/application/WebPage/NiceWebPage.php     | 17 ++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sources/application/UI/Base/Component/DataTable/DataTable.php b/sources/application/UI/Base/Component/DataTable/DataTable.php
index 5f6d3ef16..aa69895dd 100644
--- a/sources/application/UI/Base/Component/DataTable/DataTable.php
+++ b/sources/application/UI/Base/Component/DataTable/DataTable.php
@@ -34,6 +34,8 @@ class DataTable extends UIContentBlock
 		'node_modules/datatables.net-responsive/js/dataTables.responsive.js',
 		'node_modules/datatables.net-scroller/js/dataTables.scroller.js',
 		'node_modules/datatables.net-select/js/dataTables.select.js',
+		'js/field_sorter.js',
+		'js/table-selectable-lines.js',
 		'js/dataTables.main.js',
 		'js/dataTables.settings.js',
 		'js/dataTables.pipeline.js',
diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
index 44fd4cb62..da6cd7f7e 100644
--- a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
+++ b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
@@ -29,6 +29,7 @@ class StaticTable extends UIContentBlock
 		'node_modules/datatables.net-responsive/js/dataTables.responsive.js',
 		'node_modules/datatables.net-scroller/js/dataTables.scroller.js',
 		'node_modules/datatables.net-select/js/dataTables.select.js',
+		'js/field_sorter.js',
 		'js/dataTables.main.js',
 		'js/dataTables.settings.js',
 		'js/dataTables.pipeline.js',
diff --git a/sources/application/WebPage/NiceWebPage.php b/sources/application/WebPage/NiceWebPage.php
index 4ac75272a..22965fb47 100644
--- a/sources/application/WebPage/NiceWebPage.php
+++ b/sources/application/WebPage/NiceWebPage.php
@@ -40,9 +40,17 @@ class NiceWebPage extends WebPage
 		'js/search/search_form_criteria_date_abstract.js',
 		'js/search/search_form_criteria_date.js',
 		'js/search/search_form_criteria_date_time.js',
+		// - DataTable UIBlock
+		'js/field_sorter.js',
+		'js/table-selectable-lines.js',
 
 		// Deprecated files
 		'js/hovertip.js',
+		/** @deprecated since 3.0.0 N°2737 - Migrate table to DataTables plugin to be iso with the end-users portal */
+		'js/datatable.js',
+		'js/jquery.tablesorter.js',
+		'js/jquery.tablesorter.pager.js',
+		'js/jquery.tablehover.js',
 	];
 
 	const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/nicewebpage/layout';
@@ -138,15 +146,6 @@ EOF
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui.custom.min.js');
 
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/table-selectable-lines.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
-		//TODO deprecated in 3.0.0
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
-		// table sorting
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
-		//TODO end deprecated in 3.0.0
 
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');