@zeedhi/teknisa-components-common 1.64.0 → 1.65.0

package/coverage/lcov-report/index.html

@@ -25,7 +25,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>1389/1389</span>
+                <span class='fraction'>1393/1393</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>1318/1318</span>
+                <span class='fraction'>1322/1322</span>
             </div>
         
             
@@ -324,13 +324,13 @@
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="180" class="abs high">180/180</td>
+	<td data-value="184" class="abs high">184/184</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="119" class="abs high">119/119</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="61" class="abs high">61/61</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="173" class="abs high">173/173</td>
+	<td data-value="177" class="abs high">177/177</td>
 	</tr>
 
 <tr>
@@ -371,7 +371,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/coverage/lcov-report/tests/__helpers__/component-event-helper.ts.html

@@ -70,7 +70,7 @@
 <a name='L5'></a><a href='#L5'>5</a>
 <a name='L6'></a><a href='#L6'>6</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">28x</span>
+<span class="cline-any cline-yes">29x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { Component } from '@zeedhi/common';
@@ -85,7 +85,7 @@ export { setClick };
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/tests/__helpers__/get-child-helper.ts.html

@@ -151,7 +151,7 @@ export { getChild };
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/tests/__helpers__/index.html

@@ -146,7 +146,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/tests/__helpers__/index.ts.html

@@ -79,7 +79,7 @@ export * from './mock-created-helper';
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/tests/__helpers__/mock-created-helper.ts.html

@@ -106,7 +106,7 @@ export { mockCreated };
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-17T19:10:08.216Z
+                at 2022-11-29T16:12:22.741Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -692,12 +692,12 @@ FNDA:6,(anonymous_11)
 FNDA:5,(anonymous_12)
 FNDA:2,(anonymous_13)
 FNDA:1,(anonymous_14)
-FNDA:7,(anonymous_15)
-FNDA:10,(anonymous_16)
+FNDA:9,(anonymous_15)
+FNDA:16,(anonymous_16)
 FNDA:2,(anonymous_17)
-FNDA:11,(anonymous_18)
-FNDA:26,(anonymous_20)
-FNDA:25,(anonymous_21)
+FNDA:13,(anonymous_18)
+FNDA:32,(anonymous_20)
+FNDA:33,(anonymous_21)
 FNDA:38,(anonymous_22)
 FNDA:76,(anonymous_23)
 FNDA:16,(anonymous_24)
@@ -748,24 +748,24 @@ DA:113,1
 DA:115,1
 DA:124,1
 DA:125,1
-DA:134,7
-DA:135,7
-DA:136,10
-DA:137,5
+DA:134,9
+DA:135,9
+DA:136,16
+DA:137,11
 DA:139,5
-DA:142,7
+DA:142,9
 DA:150,2
 DA:151,2
-DA:159,11
-DA:160,11
-DA:161,11
-DA:162,11
+DA:159,13
+DA:160,13
+DA:161,13
+DA:162,13
 DA:163,2
 DA:164,1
 DA:168,1
-DA:173,11
-DA:182,26
-DA:185,25
+DA:173,13
+DA:182,32
+DA:185,33
 DA:194,38
 DA:195,76
 DA:196,38
@@ -796,21 +796,21 @@ BRDA:77,9,1,6
 BRDA:88,10,0,3
 BRDA:95,11,0,1
 BRDA:111,12,0,1
-BRDA:136,13,0,5
+BRDA:136,13,0,11
 BRDA:136,13,1,5
 BRDA:162,14,0,2
 BRDA:163,15,0,1
 BRDA:163,15,1,1
 BRDA:163,16,0,2
 BRDA:163,16,1,2
-BRDA:182,17,0,26
-BRDA:182,17,1,26
-BRDA:182,17,2,24
-BRDA:182,17,3,23
-BRDA:185,18,0,25
-BRDA:185,18,1,22
-BRDA:185,18,2,22
-BRDA:185,18,3,22
+BRDA:182,17,0,32
+BRDA:182,17,1,32
+BRDA:182,17,2,30
+BRDA:182,17,3,29
+BRDA:185,18,0,33
+BRDA:185,18,1,30
+BRDA:185,18,2,30
+BRDA:185,18,3,30
 BRDA:195,19,0,76
 BRDA:195,19,1,76
 BRDA:196,20,0,38
@@ -1170,9 +1170,9 @@ FNDA:2,(anonymous_31)
 FNDA:3,(anonymous_32)
 FNDA:106,(anonymous_33)
 FNDA:106,(anonymous_34)
