fix alerting queries (#1324)

Author: itsgareth

.changeset/great-papayas-chew.md

@@ -0,0 +1,5 @@
+---
+'grafana-infinity-datasource': minor
+---
+
+**BREAKING CHANGE:**: Renamed the Google Sheets range property to sheetRange to avoid conflicts with Grafana's built-in range field. See more information here [#1337](https://github.com/grafana/grafana-infinity-datasource/issues/1337)

pkg/models/query.go

@@ -117,7 +117,7 @@ type Query struct {
 	QueryMode                          string                 `json:"query_mode"`
 	Spreadsheet                        string                 `json:"spreadsheet,omitempty"`
 	SheetName                          string                 `json:"sheetName,omitempty"`
-	SheetRange                         string                 `json:"range,omitempty"`
+	SheetRange                         string                 `json:"sheetRange,omitempty"`
 	AzBlobContainerName                string                 `json:"azContainerName,omitempty"`
 	AzBlobName                         string                 `json:"azBlobName,omitempty"`
 	PageMode                           PaginationMode         `json:"pagination_mode,omitempty"`

src/editors/query/components/GoogleSheets.tsx

@@ -13,7 +13,7 @@ export const GoogleSheetsEditor = ({ query, onChange, onRunQuery }: { query: Inf
         <Input value={query.sheetName} width={20} onChange={(e) => onChange({ ...query, sheetName: e.currentTarget.value })} onBlur={onRunQuery} />
       </EditorField>
       <EditorField label="Range" horizontal={true}>
-        <Input value={query.range} width={20} onChange={(e) => onChange({ ...query, range: e.currentTarget.value })} onBlur={onRunQuery} />
+        <Input value={query.sheetRange} width={20} onChange={(e) => onChange({ ...query, sheetRange: e.currentTarget.value })} onBlur={onRunQuery} />
       </EditorField>
     </>
   );

src/interpolate.ts

@@ -84,7 +84,7 @@ export const interpolateQuery = (query: InfinityQuery, scopedVars: ScopedVars):
   if (newQuery.type === 'google-sheets') {
     newQuery.spreadsheet = replaceVariable(newQuery.spreadsheet, scopedVars);
     newQuery.sheetName = replaceVariable(newQuery.sheetName, scopedVars);
-    newQuery.range = replaceVariable(newQuery.range, scopedVars);
+    newQuery.sheetRange = replaceVariable(newQuery.sheetRange, scopedVars);
   }
   return newQuery;
 };

src/types/query.types.ts

@@ -108,7 +108,7 @@ export type InfinityUQLQuerySource = InfinityQueryWithURLSource<'uql'> | Infinit
 export type InfinityUQLQuery = { uql: string; format: InfinityQueryFormat } & InfinityUQLQuerySource & InfinityQueryBase<'uql'>;
 export type InfinityGROQQuerySource = InfinityQueryWithURLSource<'groq'> | InfinityQueryWithInlineSource<'groq'>;
 export type InfinityGROQQuery = { groq: string; format: InfinityQueryFormat } & InfinityGROQQuerySource & InfinityQueryBase<'groq'>;
-export type InfinityGSheetsQuery = { spreadsheet: string; sheetName?: string; range: string; columns: InfinityColumn[] } & InfinityQueryBase<'google-sheets'>;
+export type InfinityGSheetsQuery = { spreadsheet: string; sheetName?: string; sheetRange: string; columns: InfinityColumn[] } & InfinityQueryBase<'google-sheets'>;
 export type PaginationType = 'none' | 'offset' | 'page' | 'cursor' | 'list';
 export type PaginationParamType = 'query' | 'header' | 'body_data' | 'body_json' | 'replace';
 export type PaginationBase<T extends PaginationType> = { pagination_mode?: T; pagination_max_pages?: number };