codecharta-visualization 1.89.0 → 1.90.0

package/app/codeCharta/state/store.service.ts

@@ -8,17 +8,12 @@ export interface StoreSubscriber {
 	onStoreChanged(actionType: string)
 }
 
-export interface StoreExtendedSubscriber {
-	onStoreChangedExtended(actionType: string, data?: unknown)
-}
-
 export interface DispatchOptions {
 	silent: boolean
 }
 
 export class StoreService {
 	static STORE_CHANGED_EVENT = "store-changed"
-	private static STORE_CHANGED_EXTENDED_EVENT = "store-changed-extended"
 	private store = Store.store
 	private originalDispatch: typeof Store.store.dispatch
 
@@ -39,7 +34,6 @@ export class StoreService {
 			this.originalDispatch(atomicAction)
 			if (!options.silent) {
 				this.notify(atomicAction.type)
-				this.notifyExtended(atomicAction.type, atomicAction.payload)
 			}
 		}
 
@@ -54,19 +48,9 @@ export class StoreService {
 		this.$rootScope.$broadcast(StoreService.STORE_CHANGED_EVENT, { actionType })
 	}
 
-	private notifyExtended(actionType: string, payload?: unknown) {
-		this.$rootScope.$broadcast(StoreService.STORE_CHANGED_EXTENDED_EVENT, { actionType, payload })
-	}
-
 	static subscribe($rootScope: IRootScopeService, subscriber: StoreSubscriber) {
 		$rootScope.$on(StoreService.STORE_CHANGED_EVENT, (_event_, data) => {
 			subscriber.onStoreChanged(data.actionType)
 		})
 	}
-
-	static subscribeDetailedData($rootScope: IRootScopeService, subscriber: StoreExtendedSubscriber) {
-		$rootScope.$on(StoreService.STORE_CHANGED_EXTENDED_EVENT, (_event_, data) => {
-			subscriber.onStoreChangedExtended(data.actionType, data.payload)
-		})
-	}
 }

package/app/codeCharta/ui/attributeSideBar/attributeSideBar.component.spec.ts

@@ -95,7 +95,11 @@ describe("AttributeSideBarComponent", () => {
 	})
 
 	it("should display attribute type selectors for folders", async () => {
-		mockedSelectedNodeSelector.mockImplementation(() => klona(TEST_NODE_FOLDER))
+		mockedSelectedNodeSelector.mockImplementation(() => {
+			const node = klona(TEST_NODE_FOLDER)
+			node["children"] = [{}]
+			return node
+		})
 
 		const { container } = await render(AttributeSideBarComponent, { excludeComponentDeclaration: true })
 

package/app/codeCharta/ui/attributeSideBar/attributeSideBar.component.ts

@@ -2,7 +2,7 @@ import "./attributeSideBar.component.scss"
 import { Observable, map } from "rxjs"
 import { Component, Inject } from "@angular/core"
 
-import { Node } from "../../codeCharta.model"
+import { CodeMapNode } from "../../codeCharta.model"
 import { Store } from "../../state/angular-redux/store"
 import { isAttributeSideBarVisibleSelector } from "../../state/store/appSettings/isAttributeSideBarVisible/isAttributeSideBarVisible.selector"
 import { selectedNodeSelector } from "../../state/selectors/selectedNode.selector"
@@ -14,7 +14,7 @@ import { accumulatedDataSelector } from "../../state/selectors/accumulatedData/a
 })
 export class AttributeSideBarComponent {
 	isSideBarVisible$: Observable<boolean>
-	selectedNode$: Observable<Node>
+	selectedNode$: Observable<CodeMapNode>
 	fileName$: Observable<string>
 
 	constructor(@Inject(Store) store: Store) {

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/attributeSideBarHeaderSection.component.html

@@ -1,7 +1,6 @@
 <ng-container *ngIf="node">
 	<i class="close-icon fa fa-times" (click)="closeSideBar()"></i>
 
-	<h2 *ngIf="!node.link" data-testid="file-opener" class="node-name" (click)="handleClickNodeName()">{{ node.name }}</h2>
 	<div *ngIf="node.link" data-testid="file-link" matTooltip="{{ node.link }}" [matTooltipShowDelay]="200" class="node-name">
 		<a class="node-link" href="{{ node.link }}" target="_blank" rel="noopener noreferrer">
 			<h2>{{ node.name }}&nbsp;</h2>

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/attributeSideBarHeaderSection.component.spec.ts

@@ -1,7 +1,6 @@
 import { TestBed } from "@angular/core/testing"
-import { render, fireEvent } from "@testing-library/angular"
-
-import { LazyLoader } from "../../../util/lazyLoader"
+import { render } from "@testing-library/angular"
+import { CodeMapNode } from "../../../codeCharta.model"
 import { AttributeSideBarModule } from "../attributeSideBar.module"
 import { AttributeSideBarHeaderSectionComponent } from "./attributeSideBarHeaderSection.component"
 
@@ -12,56 +11,15 @@ describe("attributeSideBarHeaderSection", () => {
 		})
 	})
 
