Merge pull request #119 from influxdata/fix/get-tables

fix: get tables for sqllite client

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flightsql-datasource",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

pkg/flightsql/flightsql.go

@@ -88,7 +88,9 @@ func NewDatasource(settings backend.DataSourceInstanceSettings) (instancemgmt.In
 			if _, ok := md[k]; ok {
 				return nil, fmt.Errorf("metadata: duplicate key: %s", k)
 			}
-			md.Set(k, v)
+			if k != "" {
+				md.Set(k, v)
+			}
 		}
 	}
 

pkg/flightsql/resources.go

@@ -71,9 +71,16 @@ func (d *FlightSQLDatasource) getTables(w http.ResponseWriter, r *http.Request)
 	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
 	ctx = metadata.NewOutgoingContext(ctx, d.md)
-	info, err := d.client.GetTables(ctx, &flightsql.GetTablesOpts{
-		TableTypes: []string{"BASE TABLE"},
-	})
+	bucketMetaData := d.md.Get("bucket-name")
+
+	opts := &flightsql.GetTablesOpts{}
+
+	if len(bucketMetaData) > 0 {
+		opts = &flightsql.GetTablesOpts{
+			TableTypes: []string{"BASE TABLE"},
+		}
+	}
+	info, err := d.client.GetTables(ctx, opts)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

src/components/ConfigEditor.tsx

@@ -34,17 +34,13 @@ export function ConfigEditor(props: DataSourcePluginOptionsEditorProps<FlightSQL
   }, [selectedAuthType])
 
   useEffect(() => {
-    const {onOptionsChange, options} = props
-    let mapData
-    let jsonData
-    if (metaDataArr[0]?.key !== '') {
-      mapData = metaDataArr?.map((m: any) => ({[m.key]: m.value}))
-        jsonData = {
+    const {onOptionsChange, options} = props  
+      const mapData = metaDataArr?.map((m: any) => ({[m.key]: m.value}))
+        const jsonData = {
         ...options.jsonData,
         metadata: mapData,
       }
       onOptionsChange({...options, jsonData})
-    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [metaDataArr])
 

src/components/utils.ts

@@ -131,11 +131,27 @@ export const onPasswordChange = (event: any, options: any, onOptionsChange: any)
 }
 
 export const onAuthTypeChange = (selectedAuthType: any, options: any, onOptionsChange: any) => {
-  const jsonData = {
-    ...options.jsonData,
-    selectedAuthType: selectedAuthType?.label,
-  }
-  onOptionsChange({...options, jsonData})
+  const notTokenType =  selectedAuthType?.label !== "token"
+  const notPassType = selectedAuthType?.label !== "username/password"
+
+  onOptionsChange({
+    ...options,
+    jsonData: {
+      ...options.jsonData,
+      selectedAuthType: selectedAuthType?.label,
+      username: notPassType && '',
+    },
+    secureJsonFields: {
+      ...options.secureJsonFields,
+      token: notTokenType && false,
+      password: notPassType && false,
+    },
+    secureJsonData: {
+      ...options.secureJsonData,
+      token: notTokenType && '',
+      password: notPassType && '',
+    },
+  })
 }
 
 export const getSqlCompletionProvider: (args: any) => LanguageCompletionProvider =