Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(react-components): deduplicate result models from useModelsForInstanceQuery #4657

Merged
merged 4 commits into from
Jul 4, 2024
Merged

fix(react-components): deduplicate result models from useModelsForInstanceQuery #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37e519b
fix(react-components): deduplicate result models from `useModelsForIn…
haakonflatval-cognite Jul 4, 2024
54882c4
chore: lint fix
haakonflatval-cognite Jul 4, 2024
1fb76cd
chore: move function to separate place
haakonflatval-cognite Jul 4, 2024
677193b
chore: lint fix
haakonflatval-cognite Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion react-components/src/query/useModelsForInstanceQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
isAssetInstance,
isDmsInstance
} from '../utilities/types';
import { uniqBy } from 'lodash';
import { createAddOptionsKey } from '../utilities/createAddOptionsKey';

export const useModelsForInstanceQuery = (
instance: InstanceReference | undefined
Expand Down Expand Up @@ -53,9 +55,11 @@ async function getModelsForAssetInstance(
cogniteClient
);

return (
const results = (
await Promise.all([cadModelsPromise, pointCloudModelsPromise, image360CollectionsPromise])
).flat();

return uniqBy(results, createAddOptionsKey);
}

async function getModelsForFdmInstance(
Expand Down
20 changes: 20 additions & 0 deletions react-components/src/utilities/createAddOptionsKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*!
* Copyright 2024 Cognite AS
*/
import {
is360ImageDataModelAddOptions,
is360ImageEventsAddOptions
} from '../components/Reveal3DResources/typeGuards';
import { type TaggedAddResourceOptions } from '../components/Reveal3DResources/types';

export function createAddOptionsKey(model: TaggedAddResourceOptions): string {
if (model.type === 'cad' || model.type === 'pointcloud') {
return `${model.type}-${model.addOptions.modelId}-${model.addOptions.revisionId}`;
} else if (model.type === 'image360' && is360ImageDataModelAddOptions(model.addOptions)) {
return `${model.type}-${model.addOptions.externalId}/${model.addOptions.space}`;
} else if (model.type === 'image360' && is360ImageEventsAddOptions(model.addOptions)) {
return `${model.type}-${model.addOptions.siteId}`;
} else {
throw Error('Unrecognized add option type');
}
}
Loading