Merge pull request stakwork#2562 from stakwork/bugfix/sequence

fix: update edges handler
aliraza556 · Dec 19, 2024 · 1dfc7f0 · 1dfc7f0
2 parents a77ae10 + 471d4eb
commit 1dfc7f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/src/components/App/SideBar/SelectedNodeView/Default/index.tsx b/src/components/App/SideBar/SelectedNodeView/Default/index.tsx
@@ -23,11 +23,6 @@ import { Link, Node } from '~/types'
 import { colors } from '~/utils/colors'
 import { BoostAmt } from '../../../Helper/BoostAmt'
 
-interface SequencedNode {
-  node: Node
-  sequence: number
-}
-
 interface EdgeWithTargetNode extends Link<string> {
   target_node?: Node
   properties?: {
@@ -41,7 +36,7 @@ export const Default = () => {
   const audioRef = useRef<HTMLAudioElement | null>(null)
   const { currentPlayingAudio, setCurrentPlayingAudio } = useAppStore((s) => s)
   const [isPlaying, setIsPlaying] = useState(false)
-  const [sequencedNodes, setSequencedNodes] = useState<SequencedNode[]>([])
+  const [sequencedNodes, setSequencedNodes] = useState<Node[]>([])
   const [boostAmount, setBoostAmount] = useState<number>(selectedNode?.properties?.boost || 0)
 
   const getIndexByType = useSchemaStore((s) => s.getIndexByType)
@@ -63,18 +58,18 @@ export const Default = () => {
         })
 
         if (response) {
-          const nodesWithSequence =
-            response.edges
-              ?.filter(
-                (edge: EdgeWithTargetNode) => edge.properties?.sequence !== undefined && edge.target_node !== undefined,
-              )
-              .map((edge: EdgeWithTargetNode) => ({
-                node: edge.target_node as Node,
-                sequence: edge.properties?.sequence as number,
-              }))
-              .sort((a, b) => a.sequence - b.sequence) || []
-
-          setSequencedNodes(nodesWithSequence)
+          const nodesWithSequence = response.edges
+            ?.filter((edge: EdgeWithTargetNode) => edge.properties?.sequence !== undefined)
+            .map((edge: EdgeWithTargetNode) => ({
+              node: edge.target,
+              sequence: edge.properties?.sequence as number,
+            }))
+            .sort((a, b) => a.sequence - b.sequence)
+            .map((i) => response.nodes.find((n) => n.ref_id === i.node))
+
+          const filteredNodes = nodesWithSequence.filter((i) => !!i)
+
+          setSequencedNodes(filteredNodes as Node[])
         }
       }
     }
@@ -185,10 +180,10 @@ export const Default = () => {
 
         {sequencedNodes.length > 0 && (
           <StyledSequenceWrapper>
-            {sequencedNodes.map((item, idx) => (
-              <React.Fragment key={`${item.node.ref_id}-${item.sequence}`}>
-                <Text>{getNodeContent(item.node)}</Text>
-                {idx < sequencedNodes.length - 1 && <StyledLineBreak />}
+            {sequencedNodes.map((item, index) => (
+              <React.Fragment key={`${item.ref_id}`}>
+                <Text>{getNodeContent(item)}</Text>
+                {index < sequencedNodes.length - 1 && <StyledLineBreak />}
               </React.Fragment>
             ))}
           </StyledSequenceWrapper>
@@ -373,6 +368,5 @@ const StyledSequenceWrapper = styled(Flex)`
 const StyledLineBreak = styled.div`
   width: 100%;
   height: 1px;
-  background-color: ${colors.GRAY3};
   margin: 8px 0;
 `
diff --git a/src/components/Universe/index.tsx b/src/components/Universe/index.tsx
@@ -21,7 +21,6 @@ import { Flex } from '../common/Flex'
 import { outlineEffectColor } from './constants'
 import { Controls } from './Controls'
 import { initialCameraPosition } from './Controls/CameraAnimations/constants'
-import { CursorTooltip } from './CursorTooltip'
 import { Graph } from './Graph'
 import { Lights } from './Lights'
 import { Overlay } from './Overlay'
@@ -148,7 +147,6 @@ const _Universe = () => {
       </Suspense>
       {universeQuestionIsOpen && <UniverseQuestion />}
       {isLoading && <Preloader fullSize={false} />}
-      <CursorTooltip />
       <Overlay />
     </Wrapper>
   )