adjusted some visualizations to the new viewdatatable structure, the platform is displaying some data again

11 files changed, 111 insertions, 114 deletions

diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 030a7fe6b9..83167eb89e 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -673,7 +673,7 @@ class Actions extends \Piwik\Plugin
         // so users can see that they can set it to 1 (see #3365)
         $result['custom_parameters'] = array('flat' => 0);
 
-        if (ViewDataTable::shouldLoadExpanded()) {
+        if (ViewDataTable\Request::shouldLoadExpanded()) {
             $result['visualization_properties']['table']['show_expanded'] = true;
 
             $result['filters'][] = function ($dataTable) {
diff --git a/plugins/CoreVisualizations/Visualizations/Cloud.php b/plugins/CoreVisualizations/Visualizations/Cloud.php
index 53e6e6b936..b6fe403da3 100644
--- a/plugins/CoreVisualizations/Visualizations/Cloud.php
+++ b/plugins/CoreVisualizations/Visualizations/Cloud.php
@@ -12,10 +12,9 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\DataTable\DataTableInterface;
 use Piwik\Log;
 use Piwik\View;
-use Piwik\ViewDataTable\Visualization;
+use Piwik\Plugin\Visualization;
 use Piwik\Visualization\Config;
 use Piwik\Visualization\Request;
 
@@ -49,18 +48,18 @@ class Cloud extends Visualization
     protected $wordsArray = array();
     public $truncatingLimit = 50;
 
-    public function afterAllFilteresAreApplied(DataTable $dataTable, Config $properties, Request $request)
+    public function afterAllFilteresAreApplied()
     {
-        if ($dataTable->getRowsCount() == 0) {
+        if ($this->dataTable->getRowsCount() == 0) {
             return;
         }
 
-        $columnToDisplay = isset($properties->columns_to_display[1]) ? $properties->columns_to_display[1] : 'nb_visits';
+        $columnToDisplay = isset($this->config->columns_to_display[1]) ? $this->config->columns_to_display[1] : 'nb_visits';
 
         $labelMetadata = array();
-        foreach ($dataTable->getRows() as $row) {
+        foreach ($this->dataTable->getRows() as $row) {
             $logo = false;
-            if ($properties->visualization_properties->display_logo_instead_of_label) {
+            if ($this->config->visualization_properties->display_logo_instead_of_label) {
                 $logo = $row->getMetadata('logo');
             }
 
@@ -82,11 +81,11 @@ class Cloud extends Visualization
         $this->cloudValues   = $cloudValues;
     }
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        $properties->show_exclude_low_population = false;
-        $properties->show_offset_information     = false;
-        $properties->show_limit_control          = false;
+        $this->config->show_exclude_low_population = false;
+        $this->config->show_offset_information     = false;
+        $this->config->show_limit_control          = false;
     }
 
     public static function getDefaultPropertyValues()
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
index 84085cf7ff..a74f28f7b7 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
@@ -18,7 +18,7 @@ use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Site;
 use Piwik\View;
-use Piwik\ViewDataTable\Visualization;
+use Piwik\Plugin\Visualization;
 use Piwik\Visualization\Config as VizConfig;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php';
@@ -149,12 +149,12 @@ class HtmlTable extends Visualization
         'highlight_summary_row',
     );
 
-    public function configureVisualization(VizConfig $properties)
+    public function configureVisualization()
     {
         if (Common::getRequestVar('idSubtable', false)
-            && $properties->visualization_properties->show_embedded_subtable
+            && $this->config->visualization_properties->show_embedded_subtable
         ) {
-            $properties->show_visualization_only = true;
+            $this->config->show_visualization_only = true;
         }
     }
 
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
index d03ba2c05c..2dc5ee43cc 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
@@ -31,21 +31,22 @@ class AllColumns extends HtmlTable
 {
     const ID = 'tableAllColumns';
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        $properties->visualization_properties->show_extra_columns = true;
+        $this->config->visualization_properties->show_extra_columns = true;
 
-        $properties->show_exclude_low_population = true;
-        $properties->datatable_css_class = 'dataTableVizAllColumns';
+        $this->config->show_exclude_low_population = true;
+        $this->config->datatable_css_class = 'dataTableVizAllColumns';
 
-        parent::configureVisualization($properties);
+        parent::configureVisualization();
     }
 
-    public function beforeGenericFiltersAreAppliedToLoadedDataTable(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function beforeGenericFiltersAreAppliedToLoadedDataTable()
     {
-        $dataTable->filter('AddColumnsProcessedMetrics');
+        $this->dataTable->filter('AddColumnsProcessedMetrics');
+        $properties = $this->config;
 
-        $dataTable->filter(function ($dataTable) use ($properties) {
+        $this->dataTable->filter(function ($dataTable) use ($properties) {
             $columnsToDisplay = array('label', 'nb_visits');
 
             if (in_array('nb_uniq_visitors', $dataTable->getColumns())) {
@@ -67,7 +68,7 @@ class AllColumns extends HtmlTable
 
         $prettifyTime = array('\Piwik\MetricsFormatter', 'getPrettyTimeFromSeconds');
 
-        $dataTable->filter('ColumnCallbackReplace', array('avg_time_on_site', $prettifyTime));
+        $this->dataTable->filter('ColumnCallbackReplace', array('avg_time_on_site', $prettifyTime));
     }
 
 }
\ No newline at end of file
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/Goals.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/Goals.php
index 71aec3fe2f..d63230107a 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable/Goals.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/Goals.php
@@ -29,63 +29,61 @@ class Goals extends HtmlTable
 {
     const ID = 'tableGoals';
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        $properties->visualization_properties->show_goals_columns = true;
+        $this->config->visualization_properties->show_goals_columns = true;
 
-        $properties->datatable_css_class = 'dataTableVizGoals';
-        $properties->show_exclude_low_population = true;
-        $properties->show_goals = true;
+        $this->config->datatable_css_class = 'dataTableVizGoals';
+        $this->config->show_exclude_low_population = true;
+        $this->config->show_goals = true;
 
-        $properties->translations += array(
+        $this->config->translations += array(
             'nb_conversions'    => Piwik::translate('Goals_ColumnConversions'),
             'conversion_rate'   => Piwik::translate('General_ColumnConversionRate'),
             'revenue'           => Piwik::translate('General_ColumnRevenue'),
             'revenue_per_visit' => Piwik::translate('General_ColumnValuePerVisit'),
         );
-        $properties->metrics_documentation['nb_visits'] = Piwik::translate('Goals_ColumnVisits');
+        $this->config->metrics_documentation['nb_visits'] = Piwik::translate('Goals_ColumnVisits');
 
         if (Common::getRequestVar('documentationForGoalsPage', 0, 'int') == 1) { // TODO: should not use query parameter
-            $properties->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation',
+            $this->config->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation',
                 array('<br />', '<br />', '<a href="http://piwik.org/docs/tracking-goals-web-analytics/" target="_blank">', '</a>'));
         }
 
-        if (!$properties->visualization_properties->disable_subtable_when_show_goals) {
-            $properties->subtable_controller_action = null;
+        if (!$this->config->visualization_properties->disable_subtable_when_show_goals) {
+            $this->config->subtable_controller_action = null;
         }
 
         $this->setShowGoalsColumnsProperties();
 
-        parent::configureVisualization($properties);
+        parent::configureVisualization();
     }
 
     private function setShowGoalsColumnsProperties()
     {
-        $view = $this->viewDataTable;
-
         // set view properties based on goal requested
         $idSite = Common::getRequestVar('idSite', null, 'int');
         $idGoal = Common::getRequestVar('idGoal', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW, 'string');
         if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
-            $this->setPropertiesForEcommerceView($view);
+            $this->setPropertiesForEcommerceView();
         } else if ($idGoal == AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE) {
-            $this->setPropertiesForGoals($view, $idSite, 'all');
+            $this->setPropertiesForGoals($idSite, 'all');
         } else if ($idGoal == AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW) {
-            $this->setPropertiesForGoalsOverview($view, $idSite);
+            $this->setPropertiesForGoalsOverview($idSite);
         } else {
-            $this->setPropertiesForGoals($view, $idSite, array($idGoal));
+            $this->setPropertiesForGoals($idSite, array($idGoal));
         }
 
         // add goals columns
-        $view->filters[] = array('AddColumnsProcessedMetricsGoal', array($ignore = true, $idGoal), $priority = true);
+        $this->config->filters[] = array('AddColumnsProcessedMetricsGoal', array($ignore = true, $idGoal), $priority = true);
 
         // prettify columns
         $setRatePercent = function ($rate, $thang = false) {
             return $rate == 0 ? "0%" : $rate;
         };
-        foreach ($view->columns_to_display as $columnName) {
+        foreach ($this->config->columns_to_display as $columnName) {
             if (strpos($columnName, 'conversion_rate') !== false) {
-                $view->filters[] = array('ColumnCallbackReplace', array($columnName, $setRatePercent));
+                $this->config->filters[] = array('ColumnCallbackReplace', array($columnName, $setRatePercent));
             }
         }
 
@@ -93,9 +91,9 @@ class Goals extends HtmlTable
             return MetricsFormatter::getPrettyMoney(sprintf("%.1f", $value), $idSite);
         };
 
-        foreach ($view->columns_to_display as $columnName) {
+        foreach ($this->config->columns_to_display as $columnName) {
             if ($this->isRevenueColumn($columnName)) {
-                $view->filters[] = array('ColumnCallbackReplace', array($columnName, $formatPercent));
+                $this->config->filters[] = array('ColumnCallbackReplace', array($columnName, $formatPercent));
             }
         }
 
@@ -103,25 +101,25 @@ class Goals extends HtmlTable
         $identityFunction = function ($value) {
             return $value;
         };
-        foreach ($view->columns_to_display as $columnName) {
+        foreach ($this->config->columns_to_display as $columnName) {
             if (!$this->isRevenueColumn($columnName)) {
-                $view->filters[] = array('ColumnCallbackReplace', array($columnName, $identityFunction));
+                $this->config->filters[] = array('ColumnCallbackReplace', array($columnName, $identityFunction));
             }
         }
     }
 
-    private function setPropertiesForEcommerceView($view)
+    private function setPropertiesForEcommerceView()
     {
-        $view->filter_sort_column = 'goal_ecommerceOrder_revenue';
-        $view->filter_sort_order = 'desc';
+        $this->requestConfig->filter_sort_column = 'goal_ecommerceOrder_revenue';
+        $this->requestConfig->filter_sort_order = 'desc';
 
-        $view->columns_to_display = array(
+        $this->config->columns_to_display = array(
             'label', 'nb_visits', 'goal_ecommerceOrder_nb_conversions', 'goal_ecommerceOrder_revenue',
             'goal_ecommerceOrder_conversion_rate', 'goal_ecommerceOrder_avg_order_revenue', 'goal_ecommerceOrder_items',
             'goal_ecommerceOrder_revenue_per_visit'
         );
 
-        $view->translations += array(
+        $this->config->translations += array(
             'goal_ecommerceOrder_conversion_rate'   => Piwik::translate('Goals_ConversionRate', Piwik::translate('Goals_EcommerceOrder')),
             'goal_ecommerceOrder_nb_conversions'    => Piwik::translate('General_EcommerceOrders'),
             'goal_ecommerceOrder_revenue'           => Piwik::translate('General_TotalRevenue'),
@@ -131,7 +129,7 @@ class Goals extends HtmlTable
         );
 
         $goalName = Piwik::translate('General_EcommerceOrders');
-        $view->metrics_documentation += array(
+        $this->config->metrics_documentation += array(
             'goal_ecommerceOrder_conversion_rate'   => Piwik::translate('Goals_ColumnConversionRateDocumentation', $goalName),
             'goal_ecommerceOrder_nb_conversions'    => Piwik::translate('Goals_ColumnConversionsDocumentation', $goalName),
             'goal_ecommerceOrder_revenue'           => Piwik::translate('Goals_ColumnRevenueDocumentation', $goalName),
@@ -142,28 +140,28 @@ class Goals extends HtmlTable
         );
     }
 
-    private function setPropertiesForGoalsOverview($view, $idSite)
+    private function setPropertiesForGoalsOverview($idSite)
     {
         $allGoals = $this->getGoals($idSite);
 
         // set view properties
-        $view->columns_to_display = array('label', 'nb_visits');
+        $this->config->columns_to_display = array('label', 'nb_visits');
 
         foreach ($allGoals as $goal) {
             $column = "goal_{$goal['idgoal']}_conversion_rate";
 
-            $view->columns_to_display[] = $column;
-            $view->translations[$column] = Piwik::translate('Goals_ConversionRate', $goal['name']);
-            $view->metrics_documentation[$column]
+            $this->config->columns_to_display[] = $column;
+            $this->config->translations[$column] = Piwik::translate('Goals_ConversionRate', $goal['name']);
+            $this->config->metrics_documentation[$column]
                 = Piwik::translate('Goals_ColumnConversionRateDocumentation', $goal['quoted_name'] ? : $goal['name']);
         }
 
-        $view->columns_to_display[] = 'revenue_per_visit';
-        $view->metrics_documentation['revenue_per_visit'] =
+        $this->config->columns_to_display[] = 'revenue_per_visit';
+        $this->config->metrics_documentation['revenue_per_visit'] =
             Piwik::translate('Goals_ColumnRevenuePerVisitDocumentation', Piwik::translate('Goals_EcommerceAndGoalsMenu'));
     }
 
-    private function setPropertiesForGoals($view, $idSite, $idGoals)
+    private function setPropertiesForGoals($idSite, $idGoals)
     {
         $allGoals = $this->getGoals($idSite);
 
@@ -171,11 +169,11 @@ class Goals extends HtmlTable
             $idGoals = array_keys($allGoals);
         } else {
             // only sort by a goal's conversions if not showing all goals (for FULL_REPORT)
-            $view->filter_sort_column = 'goal_' . reset($idGoals) . '_nb_conversions';
-            $view->filter_sort_order = 'desc';
+            $this->requestConfig->filter_sort_column = 'goal_' . reset($idGoals) . '_nb_conversions';
+            $this->requestConfig->filter_sort_order = 'desc';
         }
 
-        $view->columns_to_display = array('label', 'nb_visits');
+        $this->config->columns_to_display = array('label', 'nb_visits');
 
         $goalColumnTemplates = array(
             'goal_%s_nb_conversions',
@@ -189,7 +187,7 @@ class Goals extends HtmlTable
         foreach ($goalColumnTemplates as $idx => $columnTemplate) {
             foreach ($idGoals as $idGoal) {
                 $column = sprintf($columnTemplate, $idGoal);
-                $view->columns_to_display[] = $column;
+                $this->config->columns_to_display[] = $column;
             }
         }
 
@@ -198,7 +196,7 @@ class Goals extends HtmlTable
             $goalName = $allGoals[$idGoal]['name'];
             $quotedGoalName = $allGoals[$idGoal]['quoted_name'] ? : $goalName;
 
-            $view->translations += array(
+            $this->config->translations += array(
                 'goal_' . $idGoal . '_nb_conversions'    => Piwik::translate('Goals_Conversions', $goalName),
                 'goal_' . $idGoal . '_conversion_rate'   => Piwik::translate('Goals_ConversionRate', $goalName),
                 'goal_' . $idGoal . '_revenue'           =>
@@ -207,7 +205,7 @@ class Goals extends HtmlTable
                 Piwik::translate('%s ' . Piwik::translate('General_ColumnValuePerVisit'), $goalName),
             );
 
-            $view->metrics_documentation += array(
+            $this->config->metrics_documentation += array(
                 'goal_' . $idGoal . '_nb_conversions'    => Piwik::translate('Goals_ColumnConversionsDocumentation', $quotedGoalName),
                 'goal_' . $idGoal . '_conversion_rate'   => Piwik::translate('Goals_ColumnConversionRateDocumentation', $quotedGoalName),
                 'goal_' . $idGoal . '_revenue'           => Piwik::translate('Goals_ColumnRevenueDocumentation', $quotedGoalName),
@@ -216,7 +214,7 @@ class Goals extends HtmlTable
             );
         }
 
-        $view->columns_to_display[] = 'revenue_per_visit';
+        $this->config->columns_to_display[] = 'revenue_per_visit';
     }
 
     private function getGoals($idSite)
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
index bb364e5f76..33478c97b0 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
@@ -22,11 +22,11 @@ class Bar extends JqplotGraph
 {
     const ID = 'graphVerticalBar';
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        parent::configureVisualization($properties);
+        parent::configureVisualization();
 
-        $properties->datatable_js_type = 'JqplotBarGraphDataTable';
+        $this->config->datatable_js_type = 'JqplotBarGraphDataTable';
     }
 
     public static function getDefaultPropertyValues()
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
index 75f0786427..0501174ea8 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -41,35 +41,35 @@ class Evolution extends JqplotGraph
 
     public static $overridableProperties = array('show_line_graph');
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        $this->calculateEvolutionDateRange($properties);
+        $this->calculateEvolutionDateRange();
 
-        parent::configureVisualization($properties);
+        parent::configureVisualization();
 
-        $properties->datatable_js_type = 'JqplotEvolutionGraphDataTable';
+        $this->config->datatable_js_type = 'JqplotEvolutionGraphDataTable';
     }
 
-    public function beforeLoadDataTable(Request $request, Config $properties)
+    public function beforeLoadDataTable()
     {
-        parent::beforeLoadDataTable($request, $properties);
+        parent::beforeLoadDataTable();
 
         // period will be overridden when 'range' is requested in the UI
         // but the graph will display for each day of the range.
         // Default 'range' behavior is to return the 'sum' for the range
         if (Common::getRequestVar('period', false) == 'range') {
-            $request->request_parameters_to_modify['period'] = 'day';
+            $this->requestConfig->request_parameters_to_modify['period'] = 'day';
         }
     }
 
-    public function afterAllFilteresAreApplied(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function afterAllFilteresAreApplied()
     {
-        parent::afterAllFilteresAreApplied($dataTable, $properties, $request);
+        parent::afterAllFilteresAreApplied();
 
-        if ($properties->visualization_properties->x_axis_step_size === false) {
+        if ($this->config->visualization_properties->x_axis_step_size === false) {
 
-            $size = $this->getDefaultXAxisStepSize($dataTable->getRowsCount());
-            $properties->visualization_properties->x_axis_step_size = $size;
+            $size = $this->getDefaultXAxisStepSize($this->dataTable->getRowsCount());
+            $this->config->visualization_properties->x_axis_step_size = $size;
         }
     }
 
@@ -94,16 +94,15 @@ class Evolution extends JqplotGraph
      * Based on the period, date and evolution_{$period}_last_n query parameters,
      * calculates the date range this evolution chart will display data for.
      */
-    private function calculateEvolutionDateRange(Config $properties)
+    private function calculateEvolutionDateRange()
     {
-        $view = $this->viewDataTable;
         $period = Common::getRequestVar('period');
 
         $defaultLastN = self::getDefaultLastN($period);
         $originalDate = Common::getRequestVar('date', 'last' . $defaultLastN, 'string');
 
         if ($period != 'range') { // show evolution limit if the period is not a range
-            $properties->show_limit_control = true;
+            $this->config->show_limit_control = true;
 
             // set the evolution_{$period}_last_n query param
             if (Range::parseDateRange($originalDate)) { // if a multiple period
@@ -112,11 +111,11 @@ class Evolution extends JqplotGraph
                 $lastN = count($oPeriod->getSubperiods());
             } else { // if not a multiple period
                 list($newDate, $lastN) = self::getDateRangeAndLastN($period, $originalDate, $defaultLastN);
-                $view->request_parameters_to_modify['date'] = $newDate;
-                $properties->custom_parameters['dateUsedInGraph'] = $newDate;
+                $this->requestConfig->request_parameters_to_modify['date'] = $newDate;
+                $this->config->custom_parameters['dateUsedInGraph'] = $newDate;
             }
             $lastNParamName = self::getLastNParamName($period);
-            $properties->custom_parameters[$lastNParamName] = $lastN;
+            $this->config->custom_parameters[$lastNParamName] = $lastN;
         }
     }
 
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
index e6db071c9f..593e3768a3 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php
@@ -24,25 +24,25 @@ class Pie extends JqplotGraph
 {
     const ID = 'graphPie';
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        parent::configureVisualization($properties);
+        parent::configureVisualization();
 
-        $properties->visualization_properties->show_all_ticks = true;
-        $properties->datatable_js_type = 'JqplotPieGraphDataTable';
+        $this->config->visualization_properties->show_all_ticks = true;
+        $this->config->datatable_js_type = 'JqplotPieGraphDataTable';
     }
 
-    public function afterAllFilteresAreApplied(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function afterAllFilteresAreApplied()
     {
-        parent::afterAllFilteresAreApplied($dataTable, $properties, $request);
+        parent::afterAllFilteresAreApplied();
 
-        $metricColumn = reset($properties->columns_to_display);
+        $metricColumn = reset($this->config->columns_to_display);
 
         if ($metricColumn == 'label') {
-            $metricColumn = next($properties->columns_to_display);
+            $metricColumn = next($this->config->columns_to_display);
         }
 
-        $properties->columns_to_display = array($metricColumn ? : 'nb_visits');
+        $this->config->columns_to_display = array($metricColumn ? : 'nb_visits');
     }
 
     public static function getDefaultPropertyValues()
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index f18a7afa99..0cfd21266b 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -36,7 +36,7 @@
                     {% endfor %}
                 </tr>
                 {% endif %}
-                
+
                 {# display subtable if present and showing expanded datatable #}
                 {% if properties.visualization_properties.show_expanded|default(false) and rowHasSubtable %}
                     {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': row.getIdSubDataTable()} %}
diff --git a/plugins/ExampleVisualization/SimpleTable.php b/plugins/ExampleVisualization/SimpleTable.php
index abd5c8aff2..07e686e8fd 100644
--- a/plugins/ExampleVisualization/SimpleTable.php
+++ b/plugins/ExampleVisualization/SimpleTable.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\ExampleVisualization;
 
 use Piwik\DataTable;
 use Piwik\DataTable\DataTableInterface;
-use Piwik\ViewDataTable\Visualization;
+use Piwik\Plugin\Visualization;
 use Piwik\Visualization\Config;
 use Piwik\Visualization\Request;
 
@@ -34,33 +34,33 @@ class SimpleTable extends Visualization
         $this->vizTitle = 'MyAwesomeTitle';
     }
 
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
         // Configure how your visualization should look like, for instance you can disable search
-        // $properties->show_search = false
+        // $this->config->show_search = false
     }
 
-    public function beforeLoadDataTable(Request $request, Config $properties)
+    public function beforeLoadDataTable()
     {
         // Here you can change the request that is sent to the API, for instance
-        // $properties->filter_sort_order = 'desc';
+        // $this->requestConfig->filter_sort_order = 'desc';
     }
 
-    public function beforeGenericFiltersAreAppliedToLoadedDataTable(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function beforeGenericFiltersAreAppliedToLoadedDataTable()
     {
         // this hook is executed before generic filters like "filter_limit" and "filter_offset" are applied
         // Usage:
-        // $dateTable->filter($nameOrClosure);
+        // $this->dateTable->filter($nameOrClosure);
     }
 
-    public function afterGenericFiltersAreAppliedToLoadedDataTable(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function afterGenericFiltersAreAppliedToLoadedDataTable()
     {
         // this hook is executed after generic filters like "filter_limit" and "filter_offset" are applied
         // Usage:
-        // $dateTable->filter($nameOrClosure, $parameters);
+        // $this->dateTable->filter($nameOrClosure, $parameters);
     }
 
-    public function afterAllFilteresAreApplied(DataTableInterface $dataTable, Config $properties, Request $request)
+    public function afterAllFilteresAreApplied()
     {
         // this hook is executed after the data table is loaded and after all filteres are applied.
         // format your data here that you want to pass to the view
diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php
index 88b7260bbe..6383a9b07c 100644
--- a/plugins/Live/VisitorLog.php
+++ b/plugins/Live/VisitorLog.php
@@ -11,7 +11,7 @@
 namespace Piwik\Plugins\Live;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Visualization;
+use Piwik\Plugin\Visualization;
 use Piwik\Visualization\Config;
 
 /**
@@ -31,8 +31,8 @@ class VisitorLog extends Visualization
     /**
      * Configure visualization.
      */
-    public function configureVisualization(Config $properties)
+    public function configureVisualization()
     {
-        $properties->datatable_js_type = 'VisitorLog';
+        $this->config->datatable_js_type = 'VisitorLog';
     }
 }
\ No newline at end of file