@zeedhi/teknisa-components-common 1.44.0 → 1.47.0

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

@@ -4,9 +4,10 @@ import {
   Button, Date, Dropdown, Form, IButton, IForm, IModal, Modal, ModalService, Search, Text, TextInput,
 } from '@zeedhi/common';
 import {
-  KeyMap, Http, Metadata, dayjs, Config, IDictionary,
+  KeyMap, Http, Metadata, IDictionary, DateHelper,
 } from '@zeedhi/core';
 import {
+  IFilterPropsComponent,
   ITekGrid,
   TekGrid, TekGridColumn, TekRestDatasource,
 } from '../../../../src';
@@ -1756,6 +1757,8 @@ describe('TekGrid', () => {
 
         return new Modal(modal);
       });
+      const dateHelperSpy = jest.spyOn(DateHelper, 'getLabel').mockImplementation((name: string) => name);
+
       instance.onCreated();
       const filterTooltip = instance.toolbarSlot[6];
       if (filterTooltip && filterTooltip.children && filterTooltip.children.length > 0) {
@@ -1763,29 +1766,11 @@ describe('TekGrid', () => {
         const event = new Event('click');
         button.click(event, {} as HTMLElement);
         expect(formElements[0].name).toBe('grid_filterClick7-filter-AND-CONTAINS-id-0');
-        expect(formElements[1].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-0_helperspan');
-        expect(formElements[1].component).toBe('ZdTag');
-        expect(formElements[1].children.length).toBe(2);
-        expect(formElements[1].children[0].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-0');
-        expect(formElements[1].children[0].component).toBe('ZdDate');
-        expect(formElements[1].children[1].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-0_helperdropdown');
-        expect(formElements[1].children[1].component).toBe('ZdDropdown');
-        expect(formElements[1].children[1].activator.cssClass).toBe('filter-helper-values-button with-label');
-        expect(formElements[1].children[1].children.length).toBe(2);
-        expect(formElements[1].children[1].children[0].component).toBe('ZdText');
-        expect(formElements[1].children[1].children[0].text).toBe('TEKGRID_HELPERVALUE_TODAY');
-        expect(formElements[1].children[1].children[1].component).toBe('ZdText');
-        expect(formElements[1].children[1].children[1].text).toBe('TEKGRID_HELPERVALUE_TOMORROW');
-        expect(formElements[2].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-1_helperspan');
-        expect(formElements[2].component).toBe('ZdTag');
-        expect(formElements[2].children.length).toBe(2);
-        expect(formElements[2].children[0].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-1');
-        expect(formElements[2].children[0].component).toBe('ZdDate');
-        expect(formElements[2].children[1].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-1_helperdropdown');
-        expect(formElements[2].children[1].component).toBe('ZdDropdown');
-        expect(formElements[2].children[1].activator.cssClass).toBe('filter-helper-values-button ');
+        expect(formElements[1].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-0');
+        expect(formElements[2].name).toBe('grid_filterClick7-filter-OR-NOT_EQUALS-date-1');
       }
       spy.mockClear();
+      dateHelperSpy.mockClear();
     });
 
     it('should apply helper value', () => {
@@ -1797,11 +1782,11 @@ describe('TekGrid', () => {
         },
         columns: [
           {
-            name: 'date',
-            componentProps: { name: 'date_edit', component: 'ZdDate' },
+            name: 'date1',
+            componentProps: { name: 'date_edit1', component: 'ZdDate' },
             filterProps: {
-              name: 'date_edit',
-              label: 'date',
+              name: 'date_edit1',
+              label: 'date1',
               operation: 'NOT_EQUALS',
               relation: 'OR',
               helperOptions: [
@@ -1810,53 +1795,23 @@ describe('TekGrid', () => {
               ],
             },
           },
-        ],
-      });
-
-      let formElements: any = [];
-      let form: IForm;
-      const spy = jest.spyOn(ModalService, 'create').mockImplementation((modal: IModal) => {
-        if (modal.children && modal.children.length > 1) {
-          form = modal.children[1] as IForm;
-          formElements = form.children;
-        }
-
-        return new Modal(modal);
-      });
-      instance.onCreated();
-      const filterTooltip = instance.toolbarSlot[6];
-      if (filterTooltip && filterTooltip.children && filterTooltip.children.length > 0) {
-        const button = new Button(filterTooltip.children[0]);
-        const event = new Event('click');
-        button.click(event, {} as HTMLElement);
-        const todayHelper = new Text(formElements[0].children[1].children[0]);
-        const dateComp = new Date(formElements[0].children[0]);
-        const spyMetadata = jest.spyOn(Metadata, 'getInstance').mockImplementation(() => dateComp);
-        todayHelper.click(event, {} as HTMLElement);
-        expect(dateComp.value).toBe(dayjs().format(Config.dateFormat));
-        expect(dateComp.hint).toBe('TEKGRID_HELPERVALUE_TODAY');
-        dateComp.change(event, {} as HTMLElement);
-        expect(dateComp.hint).toBe('');
-        spyMetadata.mockClear();
-      }
-      spy.mockClear();
-    });
-
-    it('should apply helper value on filterProps as an array', () => {
-      const instance = new TekGrid({
-        name: 'grid_filterClick8_1',
-        component: 'TekGrid',
-        datasource: {
-          type: 'tek-rest',
-        },
-        columns: [
           {
-            name: 'date',
-            componentProps: { name: 'date_edit', component: 'ZdDate' },
+            name: 'date2',
+            componentProps: { name: 'date_edit2', component: 'ZdDate' },
             filterProps: [
               {
-                name: 'date_edit',
-                label: 'date',
+                name: 'date_edit21',
+                label: 'date21',
+                operation: 'NOT_EQUALS',
+                relation: 'OR',
+                helperOptions: [
+                  'TODAY',
+                  'TOMORROW',
+                ],
+              },
+              {
+                name: 'date_edit22',
+                label: 'date22',
                 helperOptions: [
                   'TODAY',
                   'TOMORROW',
@@ -1883,68 +1838,20 @@ describe('TekGrid', () => {
         const button = new Button(filterTooltip.children[0]);
         const event = new Event('click');
         button.click(event, {} as HTMLElement);
-        const todayHelper = new Text(formElements[0].children[1].children[0]);
-        const dateComp = new Date(formElements[0].children[0]);
-        const spyMetadata = jest.spyOn(Metadata, 'getInstance').mockImplementation(() => dateComp);
-        todayHelper.click(event, {} as HTMLElement);
-        expect(dateComp.value).toBe(dayjs().format(Config.dateFormat));
-        expect(dateComp.hint).toBe('TEKGRID_HELPERVALUE_TODAY');
+        const dateComp = new Date(formElements[0]);
+        dateComp.helperValue = 'TODAY';
         dateComp.change(event, {} as HTMLElement);
-        expect(dateComp.hint).toBe('');
-        spyMetadata.mockClear();
-      }
-      spy.mockClear();
-    });
-
-    it('should apply helper value on filterProps as an array', () => {
-      const instance = new TekGrid({
-        name: 'grid_filterClick8_2',
-        component: 'TekGrid',
-        datasource: {
-          type: 'tek-rest',
-        },
-        columns: [
-          {
-            name: 'date',
-            componentProps: { name: 'date_edit', component: 'ZdDate' },
-            filterProps: {
-              name: 'date_edit',
-              label: 'date',
-              helperOptions: [
-                'TODAY',
-                'TOMORROW',
-              ],
-            },
-          },
-        ],
-      });
+        expect((instance.columns[0].filterProps as IFilterPropsComponent).helperValue).toBe('TODAY');
 
-      let formElements: any = [];
-      let form: IForm | undefined;
-      const spy = jest.spyOn(ModalService, 'create').mockImplementation((modal: IModal) => {
-        if (modal.children && modal.children.length > 1) {
-          form = modal.children[1] as IForm;
-          formElements = form.children;
-        }
+        const dateComp21 = new Date(formElements[1]);
+        dateComp21.helperValue = 'TODAY';
+        dateComp21.change(event, {} as HTMLElement);
+        expect((instance.columns[1].filterProps as IFilterPropsComponent[])[0].helperValue).toBe('TODAY');
 
-        return new Modal(modal);
-      });
-      instance.onCreated();
-      const filterTooltip = instance.toolbarSlot[6];
-      if (filterTooltip && filterTooltip.children && filterTooltip.children.length > 0) {
-        const button = new Button(filterTooltip.children[0]);
-        const event = new Event('click');
-        button.click(event, {} as HTMLElement);
-        const dateComp = new Date(formElements[0].children[0]);
-        if (form) {
-          const formObj = new Form(form);
-          const spyMetadata = jest.spyOn(Metadata, 'getInstance').mockImplementation(() => formObj);
-          dateComp.onMounted({} as HTMLElement);
-          expect(formObj.value).toEqual({
-            'grid_filterClick8_2-filter-AND-CONTAINS-date-0': undefined,
-          });
-          spyMetadata.mockClear();
-        }
+        const dateComp22 = new Date(formElements[2]);
+        dateComp22.helperValue = 'TODAY';
+        dateComp22.change(event, {} as HTMLElement);
+        expect((instance.columns[1].filterProps as IFilterPropsComponent[])[1].helperValue).toBe('TODAY');
       }
       spy.mockClear();
     });
@@ -2026,7 +1933,7 @@ describe('TekGrid', () => {
             'grid_filterClick9-filter-AND-CONTAINS-phone-0': '9',
             'grid_filterClick9-filter-OR-IN-date-0': ['2021-11-12', '2021-12-12'],
           });
-          expect(dateObject.hint).toBe('TEKGRID_HELPERVALUE_TODAY');
+          expect(dateObject.hint).toBe('TODAY');
           spyMetadata.mockClear();
         }
       }

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

@@ -1,7 +1,5 @@
 import { TekGridColumn } from '..';
 export declare class TekFilterHelper {
-    private static values;
-    private static formatDate;
     static getLabel(name: string): string;
     static getValue(name: string, column: TekGridColumn): string | string[];
     static register(name: string, label: string, fn: () => Date | [Date, Date]): void;

package/types/components/tek-grid/grid-columns-button-controller.d.ts

@@ -4,4 +4,5 @@ import { TekGridColumn } from './grid-column';
 export declare class TekGridColumnsButtonController extends IterableColumnsButtonController {
     changeGroupedColumn(column: TekGridColumn, { component, event, element }: IEventParam<Checkbox>): void;
     changeAggregationColumn(column: TekGridColumn, { component, event, element }: IEventParam<Checkbox>): void;
+    showHideTekColumn(column: TekGridColumn, { component, event, element }: IEventParam<Checkbox>): void;
 }

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

@@ -1,5 +1,5 @@
 import { IComponent, IComponentEvents, IComponentRender, IGridColumnEditable, IGridEditable, IIterableColumnsButton } from '@zeedhi/common';
-import { IDictionary, IEvent, IEventParam } from '@zeedhi/core';
+import { IDictionary, IEvent, IEventParam, IDateHelperValue, IDateHelperValues } from '@zeedhi/core';
 import { IDynamicFilterItem, TekGridLayoutOptions } from '..';
 export interface ITekGridLayoutEventParams extends IEventParam<ITekGrid> {
     layouts: ITekGridLayoutInfo;
@@ -138,10 +138,7 @@ export interface ITekGridSummary {
     min: any;
     max: any;
 }
-export interface ITekFilterHelperValue {
-    label: string;
-    fn: () => Date | [Date, Date];
+export interface ITekFilterHelperValue extends IDateHelperValue {
 }
-export interface ITekFilterHelperValues {
-    [key: string]: ITekFilterHelperValue;
+export interface ITekFilterHelperValues extends IDateHelperValues {
 }

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

@@ -1,5 +1,5 @@
-import { IComponentRender } from '@zeedhi/common';
-export interface ILoading extends IComponentRender {
+import { ILoading as IZdLoading } from '@zeedhi/common';
+export interface ILoading extends IZdLoading {
     text?: string;
     zIndex?: number | string;
     image?: string;

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

@@ -1,9 +1,9 @@
-import { ComponentRender } from '@zeedhi/common';
+import { Loading as ZdLoading } from '@zeedhi/common';
 import { ILoading } from './interfaces';
 /**
  * Teknisa component
  */
-export declare class Loading extends ComponentRender implements ILoading {
+export declare class Loading extends ZdLoading implements ILoading {
     /**
     * text to show in Loader Overlay
     */

package/types/utils/grid-base/grid-base.d.ts

@@ -252,12 +252,7 @@ export declare class GridBase {
     hideFilterModal(): void;
     private sortFilterIndex;
     private getFilterModalComponents;
-    private getHelperValueComponent;
-    private createHelperValueOptions;
-    private helperValuesOptionClick;
-    private setFilterPropsHelperValue;
-    private registerFilterComponentToForm;
-    private clearFilterHelperValue;
+    private changeHelperEvent;
     private loadFilterValues;
     private applyFilter;
     private clearFilter;