@adaptabletools/adaptable 13.0.0-canary.10 → 13.0.0-canary.11

package/src/agGrid/agGridHelper.js

@@ -174,7 +174,7 @@ class agGridHelper {
         const customFriendlyName = typeof columnFriendlyName === 'function'
             ? columnFriendlyName({ colId: colId, agColumn: agGridColumn })
             : null;
-        const FriendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
+        const friendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
             ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
             : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header'));
         if (!this.initialAgGridColDefs[colId]) {
@@ -183,13 +183,14 @@ class agGridHelper {
         const ColumnId = colId;
         const pkColumn = this.adaptable.adaptableOptions.primaryKey;
         let ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
+        const dataType = this.getColumnDataType(agGridColumn, false);
         const abColumn = {
             Uuid: (0, Uuid_1.createUuid)(),
             columnId: ColumnId,
             field: colDef.field,
-            friendlyName: FriendlyName,
+            friendlyName: friendlyName,
             isPrimaryKey: ColumnId === pkColumn,
-            dataType: this.getColumnDataType(agGridColumn, false),
+            dataType: dataType,
             visible: agGridColumn.isVisible(),
             readOnly: this.isColumnReadonly(colDef),
             columnGroup: ColumnGroup,
@@ -202,7 +203,7 @@ class agGridHelper {
             aggregationFunction: null,
             moveable: this.isColumnMoveable(colDef),
             hideable: this.isColumnHideable(colDef),
-            queryable: this.isColumnQueryable(colDef, ColumnId),
+            queryable: this.isColumnQueryable(colDef, ColumnId, friendlyName, dataType),
             isGrouped: this.isColumnGrouped(colDef),
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
@@ -316,21 +317,19 @@ class agGridHelper {
         }
         return true;
     }
-    isColumnQueryable(colDef, columnId) {
+    isColumnQueryable(colDef, columnId, friendlyName, datatype) {
         if (!colDef) {
             return false;
         }
         if (colDef.colId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS) {
             return false;
         }
-        const queryableColumns = this.adaptable.api.queryLanguageApi.getQueryableColumnIds();
-        if (ArrayExtensions_1.ArrayExtensions.IsNull(queryableColumns)) {
-            return true;
-        }
-        if (ArrayExtensions_1.ArrayExtensions.IsEmpty(queryableColumns)) {
-            return false;
-        }
-        return queryableColumns.find((qc) => qc == columnId) != null;
+        const abColumnBase = {
+            columnId: columnId,
+            friendlyName: friendlyName,
+            dataType: datatype,
+        };
+        return this.adaptable.api.queryLanguageApi.isColumnQueryable(abColumnBase);
     }
     isColumnHideable(colDef) {
         if (!colDef) {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -4195,6 +4195,18 @@ export declare const ADAPTABLE_METAMODEL: {
             reference?: undefined;
         })[];
     };
+    QueryableColumnContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
     QueryApi: {
         name: string;
         kind: string;