Revert "convert sparkline api to one request - fixes archive (#18399)" (

#18483) This reverts commit 35bcf9c.
matomo-org · Dec 10, 2021 · eb721f1 · eb721f1
1 parent e669bec
commit eb721f1
Show file tree

Hide file tree

Showing 6 changed files with 863 additions and 776 deletions.
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
@@ -67,7 +67,7 @@ class API extends \Piwik\Plugin\API
     public function getGoal($idSite, $idGoal)
     {
         Piwik::checkUserHasViewAccess($idSite);
-
+        
         $goal = $this->getModel()->getActiveGoal($idSite, $idGoal);
 
         if (!empty($goal)) {

diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\Goals;
 
-use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
@@ -17,13 +16,10 @@
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines;
 use Piwik\Plugins\Live\Live;
 use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Translation\Translator;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
 
 /**
  *
@@ -223,37 +219,6 @@ public function getEvolutionGraph(array $columns = array(), $idGoal = false, arr
         return $this->renderView($view);
     }
 
-    public function getSparklines()
-    {
-        $module = "Goals";
-        $action = "getMetrics";
-        $content = "";
-
-        $idSite = Common::getRequestVar('idSite', null, 'int');
-        $goals = Request::processRequest('Goals.getGoals', ['idSite' => $idSite, 'filter_limit' => '-1'], []);
-
-        $apiProxy = Proxy::getInstance();
-        $queryString = $_SERVER['QUERY_STRING'];
-        if (!$apiProxy->isExistingApiAction($module, $action)) {
-            throw new \Exception("Invalid action name '$action' for '$module' plugin.");
-        }
-
-        $apiAction = $apiProxy->buildApiActionName($module, $action);
-        foreach ($goals as $goal) {
-            //load Visualisations Sparkline
-            $view = ViewDataTableFactory::build(Sparklines::ID, $apiAction, 'Goals.' . __METHOD__, true);
-            $view->requestConfig->request_parameters_to_modify['idGoal'] = $goal['idgoal'];
-            $view->requestConfig->request_parameters_to_modify['allow_multiple'] = (int)$goal['allow_multiple'];
-            $view->requestConfig->request_parameters_to_modify['only_summary'] = 1;
-            $view->config->show_title = true;
-            $_SERVER['QUERY_STRING'] .= $queryString . '&idGoal='. $goal['idgoal'];
-            $view->config->title = $goal['name'];
-            $content .= $view->render();
-        }
-
-        return $content;
-    }
-
     private function getColumnTranslation($nameToLabel, $columnName, $idGoal)
     {
         $columnTranslation = '';

diff --git a/plugins/Goals/Pages.php b/plugins/Goals/Pages.php
@@ -54,20 +54,9 @@ public function createGoalsOverviewPage($goals)
         $config->setSubcategoryId($subcategory);
         $config->setName('');
         $config->setOrder(15);
-        $config->setAction('getMetrics');
         $config->setIsNotWidgetizable();
         $widgets[] = $config;
 
-        // load sparkline
-        $config = $this->factory->createCustomWidget('getSparklines');
-        $config->setSubcategoryId($subcategory);
-        $config->setName('');
-        $config->setOrder(25);
-        $config->setIsNotWidgetizable();
-        $widgets[] = $config;
-
-        $container = $this->createWidgetizableWidgetContainer('GoalsOverview', $subcategory, $widgets);
-
         foreach ($goals as $goal) {
             $name = Common::sanitizeInputValue($goal['name']);
             $goalTranslated = Piwik::translate('Goals_GoalX', array($name));
@@ -79,10 +68,11 @@ public function createGoalsOverviewPage($goals)
             $config->setParameters(array('idGoal' => $goal['idgoal']));
             $config->setOrder(25);
             $config->setIsNotWidgetizable();
-            $config->addParameters(array('allow_multiple' => (int)$goal['allow_multiple'], 'only_summary' => '1'));
+            $config->addParameters(array('allow_multiple' => (int) $goal['allow_multiple'], 'only_summary' => '1'));
             $widgets[] = $config;
         }
 
+        $container = $this->createWidgetizableWidgetContainer('GoalsOverview', $subcategory, $widgets);
 
         $config = $this->factory->createContainerWidget('Goals');
         $config->setSubcategoryId($subcategory);

diff --git a/plugins/Goals/Reports/GetMetrics.php b/plugins/Goals/Reports/GetMetrics.php
@@ -10,10 +10,8 @@
 
 use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
-use Piwik\Report\ReportWidgetFactory;
-use Piwik\Widget\WidgetsList;
 
-class GetMetrics extends Get
+class GetMetrics extends Base
 {
     protected function init()
     {
@@ -28,10 +26,6 @@ protected function init()
         $this->parameters = null;
     }
 
-    public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)
-    {
-    }
-
     public function configureReportMetadata(&$availableReports, $infos)
     {
     }