Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • graphpolaris/frontend-v2
  • rijkheere/frontend-v-2-reordering-paoh
2 results
Show changes
Commits on Source (1)
......@@ -40,7 +40,6 @@ import {
setQueryState,
setQuerybuilderNodes,
selectSaveState,
setQueryNodeCounts,
} from '../store/sessionSlice';
import { URLParams, getParam, setParam } from './url';
import { VisState, setVisualizationState } from '../store/visualizationSlice';
......@@ -170,7 +169,6 @@ export const EventBus = (props: { onRunQuery: (useCached: boolean) => void; onAu
dispatch(addError('Failed to fetch graph query counts'));
return;
}
// dispatch(setQueryNodeCounts(data)); // TODO needed?
dispatch(setNewGraphQueryCountResult({ data, callID: params.callID }));
}),
);
......
......@@ -219,12 +219,6 @@ export const sessionSlice = createSlice({
activeSS.queryStates = action.payload;
},
setQueryNodeCounts: (state: SessionCacheI, action: PayloadAction<CountQueryResultFromBackend>) => {
const activeQuery = getActiveQuery(state);
if (activeQuery) {
activeQuery.graph.nodeCounts = action.payload;
}
},
reorderQueryState: (
state,
action: PayloadAction<{
......@@ -302,7 +296,6 @@ export const {
clearQB,
removeQueryByID,
setQueryState,
setQueryNodeCounts,
reorderQueryState,
setQuerybuilderNodes,
attributeShownToggle,
......
......@@ -76,6 +76,9 @@ function differentiationFor(
.filter(x => x.attributes.type === 'entity')
.map(x => ({ name: x.attributes.name, count: saveState?.schemas[0].stats?.nodes?.stats[x.attributes.name]?.count ?? 0 }));
const diffs = nodeCounts.map((x, i) => x.count / totalCounts[i].count);
if (diffs.length === 0) return 0;
const score = diffs.reduce((a, b) => a + b) / diffs.length;
return Math.round(score * 100) / 100;
}
......@@ -84,7 +87,7 @@ export const DatabaseLine = (props: DatabaseLineProps) => {
const session = useSessionCache();
const dispatch = useAppDispatch();
const activeQuery = useActiveQuery();
const queryResult = useGraphQueryCounts();
const graphCounts = useGraphQueryCounts();
const sharing = props.sharing ?? false;
return (
......@@ -111,7 +114,7 @@ export const DatabaseLine = (props: DatabaseLineProps) => {
<td className="text-left">
<Heatmap1D
data={props.saveState.queryStates.openQueryArray.map((_, qi) =>
differentiationFor(props.saveState, qi, queryResult, activeQuery),
differentiationFor(props.saveState, qi, graphCounts, activeQuery),
)}
numBins={40}
maxValue={configVisuals.maxValue}
......@@ -191,7 +194,7 @@ export const DatabaseLine = (props: DatabaseLineProps) => {
<Tooltip placement="right">
<TooltipTrigger>
<IndicatorGraph
data={differentiationFor(props.saveState, qi, queryResult, activeQuery)}
data={differentiationFor(props.saveState, qi, graphCounts, activeQuery)}
maxValue={configVisuals.maxValue}
marginPercentage={configVisuals.marginPercentage}
ticks={true}
......