@zeedhi/teknisa-components-common 1.102.0 → 1.103.0

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

@@ -1253,7 +1253,6 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Mês Atual',
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Ano Atual',
             TEKGRID_WITH_GROUPS: '(Com grupos)',
-            TEKGRID_WITHOUT_GROUPS: '(Sem grupos)',
             TEKGRID_GRID_MIRROR: '(Espelho do grid)',
         },
     },
@@ -1326,7 +1325,6 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Current Month',
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Current Year',
             TEKGRID_WITH_GROUPS: '(With groups)',
-            TEKGRID_WITHOUT_GROUPS: '(No groups)',
             TEKGRID_GRID_MIRROR: '(Grid mirror)',
         },
     },
@@ -1399,7 +1397,6 @@ Messages.add({
             TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Mes actual',
             TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Año actual',
             TEKGRID_WITH_GROUPS: '(Con grupos)',
-            TEKGRID_WITHOUT_GROUPS: '(No grupos)',
             TEKGRID_GRID_MIRROR: '(Espejo de grid)',
         },
     },
@@ -2239,7 +2236,7 @@ class TekGrid extends GridEditable {
             {
                 type: 'xls',
                 label: I18n.translate('TEKGRID_EXPORT_AS', {
-                    type: `XLS ${I18n.translate('TEKGRID_WITHOUT_GROUPS')}`,
+                    type: 'XLS',
                 }),
             },
             {
@@ -2276,6 +2273,7 @@ class TekGrid extends GridEditable {
         this.showCheckboxAllFilter = Config.gridShowCheckboxAllFilter || false;
         this.defaultFilter = {};
         this.toolbarOpened = true;
+        this.reportTitle = '';
         this.defaultLazy = false;
         this.groups = [];
         this.summary = {};
@@ -2312,6 +2310,7 @@ class TekGrid extends GridEditable {
         this.toolbarOpened = this.getInitValue('toolbarOpened', props.toolbarOpened, this.toolbarOpened);
         this.editNewRowsOnly = this.getInitValue('editNewRowsOnly', props.editNewRowsOnly, this.editNewRowsOnly);
         this.mainGrid = this.getInitValue('mainGrid', props.mainGrid, this.mainGrid);
+        this.reportTitle = this.getInitValue('reportTitle', props.reportTitle, this.reportTitle);
         this.actions = props.actions || this.actions;
         this.toolbarSlotProps = props.toolbarSlot !== undefined;
         if (this.deleteButton === 'selection') {
@@ -2441,9 +2440,13 @@ class TekGrid extends GridEditable {
     }
     getReport(type, portrait, rowObj = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const report = new Report(this, this.title);
+            const report = new Report(this, this.title || this.reportTitle);
             const reportGroups = this.buildReportGroups();
             const reportAggregations = this.buildReportAggregations();
+            let typeValue = type;
+            if (reportGroups.length === 0 && type.substring(0, 3) === 'xls') {
+                typeValue = 'xls';
+            }
             let filter;
             if (this.datasource instanceof TekRestDatasource
                 || this.datasource instanceof TekMemoryDatasource) {
@@ -2485,7 +2488,7 @@ class TekGrid extends GridEditable {
                 beforeOpen = this.events.beforeOpenReport;
             }
             return report
-                .getReport(type, portrait, {
+                .getReport(typeValue, portrait, {
                 metaData: merge(rowObj, {
                     filter,
                     groups: reportGroups,
@@ -3679,7 +3682,7 @@ class TekTreeGrid extends TreeGridEditable {
             {
                 type: 'xls',
                 label: I18n.translate('TEKGRID_EXPORT_AS', {
-                    type: `XLS ${I18n.translate('TEKGRID_WITHOUT_GROUPS')}`,
+                    type: 'XLS',
                 }),
             },
             {
@@ -3702,6 +3705,7 @@ class TekTreeGrid extends TreeGridEditable {
         this.toolbarSlotProps = false;
         this.showCheckboxAllFilter = false;
         this.defaultFilter = {};
+        this.reportTitle = '';
         this.title = this.getInitValue('title', props.title, this.title);
         this.addButton = this.getInitValue('addButton', props.addButton, this.addButton);
         this.deleteButton = this.getInitValue('deleteButton', props.deleteButton, this.deleteButton);
@@ -3721,6 +3725,7 @@ class TekTreeGrid extends TreeGridEditable {
         this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
         this.toolbarOpened = this.getInitValue('toolbarOpened', props.toolbarOpened, this.toolbarOpened);
         this.exportActions = props.exportActions || this.exportActions;
+        this.reportTitle = this.getInitValue('reportTitle', props.reportTitle, this.reportTitle);
         this.actions = props.actions || this.actions;
         this.toolbarSlotProps = props.toolbarSlot !== undefined;
         if (this.deleteButton === 'selection') {
@@ -3800,7 +3805,7 @@ class TekTreeGrid extends TreeGridEditable {
     }
     getReport(type, portrait, rowObj = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const report = new Report(this, this.title);
+            const report = new Report(this, this.title || this.reportTitle);
             const reportGroups = {};
             const reportAggregations = {};
             let filter;

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

@@ -1257,7 +1257,6 @@
               TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Mês Atual',
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Ano Atual',
               TEKGRID_WITH_GROUPS: '(Com grupos)',
-              TEKGRID_WITHOUT_GROUPS: '(Sem grupos)',
               TEKGRID_GRID_MIRROR: '(Espelho do grid)',
           },
       },
@@ -1330,7 +1329,6 @@
               TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Current Month',
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Current Year',
               TEKGRID_WITH_GROUPS: '(With groups)',
-              TEKGRID_WITHOUT_GROUPS: '(No groups)',
               TEKGRID_GRID_MIRROR: '(Grid mirror)',
           },
       },
@@ -1403,7 +1401,6 @@
               TEKGRID_HELPERVALUE_CURRENT_MONTH: 'Mes actual',
               TEKGRID_HELPERVALUE_CURRENT_YEAR: 'Año actual',
               TEKGRID_WITH_GROUPS: '(Con grupos)',
-              TEKGRID_WITHOUT_GROUPS: '(No grupos)',
               TEKGRID_GRID_MIRROR: '(Espejo de grid)',
           },
       },
@@ -2243,7 +2240,7 @@
               {
                   type: 'xls',
                   label: core.I18n.translate('TEKGRID_EXPORT_AS', {
-                      type: `XLS ${core.I18n.translate('TEKGRID_WITHOUT_GROUPS')}`,
+                      type: 'XLS',
                   }),
               },
               {
@@ -2280,6 +2277,7 @@
           this.showCheckboxAllFilter = core.Config.gridShowCheckboxAllFilter || false;
           this.defaultFilter = {};
           this.toolbarOpened = true;
+          this.reportTitle = '';
           this.defaultLazy = false;
           this.groups = [];
           this.summary = {};
@@ -2316,6 +2314,7 @@
           this.toolbarOpened = this.getInitValue('toolbarOpened', props.toolbarOpened, this.toolbarOpened);
           this.editNewRowsOnly = this.getInitValue('editNewRowsOnly', props.editNewRowsOnly, this.editNewRowsOnly);
           this.mainGrid = this.getInitValue('mainGrid', props.mainGrid, this.mainGrid);
+          this.reportTitle = this.getInitValue('reportTitle', props.reportTitle, this.reportTitle);
           this.actions = props.actions || this.actions;
           this.toolbarSlotProps = props.toolbarSlot !== undefined;
           if (this.deleteButton === 'selection') {
@@ -2445,9 +2444,13 @@
       }
       getReport(type, portrait, rowObj = {}) {
           return __awaiter(this, void 0, void 0, function* () {
-              const report = new common.Report(this, this.title);
+              const report = new common.Report(this, this.title || this.reportTitle);
               const reportGroups = this.buildReportGroups();
               const reportAggregations = this.buildReportAggregations();
+              let typeValue = type;
+              if (reportGroups.length === 0 && type.substring(0, 3) === 'xls') {
+                  typeValue = 'xls';
+              }
               let filter;
               if (this.datasource instanceof TekRestDatasource
                   || this.datasource instanceof TekMemoryDatasource) {
@@ -2489,7 +2492,7 @@
                   beforeOpen = this.events.beforeOpenReport;
               }
               return report
-                  .getReport(type, portrait, {
+                  .getReport(typeValue, portrait, {
                   metaData: merge__default["default"](rowObj, {
                       filter,
                       groups: reportGroups,
@@ -3683,7 +3686,7 @@
               {
                   type: 'xls',
                   label: core.I18n.translate('TEKGRID_EXPORT_AS', {
-                      type: `XLS ${core.I18n.translate('TEKGRID_WITHOUT_GROUPS')}`,
+                      type: 'XLS',
                   }),
               },
               {
@@ -3706,6 +3709,7 @@
           this.toolbarSlotProps = false;
           this.showCheckboxAllFilter = false;
           this.defaultFilter = {};
+          this.reportTitle = '';
           this.title = this.getInitValue('title', props.title, this.title);
           this.addButton = this.getInitValue('addButton', props.addButton, this.addButton);
           this.deleteButton = this.getInitValue('deleteButton', props.deleteButton, this.deleteButton);
@@ -3725,6 +3729,7 @@
           this.defaultFilter = this.getInitValue('defaultFilter', props.defaultFilter, this.defaultFilter);
           this.toolbarOpened = this.getInitValue('toolbarOpened', props.toolbarOpened, this.toolbarOpened);
           this.exportActions = props.exportActions || this.exportActions;
+          this.reportTitle = this.getInitValue('reportTitle', props.reportTitle, this.reportTitle);
           this.actions = props.actions || this.actions;
           this.toolbarSlotProps = props.toolbarSlot !== undefined;
           if (this.deleteButton === 'selection') {
@@ -3804,7 +3809,7 @@
       }
       getReport(type, portrait, rowObj = {}) {
           return __awaiter(this, void 0, void 0, function* () {
-              const report = new common.Report(this, this.title);
+              const report = new common.Report(this, this.title || this.reportTitle);
               const reportGroups = {};
               const reportAggregations = {};
               let filter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.102.0",
+  "version": "1.103.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -30,7 +30,7 @@
     "@types/lodash.merge": "4.6.*"
   },
   "peerDependencies": {
-    "@zeedhi/core": "~1.97.0"
+    "@zeedhi/core": "^1.97.0"
   },
-  "gitHead": "b97e803072580b43c8e2e83a1f467186616e42ae"
+  "gitHead": "f5fd5144d582c73468d08511c491868f5f4b71c8"
 }

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

@@ -387,6 +387,33 @@ describe('TekGrid', () => {
       spy.mockReset();
       getColumnSpy.mockReset();
     });
+
+    it('should call getReport always with "xls" when there is no group', async () => {
+      (window as any).open = jest.fn();
+
+      const instance = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        columns: [
+          {
+            name: 'id',
+            label: 'ID',
+          },
+          {
+            name: 'department_id',
+            label: 'Department ID',
+          },
+        ],
+      });
+
+      await instance.getReport('xls2');
+
+      expect(reportSpy).toHaveBeenCalledWith('xls', undefined, {
+        metaData: {
+          columns: {}, filter: undefined, groups: [], xlsDefaultType: undefined,
+        },
+      }, undefined);
+    });
   });
 
   describe('saveChanges()', () => {

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

@@ -76,6 +76,7 @@ export declare class TekGrid extends GridEditable implements ITekGrid {
     showCheckboxAllFilter: boolean;
     defaultFilter: IDictionary;
     toolbarOpened: boolean;
+    reportTitle: string;
     /**
      * TekGrid class constructor
      * @param props TekGrid properties

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

@@ -63,6 +63,7 @@ export interface ITekGrid extends IGridEditable {
     defaultFilter?: IDictionary;
     xlsDefaultType?: string;
     toolbarOpened?: boolean;
+    reportTitle?: string;
 }
 export declare type MultiOptionParams = {
     iconName: string;

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

@@ -25,4 +25,5 @@ export interface ITekTreeGrid extends ITreeGridEditable {
     showCheckboxAllFilter?: boolean;
     defaultFilter?: IDictionary;
     toolbarOpened?: boolean;
+    reportTitle?: string;
 }

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

@@ -65,6 +65,7 @@ export declare class TekTreeGrid extends TreeGridEditable implements ITekTreeGri
     filterOperationsDatasource: Datasource;
     showCheckboxAllFilter: boolean;
     defaultFilter: IDictionary;
+    reportTitle: string;
     /**
      * TekTreeGrid class constructor
      * @param props TekTreeGrid properties