From eccf0a918654d53c5c65e4ba320871aaea58e8a7 Mon Sep 17 00:00:00 2001 From: Dimitrie Stefanescu Date: Wed, 17 Aug 2022 09:51:46 +0300 Subject: [PATCH] chore(frontend/viewer): fixes some eslint errors --- .../src/main/components/viewer/ObjectPropertiesRow.vue | 10 ---------- .../lib/viewer/commit-object-viewer/stateManager.ts | 2 +- packages/viewer/src/helpers/flatten.ts | 2 +- packages/viewer/src/modules/FilteringManager.ts | 1 + packages/viewer/src/modules/SpeckleRenderer.ts | 2 +- packages/viewer/src/modules/input/Input.ts | 5 +++-- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/frontend/src/main/components/viewer/ObjectPropertiesRow.vue b/packages/frontend/src/main/components/viewer/ObjectPropertiesRow.vue index e9b87f05a..2c047da9f 100644 --- a/packages/frontend/src/main/components/viewer/ObjectPropertiesRow.vue +++ b/packages/frontend/src/main/components/viewer/ObjectPropertiesRow.vue @@ -128,15 +128,11 @@ import { useQuery } from '@vue/apollo-composable' import { computed } from 'vue' import gql from 'graphql-tag' import { - hideObjects, hideObjects2, hideTree, showTree, - showObjects, showObjects2, - isolateObjects, isolateObjects2, - unisolateObjects, unIsolateObjects2, getInitializedViewer } from '@/main/lib/viewer/commit-object-viewer/stateManager' @@ -265,23 +261,17 @@ export default { }, toggleFilter() { if (this.prop.type === 'object') { - // TODO: isolateTree? if (this.isolated) { - // TODO unIsolateObjects2([this.prop.value.referencedId], 'ui-iso') } else { - // TODO isolateObjects2([this.prop.value.referencedId], 'ui-iso') } } if (this.prop.type === 'array') { const targetIds = this.prop.value.map((o) => o.referencedId) - // TODO: isolateObjects? if (this.isolated) { - // TODO unIsolateObjects2(targetIds, 'ui-iso') } else { - // TODO isolateObjects2(targetIds, 'ui-iso') } } diff --git a/packages/frontend/src/main/lib/viewer/commit-object-viewer/stateManager.ts b/packages/frontend/src/main/lib/viewer/commit-object-viewer/stateManager.ts index c1b0e7f02..62ae51547 100644 --- a/packages/frontend/src/main/lib/viewer/commit-object-viewer/stateManager.ts +++ b/packages/frontend/src/main/lib/viewer/commit-object-viewer/stateManager.ts @@ -6,7 +6,7 @@ import { setupNewViewerInjection } from '@/main/lib/viewer/core/composables/view import { makeVar, TypePolicies } from '@apollo/client/cache' import { DefaultViewerParams, Viewer, SelectionEvent } from '@speckle/viewer' import emojis from '@/main/store/emojis' -import { cloneDeep, has, isArray, update } from 'lodash' +import { cloneDeep, has, isArray } from 'lodash' import { computed, ComputedRef, inject, InjectionKey, provide, Ref } from 'vue' const ViewerStreamIdKey: InjectionKey> = Symbol( diff --git a/packages/viewer/src/helpers/flatten.ts b/packages/viewer/src/helpers/flatten.ts index 42dc8af14..c7482698f 100644 --- a/packages/viewer/src/helpers/flatten.ts +++ b/packages/viewer/src/helpers/flatten.ts @@ -5,7 +5,7 @@ * @returns an object with all its props flattened into `prop.subprop.subsubprop`. */ const flattenObject = function (obj) { - const flatten = {} as any + const flatten = {} as Record for (const k in obj) { if (['id', '__closure', '__parents', 'bbox', 'totalChildrenCount'].includes(k)) continue diff --git a/packages/viewer/src/modules/FilteringManager.ts b/packages/viewer/src/modules/FilteringManager.ts index 213b1652b..d6f0241d2 100644 --- a/packages/viewer/src/modules/FilteringManager.ts +++ b/packages/viewer/src/modules/FilteringManager.ts @@ -672,6 +672,7 @@ export class FilteringManager { public handleLegacyFilter(filter) { // TODO console.warn('Not yet implemented.') + console.log(filter) } /** diff --git a/packages/viewer/src/modules/SpeckleRenderer.ts b/packages/viewer/src/modules/SpeckleRenderer.ts index 5512fd5d3..e3e3b7fc4 100644 --- a/packages/viewer/src/modules/SpeckleRenderer.ts +++ b/packages/viewer/src/modules/SpeckleRenderer.ts @@ -569,7 +569,7 @@ export default class SpeckleRenderer { ) const hitId = rv.renderData.id - const hitNode = WorldTree.getInstance().findId(hitId) + // const hitNode = WorldTree.getInstance().findId(hitId) // console.log(hitNode) this.batcher.resetBatchesDrawRanges() diff --git a/packages/viewer/src/modules/input/Input.ts b/packages/viewer/src/modules/input/Input.ts index 7081b146c..49e54ffb6 100644 --- a/packages/viewer/src/modules/input/Input.ts +++ b/packages/viewer/src/modules/input/Input.ts @@ -33,8 +33,9 @@ export default class Input extends EventEmitter { if (delta > 250) return - const loc = this._getNormalisedClickPosition(e) as any - if (e.shiftKey) loc.multiSelect = true + const loc = this._getNormalisedClickPosition(e) + + if (e.shiftKey) (loc as unknown as Record).multiSelect = true if (e.ctrlKey) this.emit('object-clicked-debug', loc) else this.emit('object-clicked', loc) })