fix: find annotation for selected asset for data model source (#4968)

* fixed annotation object fetch for selected asset

* updated annotation array to use some method to identify matched identifer

Author: pramod-cog

viewer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.23.1",
+  "version": "4.23.2",
   "description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
   "homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
   "repository": {

viewer/packages/data-providers/src/DataSourceType.ts

@@ -141,3 +141,7 @@ export function isDMIdentifier(identifier: InternalModelIdentifier): identifier
 export function isLocalIdentifier(identifier: InternalModelIdentifier): identifier is LocalModelIdentifierType {
   return (identifier as LocalModelIdentifierType).localPath !== undefined;
 }
+
+export function isSameDMIdentifier(id0: DMInstanceRef, id1: DMInstanceRef): boolean {
+  return id0.externalId === id1.externalId && id0.space === id1.space;
+}

viewer/packages/data-providers/src/image-360-data-providers/CoreDm360ImageAnnotationProvider.ts

@@ -1,7 +1,7 @@
 /*!
  * Copyright 2025 Cognite AS
  */
-import { ClassicDataSourceType, DataSourceType, DMDataSourceType } from '../DataSourceType';
+import { ClassicDataSourceType, DataSourceType, DMDataSourceType, isSameDMIdentifier } from '../DataSourceType';
 import {
   Image360AnnotationFilterDelegate,
   Image360AnnotationProvider,
@@ -18,7 +18,7 @@ import {
 import { isSameImage360RevisionId } from './shared';
 import { fetchCoreDm360AnnotationsForRevision } from './cdm/fetchCoreDm360AnnotationsForRevision';
 import { CogniteClient } from '@cognite/sdk/dist/src';
-import { fetchAnnotationsForInstance } from './cdm/fetchAnnotationsForInstance';
+import { fetchAnnotationsForInstance, Image360AnnotationsForInstanceResult } from './cdm/fetchAnnotationsForInstance';
 import { fetchCoreDm360AnnotationsForCollection } from './cdm/fetchCoreDm360AnnotationsForCollection';
 import { DMInstanceKey, dmInstanceRefToKey } from '@reveal/utilities';
 
@@ -48,21 +48,30 @@ export class CoreDm360ImageAnnotationProvider implements Image360AnnotationProvi
     ): Promise<Image360AnnotationAssetQueryResult<DMDataSourceType>[]> {
       const revisions = entity
         .getRevisions()
-        .filter(
-          revision =>
-            relatedRevisionsAndAnnotations.imageRevisionIds.find(foundRevisionId =>
-              isSameImage360RevisionId(revision.identifier, foundRevisionId)
-            ) !== undefined
+        .filter(revision =>
+          relatedRevisionsAndAnnotations.imageRevisionIds.some(foundRevisionId =>
+            isSameImage360RevisionId(revision.identifier, foundRevisionId)
+          )
         );
-      return (await Promise.all(revisions.map(revision => getAnnotationInfoForRevision(entity, revision)))).flat();
+      return (
+        await Promise.all(
+          revisions.map(revision => getAnnotationInfoForRevision(entity, revision, relatedRevisionsAndAnnotations))
+        )
+      ).flat();
     }
 
     async function getAnnotationInfoForRevision(
       entity: Image360Entity<DMDataSourceType>,
-      revision: Image360RevisionEntity<DMDataSourceType>
+      revision: Image360RevisionEntity<DMDataSourceType>,
+      relatedRevisionsAndAnnotations: Image360AnnotationsForInstanceResult
     ): Promise<Image360AnnotationAssetQueryResult<DMDataSourceType>[]> {
       const annotations = await revision.getAnnotations();
-      return annotations.map(annotation => ({
+      const filteredAnnotations = annotations.filter(annotation =>
+        relatedRevisionsAndAnnotations.annotationIds.some(relatedRevisionAnnotationId =>
+          isSameDMIdentifier(relatedRevisionAnnotationId, annotation.annotation.annotationIdentifier)
+        )
+      );
+      return filteredAnnotations.map(annotation => ({
         image: entity,
         revision,
         annotation

viewer/packages/data-providers/src/image-360-data-providers/cdm/fetchAnnotationsForInstance.ts

@@ -59,12 +59,12 @@ function getImage360AnnotationsForInstanceQuery(instance: DMInstanceRef) {
       },
       object3ds: {
         nodes: {
-          from: 'instance_objects',
+          from: 'instance_object',
           through: { view: COGNITE_VISUALIZABLE_SOURCE, identifier: 'object3D' },
           direction: 'outwards'
         }
       },
-      annotation_dges: {
+      annotation_edges: {
         edges: {
           from: 'object3ds',
           direction: 'outwards',