Merge master into hflatval/remove-url-mutations

cognitedata · Sep 6, 2024 · 3fb7750 · 3fb7750
2 parents 48835bd + 5a55694
commit 3fb7750
Show file tree

Hide file tree

Showing 10 changed files with 382 additions and 342 deletions.
diff --git a/documentation/yarn.lock b/documentation/yarn.lock
diff --git a/examples/yarn.lock b/examples/yarn.lock
diff --git a/react-components/package.json b/react-components/package.json
@@ -91,7 +91,7 @@
     "ts-loader": "^9.5.1",
     "typescript": "^5.4.5",
     "vite": "^5.2.10",
-    "vite-plugin-dts": "^3.9.0",
+    "vite-plugin-dts": "^4.0.0",
     "vite-plugin-externalize-deps": "^0.8.0",
     "vitest": "^1.5.3"
   },

diff --git a/react-components/src/data-providers/core-dm-provider/getDMSRevision.ts b/react-components/src/data-providers/core-dm-provider/getDMSRevision.ts
@@ -12,9 +12,10 @@ export async function getDMSRevision(
   revisionId: number,
   fdmSdk: FdmSDK
 ): Promise<NodeItem<CogniteCADRevisionProperties>> {
+  const revisionExternalId = `cog_3d_revision_${revisionId}`;
   const query = {
     ...revisionQuery,
-    parameters: { modelReference: restrictToDmsId(model), revisionId }
+    parameters: { modelReference: restrictToDmsId(model), revisionExternalId }
   } as const satisfies QueryRequest;
 
   const result = await fdmSdk.queryNodesAndEdges<

diff --git a/react-components/src/data-providers/core-dm-provider/revisionQuery.ts b/react-components/src/data-providers/core-dm-provider/revisionQuery.ts
@@ -2,11 +2,7 @@
  * Copyright 2024 Cognite AS
  */
 import { type QueryRequest } from '@cognite/sdk/dist/src';
-import {
-  COGNITE_3D_REVISION_SOURCE,
-  COGNITE_CAD_REVISION_SOURCE,
-  CORE_DM_3D_CONTAINER_SPACE
-} from './dataModels';
+import { COGNITE_3D_REVISION_SOURCE, CORE_DM_3D_CONTAINER_SPACE } from './dataModels';
 import { cogniteCadRevisionSourceWithProperties } from './cogniteCadRevisionSourceWithProperties';
 
 export const revisionQuery = {
@@ -27,12 +23,8 @@ export const revisionQuery = {
             },
             {
               equals: {
-                property: [
-                  CORE_DM_3D_CONTAINER_SPACE,
-                  COGNITE_CAD_REVISION_SOURCE.externalId,
-                  'revisionId'
-                ],
-                value: { parameter: 'revisionId' }
+                property: ['node', 'externalId'],
+                value: { parameter: 'revisionExternalId' }
               }
             }
           ]