-FNDA:82,(anonymous_35)
-FNDA:82,(anonymous_36)
-FNDA:80,(anonymous_37)
+FNDA:83,(anonymous_35)
+FNDA:83,(anonymous_36)
+FNDA:81,(anonymous_37)
 FNDA:78,(anonymous_38)
 FNDA:120,(anonymous_40)
 FNDA:18,(anonymous_41)
@@ -1349,9 +1349,9 @@ DA:390,106
 DA:391,106
 DA:392,106
 DA:396,106
-DA:397,80
+DA:397,81
 DA:398,16
-DA:401,80
+DA:401,81
 DA:405,106
 DA:406,78
 DA:410,78
@@ -1546,9 +1546,9 @@ BRDA:324,15,0,1
 BRDA:337,16,0,1
 BRDA:363,17,0,1
 BRDA:397,18,0,16
-BRDA:397,19,0,80
-BRDA:397,19,1,65
-BRDA:397,19,2,64
+BRDA:397,19,0,81
+BRDA:397,19,1,66
+BRDA:397,19,2,65
 BRDA:414,20,0,17
 BRDA:414,20,1,61
 BRDA:414,21,0,78
@@ -2421,23 +2421,23 @@ FN:492,(anonymous_28)
 FN:505,(anonymous_29)
 FN:522,(anonymous_30)
 FN:530,(anonymous_31)
-FN:536,(anonymous_32)
-FN:558,(anonymous_33)
-FN:582,(anonymous_34)
-FN:584,(anonymous_35)
-FN:589,(anonymous_36)
-FN:597,(anonymous_37)
-FN:605,(anonymous_38)
-FN:614,(anonymous_39)
-FN:623,(anonymous_40)
-FN:626,(anonymous_42)
-FN:630,(anonymous_43)
-FN:630,(anonymous_44)
-FN:634,(anonymous_45)
-FN:668,(anonymous_46)
-FN:672,(anonymous_47)
-FN:673,(anonymous_48)
-FN:681,(anonymous_49)
+FN:539,(anonymous_32)
+FN:567,(anonymous_33)
+FN:588,(anonymous_34)
+FN:590,(anonymous_35)
+FN:595,(anonymous_36)
+FN:603,(anonymous_37)
+FN:611,(anonymous_38)
+FN:620,(anonymous_39)
+FN:629,(anonymous_40)
+FN:632,(anonymous_42)
+FN:636,(anonymous_43)
+FN:636,(anonymous_44)
+FN:640,(anonymous_45)
+FN:674,(anonymous_46)
+FN:678,(anonymous_47)
+FN:679,(anonymous_48)
+FN:687,(anonymous_49)
 FNF:42
 FNH:42
 FNDA:121,(anonymous_7)
@@ -2464,9 +2464,9 @@ FNDA:4,(anonymous_27)
 FNDA:3,(anonymous_28)
 FNDA:1,(anonymous_29)
 FNDA:3,(anonymous_30)
-FNDA:6,(anonymous_31)
+FNDA:7,(anonymous_31)
 FNDA:10,(anonymous_32)
-FNDA:6,(anonymous_33)
+FNDA:10,(anonymous_33)
 FNDA:1,(anonymous_34)
 FNDA:5,(anonymous_35)
 FNDA:121,(anonymous_36)
@@ -2574,69 +2574,73 @@ DA:520,1
 DA:522,1
 DA:523,3
 DA:524,2
-DA:531,6
-DA:532,6
-DA:533,4
-DA:534,4
-DA:535,2
-DA:536,2
-DA:537,10
-DA:538,8
-DA:539,8
-DA:540,8
+DA:531,7
+DA:532,7
+DA:533,5
+DA:535,5
+DA:537,5
+DA:538,2
+DA:539,2
+DA:540,10
 DA:541,8
+DA:542,8
 DA:543,8
