Merge pull request #598 from Altinity/fix-595-587

Bugfixes #595 and #587
Altinity · Jul 22, 2024 · d2edcc4 · d2edcc4
2 parents 9b200ab + 826bcde
commit d2edcc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/datasource/response_parser.ts b/src/datasource/response_parser.ts
@@ -5,7 +5,7 @@ export default class ResponseParser {
   constructor() {}
 
   parse(query: string, results: any): any[] {
-    if (!results || results.data.length === 0) {
+    if (!results || !results.data || results.data?.length === 0) {
       return [];
     }
 

diff --git a/src/views/ConfigEditor/FormParts/DefaultValues/DefaultValues.tsx b/src/views/ConfigEditor/FormParts/DefaultValues/DefaultValues.tsx
@@ -14,6 +14,10 @@ jsonData, onSwitchToggle, onFieldChange, externalProps
 
   useEffect(() => {
     const doRequest = async () => {
+      if (!jsonData.useDefaultConfiguration || (!jsonData.dataSourceUrl.startsWith('http://') && !jsonData.dataSourceUrl.startsWith('https://'))) {
+       return;
+      }
+
       try {
         const data = await getOptions(TABLES_QUERY, jsonData.dataSourceUrl)
 
@@ -46,7 +50,7 @@ jsonData, onSwitchToggle, onFieldChange, externalProps
     }
 
     doRequest()
-  }, [jsonData.dataSourceUrl]);
+  }, [jsonData.dataSourceUrl, jsonData.useDefaultConfiguration]);
 
   return <div className="gf-form-group">
     <InlineField