Merge pull request #16 from OpenLMIS/SELV3-783

SELV3-783: Added corrections to create state for dashboards
OpenLMIS · Jan 10, 2025 · aa9b0e2 · aa9b0e2
2 parents d59dc6d + ca201dd
commit aa9b0e2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 51 deletions.
diff --git a/src/report/dashboard-report.routes.js b/src/report/dashboard-report.routes.js
diff --git a/src/report/dashboard-reports.factory.js b/src/report/dashboard-reports.factory.js
@@ -31,7 +31,7 @@
     dashboardReports.$inject = ['reportDashboardService', 'REPORT_TYPES'];
 
     function dashboardReports(reportDashboardService, REPORT_TYPES) {
-        var reports = getReports();
+        var reports = undefined;
 
         return {
             getReports: getReports,
@@ -83,7 +83,7 @@
         function createResolve(report) {
             var resolve = {
                 reportUrl: function($sce) {
-                    return $sce.trustAsResourceUrl(report.url);
+                    return $sce.trustAsResourceUrl(report.url + '?standalone=true');
                 },
                 reportName: function() {
                     return report.name;

diff --git a/src/report/report-list.routes.js b/src/report/report-list.routes.js
@@ -44,8 +44,11 @@
                 jasperReports: function(reportFactory) {
                     return reportFactory.getAllReports();
                 },
-                dashboardReportsList: function(dashboardReports) {
-                    return dashboardReports.getReports();
+                dashboardReportsList: function(dashboardReports, reportDashboardService) {
+                    return reportDashboardService.getAllForUser().then(function(response) {
+                        dashboardReports.addReporingPages($stateProvider);
+                        return response.content;
+                    });
                 }
             }
         });

diff --git a/src/report/report-list.routes.spec.js b/src/report/report-list.routes.spec.js
@@ -24,6 +24,7 @@ describe('openlmis.reports.list state', function() {
             this.$q = $injector.get('$q');
             this.reportFactory = $injector.get('reportFactory');
             this.reportCategoryService = $injector.get('reportCategoryService');
+            this.reportDashboardService = $injector.get('reportDashboardService');
             this.dashboardReports = $injector.get('dashboardReports');
             this.$location = $injector.get('$location');
             this.REPORT_RIGHTS = $injector.get('REPORT_RIGHTS');
@@ -53,26 +54,29 @@ describe('openlmis.reports.list state', function() {
             ]
         };
 
-        this.dashboardReportsList = [
-            {
-                id: 'id-three',
-                name: 'Report 3',
-                category: {
-                    name: 'Administartion'
-                }
-            },
-            {
-                id: 'id-four',
-                name: 'Report 4',
-                category: {
-                    name: 'Orders'
+        this.dashboardReportsList = {
+            content: [
+                {
+                    id: 'id-three',
+                    name: 'Report 3',
+                    category: {
+                        name: 'Administartion'
+                    }
+                },
+                {
+                    id: 'id-four',
+                    name: 'Report 4',
+                    category: {
+                        name: 'Orders'
+                    }
                 }
-            }
-        ];
+            ]
+        };
 
         spyOn(this.reportFactory, 'getAllReports').andReturn(this.$q.resolve(this.jasperReports));
         spyOn(this.reportCategoryService, 'getAll').andReturn(this.$q.resolve(this.reportCategories));
-        spyOn(this.dashboardReports, 'getReports').andReturn(this.$q.resolve(this.dashboardReportsList));
+        spyOn(this.reportDashboardService, 'getAllForUser').andReturn(this.$q.resolve(this.dashboardReportsList));
+        spyOn(this.dashboardReports, 'addReporingPages').andReturn(true);
 
         this.goToUrl = goToUrl;
         this.getResolvedValue = getResolvedValue;
@@ -93,7 +97,7 @@ describe('openlmis.reports.list state', function() {
 
         expect(this.getResolvedValue('jasperReports')).toEqual(this.jasperReports);
         expect(this.getResolvedValue('reportCategories')).toEqual(this.reportCategories.content);
-        expect(this.getResolvedValue('dashboardReportsList')).toEqual(this.dashboardReportsList);
+        expect(this.getResolvedValue('dashboardReportsList')).toEqual(this.dashboardReportsList.content);
     });
 
     function goToUrl(url) {