From 13c845ac9d2db54ece65ef4b9759670e123d9589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Flatval?= Date: Tue, 1 Aug 2023 11:14:14 +0200 Subject: [PATCH] chore: lint fix --- .../Reveal3DResources/queryMappedData.ts | 9 ++++--- .../src/components/Reveal3DResources/types.ts | 8 +++++-- react-components/src/utilities/FdmSDK.ts | 2 +- .../stories/HighlightNode.stories.tsx | 24 +++++-------------- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/react-components/src/components/Reveal3DResources/queryMappedData.ts b/react-components/src/components/Reveal3DResources/queryMappedData.ts index c4358a4f592..8d5b23d73bf 100644 --- a/react-components/src/components/Reveal3DResources/queryMappedData.ts +++ b/react-components/src/components/Reveal3DResources/queryMappedData.ts @@ -3,7 +3,7 @@ */ import { type Cognite3DViewer, type PointerEventData, type CogniteCadModel } from '@cognite/reveal'; -import { type CogniteInternalId, type CogniteClient, Node3D } from '@cognite/sdk'; +import { type CogniteInternalId, type CogniteClient, type Node3D } from '@cognite/sdk'; import { type EdgeItem, type InspectResultList, @@ -12,7 +12,8 @@ import { type Source } from '../../utilities/FdmSDK'; import { type FdmAssetMappingsConfig } from '../../hooks/types'; -import { FdmPropertyType, type NodeDataResult } from './types'; +import { type FdmPropertyType, type NodeDataResult } from './types'; +import assert from 'assert'; export async function queryMappedData( viewer: Cognite3DViewer, @@ -52,6 +53,8 @@ export async function queryMappedData( `${fdmConfig.source.externalId}/${fdmConfig.source.version}` ].revisionNodeId; const selectedNode = ancestors.find((n) => n.id === selectedNodeId); + assert(selectedNode !== undefined); + const dataNode = selectedEdge.startNode; const inspectionResult = await inspectNode(fdmClient, dataNode); @@ -68,7 +71,7 @@ export async function queryMappedData( return { data: nodeData as FdmPropertyType, view: dataView, - cadNode: selectedNode!, + cadNode: selectedNode, model: cadIntersection.model }; } diff --git a/react-components/src/components/Reveal3DResources/types.ts b/react-components/src/components/Reveal3DResources/types.ts index ff400a7ea82..2445488069f 100644 --- a/react-components/src/components/Reveal3DResources/types.ts +++ b/react-components/src/components/Reveal3DResources/types.ts @@ -2,10 +2,14 @@ * Copyright 2023 Cognite AS */ -import { CogniteCadModel, type AddModelOptions, type SupportedModelTypes } from '@cognite/reveal'; +import { + type CogniteCadModel, + type AddModelOptions, + type SupportedModelTypes +} from '@cognite/reveal'; import { type Matrix4 } from 'three'; import { type Source } from '../../utilities/FdmSDK'; -import { Node3D } from '@cognite/sdk/dist/src'; +import { type Node3D } from '@cognite/sdk/dist/src'; export type AddImageCollection360Options = { siteId: string; diff --git a/react-components/src/utilities/FdmSDK.ts b/react-components/src/utilities/FdmSDK.ts index d7b93f96c60..ea92e8b4fe4 100644 --- a/react-components/src/utilities/FdmSDK.ts +++ b/react-components/src/utilities/FdmSDK.ts @@ -149,7 +149,7 @@ export class FdmSDK { } public async getByExternalIds( - queries: { instanceType: InstanceType; externalId: string; space: string }[], + queries: Array<{ instanceType: InstanceType; externalId: string; space: string }>, source?: Source ): Promise> { const data: any = { items: queries, includeTyping: true }; diff --git a/react-components/stories/HighlightNode.stories.tsx b/react-components/stories/HighlightNode.stories.tsx index 0f92827980b..0bb6cfa3ff6 100644 --- a/react-components/stories/HighlightNode.stories.tsx +++ b/react-components/stories/HighlightNode.stories.tsx @@ -4,28 +4,16 @@ import type { Meta, StoryObj } from '@storybook/react'; import { - CadModelContainer, type FdmAssetMappingsConfig, RevealContainer, RevealToolbar, - useReveal, Reveal3DResources, - NodeDataResult, - Reveal3DResourcesProps, - AddResourceOptions + type NodeDataResult, + type AddResourceOptions } from '../src'; -import { CogniteClient } from '@cognite/sdk'; import { Color, Matrix4 } from 'three'; -import { type ReactElement, useEffect, useState } from 'react'; -import { - CogniteCadModel, - DefaultNodeAppearance, - NodeIdNodeCollection, - TreeIndexNodeCollection, - type PointerEventData -} from '@cognite/reveal'; -import { queryMappedData } from '../src/components/Reveal3DResources/queryMappedData'; -import { useFdmSdk, useSDK } from '../src/components/RevealContainer/SDKProvider'; +import { type ReactElement, useState } from 'react'; +import { DefaultNodeAppearance, TreeIndexNodeCollection } from '@cognite/reveal'; import { createSdkByUrlToken } from './utilities/createSdkByUrlToken'; const DefaultFdmConfig: FdmAssetMappingsConfig = { @@ -77,10 +65,10 @@ const StoryContent = ({ }: { resources: AddResourceOptions[]; fdmAssetMappingConfig: FdmAssetMappingsConfig; -}) => { +}): ReactElement => { const [nodeData, setNodeData] = useState(); - const callback = (nodeData: NodeDataResult) => { + const callback = (nodeData: NodeDataResult): void => { setNodeData(nodeData.data); nodeData.model.assignStyledNodeCollection(