-	it("should have file opener when given node has no link and open it on click if it is a leaf", async () => {
-		const { container } = await render(AttributeSideBarHeaderSectionComponent, {
-			excludeComponentDeclaration: true,
-			componentProperties: {
-				node: { name: "myNode", isLeaf: true, path: "./myNode.ts", link: undefined },
-				fileName: "myNode.ts"
-			}
-		})
-
-		expect(container.querySelector("[data-testid=file-link]")).toBe(null)
-		const fileOpener = container.querySelector("[data-testid=file-opener]")
-		expect(fileOpener).not.toBe(null)
-
-		// @ts-ignore
-		const openFileMock = jest.spyOn(LazyLoader, "openFile").mockImplementation(() => {})
-		fireEvent.click(fileOpener)
-
-		expect(openFileMock).toHaveBeenCalledWith("myNode.ts", "./myNode.ts")
-	})
-
-	it("should have file opener when given node has no link but don't open it on click if it isn't a leaf", async () => {
-		const { container } = await render(AttributeSideBarHeaderSectionComponent, {
-			excludeComponentDeclaration: true,
-			componentProperties: {
-				node: { name: "myNode", isLeaf: false, path: "./myNode.ts", link: undefined },
-				fileName: "myNode.ts"
-			}
-		})
-
-		expect(container.querySelector("[data-testid=file-link]")).toBe(null)
-		const fileOpener = container.querySelector("[data-testid=file-opener]")
-		expect(fileOpener).not.toBe(null)
-
-		// @ts-ignore
-		const openFileMock = jest.spyOn(LazyLoader, "openFile").mockReset()
-		fireEvent.click(fileOpener)
-
-		expect(openFileMock).not.toHaveBeenCalled()
-	})
-
 	it("should have file link when given node has a link", async () => {
 		const { container } = await render(AttributeSideBarHeaderSectionComponent, {
 			excludeComponentDeclaration: true,
 			componentProperties: {
-				node: { name: "myNode", isLeaf: true, path: "./myNode.ts", link: "myNode.com" },
+				node: { name: "myNode", children: [{}], path: "./myNode.ts", link: "myNode.com" } as CodeMapNode,
 				fileName: "myNode.ts"
 			}
 		})
 
-		expect(container.querySelector("[data-testid=file-opener]")).toBe(null)
 		expect(container.querySelector("[data-testid=file-link] a[href='myNode.com']")).not.toBe(null)
 	})
 })

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/attributeSideBarHeaderSection.component.ts

@@ -1,8 +1,7 @@
 import "./attributeSideBarHeaderSection.component.scss"
 import { Component, Inject, Input } from "@angular/core"
 
-import { Node } from "../../../codeCharta.model"
-import { LazyLoader } from "../../../util/lazyLoader"
+import { CodeMapNode } from "../../../codeCharta.model"
 import { Store } from "../../../state/angular-redux/store"
 import { closeAttributeSideBar } from "../../../state/store/appSettings/isAttributeSideBarVisible/isAttributeSideBarVisible.actions"
 
