Panorama PoC #376

Rello · Dec 21, 2023 · 6450789 · 6450789
1 parent aaa4c3f
commit 6450789
Show file tree

Hide file tree

Showing 9 changed files with 449 additions and 290 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -13,7 +13,7 @@
     'routes' => [
         ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
         ['name' => 'page#advanced', 'url' => '/a/', 'verb' => 'GET'],
-        ['name' => 'page#panorama', 'url' => '/s/', 'verb' => 'GET'],
+        ['name' => 'page#panorama', 'url' => '/pa/', 'verb' => 'GET'],
         ['name' => 'page#indexPublic', 'url' => '/p/{token}', 'verb' => 'GET'],
         ['name' => 'page#indexPublicMin', 'url' => '/pm/{token}', 'verb' => 'GET'],
         ['name' => 'page#authenticatePassword', 'url' => '/p/{token}', 'verb' => 'POST'],
@@ -48,6 +48,8 @@
         ['name' => 'panorama#read', 'url' => '/panorama/{panoramaId}', 'verb' => 'GET'],
         ['name' => 'panorama#delete', 'url' => '/panorama/{panoramaId}', 'verb' => 'DELETE'],
         ['name' => 'panorama#update', 'url' => '/panorama/{panoramaId}', 'verb' => 'PUT'],
+        ['name' => 'panorama#getOwnFavoriteReports', 'url' => '/panoramaFavorites', 'verb' => 'GET'],
+        ['name' => 'panorama#setFavorite', 'url' => '/panoramaFavorite/{panoramaId}', 'verb' => 'POST'],
 
         // Data Output
         ['name' => 'output#read', 'url' => '/data/{reportId}', 'verb' => 'GET'],

diff --git a/js/app.js b/js/app.js
@@ -66,7 +66,7 @@ OCA.Analytics = Object.assign({}, OCA.Analytics, {
  * @namespace OCA.Analytics.Core
  */
 OCA.Analytics.Core = {
-    initApplication: function () {
+    init: function () {
 
         const urlHash = decodeURI(location.hash);
         if (urlHash.length > 1) {
@@ -1793,7 +1793,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     if (document.getElementById('sharingToken').value === '') {
         OCA.Analytics.UI.showElement('analytics-intro');
-        OCA.Analytics.Core.initApplication();
+        OCA.Analytics.Core.init();
         if (!OCA.Analytics.isAdvanced) {
             OCA.Analytics.UI.reportOptionsEventlisteners();
             document.getElementById("infoBoxReport").addEventListener('click', OCA.Analytics.Navigation.handleNewButton);

diff --git a/js/navigation.js b/js/navigation.js
@@ -19,7 +19,7 @@ OCA.Analytics.Navigation = {
     quickstartId: 0,
     handlers: {},
 
-    registerHandler: function(context, handlerFunction) {
+    registerHandler: function (context, handlerFunction) {
         OCA.Analytics.Navigation.handlers[context] = handlerFunction;
     },
 
@@ -389,23 +389,26 @@ OCA.Analytics.Navigation = {
             dataset.parentElement.remove();
         }
 
+        if (OCA.Analytics.isPanorama) {
+            edit.parentElement.remove();
+            newGroup.parentElement.remove(); // re-add later
+        }
+
         return navigationMenu;
     },
 
     handleNewButton: function () {
         // ToDo: change app.js to register handler
 
-        if (OCA.Analytics.isAdvanced) {
+        let handler = OCA.Analytics.Navigation.handlers['create'];
+        if (handler) {
+            handler();
+        } else if (OCA.Analytics.isAdvanced) {
             OCA.Analytics.Wizard.sildeArray = [
                 ['', ''],
                 ['wizardDatasetGeneral', OCA.Analytics.Advanced.Dataset.wizard],
             ];
             OCA.Analytics.Wizard.show();
-        } else if (OCA.Analytics.isPanorama) {
-            let handler = OCA.Analytics.Navigation.handlers['create'];
-            if (handler) {
-                handler();
-            }
         } else {
             OCA.Analytics.Sidebar.close();
             OCA.Analytics.Wizard.sildeArray = [
@@ -419,15 +422,16 @@ OCA.Analytics.Navigation = {
     },
 
     handleOverviewButton: function () {
-        OCA.Analytics.Sidebar.close();
+        OCA.Analytics.Sidebar?.close?.();
         if (document.querySelector('#navigationDatasets .active')) {
             document.querySelector('#navigationDatasets .active').classList.remove('active');
         }
         OCA.Analytics.UI.hideElement('analytics-content');
         OCA.Analytics.UI.showElement('analytics-intro');
         document.getElementById('ulAnalytics').innerHTML = '';
         window.location.href = '#';
-        OCA.Analytics.Dashboard.init();
+        OCA.Analytics.Dashboard?.init?.();
+        OCA.Analytics.Panorama?.Dashboard?.init?.();
     },
 
     handleNavigationClicked: function (evt) {
@@ -443,14 +447,13 @@ OCA.Analytics.Navigation = {
             }
             evt.target.parentElement.classList.add('active');
         }
-        if (OCA.Analytics.isAdvanced) {
+
+        let handler = OCA.Analytics.Navigation.handlers['navigationClicked'];
+        if (handler) {
+            handler(evt);
+        } else if (OCA.Analytics.isAdvanced) {
             OCA.Analytics.Advanced.showSidebar(evt);
             evt.stopPropagation();
-        } else if (OCA.Analytics.isPanorama) {
-            let handler = OCA.Analytics.Navigation.handlers['navigationClicked'];
-            if (handler) {
-                handler(evt);
-            }
         } else {
             document.getElementById('filterVisualisation').innerHTML = '';
             if (typeof (OCA.Analytics.currentReportData.options) !== 'undefined') {
@@ -480,7 +483,7 @@ OCA.Analytics.Navigation = {
             document.querySelector('.app-navigation-entry-menu.open').classList.remove('open');
         }
         evt.stopPropagation();
-        OCA.Analytics.Sidebar.showSidebar(evt);
+        OCA.Analytics.Sidebar?.showSidebar?.(evt);
     },
 
     handleNewGroupClicked: function (evt) {
@@ -518,7 +521,13 @@ OCA.Analytics.Navigation = {
             evt.target.parentNode.children[1].innerHTML = t('analytics', 'Add to favorites');
             document.getElementById('fav-' + datasetId).remove();
         }
-        OCA.Analytics.Navigation.favoriteUpdate(datasetId, isFavorite);
+
+        let handler = OCA.Analytics.Navigation.handlers['favoriteUpdate'];
+        if (handler) {
+            handler(datasetId, isFavorite);
+        } else {
+            OCA.Analytics.Navigation.favoriteUpdate(datasetId, isFavorite);
+        }
         document.querySelector('.app-navigation-entry-menu.open').classList.remove('open');
     },
 
@@ -562,11 +571,9 @@ OCA.Analytics.Navigation = {
     handleDeleteButton: function (evt) {
         // ToDo: change app.js to register handler
 
-        if (OCA.Analytics.isPanorama) {
-            let handler = OCA.Analytics.Navigation.handlers['delete'];
-            if (handler) {
-                handler(evt);
-            }
+        let handler = OCA.Analytics.Navigation.handlers['delete'];
+        if (handler) {
+            handler(evt);
         } else {
             OCA.Analytics.Sidebar.Report.handleDeleteButton(evt);
         }