diff --git a/CHANGELOG.md b/CHANGELOG.md index d00b2a1b..9318f402 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Warn about unsaved changes before leaving a report ### Fixed +- Hide menu bar and show loading spinner while reports are loading - Fix PHP 8.4 deprecation warnings #534 @[robertoschwald](https://github.com/robertoschwald) - date formatting on all rows - fix double report execution after wizard close diff --git a/js/report.js b/js/report.js index 90759fee..a0f881ce 100644 --- a/js/report.js +++ b/js/report.js @@ -784,6 +784,7 @@ Object.assign(OCA.Analytics.Report.Backend = { getData: function () { if (OCA.Analytics.currentXhrRequest) OCA.Analytics.currentXhrRequest.abort(); OCA.Analytics.Report.resetContentArea(); + OCA.Analytics.Visualization.showContentByType('loading'); // Build AJAX parameters from filter options const ajaxData = ['filteroptions', 'dataoptions', 'chartoptions', 'tableoptions'].reduce((acc, option) => { diff --git a/js/visualization.js b/js/visualization.js index 74dd966d..96b6502d 100644 --- a/js/visualization.js +++ b/js/visualization.js @@ -1341,7 +1341,7 @@ OCA.Analytics.Visualization = { OCA.Analytics.currentContentType = type; } //} - if (type === 'intro' || type === 'warning') { + if (type === 'intro' || type === 'warning' || type === 'loading') { OCA.Analytics.Visualization.hideElement('menuBar'); } else { OCA.Analytics.Visualization.showElement('menuBar');