codecharta-visualization 1.89.0 → 1.90.0

package/app/app.module.ts

@@ -24,18 +24,28 @@ import { FilePanelStateButtonsComponent } from "./codeCharta/ui/filePanel/filePa
 import { FilePanelDeltaSelectorComponent } from "./codeCharta/ui/filePanel/filePanelDeltaSelector/filePanelDeltaSelector.component"
 import { EffectsModule } from "./codeCharta/state/angular-redux/effects/effects.module"
 import { UnfocusNodesOnLoadingMapEffect } from "./codeCharta/state/effects/unfocusNodesOnLoadingMap.effect"
+import { TrackEventUsageDataEffect } from "./codeCharta/state/effects/trackEventUsageData/trackEventUsageData.effect"
 import { AddBlacklistItemsIfNotResultsInEmptyMapEffect } from "./codeCharta/state/effects/addBlacklistItemsIfNotResultsInEmptyMap/addBlacklistItemsIfNotResultsInEmptyMap.effect"
 import { dialogs } from "./codeCharta/ui/dialogs/dialogs"
 import { threeSceneServiceProvider } from "./codeCharta/services/ajs-upgraded-providers"
 import { NodeContextMenuCardModule } from "./codeCharta/state/effects/nodeContextMenu/nodeContextMenuCard/nodeContextMenuCard.module"
 import { OpenNodeContextMenuEffect } from "./codeCharta/state/effects/nodeContextMenu/openNodeContextMenu.effect"
 import { InvertAreaOptionComponent } from "./codeCharta/ui/areaSettingsPanel/invertAreaOption/invertAreaOption.component"
+import { RemoveFileButtonComponent } from "./codeCharta/ui/filePanel/filePanelFileSelector/removeFileButton/removeFileButton.component"
+import { FocusButtonsComponent } from "./codeCharta/state/effects/nodeContextMenu/focusButtons/focusButtons.component"
+import { MarkFolderRowComponent } from "./codeCharta/state/effects/nodeContextMenu/markFolderRow/markFolderRow.component"
+import { IdToBuildingService } from "./codeCharta/services/idToBuilding/idToBuilding.service"
 
 @NgModule({
 	imports: [
 		BrowserModule,
 		UpgradeModule,
-		EffectsModule.forRoot([UnfocusNodesOnLoadingMapEffect, AddBlacklistItemsIfNotResultsInEmptyMapEffect, OpenNodeContextMenuEffect]),
+		EffectsModule.forRoot([
+			UnfocusNodesOnLoadingMapEffect,
+			AddBlacklistItemsIfNotResultsInEmptyMapEffect,
+			OpenNodeContextMenuEffect,
+			TrackEventUsageDataEffect
+		]),
 		MapTreeViewModule,
 		MatchingFilesCounterModule,
 		AttributeSideBarModule,
@@ -46,12 +56,13 @@ import { InvertAreaOptionComponent } from "./codeCharta/ui/areaSettingsPanel/inv
 		ColorPickerForMapColorModule,
 		NodeContextMenuCardModule
 	],
-	providers: [threeSceneServiceProvider],
+	providers: [threeSceneServiceProvider, IdToBuildingService],
 	declarations: [
 		FilePanelFileSelectorComponent,
 		FilePanelStateButtonsComponent,
 		FilePanelDeltaSelectorComponent,
 		InvertAreaOptionComponent,
+		RemoveFileButtonComponent,
 		...dialogs
 	],
 	entryComponents: [
@@ -66,6 +77,9 @@ import { InvertAreaOptionComponent } from "./codeCharta/ui/areaSettingsPanel/inv
 		FilePanelStateButtonsComponent,
 		FilePanelDeltaSelectorComponent,
 		InvertAreaOptionComponent,
+		FocusButtonsComponent,
+		MarkFolderRowComponent,
+		RemoveFileButtonComponent,
 		...dialogs
 	]
 })

package/app/codeCharta/assets/gameObjectsFile.json

