From f98c30babb6bb611f11152cf1087bf3c55827165 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:07:32 +0000 Subject: [PATCH 01/11] chore(deps): update dependency @types/jest to v29.5.4 (#3622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- viewer/package.json | 2 +- viewer/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/viewer/package.json b/viewer/package.json index 3da94039bb3..71941d09bd1 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -84,7 +84,7 @@ "@types/dat.gui": "0.7.10", "@types/gl": "^6.0.2", "@types/glob": "8.1.0", - "@types/jest": "29.5.3", + "@types/jest": "29.5.4", "@types/jest-environment-puppeteer": "5.0.3", "@types/jest-image-snapshot": "6.2.0", "@types/jsdom": "21.1.1", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 4c613462b78..077b22dbe01 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -591,7 +591,7 @@ __metadata: "@types/dat.gui": 0.7.10 "@types/gl": ^6.0.2 "@types/glob": 8.1.0 - "@types/jest": 29.5.3 + "@types/jest": 29.5.4 "@types/jest-environment-puppeteer": 5.0.3 "@types/jest-image-snapshot": 6.2.0 "@types/jsdom": 21.1.1 @@ -2126,13 +2126,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:29.5.3": - version: 29.5.3 - resolution: "@types/jest@npm:29.5.3" +"@types/jest@npm:29.5.4": + version: 29.5.4 + resolution: "@types/jest@npm:29.5.4" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: e36bb92e0b9e5ea7d6f8832baa42f087fc1697f6cd30ec309a07ea4c268e06ec460f1f0cfd2581daf5eff5763475190ec1ad8ac6520c49ccfe4f5c0a48bfa676 + checksum: 38ed5942f44336452efd0f071eab60aaa57cd8d46530348d0a3aa5a691dcbf1366c4ca8f6ee8364efb45b4413bfefae443e5d4f469246a472a03b21ac11cd4ed languageName: node linkType: hard From ccaf55b558ba0ed59e99452acb74c91a0bcfc8a7 Mon Sep 17 00:00:00 2001 From: "Christopher J. Tannum" Date: Mon, 28 Aug 2023 13:27:21 +0200 Subject: [PATCH 02/11] fix: node appearance provider still issuing events after cad node disposal (#3626) --- .../cad-geometry-loaders/src/CadModelUpdateHandler.ts | 2 +- .../cad-geometry-loaders/src/sector/SectorLoader.ts | 2 +- viewer/packages/cad-model/src/wrappers/CadNode.ts | 8 ++++++++ viewer/packages/cad-styling/src/NodeAppearanceProvider.ts | 7 +++++++ .../cad-styling/visual-tests/Highlighted.VisualTest.ts | 2 +- viewer/packages/rendering/src/CadMaterialManager.ts | 1 + 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/viewer/packages/cad-geometry-loaders/src/CadModelUpdateHandler.ts b/viewer/packages/cad-geometry-loaders/src/CadModelUpdateHandler.ts index 1c04370ef0b..c5effdb74c5 100644 --- a/viewer/packages/cad-geometry-loaders/src/CadModelUpdateHandler.ts +++ b/viewer/packages/cad-geometry-loaders/src/CadModelUpdateHandler.ts @@ -233,7 +233,7 @@ function createDetermineSectorsInput([settings, _, camera, clipping, models]: [ ClippingInput, CadNode[] ]): DetermineSectorsPayload { - const prioritizedAreas = models.flatMap(model => model.prioritizedAreas); + const prioritizedAreas = models.filter(model => !model.isDisposed).flatMap(model => model.prioritizedAreas); return { ...camera, ...settings, diff --git a/viewer/packages/cad-geometry-loaders/src/sector/SectorLoader.ts b/viewer/packages/cad-geometry-loaders/src/sector/SectorLoader.ts index da017514836..f2dc1379155 100644 --- a/viewer/packages/cad-geometry-loaders/src/sector/SectorLoader.ts +++ b/viewer/packages/cad-geometry-loaders/src/sector/SectorLoader.ts @@ -62,7 +62,7 @@ export class SectorLoader { } const cadModels = input.models; - const visibleCadModels = cadModels.filter(x => x.visible); + const visibleCadModels = cadModels.filter(x => x.visible && !x.isDisposed); const sectorCullerInput: DetermineSectorsInput = { ...input, diff --git a/viewer/packages/cad-model/src/wrappers/CadNode.ts b/viewer/packages/cad-model/src/wrappers/CadNode.ts index d16ac0fe4da..43b31e7be1d 100644 --- a/viewer/packages/cad-model/src/wrappers/CadNode.ts +++ b/viewer/packages/cad-model/src/wrappers/CadNode.ts @@ -37,6 +37,8 @@ export class CadNode extends Object3D { private readonly _batchedGeometryMeshGroup: Group; private readonly _styledTreeIndexSets: StyledTreeIndexSets; + private _isDisposed: boolean = false; + private _needsRedraw: boolean = false; public readonly treeIndexToSectorsMap = new TreeIndexToSectorsMap(); @@ -153,6 +155,10 @@ export class CadNode extends Object3D { return this._materialManager.getRenderMode(); } + get isDisposed(): boolean { + return this._isDisposed; + } + public loadSector(sector: WantedSector, abortSignal?: AbortSignal): Promise { return this._sectorRepository.loadSector(sector, abortSignal); } @@ -203,6 +209,7 @@ export class CadNode extends Object3D { } public dispose(): void { + this.nodeAppearanceProvider.dispose(); this.nodeAppearanceProvider.off('changed', this._setModelRenderLayers); this._sectorRepository.clearCache(); this._materialManager.removeModelMaterials(this._cadModelMetadata.modelIdentifier); @@ -210,6 +217,7 @@ export class CadNode extends Object3D { this._rootSector?.dereferenceAllNodes(); this._rootSector?.clear(); this.clear(); + this._isDisposed = true; delete this._geometryBatchingManager; // @ts-ignore diff --git a/viewer/packages/cad-styling/src/NodeAppearanceProvider.ts b/viewer/packages/cad-styling/src/NodeAppearanceProvider.ts index 04055176fee..447756c5188 100644 --- a/viewer/packages/cad-styling/src/NodeAppearanceProvider.ts +++ b/viewer/packages/cad-styling/src/NodeAppearanceProvider.ts @@ -156,6 +156,13 @@ export class NodeAppearanceProvider { return this._styledCollections.some(x => x.nodeCollection.isLoading); } + dispose(): void { + this.scheduleNotifyChanged.cancel(); + this._events.changed.unsubscribeAll(); + this._events.loadingStateChanged.unsubscribeAll(); + this._events.prioritizedAreasChanged.unsubscribeAll(); + } + private notifyChanged() { this._cachedPrioritizedAreas = undefined; this._events.changed.fire(); diff --git a/viewer/packages/cad-styling/visual-tests/Highlighted.VisualTest.ts b/viewer/packages/cad-styling/visual-tests/Highlighted.VisualTest.ts index 85f9f2c1491..096308d8ba0 100644 --- a/viewer/packages/cad-styling/visual-tests/Highlighted.VisualTest.ts +++ b/viewer/packages/cad-styling/visual-tests/Highlighted.VisualTest.ts @@ -22,7 +22,7 @@ export default class HighlightedVisualTest extends StreamingVisualTestFixture { .getModelNodeAppearanceProvider(modelIdentifier) .assignStyledNodeCollection(nodes, DefaultNodeAppearance.Highlighted); - // Styles are not applied immidiatly, so wait a little for styling to take effect + // Styles are not applied immediately, so wait a little for styling to take effect await new Promise(resolve => setTimeout(resolve, 100)); model.geometryNode.position.set(25, 0, -15); diff --git a/viewer/packages/rendering/src/CadMaterialManager.ts b/viewer/packages/rendering/src/CadMaterialManager.ts index 337912b748d..761e263da75 100644 --- a/viewer/packages/rendering/src/CadMaterialManager.ts +++ b/viewer/packages/rendering/src/CadMaterialManager.ts @@ -267,6 +267,7 @@ export class CadMaterialManager { for (const [_, wrapper] of this.materialsMap) { wrapper.nodeAppearanceTextureBuilder.dispose(); wrapper.nodeTransformTextureBuilder.dispose(); + wrapper.nodeAppearanceProvider.dispose(); } } From f531a8cf194049cae7a8dc1dd6ca5ad32e7e42f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:44:42 +0000 Subject: [PATCH 03/11] chore(deps): update dependency @types/three to v0.155.1 (#3625) * chore(deps): update dependency @types/three to v0.155.1 * chore: bump three types in examples --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Christopher Tannum --- examples/package.json | 2 +- examples/yarn.lock | 8 ++++---- react-components/package.json | 2 +- react-components/yarn.lock | 10 +++++----- viewer/package.json | 2 +- viewer/yarn.lock | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/package.json b/examples/package.json index ac3526ac812..7667d02674c 100644 --- a/examples/package.json +++ b/examples/package.json @@ -40,7 +40,7 @@ "@types/react-dom": "18.2.4", "@types/stats.js": "^0.17.0", "@types/styled-components": "^5.1.26", - "@types/three": "0.155.0", + "@types/three": "0.155.1", "css-loader": "^6.7.1", "dotenv-webpack": "^7.1.0", "html-webpack-plugin": "^5.5.0", diff --git a/examples/yarn.lock b/examples/yarn.lock index 9c04d8651de..46fe68014a0 100644 --- a/examples/yarn.lock +++ b/examples/yarn.lock @@ -593,10 +593,10 @@ dependencies: "@types/jest" "*" -"@types/three@0.155.0": - version "0.155.0" - resolved "https://registry.yarnpkg.com/@types/three/-/three-0.155.0.tgz#703df6d3657b466b1b9ba4f36e000030fb4f137a" - integrity sha512-IzdbqXsGsbG0flvq9D5L9pZRwySQQps2bGcizLYEsfvK3dM+B0sqKR6S+xAOXbouXemfDmHttrcQjVOM46YnAw== +"@types/three@0.155.1": + version "0.155.1" + resolved "https://registry.yarnpkg.com/@types/three/-/three-0.155.1.tgz#03e1cc9bf7132f50606254611ff5f68ccd682b05" + integrity sha512-uNUwnz/wWRxahjIqTtDYQ1qdE1R1py21obxfuILkT+kKrjocMwRLQQA1l8nMxfQU7VXb7CXu04ucMo8OqZt4ZA== dependencies: "@tweenjs/tween.js" "~18.6.4" "@types/stats.js" "*" diff --git a/react-components/package.json b/react-components/package.json index e76cad39cb9..e3dc736c904 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -42,7 +42,7 @@ "@types/react": "18.2.7", "@types/react-dom": "^18.2.7", "@types/styled-components": "5.1.26", - "@types/three": "0.155.0", + "@types/three": "0.155.1", "@typescript-eslint/eslint-plugin": "^5.50.0", "eslint": "^8.0.1", "eslint-config-prettier": "^9.0.0", diff --git a/react-components/yarn.lock b/react-components/yarn.lock index e21d24bd31c..13b59ebb682 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2157,7 +2157,7 @@ __metadata: "@types/react": 18.2.7 "@types/react-dom": ^18.2.7 "@types/styled-components": 5.1.26 - "@types/three": 0.155.0 + "@types/three": 0.155.1 "@typescript-eslint/eslint-plugin": ^5.50.0 eslint: ^8.0.1 eslint-config-prettier: ^9.0.0 @@ -5756,9 +5756,9 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:0.155.0": - version: 0.155.0 - resolution: "@types/three@npm:0.155.0" +"@types/three@npm:0.155.1": + version: 0.155.1 + resolution: "@types/three@npm:0.155.1" dependencies: "@tweenjs/tween.js": ~18.6.4 "@types/stats.js": "*" @@ -5766,7 +5766,7 @@ __metadata: fflate: ~0.6.9 lil-gui: ~0.17.0 meshoptimizer: ~0.18.1 - checksum: decd966b198ad0f24febcbd16a2c3ff584e7b0f7f89e70c2ecb8c1a7842598a51f79cd0965220aa74d216ab4474ca2f6e4023904aa7ca0f38c93fc8b99e2a0d6 + checksum: dbe682fed53b59776d09140eec755677aedb49df6a16333a507f87a4ade2cbd4ea0fa46984e28425f3c3026d5eb9a8568e75a1a362fb4f1889427e4c6df4b640 languageName: node linkType: hard diff --git a/viewer/package.json b/viewer/package.json index 71941d09bd1..0d0f479d706 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -94,7 +94,7 @@ "@types/random-seed": "0.3.3", "@types/skmeans": "0.11.4", "@types/stats": "0.16.30", - "@types/three": "0.155.0", + "@types/three": "0.155.1", "@types/tween.js": "18.5.1", "@typescript-eslint/eslint-plugin": "5.62.0", "@typescript-eslint/parser": "5.62.0", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 077b22dbe01..27314f0ff59 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -601,7 +601,7 @@ __metadata: "@types/random-seed": 0.3.3 "@types/skmeans": 0.11.4 "@types/stats": 0.16.30 - "@types/three": 0.155.0 + "@types/three": 0.155.1 "@types/tween.js": 18.5.1 "@typescript-eslint/eslint-plugin": 5.62.0 "@typescript-eslint/parser": 5.62.0 @@ -2323,9 +2323,9 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:0.155.0": - version: 0.155.0 - resolution: "@types/three@npm:0.155.0" +"@types/three@npm:0.155.1": + version: 0.155.1 + resolution: "@types/three@npm:0.155.1" dependencies: "@tweenjs/tween.js": ~18.6.4 "@types/stats.js": "*" @@ -2333,7 +2333,7 @@ __metadata: fflate: ~0.6.9 lil-gui: ~0.17.0 meshoptimizer: ~0.18.1 - checksum: decd966b198ad0f24febcbd16a2c3ff584e7b0f7f89e70c2ecb8c1a7842598a51f79cd0965220aa74d216ab4474ca2f6e4023904aa7ca0f38c93fc8b99e2a0d6 + checksum: dbe682fed53b59776d09140eec755677aedb49df6a16333a507f87a4ade2cbd4ea0fa46984e28425f3c3026d5eb9a8568e75a1a362fb4f1889427e4c6df4b640 languageName: node linkType: hard From 91c03eb02fc9d12646f113bf124a9d93571a73dd Mon Sep 17 00:00:00 2001 From: "Christopher J. Tannum" Date: Mon, 28 Aug 2023 13:57:29 +0200 Subject: [PATCH 04/11] chore: bump reveal to version 4.4.1 (#3629) Co-authored-by: cognite-bulldozer[bot] <51074376+cognite-bulldozer[bot]@users.noreply.github.com> --- viewer/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewer/package.json b/viewer/package.json index 0d0f479d706..1d08988e6d2 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -1,6 +1,6 @@ { "name": "@cognite/reveal", - "version": "4.4.0", + "version": "4.4.1", "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": { From 177e1d6673c0e83783aefc3a2b410024ad1eda5f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 13:29:57 +0000 Subject: [PATCH 05/11] chore(deps): update dependency @types/jsdom to v21.1.2 (#3623) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- viewer/package.json | 2 +- viewer/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/viewer/package.json b/viewer/package.json index 1d08988e6d2..e90af066a54 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -87,7 +87,7 @@ "@types/jest": "29.5.4", "@types/jest-environment-puppeteer": "5.0.3", "@types/jest-image-snapshot": "6.2.0", - "@types/jsdom": "21.1.1", + "@types/jsdom": "21.1.2", "@types/lodash": "4.14.197", "@types/mixpanel-browser": "2.47.1", "@types/node": "18.17.6", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 27314f0ff59..6a2714a1428 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -594,7 +594,7 @@ __metadata: "@types/jest": 29.5.4 "@types/jest-environment-puppeteer": 5.0.3 "@types/jest-image-snapshot": 6.2.0 - "@types/jsdom": 21.1.1 + "@types/jsdom": 21.1.2 "@types/lodash": 4.14.197 "@types/mixpanel-browser": 2.47.1 "@types/node": 18.17.6 @@ -2136,14 +2136,14 @@ __metadata: languageName: node linkType: hard -"@types/jsdom@npm:21.1.1": - version: 21.1.1 - resolution: "@types/jsdom@npm:21.1.1" +"@types/jsdom@npm:21.1.2": + version: 21.1.2 + resolution: "@types/jsdom@npm:21.1.2" dependencies: "@types/node": "*" "@types/tough-cookie": "*" parse5: ^7.0.0 - checksum: 7450d6e23aa31b837a1682f0e59b06838aacca85c9d030035f40e21d559169c773aee5cee9244f23c3004b78f7064f0c540ceb808d2f187deb3140f2b0449dee + checksum: 62513fc82afa0234034919dee37d3f82425245e1794c58bac55fabbd00de10b3c384992db1cdd53d35a0af58540e2733730f22dbeb57f5b76bca90bca8c368a8 languageName: node linkType: hard From 1d6e2b9ed598709872149d5c095dfb6719087e19 Mon Sep 17 00:00:00 2001 From: "Christopher J. Tannum" Date: Mon, 28 Aug 2023 15:34:22 +0200 Subject: [PATCH 06/11] chore: bump reveal react components to 0.13.0 (#3630) Co-authored-by: cognite-bulldozer[bot] <51074376+cognite-bulldozer[bot]@users.noreply.github.com> --- react-components/package.json | 6 +++--- react-components/yarn.lock | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/react-components/package.json b/react-components/package.json index e3dc736c904..efcca42301a 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@cognite/reveal-react-components", - "version": "0.12.0", + "version": "0.13.0", "exports": "./dist/index.js", "types": "./dist/index.d.ts", "type": "module", @@ -18,7 +18,7 @@ }, "peerDependencies": { "@cognite/cogs.js": ">=9", - "@cognite/reveal": "4.4.0", + "@cognite/reveal": "4.4.1", "react": ">=18", "react-dom": ">=18", "styled-components": ">=5" @@ -28,7 +28,7 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@cognite/cogs.js": "^9.17.0", - "@cognite/reveal": "4.4.0", + "@cognite/reveal": "4.4.1", "@cognite/sdk": "^8.2.0", "@storybook/addon-essentials": "7.3.2", "@storybook/addon-interactions": "7.3.2", diff --git a/react-components/yarn.lock b/react-components/yarn.lock index 13b59ebb682..4afd9554ab4 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2142,7 +2142,7 @@ __metadata: "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 "@cognite/cogs.js": ^9.17.0 - "@cognite/reveal": 4.4.0 + "@cognite/reveal": 4.4.1 "@cognite/sdk": ^8.2.0 "@storybook/addon-essentials": 7.3.2 "@storybook/addon-interactions": 7.3.2 @@ -2185,16 +2185,16 @@ __metadata: webpack-node-externals: 3.0.0 peerDependencies: "@cognite/cogs.js": ">=9" - "@cognite/reveal": 4.4.0 + "@cognite/reveal": 4.4.1 react: ">=18" react-dom: ">=18" styled-components: ">=5" languageName: unknown linkType: soft -"@cognite/reveal@npm:4.4.0": - version: 4.4.0 - resolution: "@cognite/reveal@npm:4.4.0" +"@cognite/reveal@npm:4.4.1": + version: 4.4.1 + resolution: "@cognite/reveal@npm:4.4.1" dependencies: "@tweenjs/tween.js": 19.0.0 assert: 2.0.0 @@ -2212,8 +2212,8 @@ __metadata: sparse-octree: 7.1.8 peerDependencies: "@cognite/sdk": ^7.16.0 || ^8.0.0 - three: 0.154.0 - checksum: 37818f3b3cf3a0af7221f97db9b96b1fb9c31ba0056375afbe7f7c7b940f345bc64521dcc9fc4d5de110d38ae92a22df2f2f2bd850f94aee8be5229ac016ebaf + three: 0.155.0 + checksum: 8747719e2296c2c7e6968560b55924cc9465110fc1bc7f444afb63b8bcf1d9d60fc15fffa7a0622de2b4a2230d9d5b874d05a2c5f495ff7a0a85186a5e4e7801 languageName: node linkType: hard From cba976c8a1592d5bce0ea3a832c7e6369ac9611b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:36:30 +0000 Subject: [PATCH 07/11] chore(deps): update dependency @types/node to v18.17.9 (#3624) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- viewer/package.json | 2 +- viewer/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/viewer/package.json b/viewer/package.json index e90af066a54..42ea393eb56 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -90,7 +90,7 @@ "@types/jsdom": "21.1.2", "@types/lodash": "4.14.197", "@types/mixpanel-browser": "2.47.1", - "@types/node": "18.17.6", + "@types/node": "18.17.9", "@types/random-seed": "0.3.3", "@types/skmeans": "0.11.4", "@types/stats": "0.16.30", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 6a2714a1428..ab5b48bf128 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -597,7 +597,7 @@ __metadata: "@types/jsdom": 21.1.2 "@types/lodash": 4.14.197 "@types/mixpanel-browser": 2.47.1 - "@types/node": 18.17.6 + "@types/node": 18.17.9 "@types/random-seed": 0.3.3 "@types/skmeans": 0.11.4 "@types/stats": 0.16.30 @@ -2207,10 +2207,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.17.6": - version: 18.17.6 - resolution: "@types/node@npm:18.17.6" - checksum: 70bc92adde47d569f25c5ed40b55040cdf189518d6149e0c3041c6e60b1098cad9c48a856f0b7868ebd74d4098a0ca508b0ec4373dd96216eb8a387ee898e14c +"@types/node@npm:18.17.9": + version: 18.17.9 + resolution: "@types/node@npm:18.17.9" + checksum: 0d5835710e49a654a1ca34167e7cd504cc709c006006ebe9b23c360dac5637c6c4f1b4f3aff33df1b7f9debfb9ad8bd81da2fc4540970d2ad56eb479cda77613 languageName: node linkType: hard From 3ee044249d4720f75b782fb80f4d4776891caa81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:27:23 +0000 Subject: [PATCH 08/11] chore(deps): update dependency concurrently to v8.2.1 (#3627) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- viewer/package.json | 2 +- viewer/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/viewer/package.json b/viewer/package.json index 42ea393eb56..714f094f3e6 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -98,7 +98,7 @@ "@types/tween.js": "18.5.1", "@typescript-eslint/eslint-plugin": "5.62.0", "@typescript-eslint/parser": "5.62.0", - "concurrently": "8.2.0", + "concurrently": "8.2.1", "cross-env": "7.0.3", "dat.gui": "0.7.9", "eslint": "8.47.0", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index ab5b48bf128..e5e277c4eb4 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -607,7 +607,7 @@ __metadata: "@typescript-eslint/parser": 5.62.0 assert: 2.0.0 async-mutex: 0.4.0 - concurrently: 8.2.0 + concurrently: 8.2.1 cross-env: 7.0.3 dat.gui: 0.7.9 eslint: 8.47.0 @@ -3964,9 +3964,9 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:8.2.0": - version: 8.2.0 - resolution: "concurrently@npm:8.2.0" +"concurrently@npm:8.2.1": + version: 8.2.1 + resolution: "concurrently@npm:8.2.1" dependencies: chalk: ^4.1.2 date-fns: ^2.30.0 @@ -3980,7 +3980,7 @@ __metadata: bin: conc: dist/bin/concurrently.js concurrently: dist/bin/concurrently.js - checksum: eafe6a4d9b7fda87f55ea285cfc6acd937a5286ceec8991ab48e6cc27c45fce6a5c6f45e18d7555defa15dc7d7e8941bc5a9d1ceaf182e31441d420e00333434 + checksum: 216cb16d5b301cbd9c657b19430836d1686fe8fa9b9ef35ef7ac601e1a5cf6535166a3e57de446696dbd5e7e3f45d78fc70f33c5fd4bb565342cd5e752c5b069 languageName: node linkType: hard From c41b631b82fe9722207b677a5a22b8d308b722c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 21:09:34 +0000 Subject: [PATCH 09/11] chore(deps): update jest monorepo to v29.6.4 (#3628) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- viewer/package.json | 4 ++-- viewer/yarn.lock | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/viewer/package.json b/viewer/package.json index 714f094f3e6..40335174cae 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -113,9 +113,9 @@ "glob": "10.3.3", "glslify-loader": "2.0.0", "html-webpack-plugin": "5.5.3", - "jest": "29.6.3", + "jest": "29.6.4", "jest-canvas-mock": "2.5.2", - "jest-environment-jsdom": "29.6.3", + "jest-environment-jsdom": "29.6.4", "jest-extended": "4.0.1", "jest-image-snapshot": "6.2.0", "jest-puppeteer": "9.0.0", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index e5e277c4eb4..2d83b8cb745 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -625,9 +625,9 @@ __metadata: glslify-loader: 2.0.0 html-webpack-plugin: 5.5.3 html2canvas: ^1.4.1 - jest: 29.6.3 + jest: 29.6.4 jest-canvas-mock: 2.5.2 - jest-environment-jsdom: 29.6.3 + jest-environment-jsdom: 29.6.4 jest-extended: 4.0.1 jest-image-snapshot: 6.2.0 jest-puppeteer: 9.0.0 @@ -842,7 +842,7 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^29.6.3, @jest/core@npm:^29.6.4": +"@jest/core@npm:^29.6.4": version: 29.6.4 resolution: "@jest/core@npm:29.6.4" dependencies: @@ -907,7 +907,7 @@ __metadata: languageName: node linkType: hard -"@jest/environment@npm:^29.6.3, @jest/environment@npm:^29.6.4": +"@jest/environment@npm:^29.6.4": version: 29.6.4 resolution: "@jest/environment@npm:29.6.4" dependencies: @@ -975,7 +975,7 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.6.3, @jest/fake-timers@npm:^29.6.4": +"@jest/fake-timers@npm:^29.6.4": version: 29.6.4 resolution: "@jest/fake-timers@npm:29.6.4" dependencies: @@ -7237,7 +7237,7 @@ __metadata: languageName: node linkType: hard -"jest-cli@npm:^29.6.3": +"jest-cli@npm:^29.6.4": version: 29.6.4 resolution: "jest-cli@npm:29.6.4" dependencies: @@ -7375,12 +7375,12 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:29.6.3": - version: 29.6.3 - resolution: "jest-environment-jsdom@npm:29.6.3" +"jest-environment-jsdom@npm:29.6.4": + version: 29.6.4 + resolution: "jest-environment-jsdom@npm:29.6.4" dependencies: - "@jest/environment": ^29.6.3 - "@jest/fake-timers": ^29.6.3 + "@jest/environment": ^29.6.4 + "@jest/fake-timers": ^29.6.4 "@jest/types": ^29.6.3 "@types/jsdom": ^20.0.0 "@types/node": "*" @@ -7392,7 +7392,7 @@ __metadata: peerDependenciesMeta: canvas: optional: true - checksum: c8c3a45952c4ca82fa17ae77b9be986ebe323300bd3d2f85895a143f078402668df42978a8764005d373d8b10926367a832731ae524a79d61568cc4e75a92c41 + checksum: 2afe105f12d7d93ca56e2e6f67ab07ada3dd3da0516d1198f254930683ab9feb2b8c14417baaca53544eed88fd7fb5744f0dbce2e100269746187317ce0347df languageName: node linkType: hard @@ -7945,14 +7945,14 @@ __metadata: languageName: node linkType: hard -"jest@npm:29.6.3": - version: 29.6.3 - resolution: "jest@npm:29.6.3" +"jest@npm:29.6.4": + version: 29.6.4 + resolution: "jest@npm:29.6.4" dependencies: - "@jest/core": ^29.6.3 + "@jest/core": ^29.6.4 "@jest/types": ^29.6.3 import-local: ^3.0.2 - jest-cli: ^29.6.3 + jest-cli: ^29.6.4 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -7960,7 +7960,7 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: dd4f53fb84f28b665b47c628222e5d3b624e9e0afa79b22afceef4f2a53dc0d8f0edd7ca254917ace5c94c3a7bf58c108563234c4fe34e86c679ce99633cfbe6 + checksum: ba28ca7a86d029bcd742bb254c0c8d0119c1e002ddae128ff6409ebabc0b29c36f69dbf3fdd326aff16e7b2500c9a918bbc6a9a5db4d966e035127242239439f languageName: node linkType: hard From 4e452073c99ecbd0d1d8c84977e986d82c7dd77f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 06:26:28 +0000 Subject: [PATCH 10/11] chore(deps): update dependency @azure/msal-browser to v2.38.2 (#3631) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- documentation/package.json | 2 +- documentation/yarn.lock | 20 ++++++++++---------- viewer/package.json | 2 +- viewer/yarn.lock | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/documentation/package.json b/documentation/package.json index a54e3303618..258cb7581b5 100644 --- a/documentation/package.json +++ b/documentation/package.json @@ -24,7 +24,7 @@ "ws:replace": "replace" }, "dependencies": { - "@azure/msal-browser": "2.38.1", + "@azure/msal-browser": "2.38.2", "@codemirror/lang-javascript": "6.1.9", "@docusaurus/core": "2.4.1", "@docusaurus/preset-classic": "2.4.1", diff --git a/documentation/yarn.lock b/documentation/yarn.lock index dc3cc275823..6496ee6c48e 100644 --- a/documentation/yarn.lock +++ b/documentation/yarn.lock @@ -182,12 +182,12 @@ __metadata: languageName: node linkType: hard -"@azure/msal-browser@npm:2.38.1": - version: 2.38.1 - resolution: "@azure/msal-browser@npm:2.38.1" +"@azure/msal-browser@npm:2.38.2": + version: 2.38.2 + resolution: "@azure/msal-browser@npm:2.38.2" dependencies: - "@azure/msal-common": 13.2.1 - checksum: 86306ccfdaf3c412c21dc7b575c9ed8c6c5a7eb638a895573b6d01cae15afdeb4f54e3271f0bd5608c204a12acbd8b4de07fed6c0a63977fa18d254d4f99cc5d + "@azure/msal-common": 13.3.0 + checksum: 78142f33971ed18110ede263f5bba37f7b9e81fb7f30c7feb28e6715bef15faf7e59e1b8fa1843e544dc86607aedf011d27f2e6867f16acb98d963a525186e5e languageName: node linkType: hard @@ -200,10 +200,10 @@ __metadata: languageName: node linkType: hard -"@azure/msal-common@npm:13.2.1": - version: 13.2.1 - resolution: "@azure/msal-common@npm:13.2.1" - checksum: 6b4ba4426ff79ef72bbdcb3c1d600dbe5432d63beb0666b674701c0575989e2288e2b5a10e83a498395b24dacf506d7daa3de6556cdea983e683e404f35e32ef +"@azure/msal-common@npm:13.3.0": + version: 13.3.0 + resolution: "@azure/msal-common@npm:13.3.0" + checksum: 334c2d4cee12064ef80ce949cc2c6e02ac54f5931b522e0592512ce12738206fd4558158205d6ed73a01a3227fd2e95965c1cb08bd302d5e3bf1099b81385b3d languageName: node linkType: hard @@ -2137,7 +2137,7 @@ __metadata: version: 0.0.0-use.local resolution: "@cognite/reveal-documentation@workspace:." dependencies: - "@azure/msal-browser": 2.38.1 + "@azure/msal-browser": 2.38.2 "@codemirror/lang-javascript": 6.1.9 "@docusaurus/core": 2.4.1 "@docusaurus/preset-classic": 2.4.1 diff --git a/viewer/package.json b/viewer/package.json index 40335174cae..afeec77b604 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -78,7 +78,7 @@ "sparse-octree": "7.1.8" }, "devDependencies": { - "@azure/msal-browser": "2.38.1", + "@azure/msal-browser": "2.38.2", "@cognite/sdk": "8.2.0", "@microsoft/api-extractor": "^7.33.6", "@types/dat.gui": "0.7.10", diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 2d83b8cb745..a5b25a2363c 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -22,19 +22,19 @@ __metadata: languageName: node linkType: hard -"@azure/msal-browser@npm:2.38.1": - version: 2.38.1 - resolution: "@azure/msal-browser@npm:2.38.1" +"@azure/msal-browser@npm:2.38.2": + version: 2.38.2 + resolution: "@azure/msal-browser@npm:2.38.2" dependencies: - "@azure/msal-common": 13.2.1 - checksum: 86306ccfdaf3c412c21dc7b575c9ed8c6c5a7eb638a895573b6d01cae15afdeb4f54e3271f0bd5608c204a12acbd8b4de07fed6c0a63977fa18d254d4f99cc5d + "@azure/msal-common": 13.3.0 + checksum: 78142f33971ed18110ede263f5bba37f7b9e81fb7f30c7feb28e6715bef15faf7e59e1b8fa1843e544dc86607aedf011d27f2e6867f16acb98d963a525186e5e languageName: node linkType: hard -"@azure/msal-common@npm:13.2.1": - version: 13.2.1 - resolution: "@azure/msal-common@npm:13.2.1" - checksum: 6b4ba4426ff79ef72bbdcb3c1d600dbe5432d63beb0666b674701c0575989e2288e2b5a10e83a498395b24dacf506d7daa3de6556cdea983e683e404f35e32ef +"@azure/msal-common@npm:13.3.0": + version: 13.3.0 + resolution: "@azure/msal-common@npm:13.3.0" + checksum: 334c2d4cee12064ef80ce949cc2c6e02ac54f5931b522e0592512ce12738206fd4558158205d6ed73a01a3227fd2e95965c1cb08bd302d5e3bf1099b81385b3d languageName: node linkType: hard @@ -584,7 +584,7 @@ __metadata: version: 0.0.0-use.local resolution: "@cognite/reveal@workspace:." dependencies: - "@azure/msal-browser": 2.38.1 + "@azure/msal-browser": 2.38.2 "@cognite/sdk": 8.2.0 "@microsoft/api-extractor": ^7.33.6 "@tweenjs/tween.js": 19.0.0 From a65ad0535d0c790ccedd2755975173acf7b45ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Flatval?= <70905152+haakonflatval-cognite@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:00:55 +0200 Subject: [PATCH 11/11] chore: remove console log (#3637) --- react-components/src/hooks/useCalculateModelsStyling.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/react-components/src/hooks/useCalculateModelsStyling.tsx b/react-components/src/hooks/useCalculateModelsStyling.tsx index 902e04c88bb..9c563c15360 100644 --- a/react-components/src/hooks/useCalculateModelsStyling.tsx +++ b/react-components/src/hooks/useCalculateModelsStyling.tsx @@ -42,7 +42,6 @@ export const useCalculateCadStyling = ( defaultResourceStyling?.cad?.mapped ); const modelInstanceStyleGroups = useCalculateInstanceStyling(models, instanceGroups); - console.log('Model instance style groups = ', modelInstanceStyleGroups); const joinedStyleGroups = useJoinStylingGroups( models, modelsMappedStyleGroups,