re-enable map key selection even on aliased tables

grafana · Jun 13, 2024 · 56c8407 · 56c8407
1 parent 8ede171
commit 56c8407
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/queryBuilder/FilterEditor.tsx b/src/components/queryBuilder/FilterEditor.tsx
@@ -203,7 +203,7 @@ export const FilterEditor = (props: {
   const { index, filter, allColumns: fieldsList, onFilterChange, removeFilter } = props;
   const [isOpen, setIsOpen] = useState(false);
   const isMapType = filter.type.startsWith('Map');
-  const mapKeys = useUniqueMapKeys(props.datasource, (isMapType && !filter.label) ? filter.key : '', props.database, props.table);
+  const mapKeys = useUniqueMapKeys(props.datasource, isMapType ? filter.key : '', props.database, props.table);
   const mapKeyOptions = mapKeys.map(k => ({ label: k, value: k }));
   if (filter.mapKey && !mapKeys.includes(filter.mapKey)) {
     mapKeyOptions.push({ label: filter.label || filter.mapKey, value: filter.mapKey });
@@ -375,7 +375,7 @@ export const FilterEditor = (props: {
         allowCustomValue
         menuPlacement={'bottom'}
       />
-      { (isMapType && !filter.label) &&
+      { isMapType &&
         <Select
           value={filter.mapKey}
           placeholder={labels.components.FilterEditor.mapKeyPlaceholder}

diff --git a/src/data/CHDatasource.ts b/src/data/CHDatasource.ts
@@ -496,6 +496,8 @@ export class Datasource
    * 
    * Samples rows to get a unique set of keys for the map.
    * May not include ALL keys for a given dataset.
+   * 
+   * TODO: This query can be slow/expensive
    */
   async fetchUniqueMapKeys(mapColumn: string, db: string, table: string): Promise<string[]> {
     const rawSql = `SELECT DISTINCT arrayJoin(${mapColumn}.keys) as keys FROM "${db}"."${table}" LIMIT 1000`;