@@ -0,0 +1,75 @@
+{
+  "gameObjectPositions": [
+    {
+      "name": "root.visualization.ui",
+      "position": {
+        "x": 159.5,
+        "y": 3.5,
+        "z": 8.5
+      },
+      "scale": {
+        "x": 5.0,
+        "y": 1.0,
+        "z": 5.0
+      }
+    },
+    {
+      "name": "root.visualization.packageLock",
+      "position": {
+        "x": 82.0,
+        "y": 5.0,
+        "z": 89.0
+      },
+      "scale": {
+        "x": 2.0,
+        "y": 4.0,
+        "z": 2.0
+      }
+    },
+    {
+      "name": "root.visualization",
+      "position": {
+        "x": 84.0,
+        "y": 2.5,
+        "z": 48.0
+      },
+      "scale": {
+        "x": 160.0,
+        "y": 1.0,
+        "z": 88.0
+      }
+    },
+    {
+      "name": "root.CHANGELOG",
+      "position": {
+        "x": 84.0,
+        "y": 2.5,
+        "z": 552.5
+      },
+      "scale": {
+        "x": 5.0,
+        "y": 1.0,
+        "z": 5.0
+      }
+    },
+    {
+      "name": "root",
+      "position": {
+        "x": 84.0,
+        "y": 0.5,
+        "z": 279.5
+      },
+      "scale": {
+        "x": 168.0,
+        "y": 1.0,
+        "z": 559.0
+      }
+    }
+  ],
+  "cycles": [
+    {
+      "from": "root.CHANGELOG",
+      "to": "root.visualization.packageLock"
+    }
+  ]
+}

package/app/codeCharta/codeCharta.model.ts

@@ -1,7 +1,6 @@
 import { Vector3 } from "three"
 import { Action } from "redux"
 import { ExportCCFile } from "./codeCharta.api.model"
-import { CodeMapBuilding } from "./ui/codeMap/rendering/codeMapBuilding"
 import { FileState } from "./model/files/files"
 import { CustomConfig } from "./model/customConfig/customConfig.api.model"
 import Rectangle from "./util/algorithm/streetLayout/rectangle"
@@ -349,7 +348,6 @@ export interface State {
 	appSettings: AppSettings
 	treeMap: TreeMapSettings
 	files: FileState[]
-	lookUp: LookUp
 	appStatus: AppStatus
 }
 
