Fix timeseries name and adhoc AND

Author: lunaticusgreen

pkg/backend_wasm.go

@@ -176,7 +176,7 @@ func applyAdhocFiltersWasm(this js.Value, args []js.Value) interface{} {
 	// Replace $adhoc macro
 	renderedCondition := "1"
 	if len(adhocConditions) > 0 {
-		renderedCondition = fmt.Sprintf("(%s)", strings.Join(adhocConditions, " AND "))
+		renderedCondition = fmt.Sprintf("AND (%s)", strings.Join(adhocConditions, " AND "))
 	}
 
 	query = strings.ReplaceAll(query, "$adhoc", renderedCondition)

pkg/response.go

@@ -178,7 +178,7 @@ func (r *Response) createFrameIfNotExistsAndAddPoint(query *Query, framesMap map
 		timeStampDataFieldMap[frameName] = data.NewField(timestampFieldName, nil, []time.Time{})
 		valueDataFieldMap[frameName] = NewDataFieldByType(frameName, fieldType)
 		framesMap[frameName] = data.NewFrame(
-			frameName,
+			"",
 			timeStampDataFieldMap[frameName],
 			valueDataFieldMap[frameName],
 		)