@zeedhi/teknisa-components-common 1.106.0 → 1.107.0

package/dist/tek-components-common.esm.js

@@ -1,5 +1,5 @@
 import { KeyMap, I18n, FormatterParserProvider, Messages, Metadata, DatasourceFactory, MemoryDatasource, URL, Utils, RestDatasource, Config, Accessor, Loader, DateHelper, Http, Singleton, VersionService } from '@zeedhi/core';
-import { Form, Button, Tooltip, GridEditable, Grid, ComponentRender, Iterable, Carousel, IterableComponentRender as IterableComponentRender$1, Loading as Loading$1, GridColumnEditable, Report, ColumnNotFoundError, IterableColumnsButtonController, IterableColumnsButton, ModalService, SelectMultiple, TreeGridEditable, List } from '@zeedhi/common';
+import { Form, Button, Tooltip, GridEditable, Grid, ComponentRender, Iterable, Carousel, IterableComponentRender as IterableComponentRender$1, Loading as Loading$1, GridColumnEditable, Report, EmptyDataError, AlertService, ColumnNotFoundError, IterableColumnsButtonController, IterableColumnsButton, ModalService, SelectMultiple, TreeGridEditable, List } from '@zeedhi/common';
 import debounce from 'lodash.debounce';
 import merge from 'lodash.merge';
 import { UserInfo } from '@zeedhi/zd-user-info-common';
@@ -1254,6 +1254,7 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Ano Atual',
             TEKGRID_WITH_GROUPS: '(Com grupos)',
             TEKGRID_GRID_MIRROR: '(Espelho do grid)',
+            TEKGRID_NO_DATA: 'Não há dados para gerar o relatório',
         },
     },
     'en-US': {
@@ -1326,6 +1327,7 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Current Year',
             TEKGRID_WITH_GROUPS: '(With groups)',
             TEKGRID_GRID_MIRROR: '(Grid mirror)',
+            TEKGRID_NO_DATA: 'There is no data to generate the report',
         },
     },
     'es-CL': {
@@ -1398,6 +1400,7 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Año actual',
             TEKGRID_WITH_GROUPS: '(Con grupos)',
             TEKGRID_GRID_MIRROR: '(Espejo de grid)',
+            TEKGRID_NO_DATA: 'No hay datos para generar el reporte',
         },
     },
 });
@@ -2490,16 +2493,25 @@ class TekGrid extends GridEditable {
             if (typeof this.events.beforeOpenReport === 'function') {
                 beforeOpen = this.events.beforeOpenReport;
             }
-            return report
-                .getReport(typeValue, portrait, {
-                metaData: merge(rowObj, {
-                    filter,
-                    groups: reportGroups,
-                    columns: reportAggregations,
-                    xlsDefaultType: this.xlsDefaultType,
-                }),
-            }, beforeOpen)
-                .then((reportUrl) => window.open(reportUrl));
+            try {
+                const reportUrl = yield report
+                    .getReport(typeValue, portrait, {
+                    metaData: merge(rowObj, {
+                        filter,
+                        groups: reportGroups,
+                        columns: reportAggregations,
+                        xlsDefaultType: this.xlsDefaultType,
+                    }),
+                }, beforeOpen);
+                window.open(reportUrl);
+            }
+            catch (e) {
+                if (e instanceof EmptyDataError) {
+                    AlertService.show({ name: 'no-data-warning', text: I18n.translate('TEKGRID_NO_DATA'), color: 'warning' });
+                    return;
+                }
+                throw e;
+            }
         });
     }
     registerTask(task) {

package/dist/tek-components-common.umd.js

@@ -1258,6 +1258,7 @@
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Ano Atual',
               TEKGRID_WITH_GROUPS: '(Com grupos)',
               TEKGRID_GRID_MIRROR: '(Espelho do grid)',
+              TEKGRID_NO_DATA: 'Não há dados para gerar o relatório',
           },
       },
       'en-US': {
@@ -1330,6 +1331,7 @@
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Current Year',
               TEKGRID_WITH_GROUPS: '(With groups)',
               TEKGRID_GRID_MIRROR: '(Grid mirror)',
+              TEKGRID_NO_DATA: 'There is no data to generate the report',
           },
       },
       'es-CL': {
@@ -1402,6 +1404,7 @@
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Año actual',
               TEKGRID_WITH_GROUPS: '(Con grupos)',
               TEKGRID_GRID_MIRROR: '(Espejo de grid)',
+              TEKGRID_NO_DATA: 'No hay datos para generar el reporte',
           },
       },
   });