@@ -385,9 +383,8 @@ export interface CCAction extends Action {
 	//
 	// As a starting point:
 	//
-	// RecursivePartial<MetricData & DynamicSettings & LookUp & FileSettings & AppSettings & TreeMapSettings & FileState> & {
+	// RecursivePartial<MetricData & DynamicSettings & FileSettings & AppSettings & TreeMapSettings & FileState> & {
 	// 	metricData: MetricData
-	// 	lookUp: LookUp
 	// 	dynamicSettings: DynamicSettings
 	// 	fileSettings: FileSettings
 	// 	appSettings: AppSettings
@@ -397,12 +394,6 @@ export interface CCAction extends Action {
 	payload?: any
 }
 
-export interface LookUp {
-	idToNode: Map<number, CodeMapNode>
-	// note that key is id of node and NOT id of building
-	idToBuilding: Map<number, CodeMapBuilding>
-}
-
 export interface AppStatus {
 	hoveredBuildingPath: string | null
 	selectedBuildingId: number | null

package/app/codeCharta/services/idToBuilding/idToBuilding.service.ts

@@ -0,0 +1,17 @@
+import { Injectable } from "@angular/core"
+import { CodeMapBuilding } from "../../ui/codeMap/rendering/codeMapBuilding"
+
+@Injectable()
+export class IdToBuildingService {
+	private idToBuilding = new Map<number, CodeMapBuilding>()
+
+	setIdToBuilding(buildings: CodeMapBuilding[]) {
+		this.idToBuilding = new Map<number, CodeMapBuilding>()
+		for (const building of buildings) this.idToBuilding.set(building.node.id, building)
+	}
+
+	/** id is buildings' node.id */
+	get(id: number) {
+		return this.idToBuilding.get(id)
+	}
+}

package/app/codeCharta/state/effects/nodeContextMenu/highlightButtons/highlightButtons.component.spec.ts

@@ -4,45 +4,41 @@ import userEvent from "@testing-library/user-event"
 import { HighlightButtonsModule } from "./highlightButtons.module"
 import { ThreeSceneServiceToken } from "../../../../services/ajs-upgraded-providers"
 import { HighlightButtonsComponent } from "./highlightButtons.component"
-import { VALID_FILE_NODE_WITH_ID as codeMapNode } from "../../../../util/dataMocks"
-import { State } from "../../../angular-redux/state"
 import { CodeMapNode } from "../../../../codeCharta.model"
+import { IdToBuildingService } from "../../../../services/idToBuilding/idToBuilding.service"
+import { CodeMapBuilding } from "../../../../ui/codeMap/rendering/codeMapBuilding"
 
 describe("flattenButtonsComponent", () => {
-	let threeSceneService
-	let state
-
 	beforeEach(() => {
-		threeSceneService = createMockedThreeSceneService()
-		state = createMockedState()
 		TestBed.configureTestingModule({
-			imports: [HighlightButtonsModule],
-			providers: [
-				{ provide: ThreeSceneServiceToken, useValue: threeSceneService },
-				{ provide: State, useValue: state }
-			]
+			imports: [HighlightButtonsModule]
 		})
 	})
 
 	it("should let a user permanently highlight and remove permanently highlight of a node", async () => {
-		state.getValue().lookUp.idToBuilding.set(codeMapNode.id, { id: codeMapNode.id, node: codeMapNode })
+		const idToBuilding = new IdToBuildingService()
+		idToBuilding.setIdToBuilding([{ id: 0, node: { id: 0 } } as unknown as CodeMapBuilding])
 
 		const { rerender } = await render(HighlightButtonsComponent, {
 			excludeComponentDeclaration: true,
-			componentProperties: { codeMapNode }
+			componentProperties: { codeMapNode: { id: 0 } },
+			providers: [
+				{ provide: IdToBuildingService, useValue: idToBuilding },
+				{ provide: ThreeSceneServiceToken, useValue: createMockedThreeSceneService() }
+			]
 		})
 
 		expect(screen.queryByText("REMOVE HIGHLIGHT")).toBe(null)
 		userEvent.click(screen.getByText("KEEP HIGHLIGHT"))
 
-		rerender({ codeMapNode: null })
-		rerender({ codeMapNode })
+		rerender({ codeMapNode: undefined })
+		rerender({ codeMapNode: { id: 0 } })
 
 		expect(screen.queryByText("KEEP HIGHLIGHT")).toBe(null)
 		userEvent.click(screen.getByText("REMOVE HIGHLIGHT"))
 
-		rerender({ codeMapNode: null })
-		rerender({ codeMapNode })
+		rerender({ codeMapNode: undefined })
+		rerender({ codeMapNode: { id: 0 } })
 
 		expect(screen.queryByText("REMOVE HIGHLIGHT")).toBe(null)
 		expect(screen.queryByText("KEEP HIGHLIGHT")).not.toBe(null)
@@ -56,9 +52,4 @@ describe("flattenButtonsComponent", () => {
 			getConstantHighlight: () => highlighted
 		}
 	}
-
-	function createMockedState() {
-		const idToBuilding = new Map()
-		return { getValue: () => ({ lookUp: { idToBuilding } }) }
-	}
 })

package/app/codeCharta/state/effects/nodeContextMenu/highlightButtons/highlightButtons.component.ts

@@ -1,7 +1,7 @@
 import { Component, Inject, Input, OnChanges, SimpleChanges } from "@angular/core"
 import { CodeMapNode } from "../../../../codeCharta.model"
 import { ThreeSceneServiceToken } from "../../../../services/ajs-upgraded-providers"
-import { State } from "../../../angular-redux/state"
+import { IdToBuildingService } from "../../../../services/idToBuilding/idToBuilding.service"
 import { ThreeSceneService } from "../../../../ui/codeMap/threeViewer/threeSceneService"
 
 @Component({
@@ -9,11 +9,14 @@ import { ThreeSceneService } from "../../../../ui/codeMap/threeViewer/threeScene
 	template: require("./highlightButtons.component.html")
 })
 export class HighlightButtonsComponent implements OnChanges {
-	@Input() codeMapNode: CodeMapNode
+	@Input() codeMapNode: Pick<CodeMapNode, "id">
 
 	isHighlighted: boolean
 
-	constructor(@Inject(ThreeSceneServiceToken) private threeSceneService: ThreeSceneService, @Inject(State) private state: State) {}
+	constructor(
+		@Inject(ThreeSceneServiceToken) private threeSceneService: ThreeSceneService,
+		@Inject(IdToBuildingService) private idToBuilding: IdToBuildingService
+	) {}
 
 	ngOnChanges(changes: SimpleChanges): void {
 		if (changes.codeMapNode) this.isHighlighted = this.calculateIsHighlighted()
@@ -30,8 +33,7 @@ export class HighlightButtonsComponent implements OnChanges {
 	private calculateIsHighlighted() {
 		if (!this.codeMapNode) return false
 
-		const { lookUp } = this.state.getValue()
-		const codeMapBuilding = lookUp.idToBuilding.get(this.codeMapNode.id)
+		const codeMapBuilding = this.idToBuilding.get(this.codeMapNode.id)
 		if (!codeMapBuilding) return false
 
 		return this.threeSceneService.getConstantHighlight().has(codeMapBuilding.id)

package/app/codeCharta/state/effects/nodeContextMenu/nodeContextMenuCard/nodeContextMenuCard.component.spec.ts

@@ -2,6 +2,7 @@ import { TestBed } from "@angular/core/testing"
 import { render, screen } from "@testing-library/angular"
 import { mocked } from "ts-jest/utils"
 import { ThreeSceneServiceToken } from "../../../../services/ajs-upgraded-providers"
+import { IdToBuildingService } from "../../../../services/idToBuilding/idToBuilding.service"
 import { VALID_FILE_NODE_WITH_ID, VALID_NODE_WITH_PATH } from "../../../../util/dataMocks"
 import { rightClickedCodeMapNodeSelector } from "../rightClickedCodeMapNode.selector"
 import { NodeContextMenuCardComponent } from "./nodeContextMenuCard.component"
@@ -24,7 +25,8 @@ describe("NodeContextMenuCardComponent", () => {
 						removeNodeAndChildrenFromConstantHighlight: jest.fn(),
 						getConstantHighlight: jest.fn()
 					}
-				}
+				},
+				IdToBuildingService
 			]
 		})
 	})

package/app/codeCharta/state/effects/nodeContextMenu/rightClickedCodeMapNode.selector.ts

@@ -1,6 +1,6 @@
 import { createSelector } from "../../angular-redux/createSelector"
+import { idToNodeSelector } from "../../selectors/accumulatedData/idToNode.selector"
 import { rightClickedNodeDataSelector } from "../../store/appStatus/rightClickedNodeData/rightClickedNodeData.selector"
-import { idToNodeSelector } from "../../store/lookUp/idToNode/idToNode.selector"
 
 export const rightClickedCodeMapNodeSelector = createSelector(
 	[rightClickedNodeDataSelector, idToNodeSelector],

package/app/codeCharta/state/effects/trackEventUsageData/trackEventUsageData.effect.spec.ts

@@ -0,0 +1,56 @@
+import { ApplicationInitStatus } from "@angular/core"
+import { TestBed } from "@angular/core/testing"
+import { Action } from "redux"
+import { Subject } from "rxjs"
+import { mocked } from "ts-jest/utils"
+import { trackEventUsageData } from "../../../util/usageDataTracker"
+import { EffectsModule } from "../../angular-redux/effects/effects.module"
+import { areAllNecessaryRenderDataAvailableSelector } from "../../selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector"
+import { FocusedNodePathActions, focusNode } from "../../store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
+import { TrackEventUsageDataEffect } from "./trackEventUsageData.effect"
+
+jest.mock("../../selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector", () => ({
+	areAllNecessaryRenderDataAvailableSelector: jest.fn()
+}))
+const mockedAreAllNecessaryRenderDataAvailableSelector = mocked(areAllNecessaryRenderDataAvailableSelector)
+jest.mock("../../../util/usageDataTracker", () => ({
+	trackEventUsageData: jest.fn()
+}))
+const mockedTrackEventUsageData = mocked(trackEventUsageData)
+
+describe("TrackEventUsageDataEffect", () => {
+	afterEach(() => {
+		EffectsModule.actions$.complete()
+		mockedTrackEventUsageData.mockClear()
+	})
+
+	it("should ignore an action, when all necessary render data aren't available", async () => {
+		mockedAreAllNecessaryRenderDataAvailableSelector.mockImplementation(() => false)
+		await initEffects()
+		EffectsModule.actions$.next(focusNode("root/leaf.ts"))
+		expect(trackEventUsageData).not.toHaveBeenCalled()
+	})
+
+	it("should track an action, when all necessary render data are available", async () => {
+		mockedAreAllNecessaryRenderDataAvailableSelector.mockImplementation(() => true)
+		await initEffects()
+		EffectsModule.actions$.next(focusNode("root/leaf.ts"))
+		expect(trackEventUsageData).toHaveBeenCalledTimes(1)
+		expect(trackEventUsageData).toHaveBeenCalledWith(FocusedNodePathActions.FOCUS_NODE, [], "root/leaf.ts")
+	})
+
+	it("should ignore an action, which is not listed internally", async () => {
+		mockedAreAllNecessaryRenderDataAvailableSelector.mockImplementation(() => true)
+		await initEffects()
+		EffectsModule.actions$.next({ type: "I do not exist" })
+		expect(trackEventUsageData).not.toHaveBeenCalled()
+	})
+
+	async function initEffects() {
+		EffectsModule.actions$ = new Subject<Action>()
+		TestBed.configureTestingModule({
+			imports: [EffectsModule.forRoot([TrackEventUsageDataEffect])]
+		})
+		return TestBed.inject(ApplicationInitStatus).donePromise
+	}
+})

package/app/codeCharta/state/effects/trackEventUsageData/trackEventUsageData.effect.ts

@@ -0,0 +1,49 @@
+import { Inject, Injectable } from "@angular/core"
+import { combineLatest, filter, map, tap, withLatestFrom } from "rxjs"
+import { isActionOfType } from "../../../util/reduxHelper"
+import { trackEventUsageData } from "../../../util/usageDataTracker"
+import { createEffect } from "../../angular-redux/effects/createEffect"
+import { Actions, ActionsToken } from "../../angular-redux/effects/effects.module"
+import { Store } from "../../angular-redux/store"
+import { areAllNecessaryRenderDataAvailableSelector } from "../../selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector"
+import { AreaMetricActions } from "../../store/dynamicSettings/areaMetric/areaMetric.actions"
+import { ColorMetricActions } from "../../store/dynamicSettings/colorMetric/colorMetric.actions"
+import { ColorRangeActions } from "../../store/dynamicSettings/colorRange/colorRange.actions"
+import { FocusedNodePathActions } from "../../store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
+import { HeightMetricActions } from "../../store/dynamicSettings/heightMetric/heightMetric.actions"
+import { filesSelector } from "../../store/files/files.selector"
+import { BlacklistActions } from "../../store/fileSettings/blacklist/blacklist.actions"
+
+const actionsToTrackWithPayload = [
+	AreaMetricActions,
+	HeightMetricActions,
+	ColorMetricActions,
+	ColorRangeActions,
+	BlacklistActions,
+	FocusedNodePathActions
+]
+
+@Injectable()
+export class TrackEventUsageDataEffect {
+	private areAllNecessaryRenderDataAvailable$ = this.store.select(areAllNecessaryRenderDataAvailableSelector)
+	private files$ = this.store.select(filesSelector)
+
+	constructor(@Inject(ActionsToken) private actions$: Actions, @Inject(Store) private store: Store) {}
+
+	trackActionsWithPayload$ = createEffect(
+		() =>
+			combineLatest([this.actions$, this.areAllNecessaryRenderDataAvailable$]).pipe(
+				filter(
+					([action, areAllNecessaryRenderDataAvailable]) =>
+						areAllNecessaryRenderDataAvailable &&
+						actionsToTrackWithPayload.some(actionToTrack => isActionOfType(action.type, actionToTrack))
+				),
+				map(([action]) => action),
+				withLatestFrom(this.files$),
+				tap(([action, files]) => {
+					trackEventUsageData(action.type, files, action["payload"])
+				})
+			),
+		{ dispatch: false }
+	)
+}

package/app/codeCharta/state/effects/unfocusNodesOnLoadingMap.effect.ts

@@ -1,4 +1,4 @@
-import { Inject } from "@angular/core"
+import { Inject, Injectable } from "@angular/core"
 import { filter, map } from "rxjs"
 import { isAction } from "../../util/reduxHelper"
 import { createEffect } from "../angular-redux/effects/createEffect"
@@ -6,6 +6,7 @@ import { Actions, ActionsToken } from "../angular-redux/effects/effects.module"
 import { IsLoadingFileActions, SetIsLoadingFileAction } from "../store/appSettings/isLoadingFile/isLoadingFile.actions"
 import { unfocusAllNodes } from "../store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
 
+@Injectable()
 export class UnfocusNodesOnLoadingMapEffect {
 	constructor(@Inject(ActionsToken) private actions$: Actions) {}
 

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

@@ -9,8 +9,6 @@ import { PanelSelectionService } from "./store/appSettings/panelSelection/panelS
 import { EdgeMetricDataService } from "./store/metricData/edgeMetricData/edgeMetricData.service"
 import { NodeMetricDataService } from "./store/metricData/nodeMetricData/nodeMetricData.service"
 import { CameraTargetService } from "./store/appSettings/cameraTarget/cameraTarget.service"
-import { IdToNodeService } from "./store/lookUp/idToNode/idToNode.service"
-import { IdToBuildingService } from "./store/lookUp/idToBuilding/idToBuilding.service"
 import { IsAttributeSideBarVisibleService } from "./store/appSettings/isAttributeSideBarVisible/isAttributeSideBarVisible.service"
 import { FilesService } from "./store/files/files.service"
 import { SearchPanelModeService } from "./store/appSettings/searchPanelMode/searchPanelMode.service"
@@ -62,8 +60,6 @@ export class InjectorService {
 		private edgeMetricDataService: EdgeMetricDataService,
 		private nodeMetricDataService: NodeMetricDataService,
 		private cameraTargetService: CameraTargetService,
-		private idToNodeService: IdToNodeService,
-		private idToBuildingService: IdToBuildingService,
 		private isAttributeSideBarVisibleService: IsAttributeSideBarVisibleService,
 		private searchPanelModeService: SearchPanelModeService,
 		private isLoadingFileService: IsLoadingFileService,

package/app/codeCharta/state/selectors/accumulatedData/idToNode.selector.spec.ts

@@ -0,0 +1,15 @@
+import { VALID_NODES_WITH_ID } from "../../../util/dataMocks"
+import { _calculateIdToNode } from "./idToNode.selector"
+
+describe("idToNodeSelector", () => {
+	it("should return an empty Map if there is no unifiedMapNode", () => {
+		expect(_calculateIdToNode(undefined).size).toBe(0)
+	})
+
+	it("should include root node and its children", () => {
+		const idToNode = _calculateIdToNode(VALID_NODES_WITH_ID)
+		expect(idToNode.size).toBe(2)
+		expect(idToNode.get(0)).toEqual(VALID_NODES_WITH_ID)
+		expect(idToNode.get(1)).toEqual(VALID_NODES_WITH_ID.children[0])
+	})
+})

package/app/codeCharta/state/selectors/accumulatedData/idToNode.selector.ts

@@ -0,0 +1,16 @@
+import { hierarchy } from "d3-hierarchy"
+import { CodeMapNode } from "../../../codeCharta.model"
+import { createSelector } from "../../angular-redux/createSelector"
+import { unifiedMapNodeSelector } from "./unifiedMapNode.selector"
+
+export const _calculateIdToNode = (unifiedMapNode: CodeMapNode | undefined): Map<number, CodeMapNode> => {
+	if (!unifiedMapNode) return new Map()
+
+	const idToNode: Map<number, CodeMapNode> = new Map([[unifiedMapNode.id, unifiedMapNode]])
+	for (const { data } of hierarchy(unifiedMapNode)) {
+		idToNode.set(data.id, data)
+	}
+	return idToNode
+}
+
+export const idToNodeSelector = createSelector([unifiedMapNodeSelector], _calculateIdToNode)

package/app/codeCharta/state/selectors/selectedNode.selector.ts

@@ -1,4 +1,7 @@
 import { createSelector } from "../angular-redux/store"
-import { selectedBuildingSelector } from "./selectedBuilding.selector"
+import { selectedBuildingIdSelector } from "../store/appStatus/selectedBuildingId/selectedBuildingId.selector"
+import { idToNodeSelector } from "./accumulatedData/idToNode.selector"
 
-export const selectedNodeSelector = createSelector([selectedBuildingSelector], selectedBuilding => selectedBuilding?.node)
+export const selectedNodeSelector = createSelector([selectedBuildingIdSelector, idToNodeSelector], (selectedBuildingId, idToNode) =>
+	idToNode?.get(selectedBuildingId)
+)

package/app/codeCharta/state/state.module.ts

@@ -7,8 +7,6 @@ import { LabelShowNodeNameService } from "./store/appSettings/showMetricLabelNam
 import { PanelSelectionService } from "./store/appSettings/panelSelection/panelSelection.service"
 import { NodeMetricDataService } from "./store/metricData/nodeMetricData/nodeMetricData.service"
 import { CameraTargetService } from "./store/appSettings/cameraTarget/cameraTarget.service"
-import { IdToNodeService } from "./store/lookUp/idToNode/idToNode.service"
-import { IdToBuildingService } from "./store/lookUp/idToBuilding/idToBuilding.service"
 import { IsAttributeSideBarVisibleService } from "./store/appSettings/isAttributeSideBarVisible/isAttributeSideBarVisible.service"
 import { SearchPanelModeService } from "./store/appSettings/searchPanelMode/searchPanelMode.service"
 import { IsLoadingFileService } from "./store/appSettings/isLoadingFile/isLoadingFile.service"
@@ -65,8 +63,6 @@ angular
 	.service(camelCase(NodeMetricDataService.name), NodeMetricDataService)
 	.service(camelCase(PanelSelectionService.name), PanelSelectionService)
 	.service(camelCase(CameraTargetService.name), CameraTargetService)
-	.service(camelCase(IdToNodeService.name), IdToNodeService)
-	.service(camelCase(IdToBuildingService.name), IdToBuildingService)
 	.service(camelCase(IsAttributeSideBarVisibleService.name), IsAttributeSideBarVisibleService)
 	.service(camelCase(SearchPanelModeService.name), SearchPanelModeService)
 	.service(camelCase(IsLoadingFileService.name), IsLoadingFileService)

package/app/codeCharta/state/store/appSettings/isLoadingMap/isLoadingMap.reducer.ts

@@ -13,8 +13,6 @@ import { PanelSelectionActions } from "../panelSelection/panelSelection.actions"
 import { SearchPanelModeActions } from "../searchPanelMode/searchPanelMode.actions"
 import { SortingOrderAscendingActions } from "../sortingOrderAscending/sortingOrderAscending.actions"
 import { IsLoadingMapAction, IsLoadingMapActions, setIsLoadingMap } from "./isLoadingMap.actions"
-import { IdToNodeActions } from "../../lookUp/idToNode/idToNode.actions"
-import { IdToBuildingActions } from "../../lookUp/idToBuilding/idToBuilding.actions"
 
 // Todo state actions explicit instead of excluding all others; refs #1547
 const actionsToExclude = [
@@ -31,9 +29,7 @@ const actionsToExclude = [
 	HoveredBuildingPathActions,
 	FocusedNodePathActions,
 	CameraTargetActions,
-	CameraActions,
-	IdToNodeActions,
-	IdToBuildingActions
+	CameraActions
 ]
 
 export function isLoadingMap(state = setIsLoadingMap().payload, action: IsLoadingMapAction) {

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

@@ -1,6 +1,5 @@
 import { CCAction, RecursivePartial, State } from "../../codeCharta.model"
 
-import { defaultLookUp } from "./lookUp/lookUp.actions"
 import { defaultAppSettings } from "./appSettings/appSettings.actions"
 import { defaultFileSettings } from "./fileSettings/fileSettings.actions"
 import { defaultDynamicSettings } from "./dynamicSettings/dynamicSettings.actions"
@@ -29,7 +28,6 @@ export function setState(state: RecursivePartial<State> = defaultState): StateAc
 }
 
 export const defaultState: State = {
-	lookUp: defaultLookUp,
 	appSettings: defaultAppSettings,
 	fileSettings: defaultFileSettings,
 	dynamicSettings: defaultDynamicSettings,

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

@@ -1,6 +1,5 @@
 import { combineReducers } from "redux"
 
-import lookUp from "./lookUp/lookUp.reducer"
 import appSettings from "./appSettings/appSettings.reducer"
 import fileSettings from "./fileSettings/fileSettings.reducer"
 import dynamicSettings from "./dynamicSettings/dynamicSettings.reducer"
@@ -9,7 +8,6 @@ import files from "./files/files.reducer"
 import appStatus from "./appStatus/appStatus.reducer"
 
 const rootReducer = combineReducers({
-	lookUp,
 	fileSettings,
 	appSettings,
 	dynamicSettings,

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

@@ -1,13 +1,11 @@
 import { CCAction } from "../../codeCharta.model"
 import { StateActions } from "./state.actions"
 
-import { LookUpActions } from "./lookUp/lookUp.actions"
 import { DynamicSettingsActions } from "./dynamicSettings/dynamicSettings.actions"
 import { FileSettingsActions } from "./fileSettings/fileSettings.actions"
 import { AppSettingsActions } from "./appSettings/appSettings.actions"
 import { TreeMapSettingsActions } from "./treeMap/treeMap.actions"
 
-import { splitLookUpActions } from "./lookUp/lookUp.splitter"
 import { splitDynamicSettingsActions } from "./dynamicSettings/dynamicSettings.splitter"
 import { splitFileSettingsActions } from "./fileSettings/fileSettings.splitter"
 import { splitAppSettingsActions } from "./appSettings/appSettings.splitter"
@@ -15,10 +13,6 @@ import { splitTreeMapSettingsActions } from "./treeMap/treeMap.splitter"
 import { splitFilesAction } from "./files/files.splitter"
 
 export function splitStateActions(action: CCAction) {
-	if (LookUpActions[action.type] !== undefined) {
-		return splitLookUpActions(action.payload)
-	}
-
 	if (DynamicSettingsActions[action.type] !== undefined) {
 		return splitDynamicSettingsActions(action.payload)
 	}
@@ -38,10 +32,6 @@ export function splitStateActions(action: CCAction) {
 	if (StateActions[action.type] !== undefined) {
 		const actions: CCAction[] = []
 
-		if (action.payload.lookUp !== undefined) {
-			actions.push(...splitLookUpActions(action.payload.lookUp))
-		}
-
 		if (action.payload.dynamicSettings !== undefined) {
 			actions.push(...splitDynamicSettingsActions(action.payload.dynamicSettings))
 		}