fix: Don't assume 1 entity per text location

finos · Dec 9, 2024 · bf86ed5 · bf86ed5
1 parent 2b5a797
commit bf86ed5
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/components/query/QueryBuilderStateUtils.ts b/src/components/query/QueryBuilderStateUtils.ts
@@ -199,18 +199,17 @@ export const getMinimalEntities = async (
     },
     GET_ENTITY_TEXT_LOCATION_RESPONSE,
   );
+  const entitiesInTextLocation = await postAndWaitForMessage<Entity[]>(
+    {
+      command: GET_PROJECT_ENTITIES,
+      msg: {
+        entityTextLocations: [currentEntityTextLocation],
+      },
+    },
+    GET_PROJECT_ENTITIES_RESPONSE,
+  );
   const currentEntity = guaranteeNonNullable(
-    (
-      await postAndWaitForMessage<Entity[]>(
-        {
-          command: GET_PROJECT_ENTITIES,
-          msg: {
-            entityTextLocations: [currentEntityTextLocation],
-          },
-        },
-        GET_PROJECT_ENTITIES_RESPONSE,
-      )
-    )[0],
+    entitiesInTextLocation.find((entity) => entity.path === entityId),
     `Can't find entity with ID ${entityId}`,
   );