@@ -2494,16 +2497,25 @@
               if (typeof this.events.beforeOpenReport === 'function') {
                   beforeOpen = this.events.beforeOpenReport;
               }
-              return report
-                  .getReport(typeValue, portrait, {
-                  metaData: merge__default["default"](rowObj, {
-                      filter,
-                      groups: reportGroups,
-                      columns: reportAggregations,
-                      xlsDefaultType: this.xlsDefaultType,
-                  }),
-              }, beforeOpen)
-                  .then((reportUrl) => window.open(reportUrl));
+              try {
+                  const reportUrl = yield report
+                      .getReport(typeValue, portrait, {
+                      metaData: merge__default["default"](rowObj, {
+                          filter,
+                          groups: reportGroups,
+                          columns: reportAggregations,
+                          xlsDefaultType: this.xlsDefaultType,
+                      }),
+                  }, beforeOpen);
+                  window.open(reportUrl);
+              }
+              catch (e) {
+                  if (e instanceof common.EmptyDataError) {
+                      common.AlertService.show({ name: 'no-data-warning', text: core.I18n.translate('TEKGRID_NO_DATA'), color: 'warning' });
+                      return;
+                  }
+                  throw e;
+              }
           });
       }
       registerTask(task) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.106.0",
+  "version": "1.107.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -32,5 +32,5 @@
   "peerDependencies": {
     "@zeedhi/core": "^1.97.0"
   },
-  "gitHead": "665962544705695986852f9d8719e6e6716e6587"
+  "gitHead": "1123e6f810f91d3dbff16805911d4558caf9d6b2"
 }

package/tests/unit/components/tek-datasource/rest-datasource.spec.ts

@@ -314,7 +314,7 @@ describe('TekRestDatasource', () => {
           search_in: [],
           page: 1,
           limit: 10,
-          search_in_params: "{}",
+          search_in_params: '{}',
         },
       }));
     });

package/tests/unit/components/tek-grid/grid.spec.ts

@@ -2,6 +2,8 @@
 
 import {
   Button, Dropdown, IModal, Modal, ModalService, Search, TextInput, Text, Report,
+  AlertService,
+  EmptyDataError,
 } from '@zeedhi/common';
 import {
   KeyMap, Http, Metadata, IDictionary, IEventParam,
@@ -375,7 +377,7 @@ describe('TekGrid', () => {
 
       const getReport = async () => { await instance.getReport('pdf'); };
 
-      expect(getReport).rejects.not.toEqual(new Error());
+      expect(getReport).not.toThrow();
 
       const getColumnSpy = jest.spyOn(instance, 'getColumn').mockImplementationOnce(() => {
         throw Error();
@@ -414,6 +416,37 @@ describe('TekGrid', () => {
         },
       }, undefined);
     });
+
+    it('when data is empty, should show alert', async () => {
+      reportSpy = jest.spyOn(Report.prototype, 'getReport').mockImplementation(() => { throw new EmptyDataError(); });
+      const alertSpy = jest.spyOn(AlertService, 'show').mockImplementation(() => 1);
+
+      const instance = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        datasource: {
+          data: [],
+        },
+      });
+
+      expect(async () => instance.getReport('xls2')).not.toThrow();
+
+      expect(alertSpy).toHaveBeenCalledWith({ name: 'no-data-warning', text: 'TEKGRID_NO_DATA', color: 'warning' });
+    });
+
+    it('when an error happens, should throw normally', async () => {
+      reportSpy = jest.spyOn(Report.prototype, 'getReport').mockImplementation(() => { throw new Error(); });
+
+      const instance = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        datasource: {
+          data: [],
+        },
+      });
+
+      expect(async () => instance.getReport('xls2')).rejects.toThrow();
+    });
   });
 
   describe('saveChanges()', () => {

package/types/components/tek-grid/grid.d.ts

@@ -101,7 +101,7 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
     columnHasFilterData(column: TekGridColumn): boolean;
     private buildReportGroups;
     private buildReportAggregations;
-    getReport(type: string, portrait?: boolean, rowObj?: any): Promise<Window | null>;
+    getReport(type: string, portrait?: boolean, rowObj?: any): Promise<void>;
     private groups;
     private summary;
     private originalDatasourceLoadAll?;