Skip to content

Add absent options processing #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/grafana/dashboards/table_examples_dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"type": "table"
}
],
"schemaVersion": 22,
"schemaVersion": 40,
"style": "dark",
"tags": [],
"templating": {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"create_instrumented": "npx nyc instrument --source-map --nycrc-path .nycrc ./src ./instrumented",
"build:test:frontend": "webpack -c ./webpack.config.instrumented.ts --env test",
"build:frontend": "webpack -c ./.config/webpack/webpack.config.ts --env production",
"build:backend": "docker compose run --rm backend_builder && chmod +rx ./dist",
"build:wasm": "GOARCH=wasm GOOS=js tinygo build --target wasm ./pkg/backend_wasm.go && gzip -f ./backend_wasm.wasm && mkdir -pv ./src/static/ && mv -fv ./backend_wasm.wasm.gz ./src/static/backend.wasm.gz"
},
"author": "Altinity",
Expand Down
2 changes: 1 addition & 1 deletion pkg/backend_wasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -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],
)
Expand Down
18 changes: 18 additions & 0 deletions src/views/QueryEditor/QueryEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ export function QueryEditor(props: QueryEditorProps<CHDataSource, CHQuery, CHDat
const isAnnotationView = !props.app;
const initializedQuery = initializeQueryDefaults(query, isAnnotationView, datasource, onChange);
const [formattedData, error] = useFormattedData(initializedQuery, datasource, data?.request);

useEffect(() => {
if (formattedData !== initializedQuery.query) {
onChange({ ...initializedQuery, rawQuery: formattedData })
}

// eslint-disable-next-line
}, [formattedData, initializedQuery.query]);

const [editorMode, setEditorMode] = useState(initializedQuery.editorMode || EditorMode.Builder);
useQueryState(query, onChange, datasource);

Expand Down Expand Up @@ -89,6 +98,15 @@ export function QueryEditorVariable(props: QueryEditorProps<CHDataSource, CHQuer
const initializedQuery = initializeQueryDefaultsForVariables(processedQuery, isAnnotationView, datasource, onChange);
const [formattedData, error] = useFormattedData(initializedQuery, datasource);
const [editorMode, setEditorMode] = useState(initializedQuery.editorMode || EditorMode.Builder);

useEffect(() => {
if (formattedData !== initializedQuery.query) {
onChange({ ...initializedQuery, rawQuery: formattedData })
}

// eslint-disable-next-line
}, [formattedData, initializedQuery.query]);

useQueryState(query, onChange, datasource);
const onSqlChange = (sql: string) => onChange({ ...initializedQuery, query: sql });
const onFieldChange = (field: any) => onChange({ ...initializedQuery, [field.fieldName]: field.value });
Expand Down