pathfinding bug fix (#284)

fixes BED-3973
SpecterOps · Jan 5, 2024 · d0f1946 · d0f1946
1 parent 8dfa6c7
commit d0f1946
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/cmd/ui/src/ducks/searchbar/actions.ts b/cmd/ui/src/ducks/searchbar/actions.ts
@@ -70,10 +70,14 @@ export const sourceNodeEdited = (searchTerm: string): types.SourceNodeEditedActi
     };
 };
 
-export const sourceNodeSelected = (node: types.SearchNodeType | null): types.SourceNodeSelectedAction => {
+export const sourceNodeSelected = (
+    node: types.SearchNodeType | null,
+    doPathfindSearch: boolean = false // sometimes, selecting a source node should trigger a pathfinding search, and other times it should only trigger a single node search
+): types.SourceNodeSelectedAction => {
     return {
         type: types.SOURCE_NODE_SELECTED,
         node,
+        doPathfindSearch,
     };
 };
 

diff --git a/cmd/ui/src/ducks/searchbar/saga.ts b/cmd/ui/src/ducks/searchbar/saga.ts
@@ -41,14 +41,18 @@ function* primarySearchWatcher(): SagaIterator {
     yield takeLatest(types.PRIMARY_SEARCH, primarySearchWorker);
 }
 
-function* primarySearchWorker() {
+function* primarySearchWorker(payload: types.SourceNodeSelectedAction) {
     const { primary, secondary, pathFilters }: types.SearchState = yield select((state: AppState) => state.search);
 
     const edges = pathFilters.filter((pathFilter) => pathFilter.checked).map((pathFilter) => pathFilter.edgeType);
 
-    // attempt a pathfinding search first
-    if (primary.value !== null && secondary.value !== null) {
-        yield put(startPathfindingQuery(primary.value.objectid, secondary.value.objectid, edges));
+    // try a pathfinding search first if flag is true
+    if (payload.doPathfindSearch) {
+        if (primary.value !== null && secondary.value !== null) {
+            yield put(startPathfindingQuery(primary.value.objectid, secondary.value.objectid, edges));
+        } else if (primary.value !== null) {
+            yield put(startSearchQuery(primary.value.objectid, types.SEARCH_TYPE_EXACT));
+        }
     } else if (primary.value !== null) {
         yield put(startSearchQuery(primary.value.objectid, types.SEARCH_TYPE_EXACT));
     }

diff --git a/cmd/ui/src/ducks/searchbar/types.ts b/cmd/ui/src/ducks/searchbar/types.ts
@@ -105,6 +105,7 @@ export interface CypherQueryEditedAction {
 export interface SourceNodeSelectedAction {
     type: typeof SOURCE_NODE_SELECTED;
     node: SearchNodeType | null;
+    doPathfindSearch: boolean;
 }
 
 export interface SourceNodeEditedAction {

diff --git a/cmd/ui/src/views/Explore/ContextMenu/ContextMenu.test.tsx b/cmd/ui/src/views/Explore/ContextMenu/ContextMenu.test.tsx
@@ -82,11 +82,14 @@ describe('ContextMenu', async () => {
         await user.click(startNodeOption);
 
         expect(sourceNodeSelectedSpy).toBeCalledTimes(1);
-        expect(sourceNodeSelectedSpy).toHaveBeenCalledWith({
-            name: 'foo',
-            objectid: '1234',
-            type: 'User',
-        });
+        expect(sourceNodeSelectedSpy).toHaveBeenCalledWith(
+            {
+                name: 'foo',
+                objectid: '1234',
+                type: 'User',
+            },
+            true
+        );
     });
 
     it('handles setting an end node', async () => {

diff --git a/cmd/ui/src/views/Explore/ContextMenu/ContextMenu.tsx b/cmd/ui/src/views/Explore/ContextMenu/ContextMenu.tsx
@@ -39,11 +39,14 @@ const ContextMenu: FC<{ contextMenu: { mouseX: number; mouseY: number } | null;
         if (selectedNode) {
             dispatch(tabChanged('secondary'));
             dispatch(
-                sourceNodeSelected({
-                    name: selectedNode.name,
-                    objectid: selectedNode.id,
-                    type: selectedNode.type,
-                })
+                sourceNodeSelected(
+                    {
+                        name: selectedNode.name,
+                        objectid: selectedNode.id,
+                        type: selectedNode.type,
+                    },
+                    true
+                )
             );
         }
     };