generate pages instead of implementing them in each controller

6 files changed, 200 insertions, 2 deletions

diff --git a/plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js b/plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js
index 0617c5df88..ee1a2cf219 100644
--- a/plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js
+++ b/plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js
@@ -24,13 +24,17 @@
 
                 function onClickOutsideElement (event) {
                     if (element.has(event.target).length === 0) {
-                        scope.$apply(attr.piwikFocusAnywhereButHere);
+                        setTimeout(function () {
+                            scope.$apply(attr.piwikFocusAnywhereButHere);
+                        }, 0);
                     }
                 }
 
                 function onEscapeHandler (event) {
                     if (event.which === 27) {
-                        scope.$apply(attr.piwikFocusAnywhereButHere);
+                        setTimeout(function () {
+                            scope.$apply(attr.piwikFocusAnywhereButHere);
+                        }, 0);
                     }
                 }
 
diff --git a/plugins/CoreHome/angularjs/common/filters/escape.js b/plugins/CoreHome/angularjs/common/filters/escape.js
new file mode 100644
index 0000000000..382e84b5ac
--- /dev/null
+++ b/plugins/CoreHome/angularjs/common/filters/escape.js
@@ -0,0 +1,16 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+    angular.module('piwikApp.filter').filter('escape', escape);
+
+    function escape() {
+
+        return function(value) {
+            return piwikHelper.escape(piwikHelper.htmlEntities(value));
+        };
+    }
+})();
\ No newline at end of file
diff --git a/plugins/CoreHome/angularjs/common/services/global-ajax-queue.js b/plugins/CoreHome/angularjs/common/services/global-ajax-queue.js
new file mode 100644
index 0000000000..f831995810
--- /dev/null
+++ b/plugins/CoreHome/angularjs/common/services/global-ajax-queue.js
@@ -0,0 +1,14 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+    angular.module('piwikApp.service').service('globalAjaxQueue', ajaxQueue);
+
+    function ajaxQueue() {
+
+        return globalAjaxQueue;
+    }
+})();
\ No newline at end of file
diff --git a/plugins/CoreHome/angularjs/common/services/piwik-url.js b/plugins/CoreHome/angularjs/common/services/piwik-url.js
new file mode 100644
index 0000000000..f2d6e9bb0c
--- /dev/null
+++ b/plugins/CoreHome/angularjs/common/services/piwik-url.js
@@ -0,0 +1,54 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+    angular.module('piwikApp.service').service('piwikUrl', piwikUrl);
+
+    piwikUrl.$inject = ['$location', 'piwik'];
+
+    /**
+     * Similar to angulars $location but works around some limitation. Use it if you need to access search params
+     */
+    function piwikUrl($location, piwik) {
+
+        var model = {
+            getSearchParam: getSearchParam
+        }
+
+        return model;
+
+        function getSearchParam(paramName)
+        {
+            if (paramName === 'segment') {
+                var hash = window.location.href.split('#');
+                if (hash && hash[1]) {
+                    return piwik.broadcast.getValueFromHash(paramName, hash[1]);
+                }
+
+                return broadcast.getValueFromUrl(paramName);
+            }
+
+            // available in global scope
+            var search = $location.search();
+
+            if (!search[paramName]) {
+                // see https://github.com/angular/angular.js/issues/7239 (issue is resolved but problem still exists)
+                search[paramName] = piwik.broadcast.getValueFromUrl(paramName);
+            }
+
+            if (search[paramName]) {
+                var value =  search[paramName];
+
+                if (angular.isArray(search[paramName])) {
+                    // use last one. Eg when having period=day&period=year angular would otherwise return ['day', 'year']
+                    return value[value.length - 1];
+                }
+
+                return value;
+            }
+        }
+    }
+})();
\ No newline at end of file
diff --git a/plugins/CoreHome/angularjs/common/services/report-metadata-model.js b/plugins/CoreHome/angularjs/common/services/report-metadata-model.js
new file mode 100644
index 0000000000..f158861423
--- /dev/null
+++ b/plugins/CoreHome/angularjs/common/services/report-metadata-model.js
@@ -0,0 +1,52 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+    angular.module('piwikApp.service').factory('reportMetadataModel', reportMetadataModel);
+
+    reportMetadataModel.$inject = ['piwik', 'piwikApi'];
+
+    function reportMetadataModel (piwik, piwikApi) {
+
+        var reportsPromise = null;
+
+        var model = {
+            reports: [],
+            fetchReportMetadata: fetchReportMetadata,
+            findReport: findReport
+        };
+
+        return model;
+
+        function findReport(module, action)
+        {
+            var found = [];
+
+            angular.forEach(model.reports, function (report) {
+                if (report.module === module && report.action === action) {
+                    found = report;
+                }
+            });
+
+            return found;
+        }
+
+        function fetchReportMetadata()
+        {
+            if (!reportsPromise) {
+                reportsPromise = piwikApi.fetch({
+                    method: 'API.getReportMetadata',
+                    idSites: piwik.idSite || piwik.broadcast.getValueFromUrl('idSite'),
+                }).then(function (response) {
+                    model.reports = response;
+                    return response;
+                });
+            }
+
+            return reportsPromise;
+        }
+    }
+})();
\ No newline at end of file
diff --git a/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js b/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js
new file mode 100644
index 0000000000..1b1e406c95
--- /dev/null
+++ b/plugins/CoreHome/angularjs/common/services/reporting-pages-model.js
@@ -0,0 +1,58 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+(function () {
+    angular.module('piwikApp.service').factory('reportingPagesModel', reportingPagesModelService);
+
+    reportingPagesModelService.$inject = ['piwikApi'];
+
+    function reportingPagesModelService (piwikApi) {
+        var fetchAllPagesPromise = false;
+
+        // those sites are going to be displayed
+        var model = {
+            pages : [],
+            findPage: findPage,
+            reloadAllPages : reloadAllPages,
+            getAllPages : getAllPages
+        };
+
+        return model;
+
+        function findPage(categoryId, subcategoryId)
+        {
+            var found = null;
+
+            angular.forEach(model.pages, function (page) {
+                if (page &&
+                    page.category && page.subcategory &&
+                    page.category.id === categoryId && ('' + page.subcategory.id) === subcategoryId) {
+                    found = page;
+                }
+            });
+
+            return found;
+        }
+
+        function reloadAllPages()
+        {
+            fetchAllPagesPromise = null;
+            return getAllPages();
+        }
+
+        function getAllPages()
+        {
+            if (!fetchAllPagesPromise) {
+                fetchAllPagesPromise = piwikApi.fetch({method: 'API.getReportPagesMetadata'}).then(function (response) {
+                    model.pages = response;
+                    return response;
+                });
+            }
+
+            return fetchAllPagesPromise;
+        }
+    }
+})();
\ No newline at end of file