@@ -11,16 +10,11 @@ import { closeAttributeSideBar } from "../../../state/store/appSettings/isAttrib
 	template: require("./attributeSideBarHeaderSection.component.html")
 })
 export class AttributeSideBarHeaderSectionComponent {
-	@Input() node: Pick<Node, "isLeaf" | "name" | "link" | "path">
+	@Input() node: Pick<CodeMapNode, "children" | "name" | "link" | "path">
 	@Input() fileName: string
 
 	constructor(@Inject(Store) private store: Store) {}
 
-	handleClickNodeName() {
-		if (!this.node.isLeaf) return
-		LazyLoader.openFile(this.fileName, this.node.path)
-	}
-
 	closeSideBar() {
 		this.store.dispatch(closeAttributeSideBar())
 	}

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/nodePath.component.html

@@ -1,7 +1,7 @@
 <p class="cc-node-path">
 	<span *ngIf="node">
 		{{ node.path }}
-		<span *ngIf="!node.isLeaf && fileCountDescription$ | async as fileCountDescription" class="cc-node-file-count">
+		<span *ngIf="node.children?.length && fileCountDescription$ | async as fileCountDescription" class="cc-node-file-count">
 			({{ fileCountDescription }})
 		</span>
 	</span>

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/nodePath.component.spec.ts

@@ -1,4 +1,5 @@
 import { render } from "@testing-library/angular"
+import { CodeMapNode } from "../../../../codeCharta.model"
 
 import { selectedNodeSelector } from "../../../../state/selectors/selectedNode.selector"
 import { NodePathComponent } from "./nodePath.component"
@@ -18,7 +19,7 @@ describe("nodePathComponent", () => {
 	})
 
 	it("should display only node path, when a file is selected", async () => {
-		const node = { isLeaf: true, path: "some/file.ts" }
+		const node = { path: "some/file.ts" }
 		selectedNodeSelectorMock.mockImplementation(() => node)
 
 		const { container } = await render(NodePathComponent, { componentProperties: { node } })
@@ -27,7 +28,7 @@ describe("nodePathComponent", () => {
 
 	it("should display node path and fileCountDescription,, when a folder is selected", async () => {
 		const node = {
-			isLeaf: false,
+			children: [{}] as CodeMapNode[],
 			path: "some/folder",
 			attributes: { unary: 2 }
 		}

package/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/nodePath.component.ts

@@ -2,7 +2,7 @@ import { Component, Inject, Input } from "@angular/core"
 import { Observable } from "rxjs"
 
 import { Store } from "../../../../state/angular-redux/store"
-import { Node } from "../../../../codeCharta.model"
+import { CodeMapNode } from "../../../../codeCharta.model"
 import { fileCountDescriptionSelector } from "./fileCountDescription.selector"
 
 @Component({
@@ -10,7 +10,7 @@ import { fileCountDescriptionSelector } from "./fileCountDescription.selector"
 	template: require("./nodePath.component.html")
 })
 export class NodePathComponent {
-	@Input() node?: Pick<Node, "path" | "isLeaf">
+	@Input() node?: Pick<CodeMapNode, "path" | "children">
 	fileCountDescription$: Observable<string | undefined>
 
 	constructor(@Inject(Store) store: Store) {

package/app/codeCharta/ui/attributeSideBar/attributeSideBarSecondaryMetrics/secondaryMetrics.selector.ts

@@ -1,11 +1,11 @@
-import { Node } from "../../../codeCharta.model"
+import { CodeMapNode } from "../../../codeCharta.model"
 import { createSelector } from "../../../state/angular-redux/store"
 import { selectedNodeSelector } from "../../../state/selectors/selectedNode.selector"
 import { CcState } from "../../../state/store/store"
 import { PrimaryMetricNames, primaryMetricNamesSelector } from "../attributeSideBarPrimaryMetrics/primaryMetricNames.selector"
 import { Metric } from "../util/metric"
 
-export const _calculateSecondaryMetrics = (primaryMetricNames: PrimaryMetricNames, node?: Node) => {
+export const _calculateSecondaryMetrics = (primaryMetricNames: PrimaryMetricNames, node?: Pick<CodeMapNode, "attributes">) => {
 	if (!node) return [] as Metric[]
 
 	const primaryMetricNamesList = Object.values(primaryMetricNames)

package/app/codeCharta/ui/attributeSideBar/metricDeltaSelected/metricDeltaSelected.component.spec.ts

@@ -1,10 +1,19 @@
 import { render, screen } from "@testing-library/angular"
-
+import { mocked } from "ts-jest/utils"
+import { idToNodeSelector } from "../../../state/selectors/accumulatedData/idToNode.selector"
 import { Store } from "../../../state/store/store"
+
 import { ColorConverter } from "../../../util/color/colorConverter"
-import { CodeMapBuilding } from "../../codeMap/rendering/codeMapBuilding"
 import { MetricDeltaSelectedComponent } from "./metricDeltaSelected.component"
 
+jest.mock("../../../state/selectors/accumulatedData/idToNode.selector", () => ({
+	idToNodeSelector: jest.fn()
+}))
+const mockedIdToNodeSelector = mocked(idToNodeSelector)
+jest.mock("../../../state/store/appStatus/selectedBuildingId/selectedBuildingId.selector", () => ({
+	selectedBuildingIdSelector: () => 0
+}))
+
 describe("MetricDeltaSelectedComponent", () => {
 	const areColorsEqual = (hex: string, styleColor: string) => {
 		const formattedHex = ColorConverter.convertHexToRgba(hex).replace(/,1\)$/, ")").replace("a", "")
@@ -12,21 +21,13 @@ describe("MetricDeltaSelectedComponent", () => {
 		return formattedHex === formattedStyleColor
 	}
 
-	beforeEach(() => {
-		Store["initialize"]()
-	})
-
 	it("should not show, if there is no delta value", async () => {
 		await render(MetricDeltaSelectedComponent)
 		expect(screen.queryByText(/Δ/)).toBe(null)
 	})
 
 	it("should show in positive delta color when selected building has a positive delta value", async () => {
-		const fakeCodeMapBuilding = { node: { deltas: { rloc: 2 } } } as unknown as CodeMapBuilding
-		const state = Store.store.getState()
-		state.appStatus.selectedBuildingId = 0
-		state.lookUp.idToBuilding = new Map()
-		state.lookUp.idToBuilding.set(0, fakeCodeMapBuilding)
+		mockIdToNodeSelector({ rloc: 2 })
 
 		await render(MetricDeltaSelectedComponent, {
 			componentProperties: { metricName: "rloc" }
@@ -34,15 +35,13 @@ describe("MetricDeltaSelectedComponent", () => {
 
 		const metricDeltaSelectedDomNode = screen.queryByText(/Δ2/)
 		expect(metricDeltaSelectedDomNode).toBeTruthy()
-		expect(areColorsEqual(state.appSettings.mapColors.positiveDelta, metricDeltaSelectedDomNode.style.color)).toBe(true)
+		expect(areColorsEqual(Store.store.getState().appSettings.mapColors.positiveDelta, metricDeltaSelectedDomNode.style.color)).toBe(
+			true
+		)
 	})
 
 	it("should show in negative delta color when selected building has a negative delta value", async () => {
-		const fakeCodeMapBuilding = { node: { deltas: { rloc: -2 } } } as unknown as CodeMapBuilding
-		const state = Store.store.getState()
-		state.appStatus.selectedBuildingId = 0
-		state.lookUp.idToBuilding = new Map()
-		state.lookUp.idToBuilding.set(0, fakeCodeMapBuilding)
+		mockIdToNodeSelector({ rloc: -2 })
 
 		await render(MetricDeltaSelectedComponent, {
 			componentProperties: { metricName: "rloc" }
@@ -50,15 +49,13 @@ describe("MetricDeltaSelectedComponent", () => {
 
 		const metricDeltaSelectedDomNode = screen.queryByText(/Δ-2/)
 		expect(metricDeltaSelectedDomNode).toBeTruthy()
-		expect(areColorsEqual(state.appSettings.mapColors.negativeDelta, metricDeltaSelectedDomNode.style.color)).toBe(true)
+		expect(areColorsEqual(Store.store.getState().appSettings.mapColors.negativeDelta, metricDeltaSelectedDomNode.style.color)).toBe(
+			true
+		)
 	})
 
 	it("should update when its metricName changes", async () => {
-		const fakeCodeMapBuilding = { node: { deltas: { rloc: 2, mcc: 4 } } } as unknown as CodeMapBuilding
-		const state = Store.store.getState()
-		state.appStatus.selectedBuildingId = 0
-		state.lookUp.idToBuilding = new Map()
-		state.lookUp.idToBuilding.set(0, fakeCodeMapBuilding)
+		mockIdToNodeSelector({ rloc: 2, mcc: 4 })
 
 		const { rerender } = await render(MetricDeltaSelectedComponent, {
 			componentProperties: { metricName: "rloc" }
@@ -68,4 +65,10 @@ describe("MetricDeltaSelectedComponent", () => {
 		await rerender({ metricName: "mcc" })
 		expect(screen.queryByText(/Δ4/)).toBeTruthy()
 	})
+
+	function mockIdToNodeSelector(deltas: Record<string, unknown>) {
+		const idToNode = new Map()
+		idToNode.set(0, { id: 0, deltas })
+		mockedIdToNodeSelector.mockImplementation(() => idToNode)
+	}
 })

package/app/codeCharta/ui/attributeSideBar/metricDeltaSelected/metricDeltaSelected.component.ts

@@ -1,7 +1,7 @@
 import { Component, Inject, Input, OnInit } from "@angular/core"
 import { Observable } from "rxjs"
 
-import { MapColors, Node } from "../../../codeCharta.model"
+import { MapColors, CodeMapNode } from "../../../codeCharta.model"
 import { Store } from "../../../state/angular-redux/store"
 import { selectedNodeSelector } from "../../../state/selectors/selectedNode.selector"
 import { mapColorsSelector } from "../../../state/store/appSettings/mapColors/mapColors.selector"
@@ -13,7 +13,7 @@ import { mapColorsSelector } from "../../../state/store/appSettings/mapColors/ma
 export class MetricDeltaSelectedComponent implements OnInit {
 	@Input() metricName: string
 
-	selectedNode$: Observable<Node>
+	selectedNode$: Observable<CodeMapNode>
 	mapColors$: Observable<MapColors>
 
 	constructor(@Inject(Store) private store: Store) {}

package/app/codeCharta/ui/attributeSideBar/util/showAttributeTypeSelector.selector.spec.ts

@@ -2,10 +2,10 @@ import { _shouldShowAttributeType } from "./showAttributeTypeSelector.selector"
 
 describe("_shouldShowAttributeType", () => {
 	it("should return true for none leaves", () => {
-		expect(_shouldShowAttributeType({ isLeaf: false })).toBe(true)
+		expect(_shouldShowAttributeType({ children: [{}] })).toBe(true)
 	})
 
 	it("should return false for leaves", () => {
-		expect(_shouldShowAttributeType({ isLeaf: true })).toBe(false)
+		expect(_shouldShowAttributeType({})).toBe(false)
 	})
 })

package/app/codeCharta/ui/attributeSideBar/util/showAttributeTypeSelector.selector.ts

@@ -1,7 +1,7 @@
-import { Node } from "../../../codeCharta.model"
 import { createSelector } from "../../../state/angular-redux/store"
 import { selectedNodeSelector } from "../../../state/selectors/selectedNode.selector"
+import { isLeaf, MaybeLeaf } from "../../../util/codeMapHelper"
 
-export const _shouldShowAttributeType = (node?: Pick<Node, "isLeaf">) => !node?.isLeaf
+export const _shouldShowAttributeType = (node?: MaybeLeaf) => node && !isLeaf(node)
 
 export const showAttributeTypeSelectorSelector = createSelector([selectedNodeSelector], _shouldShowAttributeType)

package/app/codeCharta/ui/codeMap/codeMap.mouseEvent.service.spec.ts

@@ -9,31 +9,27 @@ import { getService, instantiateModule } from "../../../../mocks/ng.mockhelper"
 import { ThreeRendererService } from "./threeViewer/threeRendererService"
 import { ViewCubeMouseEventsService } from "../viewCube/viewCube.mouseEvents.service"
 import { CodeMapBuilding } from "./rendering/codeMapBuilding"
-import {
-	CODE_MAP_BUILDING,
-	CONSTANT_HIGHLIGHT,
-	FILE_META,
-	TEST_FILE_WITH_PATHS,
-	TEST_NODE_LEAF,
-	TEST_NODES,
-	withMockedEventMethods
-} from "../../util/dataMocks"
-import { BlacklistType, CCFile, CodeMapNode, Node } from "../../codeCharta.model"
+import { CODE_MAP_BUILDING, CONSTANT_HIGHLIGHT, TEST_FILE_WITH_PATHS, TEST_NODES, withMockedEventMethods } from "../../util/dataMocks"
+import { BlacklistType, CodeMapNode, Node } from "../../codeCharta.model"
 import { BlacklistService } from "../../state/store/fileSettings/blacklist/blacklist.service"
 import { FilesService } from "../../state/store/files/files.service"
 import { StoreService } from "../../state/store.service"
 import { NodeDecorator } from "../../util/nodeDecorator"
-import { setIdToBuilding } from "../../state/store/lookUp/idToBuilding/idToBuilding.actions"
-import { setIdToNode } from "../../state/store/lookUp/idToNode/idToNode.actions"
 import { klona } from "klona"
 import { CodeMapLabelService } from "./codeMap.label.service"
 import { CodeMapMesh } from "./rendering/codeMapMesh"
 import { BufferGeometry, Material, Object3D, Raycaster, Vector3 } from "three"
-import { CodeMapPreRenderService } from "./codeMap.preRender.service"
-import { LazyLoader } from "../../util/lazyLoader"
 import { ThreeViewerService } from "./threeViewer/threeViewerService"
 import { setShowMetricLabelNameValue } from "../../state/store/appSettings/showMetricLabelNameValue/showMetricLabelNameValue.actions"
 import { setShowMetricLabelNodeName } from "../../state/store/appSettings/showMetricLabelNodeName/showMetricLabelNodeName.actions"
+import { mocked } from "ts-jest/utils"
+import { idToNodeSelector } from "../../state/selectors/accumulatedData/idToNode.selector"
+import { IdToBuildingService } from "../../services/idToBuilding/idToBuilding.service"
+
+jest.mock("../../state/selectors/accumulatedData/idToNode.selector", () => ({
+	idToNodeSelector: jest.fn()
+}))
+const mockedIdToNodeSelector = mocked(idToNodeSelector)
 
 describe("codeMapMouseEventService", () => {
 	let codeMapMouseEventService: CodeMapMouseEventService
@@ -46,12 +42,11 @@ describe("codeMapMouseEventService", () => {
 	let threeUpdateCycleService: ThreeUpdateCycleService
 	let storeService: StoreService
 	let codeMapLabelService: CodeMapLabelService
-	let codeMapPreRenderService: CodeMapPreRenderService
 	let viewCubeMouseEventsService: ViewCubeMouseEventsService
 	let threeViewerService: ThreeViewerService
+	let idToBuildingService: IdToBuildingService
 
 	let codeMapBuilding: CodeMapBuilding
-	let file: CCFile
 
 	beforeEach(() => {
 		restartSystem()
@@ -84,12 +79,11 @@ describe("codeMapMouseEventService", () => {
 		threeUpdateCycleService = getService<ThreeUpdateCycleService>("threeUpdateCycleService")
 		storeService = getService<StoreService>("storeService")
 		codeMapLabelService = getService<CodeMapLabelService>("codeMapLabelService")
-		codeMapPreRenderService = getService<CodeMapPreRenderService>("codeMapPreRenderService")
 		viewCubeMouseEventsService = getService<ViewCubeMouseEventsService>("viewCubeMouseEventsService")
 		threeViewerService = getService<ThreeViewerService>("threeViewerService")
+		idToBuildingService = getService<IdToBuildingService>("idToBuilding")
 
 		codeMapBuilding = klona(CODE_MAP_BUILDING)
-		file = klona(TEST_FILE_WITH_PATHS)
 		document.body.style.cursor = CursorType.Default
 	}
 
@@ -103,9 +97,9 @@ describe("codeMapMouseEventService", () => {
 			threeUpdateCycleService,
 			storeService,
 			codeMapLabelService,
-			codeMapPreRenderService,
 			viewCubeMouseEventsService,
-			threeViewerService
+			threeViewerService,
+			idToBuildingService
 		)
 
 		codeMapMouseEventService["oldMouse"] = { x: 1, y: 1 }
@@ -350,7 +344,7 @@ describe("codeMapMouseEventService", () => {
 
 		function setAnimatedLabel(label: Object3D) {
 			// At first, animate a label
-			threeSceneService = new ThreeSceneService($rootScope, storeService)
+			threeSceneService = new ThreeSceneService($rootScope, storeService, idToBuildingService)
 			threeSceneService["mapMesh"] = new CodeMapMesh(TEST_NODES, storeService.getState(), false)
 			threeSceneService["highlighted"] = [CODE_MAP_BUILDING]
 			threeSceneService["constantHighlight"] = CONSTANT_HIGHLIGHT
@@ -387,17 +381,18 @@ describe("codeMapMouseEventService", () => {
 
 	describe("updateHovering", () => {
 		beforeEach(() => {
+			mockedIdToNodeSelector.mockImplementation(() => {
+				const idToNode = new Map<number, CodeMapNode>()
+				idToNode.set(codeMapBuilding.node.id, codeMapBuilding.node as unknown as CodeMapNode)
+				return idToNode
+			})
 			threeSceneService.getMapMesh = jest.fn().mockReturnValue({
 				checkMouseRayMeshIntersection: jest.fn()
 			})
 			codeMapMouseEventService["transformHTMLToSceneCoordinates"] = jest.fn().mockReturnValue({ x: 0, y: 1 })
 
-			const idToBuilding = new Map<number, CodeMapBuilding>()
-			idToBuilding.set(CODE_MAP_BUILDING.node.id, CODE_MAP_BUILDING)
-			const idToNode = new Map<number, CodeMapNode>()
-			idToNode.set(file.map.id, file.map)
-			storeService.dispatch(setIdToBuilding(idToBuilding))
-			storeService.dispatch(setIdToNode(idToNode))
+			idToBuildingService.setIdToBuilding([CODE_MAP_BUILDING])
+
 			threeSceneService.resetLabel = jest.fn()
 			threeSceneService.getLabelForHoveredNode = jest.fn()
 			threeSceneService.animateLabel = jest.fn()
@@ -692,18 +687,6 @@ describe("codeMapMouseEventService", () => {
 
 			expect($window.open).toHaveBeenCalledWith("NO_LINK", "_blank")
 		})
-
-		it("should call open file if selected.node.link is undefined", () => {
-			LazyLoader.openFile = jest.fn()
-			const node: Node = klona(TEST_NODE_LEAF)
-			node.isLeaf = true
-			node.link = null
-			threeSceneService.getSelectedBuilding = jest.fn().mockReturnValue(new CodeMapBuilding(200, null, node, null))
-			codeMapPreRenderService.getRenderFileMeta = jest.fn().mockReturnValue(klona(FILE_META))
-			codeMapMouseEventService.onDocumentDoubleClick()
-
-			expect(LazyLoader.openFile).toHaveBeenCalled()
-		})
 	})
 
 	describe("onDocumentMouseEnter", () => {
@@ -770,12 +753,12 @@ describe("codeMapMouseEventService", () => {
 
 	describe("hoverBuilding", () => {
 		beforeEach(() => {
-			const idToBuilding = new Map<number, CodeMapBuilding>()
-			idToBuilding.set(codeMapBuilding.node.id, codeMapBuilding)
-			const idToNode = new Map<number, CodeMapNode>()
-			idToNode.set(file.map.id, file.map)
-			storeService.dispatch(setIdToBuilding(idToBuilding))
-			storeService.dispatch(setIdToNode(idToNode))
+			mockedIdToNodeSelector.mockImplementation(() => {
+				const idToNode = new Map<number, CodeMapNode>()
+				idToNode.set(codeMapBuilding.node.id, codeMapBuilding.node as unknown as CodeMapNode)
+				return idToNode
+			})
+			idToBuildingService.setIdToBuilding([codeMapBuilding])
 		})
 
 		it("should set the highlight when to is not null", () => {

package/app/codeCharta/ui/codeMap/codeMap.mouseEvent.service.ts

@@ -13,12 +13,12 @@ import { StoreService } from "../../state/store.service"
 import { hierarchy } from "d3-hierarchy"
 import { Intersection, Object3D, Raycaster } from "three"
 import { CodeMapLabelService } from "./codeMap.label.service"
-import { LazyLoader } from "../../util/lazyLoader"
-import { CodeMapPreRenderService } from "./codeMap.preRender.service"
 import { ThreeViewerService } from "./threeViewer/threeViewerService"
 import { setHoveredBuildingPath } from "../../state/store/appStatus/hoveredBuildingPath/hoveredBuildingPath.actions"
 import { hoveredBuildingPathSelector } from "../../state/store/appStatus/hoveredBuildingPath/hoveredBuildingPath.selector"
 import { setRightClickedNodeData } from "../../state/store/appStatus/rightClickedNodeData/rightClickedNodeData.actions"
+import { idToNodeSelector } from "../../state/selectors/accumulatedData/idToNode.selector"
+import { IdToBuildingService } from "../../services/idToBuilding/idToBuilding.service"
 
 interface Coordinates {
 	x: number
@@ -71,9 +71,9 @@ export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscri
 		private threeUpdateCycleService: ThreeUpdateCycleService,
 		private storeService: StoreService,
 		private codeMapLabelService: CodeMapLabelService,
-		private codeMapPreRenderService: CodeMapPreRenderService,
 		private viewCubeMouseEventsService: ViewCubeMouseEventsService,
-		private threeViewerService: ThreeViewerService
+		private threeViewerService: ThreeViewerService,
+		private idToBuilding: IdToBuildingService
 	) {
 		"ngInject"
 		this.threeUpdateCycleService.register(() => this.threeRendererService.render())
@@ -297,10 +297,6 @@ export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscri
 				this.$window.open(sourceLink, "_blank")
 				return
 			}
-			const fileName = this.codeMapPreRenderService.getRenderFileMeta().fileName
-			if (fileName) {
-				LazyLoader.openFile(fileName, selectedBuilding.node.path)
-			}
 		}
 	}
 
@@ -396,10 +392,10 @@ export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscri
 	private hoverBuilding(hoveredBuilding: CodeMapBuilding) {
 		CodeMapMouseEventService.changeCursorIndicator(CursorType.Pointer)
 
-		const { lookUp } = this.storeService.getState()
-		const codeMapNode = lookUp.idToNode.get(hoveredBuilding.node.id)
+		const idToNode = idToNodeSelector(this.storeService.getState())
+		const codeMapNode = idToNode.get(hoveredBuilding.node.id)
 		for (const { data } of hierarchy(codeMapNode)) {
-			const building = lookUp.idToBuilding.get(data.id)
+			const building = this.idToBuilding.get(data.id)
 			if (building) {
 				this.threeSceneService.addBuildingToHighlightingList(building)
 			}