@zeedhi/teknisa-components-common 1.37.0 → 1.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-common",
-  "version": "1.37.0",
+  "version": "1.41.0",
   "description": "Teknisa Components Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -28,5 +28,5 @@
   "peerDependencies": {
     "@zeedhi/core": "*"
   },
-  "gitHead": "2083d86e2b1722ac34c9a7ee71ab7587340ce386"
+  "gitHead": "bce3adcbc8986e99a5467d491971d8d26a1a84fd"
 }

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

@@ -243,7 +243,7 @@ describe('TekMemoryDatasource', () => {
 
       instance.dynamicFilter = {
         id: [
-          { operation: 'IN', relation: 'AND', value: '1;2' },
+          { operation: 'IN', relation: 'AND', value: ['1', '2'] },
         ],
       };
       await instance.get();
@@ -251,7 +251,7 @@ describe('TekMemoryDatasource', () => {
 
       instance.dynamicFilter = {
         id: [
-          { operation: 'NOT_IN', relation: 'AND', value: '1;2' },
+          { operation: 'NOT_IN', relation: 'AND', value: ['1', '2'] },
         ],
       };
       await instance.get();
@@ -259,7 +259,7 @@ describe('TekMemoryDatasource', () => {
 
       instance.dynamicFilter = {
         id: [
-          { operation: 'BETWEEN', relation: 'AND', value: '2;5' },
+          { operation: 'BETWEEN', relation: 'AND', value: ['2', '5'] },
         ],
       };
       await instance.get();
@@ -267,11 +267,27 @@ describe('TekMemoryDatasource', () => {
 
       instance.dynamicFilter = {
         name: [
-          { operation: 'BETWEEN', relation: 'AND', value: 'name 2;name 5' },
+          { operation: 'BETWEEN', relation: 'AND', value: ['name 2', 'name 5'] },
         ],
       };
       await instance.get();
       expect(instance.data.length).toBe(4);
+
+      instance.dynamicFilter = {
+        name: [
+          { operation: '', relation: 'AND', value: ['1', '2'] },
+        ],
+      };
+      await instance.get();
+      expect(instance.data.length).toBe(0);
+
+      instance.dynamicFilter = {
+        name: [
+          { operation: '', relation: 'AND', value: '1' },
+        ],
+      };
+      await instance.get();
+      expect(instance.data.length).toBe(0);
     });
 
     it('should not retrieve data with wrong operator', async () => {

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

@@ -0,0 +1,145 @@
+import { Config, dayjs } from '@zeedhi/core';
+import { TekFilterHelper, TekGrid } from '../../../../src';
+
+describe('TekFilterHelper', () => {
+  describe('getLabel', () => {
+    it('should return helper label', () => {
+      expect(TekFilterHelper.getLabel('TODAY')).toBe('TEKGRID_HELPERVALUE_TODAY');
+    });
+  });
+
+  describe('getValue', () => {
+    it('should return helper value', () => {
+      const grid = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        columns: [
+          {
+            name: 'date',
+            componentProps: {
+              name: 'date-comp',
+              component: 'ZdDate',
+              dateFormat: 'YYYY-MM-DD',
+            },
+          },
+        ],
+      });
+      const today = dayjs().format('YYYY-MM-DD');
+      const tomorrow = dayjs().add(1, 'day').format('YYYY-MM-DD');
+      const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
+      const last7Days = [
+        dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
+        dayjs().format('YYYY-MM-DD'),
+      ];
+      const next7Days = [
+        dayjs().format('YYYY-MM-DD'),
+        dayjs().add(7, 'day').format('YYYY-MM-DD'),
+      ];
+      const currentWeek = [
+        dayjs().startOf('week').format('YYYY-MM-DD'),
+        dayjs().endOf('week').format('YYYY-MM-DD'),
+      ];
+      const currentMonth = [
+        dayjs().startOf('month').format('YYYY-MM-DD'),
+        dayjs().endOf('month').format('YYYY-MM-DD'),
+      ];
+      const currentYear = [
+        dayjs().startOf('year').format('YYYY-MM-DD'),
+        dayjs().endOf('year').format('YYYY-MM-DD'),
+      ];
+      expect(TekFilterHelper.getValue('TODAY', grid.columns[0])).toBe(today);
+      expect(TekFilterHelper.getValue('TOMORROW', grid.columns[0])).toBe(tomorrow);
+      expect(TekFilterHelper.getValue('YESTERDAY', grid.columns[0])).toBe(yesterday);
+      expect(TekFilterHelper.getValue('LAST_7_DAYS', grid.columns[0])).toEqual(last7Days);
+      expect(TekFilterHelper.getValue('NEXT_7_DAYS', grid.columns[0])).toEqual(next7Days);
+      expect(TekFilterHelper.getValue('CURRENT_WEEK', grid.columns[0])).toEqual(currentWeek);
+      expect(TekFilterHelper.getValue('CURRENT_MONTH', grid.columns[0])).toEqual(currentMonth);
+      expect(TekFilterHelper.getValue('CURRENT_YEAR', grid.columns[0])).toEqual(currentYear);
+    });
+
+    it('should use default date format if column does not have it', () => {
+      const grid = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        columns: [
+          {
+            name: 'date',
+          },
+        ],
+      });
+      const today = dayjs().format(Config.dateFormat);
+      expect(TekFilterHelper.getValue('TODAY', grid.columns[0])).toBe(today);
+    });
+  });
+
+  describe('register', () => {
+    it('should register new functions', () => {
+      const grid = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        columns: [
+          {
+            name: 'date',
+            componentProps: {
+              name: 'date-comp',
+              component: 'ZdDate',
+              dateFormat: 'YYYY-MM-DD',
+            },
+          },
+        ],
+      });
+
+      TekFilterHelper.register('NEXT_FIFTH_OF_THE_MONTH', 'Next fifth day of the month', () => {
+        const today = dayjs();
+        if (today.date() <= 5) return today.date(5).toDate();
+        return today.add(1, 'month').date(5).toDate();
+      });
+
+      TekFilterHelper.register('NEXT_WEEK', 'Next Week', () => {
+        const startOfNextWeek = dayjs().startOf('week').add(1, 'week').toDate();
+        const endOfNextWeek = dayjs().endOf('week').add(1, 'week').toDate();
+        return [startOfNextWeek, endOfNextWeek];
+      });
+
+      const today = dayjs();
+      let nextFifth = '';
+      if (today.date() <= 5) {
+        nextFifth = today.date(5).format('YYYY-MM-DD');
+      } else {
+        nextFifth = today.add(1, 'month').date(5).format('YYYY-MM-DD');
+      }
+
+      const nextWeek = [
+        dayjs().startOf('week').add(1, 'week').format('YYYY-MM-DD'),
+        dayjs().endOf('week').add(1, 'week').format('YYYY-MM-DD'),
+      ];
+      expect(TekFilterHelper.getValue('NEXT_FIFTH_OF_THE_MONTH', grid.columns[0])).toBe(nextFifth);
+      expect(TekFilterHelper.getValue('NEXT_WEEK', grid.columns[0])).toEqual(nextWeek);
+    });
+  });
+
+  describe('unregister', () => {
+    it('should unregister new functions', () => {
+      const grid = new TekGrid({
+        name: 'grid',
+        component: 'TekGrid',
+        columns: [
+          {
+            name: 'date',
+            componentProps: {
+              name: 'date-comp',
+              component: 'ZdDate',
+              dateFormat: 'YYYY-MM-DD',
+            },
+          },
+        ],
+      });
+
+      TekFilterHelper.unregister('NEXT_FIFTH_OF_THE_MONTH');
+      TekFilterHelper.unregister('NEXT_WEEK');
+
+      expect(TekFilterHelper.getValue('NEXT_FIFTH_OF_THE_MONTH', grid.columns[0])).toBe('');
+      expect(TekFilterHelper.getValue('NEXT_WEEK', grid.columns[0])).toEqual('');
+    });
+  });
+});