fix(graphql): a column type of number should use EQ in GraphQL query

ghiscoding · Mar 7, 2018 · a7da882 · a7da882
1 parent a25147d
commit a7da882
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/services/graphql.service.ts b/aurelia-slickgrid/src/aurelia-slickgrid/services/graphql.service.ts
@@ -1,7 +1,7 @@
 import { EventAggregator } from 'aurelia-event-aggregator';
 import { inject } from 'aurelia-framework';
 import { I18N } from 'aurelia-i18n';
-import { mapOperatorType, mapOperatorByFilterType } from './utilities';
+import { mapOperatorType, mapOperatorByFilterType, mapOperatorByFieldType } from './utilities';
 import {
   BackendService,
   Column,
@@ -10,6 +10,7 @@ import {
   CurrentFilter,
   CurrentPagination,
   CurrentSorter,
+  FieldType,
   FilterChangedArgs,
   GraphqlCursorPaginationOption,
   GraphqlDatasetFilter,
@@ -374,6 +375,11 @@ export class GraphqlService implements BackendService {
           operator = mapOperatorByFilterType(columnDef.filter.type || '');
         }
 
+        // if we still don't have an operator then go with the mapping
+        if (!operator) {
+          operator = mapOperatorByFieldType(columnDef.type || FieldType.string);
+        }
+
         searchByArray.push({
           field: fieldName,
           operator: mapOperatorType(operator),

diff --git a/aurelia-slickgrid/src/aurelia-slickgrid/services/utilities.ts b/aurelia-slickgrid/src/aurelia-slickgrid/services/utilities.ts
@@ -222,6 +222,45 @@ export function mapOperatorType(operator: string): OperatorType {
   return map;
 }
 
+/**
+ * Mapper for query operator by a Field Type
+ * For example a String should use "Contains" but a number should use "EQ" operator
+ * @param operator
+ * @returns string map
+ */
+export function mapOperatorByFieldType(fieldType: FieldType | string): OperatorType {
+  let map: OperatorType;
+
+  switch (fieldType) {
+    case FieldType.string:
+    case FieldType.unknown:
+      map = OperatorType.contains;
+      break;
+    case FieldType.float:
+    case FieldType.number:
+    case FieldType.dateIso:
+    case FieldType.date:
+    case FieldType.dateUtc:
+    case FieldType.dateTime:
+    case FieldType.dateTimeIso:
+    case FieldType.dateTimeIsoAmPm:
+    case FieldType.dateTimeIsoAM_PM:
+    case FieldType.dateUs:
+    case FieldType.dateUsShort:
+    case FieldType.dateTimeUs:
+    case FieldType.dateTimeUsAmPm:
+    case FieldType.dateTimeUsAM_PM:
+    case FieldType.dateTimeUsShort:
+    case FieldType.dateTimeUsShortAmPm:
+    case FieldType.dateTimeUsShortAM_PM:
+    default:
+      map = OperatorType.equal;
+      break;
+  }
+
+  return map;
+}
+
 /**
  * Mapper for query operator by a Filter Type
  * For example a multiple-select typically uses 'IN' operator

diff --git a/aurelia-slickgrid/src/examples/slickgrid/example6.ts b/aurelia-slickgrid/src/examples/slickgrid/example6.ts
@@ -65,7 +65,7 @@ export class Example6 {
         }
       },
       { id: 'billing.address.street', name: 'Billing Address Street', field: 'billing.address.street', headerKey: 'BILLING.ADDRESS.STREET', filterable: true, sortable: true },
-      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true },
+      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true, type: FieldType.number },
     ];
 
     this.gridOptions = {

diff --git a/client-cli/src/examples/slickgrid/example6.js b/client-cli/src/examples/slickgrid/example6.js
@@ -63,7 +63,7 @@ export class Example6 {
         }
       },
       { id: 'billing.address.street', name: 'Billing Address Street', field: 'billing.address.street', headerKey: 'BILLING.ADDRESS.STREET', filterable: true, sortable: true },
-      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true }
+      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true, type: FieldType.number }
     ];
 
     this.gridOptions = {

diff --git a/doc/github-demo/src/examples/slickgrid/example6.ts b/doc/github-demo/src/examples/slickgrid/example6.ts
@@ -57,7 +57,7 @@ export class Example6 {
         }
       },
       { id: 'billing.address.street', name: 'Billing Address Street', field: 'billing.address.street', headerKey: 'BILLING.ADDRESS.STREET', filterable: true, sortable: true },
-      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true },
+      { id: 'billing.address.zip', name: 'Billing Address Zip', field: 'billing.address.zip', headerKey: 'BILLING.ADDRESS.ZIP', filterable: true, sortable: true, type: FieldType.number },
     ];
 
     this.gridOptions = {