revert me, too ambitious

Author: oatkiller

x-pack/plugins/security_solution/public/resolver/store/actions.ts

@@ -85,16 +85,10 @@ interface UserFocusedOnResolverNode {
  */
 interface UserSelectedResolverNode {
   readonly type: 'userSelectedResolverNode';
-  readonly payload: {
-    /**
-     * The HTML ID used to identify the process node's element that the user selected
-     */
-    readonly nodeId: string;
-    /**
-     * The process entity_id for the process the node represents
-     */
-    readonly selectedProcessId: string;
-  };
+  /**
+   * entity ID of node
+   */
+  readonly payload: string;
 }
 
 /**

x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts

@@ -281,6 +281,7 @@ export function databaseDocumentIDToFetch(state: DataState): string | null {
   }
 }
 
+// TODO, don't export
 export const layout = createSelector(
   indexedProcessTree,
   function processNodePositionsAndEdgeLineSegments(

x-pack/plugins/security_solution/public/resolver/store/reducer.ts

@@ -35,6 +35,7 @@ const uiReducer: Reducer<ResolverUIState, ResolverAction> = (
   } else if (action.type === 'userSelectedResolverNode') {
     return {
       ...uiState,
+      // TODO
       selectedDescendantId: action.payload.nodeId,
       processEntityIdOfSelectedDescendant: action.payload.selectedProcessId,
     };

x-pack/plugins/security_solution/public/resolver/store/selectors.ts

@@ -113,30 +113,6 @@ export const relatedEventInfoByEntityId = composeSelectors(
   dataSelectors.relatedEventInfoByEntityId
 );
 
-/**
- * Returns the id of the "current" tree node (fake-focused)
- */
-export const uiActiveDescendantId = composeSelectors(
-  uiStateSelector,
-  uiSelectors.activeDescendantId
-);
-
-/**
- * Returns the id of the "selected" tree node (the node that is currently "pressed" and possibly controlling other popups / components)
- */
-export const uiSelectedDescendantId = composeSelectors(
-  uiStateSelector,
-  uiSelectors.selectedDescendantId
-);
-
-/**
- * Returns the entity_id of the "selected" tree node's process
- */
-export const uiSelectedDescendantProcessId = composeSelectors(
-  uiStateSelector,
-  uiSelectors.selectedDescendantProcessId
-);
-
 /**
  * Returns the camera state from within ResolverState
  */
@@ -243,3 +219,16 @@ export const ariaFlowtoNodeID: (
   dataSelectors.ariaFlowtoNodeID
 );
 
+/**
+ * Takes a nodeID and returns true if it is the current node.
+ */
+export const isAriaCurrent: (
+  state: ResolverState
+) => (nodeID: string) => boolean = composeSelectors(uiStateSelector, uiSelectors.isAriaCurrent);
+
+/**
+ * Takes a nodeID and returns true if it is the selected node.
+ */
+export const isAriaSelected: (
+  state: ResolverState
+) => (nodeID: string) => boolean = composeSelectors(uiStateSelector, uiSelectors.isAriaSelected);

x-pack/plugins/security_solution/public/resolver/types.ts

@@ -44,6 +44,7 @@ export interface ResolverUIState {
   /**
    * The entity_id of the process for the resolver's currently selected descendant.
    */
+  // TODO
   readonly processEntityIdOfSelectedDescendant: string | null;
 }
 
@@ -429,6 +430,8 @@ export interface IsometricTaxiLayout {
   /**
    * A map of events to position. each event represents its own node.
    */
+  // TODO, rename
+  // TODO, use string (nodeID/entity_id) instead of ResolverEvent
   processNodePositions: Map<ResolverEvent, Vector2>;
   /**
    * A map of edgline segments, which graphically connect nodes.

x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx

@@ -282,9 +282,7 @@ const UnstyledProcessEventDot = React.memo(
 
     const [xScale] = projectionMatrix;
 
-    // Node (html id=) IDs
-    const activeDescendantId = useSelector(selectors.uiActiveDescendantId);
-    const selectedDescendantId = useSelector(selectors.uiSelectedDescendantId);
+    // unique ID for the node
     const nodeID = processEventModel.uniquePidForProcess(event);
 
     // define a standard way of giving HTML IDs to nodes based on their entity_id/nodeID.
@@ -296,6 +294,8 @@ const UnstyledProcessEventDot = React.memo(
     // the node ID to 'flowto'
     const ariaFlowtoNodeID: string | null = useSelector(selectors.ariaFlowtoNodeID)(nodeID);
 
+    const isAriaCurrent: boolean = useSelector(selectors.isAriaCurrent)(nodeID);
+    const isAriaSelected: boolean = useSelector(selectors.isAriaSelected)(nodeID);
 
     const isShowingEventActions = xScale > 0.8;
     const isShowingDescriptionText = xScale >= 0.55;
@@ -378,8 +378,9 @@ const UnstyledProcessEventDot = React.memo(
 
     const labelHTMLID = htmlIdGenerator('resolver')(`${nodeID}:label`);
 
-    const isActiveDescendant = nodeId === activeDescendantId;
-    const isSelectedDescendant = nodeId === selectedDescendantId;
+    // TODO, can this be correct?
+    // const isActiveDescendant = nodeHTMLID === activeDescendantId;
+    // const isSelectedDescendant = nodeHTMLID === selectedDescendantId;
 
     const dispatch = useResolverDispatch();