@slickgrid-universal/odata 5.0.1 → 5.1.0

package/dist/types/interfaces/odataOption.interface.d.ts

@@ -1,4 +1,4 @@
-import type { BackendServiceOption, CaseType } from '@slickgrid-universal/common';
+import type { BackendServiceFilterQueryOverrideArgs, BackendServiceOption, CaseType } from '@slickgrid-universal/common';
 export interface OdataOption extends BackendServiceOption {
     /** What is the casing type to use? Typically that would be 1 of the following 2: camelCase or PascalCase */
     caseType: CaseType;
@@ -26,6 +26,8 @@ export interface OdataOption extends BackendServiceOption {
     filterBySeparator?: 'and' | 'or';
     /** Filter queue */
     filterQueue?: any[];
+    /** An optional predicate function to overide the built-in filter construction  */
+    filterQueryOverride?: (args: BackendServiceFilterQueryOverrideArgs) => string | undefined;
     /** Sorting string (or array of string) that must be a valid OData string */
     orderBy?: string | string[];
     /** OData (or any other) version number (the query string is different between versions) */

package/dist/types/interfaces/odataOption.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odataOption.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/odataOption.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAElF,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD,4GAA4G;IAC5G,QAAQ,EAAE,QAAQ,CAAC;IAEnB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3B,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAEjC,mBAAmB;IACnB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;IAEpB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE5B,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,4JAA4J;IAC5J,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;IAE3C,uJAAuJ;IACvJ,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;CAC9C"}
+{"version":3,"file":"odataOption.interface.d.ts","sourceRoot":"","sources":["../../../src/interfaces/odataOption.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEzH,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD,4GAA4G;IAC5G,QAAQ,EAAE,QAAQ,CAAC;IAEnB,0FAA0F;IAC1F,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE3B,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAEjC,mBAAmB;IACnB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;IAEpB,kFAAkF;IAClF,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,qCAAqC,KAAK,MAAM,GAAG,SAAS,CAAC;IAE1F,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE5B,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC,4JAA4J;IAC5J,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;IAE3C,uJAAuJ;IACvJ,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,MAAM,CAAC;CAC9C"}

package/dist/types/services/grid-odata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-odata.service.d.ts","sourceRoot":"","sources":["../../../src/services/grid-odata.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACd,MAAM,EAEN,aAAa,EACb,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,UAAU,EACV,qBAAqB,EAErB,cAAc,EACd,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,SAAS,EACV,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,SAAS,EAET,YAAY,EAGb,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,qBAAqB,CAAC;AAK3E,qBAAa,gBAAiB,YAAW,cAAc;IACrD,SAAS,CAAC,eAAe,EAAE,aAAa,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAC9D,SAAS,CAAC,eAAe,EAAE,aAAa,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAC5C,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,aAAa,EAAE,wBAAwB,CAAC;IAClD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/B,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,WAAW,CAIzB;IAEF,wCAAwC;IACxC,IAAI,iBAAiB,kBAEpB;IAED,mCAAmC;IACnC,IAAI,YAAY,6BAEf;IAED,iEAAiE;IACjE,SAAS,KAAK,YAAY,IAAI,UAAU,CAEvC;;IAMD,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI;IA8B3H,UAAU,IAAI,MAAM;IAIpB,WAAW,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI;IAuDrC,YAAY;IAKZ,YAAY;IAKZ,aAAa,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;IAKnD,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAI3C,0DAA0D;IAC1D,iBAAiB,IAAI,aAAa,EAAE;IAIpC,4DAA4D;IAC5D,oBAAoB,IAAI,iBAAiB,GAAG,IAAI;IAIhD,0DAA0D;IAC1D,iBAAiB,IAAI,aAAa,EAAE;IAIpC;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IAgCjC,sBAAsB;IAMtB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE;IAOvE,sBAAsB,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,MAAM;IAyBlF,0BAA0B,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,qBAAqB;IAWjF,oBAAoB,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,EAAE,IAAI,EAAE,gBAAgB,GAAG,eAAe;IAUxF;;;OAGG;IACH,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,EAAE,EAAE,8BAA8B,CAAC,EAAE,OAAO;IAiLtG;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAelD;;;OAGG;IACH,aAAa,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,EAAE,aAAa,EAAE;IA4FzE;;;OAGG;IACH,SAAS,CAAC,yBAAyB,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,EAAE,GAAG,aAAa,EAAE;IAuBpG;;OAEG;IACH,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE;IAsBvH;;OAEG;IACH,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,SAAS,CAAC,MAAM,OAAO,SAAS,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM;CA6CtH"}
+{"version":3,"file":"grid-odata.service.d.ts","sourceRoot":"","sources":["../../../src/services/grid-odata.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slickgrid-universal/odata",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "Grid OData Service to sync a grid with an OData backend server",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -38,12 +38,12 @@
     "not dead"
   ],
   "dependencies": {
-    "@slickgrid-universal/common": "~5.0.1",
+    "@slickgrid-universal/common": "~5.1.0",
     "@slickgrid-universal/utils": "~5.0.0"
   },
   "funding": {
     "type": "ko_fi",
     "url": "https://ko-fi.com/ghiscoding"
   },
-  "gitHead": "4affd2ca9e921166883822938f0cfae05ab2b447"
+  "gitHead": "dec8be36272c9111cd708a1836e1697ac81be323"
 }

package/src/interfaces/odataOption.interface.ts

@@ -1,4 +1,4 @@
-import type { BackendServiceOption, CaseType } from '@slickgrid-universal/common';
+import type { BackendServiceFilterQueryOverrideArgs, BackendServiceOption, CaseType } from '@slickgrid-universal/common';
 
 export interface OdataOption extends BackendServiceOption {
   /** What is the casing type to use? Typically that would be 1 of the following 2: camelCase or PascalCase */
@@ -37,6 +37,9 @@ export interface OdataOption extends BackendServiceOption {
   /** Filter queue */
   filterQueue?: any[];
 
+  /** An optional predicate function to overide the built-in filter construction  */
+  filterQueryOverride?: (args: BackendServiceFilterQueryOverrideArgs) => string | undefined;
+
   /** Sorting string (or array of string) that must be a valid OData string */
   orderBy?: string | string[];
 

package/src/services/grid-odata.service.ts

@@ -104,10 +104,10 @@ export class GridOdataService implements BackendService {
   }
 
   postProcess(processResult: any): void {
-    const odataVersion = this._odataService?.options?.version ?? 2;
+    const odataVersion = this._odataService.options.version ?? 2;
 
-    if (this.pagination && this._odataService?.options?.enableCount) {
-      const countExtractor = this._odataService?.options?.countExtractor ??
+    if (this.pagination && this._odataService.options.enableCount) {
+      const countExtractor = this._odataService.options.countExtractor ??
         odataVersion >= 4 ? (r: any) => r?.['@odata.count'] :
         odataVersion === 3 ? (r: any) => r?.['__count'] :
           (r: any) => r?.d?.['__count'];
@@ -117,8 +117,8 @@ export class GridOdataService implements BackendService {
       }
     }
 
-    if (this._odataService?.options?.enableExpand) {
-      const datasetExtractor = this._odataService?.options?.datasetExtractor ??
+    if (this._odataService.options.enableExpand) {
+      const datasetExtractor = this._odataService.options.datasetExtractor ??
         odataVersion >= 4 ? (r: any) => r?.value :
         odataVersion === 3 ? (r: any) => r?.results :
           (r: any) => r?.d?.results;
@@ -295,7 +295,7 @@ export class GridOdataService implements BackendService {
   updateFilters(columnFilters: ColumnFilters | CurrentFilter[], isUpdatedByPresetOrDynamically?: boolean) {
     let searchBy = '';
     const searchByArray: string[] = [];
-    const odataVersion = this._odataService?.options?.version ?? 2;
+    const odataVersion = this._odataService.options.version ?? 2;
 
     // on filter preset load, we need to keep current filters
     if (isUpdatedByPresetOrDynamically) {
@@ -342,13 +342,17 @@ export class GridOdataService implements BackendService {
 
         // run regex to find possible filter operators unless the user disabled the feature
         const autoParseInputFilterOperator = columnDef.autoParseInputFilterOperator ?? this._gridOptions.autoParseInputFilterOperator;
-        const matches = autoParseInputFilterOperator !== false
-          ? fieldSearchValue.match(/^([<>!=*]{0,2})(.*[^<>!=*])([*]?)$/) // group 1: Operator, 2: searchValue, 3: last char is '*' (meaning starts with, ex.: abc*)
-          : [fieldSearchValue, '', fieldSearchValue, '']; // when parsing is disabled, we'll only keep the search value in the index 2 to make it easy for code reuse
 
-        let operator = columnFilter.operator || matches?.[1];
-        let searchValue = matches?.[2] || '';
-        const lastValueChar = matches?.[3] || (operator === '*z' || operator === OperatorType.endsWith) ? '*' : '';
+        // group (2): comboStartsWith, (3): comboEndsWith, (4): Operator, (1 or 5): searchValue, (6): last char is '*' (meaning starts with, ex.: abc*)
+        const matches = autoParseInputFilterOperator !== false
+          ? fieldSearchValue.match(/^((.*[^\\*\r\n])[*]{1}(.*[^*\r\n]))|^([<>!=*]{0,2})(.*[^<>!=*])([*]?)$/) || []
+          : [fieldSearchValue, '', '', '', '', fieldSearchValue, ''];
+
+        const comboStartsWith = matches?.[2] || '';
+        const comboEndsWith = matches?.[3] || '';
+        let operator = columnFilter.operator || matches?.[4];
+        let searchValue = matches?.[1] || matches?.[5] || '';
+        const lastValueChar = matches?.[6] || (operator === '*z' || operator === OperatorType.endsWith) ? '*' : '';
         const bypassOdataQuery = columnFilter.bypassBackendQuery || false;
 
         // no need to query if search value is empty
@@ -357,7 +361,12 @@ export class GridOdataService implements BackendService {
           continue;
         }
 
-        if (Array.isArray(searchTerms) && searchTerms.length === 1 && typeof searchTerms[0] === 'string' && searchTerms[0].indexOf('..') >= 0) {
+        // StartsWith + EndsWith combo
+        if (comboStartsWith && comboEndsWith) {
+          searchTerms = [comboStartsWith, comboEndsWith];
+          operator = OperatorType.startsWithEndsWith;
+        } else if (Array.isArray(searchTerms) && searchTerms.length === 1 && typeof searchTerms[0] === 'string' && searchTerms[0].indexOf('..') >= 0) {
+          // range filter
           if (operator !== OperatorType.rangeInclusive && operator !== OperatorType.rangeExclusive) {
             operator = this._gridOptions.defaultFilterRangeOperator ?? OperatorType.rangeInclusive;
           }
@@ -390,7 +399,7 @@ export class GridOdataService implements BackendService {
           operator = OperatorType.equal;
         }
 
-        // if we still don't have an operator find the proper Operator to use by it's field type
+        // if we still don't have an operator find the proper Operator to use according to field type
         if (!operator) {
           operator = mapOperatorByFieldType(fieldType);
         }
@@ -417,7 +426,29 @@ export class GridOdataService implements BackendService {
             fieldName = titleCase(getHtmlStringOutput(fieldName || ''));
           }
 
-          if (searchTerms && searchTerms.length > 1 && (operator === 'IN' || operator === 'NIN' || operator === 'NOTIN' || operator === 'NOT IN' || operator === 'NOT_IN')) {
+          let filterQueryOverride: string | undefined = undefined;
+          if (typeof this._odataService.options.filterQueryOverride === 'function') {
+            filterQueryOverride = this._odataService.options.filterQueryOverride({
+              fieldName: getHtmlStringOutput(fieldName),
+              columnDef,
+              operator,
+              columnFilterOperator: columnFilter.operator,
+              searchValue,
+              grid: this._grid
+            });
+          }
+
+          if (filterQueryOverride !== undefined) {
+            searchBy = filterQueryOverride;
+          } else if (operator === OperatorType.startsWithEndsWith && Array.isArray(searchTerms) && searchTerms.length === 2) {
+            const tmpSearchTerms: string[] = [];
+            const [sw, ew] = searchTerms;
+
+            // add 2 conditions (StartsWith A + EndsWith B) to the search array
+            tmpSearchTerms.push(`startswith(${fieldName}, ${sw})`);
+            tmpSearchTerms.push(`endswith(${fieldName}, ${ew})`);
+            searchBy = tmpSearchTerms.join(' and ');
+          } else if (searchTerms?.length > 1 && (operator === 'IN' || operator === 'NIN' || operator === 'NOTIN' || operator === 'NOT IN' || operator === 'NOT_IN')) {
             // when having more than 1 search term (then check if we have a "IN" or "NOT IN" filter search)
             const tmpSearchTerms: string[] = [];
             if (operator === 'IN') {