-DA:544,6
-DA:547,8
-DA:548,8
-DA:556,2
-DA:558,2
-DA:559,6
-DA:560,6
-DA:562,6
-DA:563,5
-DA:565,1
-DA:570,4
-DA:572,4
-DA:573,2
-DA:575,2
-DA:578,4
-DA:583,1
-DA:584,1
-DA:585,5
-DA:590,121
-DA:598,121
-DA:606,242
-DA:607,242
-DA:609,38
-DA:610,19
-DA:612,19
-DA:614,247
-DA:620,204
-DA:624,6
-DA:625,6
-DA:626,9
-DA:627,4
-DA:629,4
-DA:630,3
-DA:631,3
-DA:633,3
-DA:634,6
+DA:544,8
+DA:546,8
+DA:547,6
+DA:550,8
+DA:551,8
+DA:559,2
+DA:560,2
+DA:561,2
+DA:563,2
+DA:566,3
+DA:567,3
+DA:568,10
+DA:569,10
+DA:571,10
+DA:572,8
+DA:576,3
+DA:577,3
+DA:578,1
+DA:580,1
+DA:584,5
+DA:589,1
+DA:590,1
+DA:591,5
+DA:596,121
+DA:604,121
+DA:612,242
+DA:613,242
+DA:615,38
+DA:616,19
+DA:618,19
+DA:620,247
+DA:626,204
+DA:630,6
+DA:631,6
+DA:632,9
+DA:633,4
+DA:635,4
+DA:636,3
 DA:637,3
-DA:640,4
-DA:643,6
-DA:644,6
-DA:647,121
-DA:649,121
-DA:669,2
-DA:673,10
-DA:675,4
-DA:676,2
-DA:679,2
+DA:639,3
+DA:640,6
+DA:643,3
+DA:646,4
+DA:649,6
+DA:650,6
+DA:653,121
+DA:655,121
+DA:675,2
+DA:679,10
 DA:681,4
-DA:685,26
-LF:153
-LH:153
+DA:682,2
+DA:685,2
+DA:687,4
+DA:691,26
+LF:157
+LH:157
 BRDA:50,0,0,570
 BRDA:52,1,0,570
 BRDA:52,1,1,1
@@ -2706,30 +2710,30 @@ BRDA:512,39,0,3
 BRDA:512,39,1,1
 BRDA:512,39,2,1
 BRDA:523,40,0,2
-BRDA:532,41,0,4
-BRDA:534,42,0,2
-BRDA:534,42,1,2
-BRDA:534,43,0,4
-BRDA:534,43,1,2
-BRDA:537,44,0,8
-BRDA:537,45,0,10
-BRDA:537,45,1,8
-BRDA:537,46,0,8
-BRDA:537,46,1,2
-BRDA:543,47,0,6
-BRDA:562,48,0,5
-BRDA:562,48,1,1
-BRDA:572,49,0,2
-BRDA:607,50,0,38
-BRDA:607,51,0,242
-BRDA:607,51,1,204
-BRDA:609,52,0,19
-BRDA:609,52,1,19
-BRDA:625,53,0,4
-BRDA:625,54,0,6
-BRDA:625,54,1,2
-BRDA:629,55,0,3
-BRDA:675,56,0,2
+BRDA:532,41,0,5
+BRDA:537,42,0,2
+BRDA:537,42,1,3
+BRDA:537,43,0,5
+BRDA:537,43,1,3
+BRDA:540,44,0,8
+BRDA:540,45,0,10
+BRDA:540,45,1,8
+BRDA:540,46,0,8
+BRDA:540,46,1,2
+BRDA:546,47,0,6
+BRDA:560,48,0,2
+BRDA:571,49,0,8
+BRDA:577,50,0,1
+BRDA:613,51,0,38
+BRDA:613,52,0,242
+BRDA:613,52,1,204
+BRDA:615,53,0,19
+BRDA:615,53,1,19
+BRDA:631,54,0,4
+BRDA:631,55,0,6
+BRDA:631,55,1,2
+BRDA:635,56,0,3
+BRDA:681,57,0,2
 BRF:93
 BRH:93
 end_of_record
@@ -2868,12 +2872,12 @@ SF:tests/__helpers__/component-event-helper.ts
 FN:3,(anonymous_0)
 FNF:1
 FNH:1
-FNDA:28,(anonymous_0)
-DA:3,28
+FNDA:29,(anonymous_0)
+DA:3,29
 DA:5,2
 LF:2
 LH:2
-BRDA:3,0,0,25
+BRDA:3,0,0,26
 BRF:1
 BRH:1
 end_of_record

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

