Skip to content
Snippets Groups Projects
Verified Commit 708bb512 authored by Dennis Collaris's avatar Dennis Collaris
Browse files

feat: run query conversion and execution fully on the query handler service

parent 524783bc
No related branches found
Tags v1.146.2
1 merge request!343feat: run query conversion and execution fully on the query handler service
Pipeline #142750 passed
......@@ -9,7 +9,7 @@ import {
} from '@graphpolaris/shared/lib/data-access';
import { addError, setCurrentTheme } from '@graphpolaris/shared/lib/data-access/store/configSlice';
import { resetGraphQueryResults, queryingBackend } from '@graphpolaris/shared/lib/data-access/store/graphQueryResultSlice';
import { Query2BackendQuery, QueryMultiGraph } from '@graphpolaris/shared/lib/querybuilder';
import { QueryMultiGraph } from '@graphpolaris/shared/lib/querybuilder';
import { Navbar } from '../components/navbar/navbar';
import { FrozenOverlay, Resizable } from '@graphpolaris/shared/lib/components/layout';
import { DashboardAlerts } from '@graphpolaris/shared/lib/data-access/security/dashboardAlerts';
......@@ -36,7 +36,6 @@ export function App(props: App) {
const ml = useML();
const session = useSessionCache();
const dispatch = useAppDispatch();
const queryBuilderSettings = useQuerybuilderSettings();
const [monitoringOpen, setMonitoringOpen] = useState<boolean>(false);
const runQuery = () => {
......@@ -45,7 +44,7 @@ export function App(props: App) {
dispatch(resetGraphQueryResults());
} else {
dispatch(queryingBackend());
wsQueryRequest(Query2BackendQuery(session.currentSaveState, query, queryBuilderSettings, ml, queryBuilderSettings.unionTypes));
wsQueryRequest(ml);
}
}
};
......
......@@ -4,13 +4,25 @@ import { BackendQueryFormat } from '../../querybuilder';
import { Broker } from './broker';
import { QueryBuilderText } from '../store/querybuilderSlice';
import { GraphQueryResultFromBackendPayload } from '../store/graphQueryResultSlice';
import { ML, MLTypes } from '../store/mlSlice';
export function wsQueryRequest(query: BackendQueryFormat) {
if (query.cached === undefined) query.cached = false;
export function wsQueryRequest(ml: ML) {
const mlEnabled = Object.entries(ml)
.filter(([_,value]) => value.enabled)
.map(([key,_]) => {
return {
type: key as MLTypes,
//parameters: []
}
})
Broker.instance().sendMessage({
key: 'query',
subKey: 'get',
body: query,
body: {
queryID: "0", // TODO: not used yet, but used when multiple queries per save state are supported
ml: mlEnabled,
cached: false
},
});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment