Make it possible to show the export url

matomo-org · Jun 10, 2018 · 233dea2 · 233dea2
1 parent e5ed60f
commit 233dea2
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 8 deletions.
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -309,6 +309,8 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreHome_Default';
         $translationKeys[] = 'CoreHome_PageOf';
         $translationKeys[] = 'CoreHome_FormatMetrics';
+        $translationKeys[] = 'CoreHome_ShowExportUrl';
+        $translationKeys[] = 'CoreHome_HideExportUrl';
         $translationKeys[] = 'CoreHome_FlattenDataTable';
         $translationKeys[] = 'CoreHome_UnFlattenDataTable';
         $translationKeys[] = 'CoreHome_ExternalHelp';

diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.directive.js b/plugins/CoreHome/angularjs/report-export/reportexport.directive.js
@@ -27,7 +27,9 @@
 
                 var popoverParamBackup;
 
-                scope.processExport = function() {
+                scope.showUrl = false;
+
+                scope.getExportLink = function() {
 
                     var dataTable = scope.dataTable;
                     var format    = scope.reportFormat;
@@ -159,7 +161,12 @@
                     exportUrlParams.token_auth = piwik.token_auth;
                     exportUrlParams.filter_limit = limit;
 
-                    window.open('index.php?' + $httpParamSerializerJQLike(exportUrlParams));
+                    var currentUrl = $location.absUrl();
+                    var urlParts = currentUrl.split('/');
+                    urlParts.pop();
+                    var url = urlParts.join('/');
+
+                    return url + '/index.php?' + $httpParamSerializerJQLike(exportUrlParams);
                 };
 
                 element.on('click', function () {

diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.popover.html b/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
@@ -49,8 +49,16 @@
         </div>
     </div>
 
+    <div class="col l12" ng-show="showUrl">
+        <textarea readonly>{{ getExportLink() }}</textarea>
+    </div>
+
     <div class="col l12">
-        <div piwik-save-button value="{{ 'General_Export'|translate }}" ng-click="processExport()"></div>
+        <a class="btn" ng-attr-href="{{ getExportLink() }}" target="_new">{{ 'General_Export'|translate }}</a>
+        <a href="javascript:;" ng-click="showUrl=!showUrl" class="toggle-export-url">
+            <span ng-show="!showUrl">{{ 'CoreHome_ShowExportUrl'|translate }}</span>
+            <span ng-show="showUrl">{{ 'CoreHome_HideExportUrl'|translate }}</span>
+        </a>
     </div>
 
 </div>
diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.popover.less b/plugins/CoreHome/angularjs/report-export/reportexport.popover.less
@@ -12,6 +12,17 @@
     }
   }
 
+  textarea {
+    word-break: break-all;
+    padding: 5px;
+    height: 80px;
+  }
+
+  .toggle-export-url {
+    font-size: 14px;
+    margin-left: 20px;
+  }
+
   .filter_limit {
     clear: both;
     float: none;

diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
@@ -26,6 +26,8 @@
         "ExternalHelp": "Help (opens in new tab)",
         "FlattenDataTable": "The report is hierarchical %s Make it flat",
         "FormatMetrics": "Format metrics",
+        "ShowExportUrl": "Show Export URL",
+        "HideExportUrl": "Hide Export URL",
         "HomeShortcut": "Home",
         "HowMuchIsPiwikWorth": "How much is Matomo worth to you?",
         "IncludeRowsWithLowPopulation": "Rows with low population are hidden %s Show all rows",

diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png b/tests/UI/expected-screenshots/ViewDataTableTest_export_options.png
diff --git a/tests/UI/specs/ReportExporting_spec.js b/tests/UI/specs/ReportExporting_spec.js
@@ -51,7 +51,7 @@ describe("ReportExporting", function () {
                 page.evaluate(function(){
                     $('[name=filter_limit] input').val(100).trigger('change');
                 });
-                page.click('[ng-click="processExport()"]', 100);
+                page.click('#reportExport a.btn', 100);
 
                 unsetWindowOpen(page);
 
@@ -84,7 +84,7 @@ describe("ReportExporting", function () {
                 page.evaluate(function(){
                     $('[name=filter_limit] input').val(100).trigger('change');
                 });
-                page.click('[ng-click="processExport()"]', 100);
+                page.click('#reportExport a.btn', 100);
 
                 unsetWindowOpen(page);
 
@@ -120,7 +120,7 @@ describe("ReportExporting", function () {
                 page.evaluate(function(){
                     $('[name=filter_limit] input').val(100).trigger('change');
                 });
-                page.click('[ng-click="processExport()"]', 100);
+                page.click('#reportExport a.btn', 100);
 
                 unsetWindowOpen(page);