@@ -1114,6 +1114,7 @@ class GridBase {
         const filterForm = Metadata.getInstance(`${this.grid.name}-filter-form`);
         if (filterForm.validate()) {
             const { datasource } = this.grid;
+            this.grid.callEvent('beforeApplyFilter', { component: this.grid, event });
             if (datasource instanceof TekRestDatasource || datasource instanceof TekMemoryDatasource) {
                 const dynamicFilter = {};
                 Object.keys(filterForm.value).forEach((item) => {
@@ -1134,23 +1135,25 @@ class GridBase {
                     }
                 });
                 datasource.dynamicFilter = dynamicFilter;
+                if (!event.defaultPrevented) {
+                    datasource.setDynamicFilter(dynamicFilter);
+                    this.filterModal.hide();
+                }
             }
             else {
+                const filter = {};
                 Object.keys(filterForm.value).forEach((item) => {
                     let columnName = item.split(`${this.grid.name}-filter-AND-CONTAINS-`)[1];
                     columnName = columnName.split('-').slice(0, -1).join('-'); // remove index
                     if (filterForm.value[item]) {
-                        datasource.filter[columnName] = filterForm.value[item];
-                    }
-                    else {
-                        delete datasource.filter[columnName];
+                        filter[columnName] = filterForm.value[item];
                     }
                 });
-            }
-            this.grid.callEvent('beforeApplyFilter', { component: this.grid, event });
-            if (!event.defaultPrevented) {
-                datasource.get();
-                this.filterModal.hide();
+                datasource.filter = filter;
+                if (!event.defaultPrevented) {
+                    datasource.setFilter(filter);
+                    this.filterModal.hide();
+                }
             }
             this.grid.changeLayout(event);
         }

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

@@ -1119,6 +1119,7 @@
           const filterForm = core.Metadata.getInstance(`${this.grid.name}-filter-form`);
           if (filterForm.validate()) {
               const { datasource } = this.grid;
+              this.grid.callEvent('beforeApplyFilter', { component: this.grid, event });
               if (datasource instanceof TekRestDatasource || datasource instanceof TekMemoryDatasource) {
                   const dynamicFilter = {};
                   Object.keys(filterForm.value).forEach((item) => {
@@ -1139,23 +1140,25 @@
                       }
                   });
                   datasource.dynamicFilter = dynamicFilter;
+                  if (!event.defaultPrevented) {
+                      datasource.setDynamicFilter(dynamicFilter);
+                      this.filterModal.hide();
+                  }
               }
               else {
+                  const filter = {};
                   Object.keys(filterForm.value).forEach((item) => {
                       let columnName = item.split(`${this.grid.name}-filter-AND-CONTAINS-`)[1];
                       columnName = columnName.split('-').slice(0, -1).join('-'); // remove index
                       if (filterForm.value[item]) {
-                          datasource.filter[columnName] = filterForm.value[item];
-                      }
-                      else {
-                          delete datasource.filter[columnName];
+                          filter[columnName] = filterForm.value[item];
                       }
                   });
-              }
-              this.grid.callEvent('beforeApplyFilter', { component: this.grid, event });
-              if (!event.defaultPrevented) {
-                  datasource.get();
-                  this.filterModal.hide();
+                  datasource.filter = filter;
+                  if (!event.defaultPrevented) {
+                      datasource.setFilter(filter);
+                      this.filterModal.hide();
+                  }
               }
               this.grid.changeLayout(event);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.64.0",
+  "version": "1.65.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -31,5 +31,5 @@
   "peerDependencies": {
     "@zeedhi/core": "*"
   },
-  "gitHead": "5594f5e85645cbc422c9e175b980624f08c447c2"
+  "gitHead": "83d40038a8a18ce4f1a59b888aa42b97d6f70cc6"
 }

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

@@ -2334,8 +2334,8 @@ describe('TekGrid', () => {
         'grid_filterClick13-filter-AND-CONTAINS-salary-0': '1000',
       };
       const applyButtonObject = new Button(applyButton);
-      setClick(applyButtonObject, { defaultPrevented: true });
-      expect((instance.datasource as TekRestDatasource).filter).toEqual({
+      setClick(applyButtonObject);
+      expect(instance.datasource.filter).toEqual({
         id: '1;2;3',
         name: 'teste',
         salary: '1000',
@@ -2343,7 +2343,9 @@ describe('TekGrid', () => {
       expect(beforeApplyFilterCalled).toBeTruthy();
       expect(changeLayoutCalled).toBeTruthy();
       expect(instance.columnHasFilterData({ name: 'name' } as TekGridColumn)).toBeTruthy();
-      expect(spyDatasourceGet).not.toBeCalled();
+
+      setClick(applyButtonObject, { defaultPrevented: true });
+      expect(spyDatasourceGet).toBeCalledTimes(1);
       spyMetadata.mockReset();
       spyDatasourceGet.mockReset();
       spyModalService.mockReset();