codecharta-visualization 1.113.0 → 1.115.0

package/app/codeCharta/state/effects/updateFileSettings/utils/__snapshots__/blacklist.merger.spec.ts.snap

@@ -1,20 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`BlacklistMerger getMergedBlacklist should merge blacklist for different paths 1`] = `
-Array [
-  Object {
+[
+  {
     "path": "/root/nodeA",
     "type": "exclude",
   },
-  Object {
+  {
     "path": "/another/nodeB",
     "type": "flatten",
   },
-  Object {
+  {
     "path": "/another/nodeC",
     "type": "exclude",
   },
-  Object {
+  {
     "path": "*prefix/nodeD",
     "type": "flatten",
   },
@@ -22,16 +22,16 @@ Array [
 `;
 
 exports[`BlacklistMerger getMergedBlacklist should only contain unique paths+type 1`] = `
-Array [
-  Object {
+[
+  {
     "path": "/root/nodeA",
     "type": "exclude",
   },
-  Object {
+  {
     "path": "/another/nodeB",
     "type": "flatten",
   },
-  Object {
+  {
     "path": "*prefix/nodeD",
     "type": "flatten",
   },

package/app/codeCharta/state/effects/updateFileSettings/utils/__snapshots__/edges.merger.spec.ts.snap

@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EdgesMerger getMergedEdges should merge all edges if one file does not contain edges 1`] = `
-Array [
-  Object {
-    "attributes": Object {
+[
+  {
+    "attributes": {
       "attribute1": 10,
       "attribute2": 20,
     },
@@ -11,8 +11,8 @@ Array [
     "toNodeName": "/root/nodeB",
     "visible": undefined,
   },
-  Object {
-    "attributes": Object {
+  {
+    "attributes": {
       "attribute1": 10,
       "attribute2": 20,
     },
@@ -24,9 +24,9 @@ Array [
 `;
 
 exports[`EdgesMerger getMergedEdges should merge different edges 1`] = `
-Array [
-  Object {
-    "attributes": Object {
+[
+  {
+    "attributes": {
       "attribute1": 10,
       "attribute2": 20,
     },
@@ -34,8 +34,8 @@ Array [
     "toNodeName": "/root/nodeB",
     "visible": undefined,
   },
-  Object {
-    "attributes": Object {
+  {
+    "attributes": {
       "attribute1": 10,
       "attribute2": 20,
     },
@@ -47,9 +47,9 @@ Array [
 `;
 
 exports[`EdgesMerger getMergedEdges should merge edge-attributes for the same edge paths 1`] = `
-Array [
-  Object {
-    "attributes": Object {
+[
+  {
+    "attributes": {
       "attribute1": 10,
       "attribute2": 20,
       "attribute3": 30,
@@ -63,9 +63,9 @@ Array [
 `;
 
 exports[`EdgesMerger getMergedEdges should overwrite duplicated edge-attributes for the same edge 1`] = `
-Array [
-  Object {
-    "attributes": Object {
+[
+  {
+    "attributes": {
       "attribute1": 70,
       "attribute2": 80,
     },

package/app/codeCharta/state/effects/updateFileSettings/utils/__snapshots__/markedPackages.merger.spec.ts.snap

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MarkedPackagesMerger getMergedMarkedPackages should merge all markedPackages if one file does not contain markedPackages 1`] = `
-Array [
-  Object {
+[
+  {
     "color": "#ABABAB",
     "path": "/root/nodeA",
   },
-  Object {
+  {
     "color": "#FFFFFF",
     "path": "/root/nodeB",
   },
@@ -14,12 +14,12 @@ Array [
 `;
 
 exports[`MarkedPackagesMerger getMergedMarkedPackages should merge different markedPackages 1`] = `
-Array [
-  Object {
+[
+  {
     "color": "#ABABAB",
     "path": "/root/nodeA",
   },
-  Object {
+  {
     "color": "#FFFFFF",
     "path": "/root/nodeB",
   },
@@ -27,8 +27,8 @@ Array [
 `;
 
 exports[`MarkedPackagesMerger getMergedMarkedPackages should merge markedPackage-attributes for the same markedPackage paths 1`] = `
-Array [
-  Object {
+[
+  {
     "color": "#ABABAB",
     "path": "/root/nodeA",
   },
@@ -36,8 +36,8 @@ Array [
 `;
 
 exports[`MarkedPackagesMerger getMergedMarkedPackages should overwrite duplicated markedPackage-attributes for the same markedPackage 1`] = `
-Array [
-  Object {
+[
+  {
     "color": "#ABABAB",
     "path": "/root/nodeA",
   },

package/app/codeCharta/state/effects/updateFileSettings/utils/blacklist.merger.spec.ts

@@ -1,6 +1,6 @@
 import { getMergedBlacklist } from "./blacklist.merger"
 import { TEST_FILE_DATA } from "../../../../util/dataMocks"
-import { BlacklistItem, BlacklistType, CCFile } from "../../../../codeCharta.model"
+import { BlacklistItem, CCFile } from "../../../../codeCharta.model"
 import { clone } from "../../../../util/clone"
 
 describe("BlacklistMerger", () => {
@@ -16,11 +16,11 @@ describe("BlacklistMerger", () => {
 	})
 
 	describe("getMergedBlacklist", () => {
-		const blacklistItem1: BlacklistItem = { path: "/root/nodeA", type: BlacklistType.exclude }
-		const blacklistItem2: BlacklistItem = { path: "/another/nodeB", type: BlacklistType.flatten }
-		const blacklistItem3: BlacklistItem = { path: "/another/nodeC", type: BlacklistType.exclude }
-		const blacklistItem4: BlacklistItem = { path: "*prefix/nodeD", type: BlacklistType.flatten }
-		const blacklistItem1Duplicate: BlacklistItem = { path: "/root/nodeA", type: BlacklistType.exclude }
+		const blacklistItem1: BlacklistItem = { path: "/root/nodeA", type: "exclude" }
+		const blacklistItem2: BlacklistItem = { path: "/another/nodeB", type: "flatten" }
+		const blacklistItem3: BlacklistItem = { path: "/another/nodeC", type: "exclude" }
+		const blacklistItem4: BlacklistItem = { path: "*prefix/nodeD", type: "flatten" }
+		const blacklistItem1Duplicate: BlacklistItem = { path: "/root/nodeA", type: "exclude" }
 
 		it("should merge blacklist for different paths", () => {
 			file1.settings.fileSettings.blacklist = [blacklistItem1, blacklistItem2]

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

@@ -1,4 +1,4 @@
-import { Inject, Injectable } from "@angular/core"
+import { Injectable } from "@angular/core"
 import { Store } from "../../angular-redux/store"
 import { createEffect } from "../../angular-redux/effects/createEffect"
 import { map, withLatestFrom } from "rxjs"
@@ -9,7 +9,7 @@ import { getNumberOfTopLabels } from "./getNumberOfTopLabels"
 
 @Injectable()
 export class UpdateVisibleTopLabelsEffect {
-	constructor(@Inject(Store) private store: Store) {}
+	constructor(private store: Store) {}
 
 	updateVisibleTopLabels$ = createEffect(() =>
 		this.store.select(visibleFileStatesSelector).pipe(

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

@@ -0,0 +1,76 @@
+import { NodeType } from "../../../codeCharta.model"
+import { FileSelectionState, FileState } from "../../../model/files/files"
+import packageJson from "../../../../../package.json"
+import { _getUndecoratedAccumulatedData } from "./accumulatedData.selector"
+
+describe("accumulatedDataSelector", () => {
+	describe("_getUndecoratedAccumulatedData", () => {
+		const fileState1 = {
+			file: {
+				fileMeta: {
+					fileName: "file1",
+					fileChecksum: "md5-file1",
+					projectName: "Sample Project",
+					apiVersion: packageJson.codecharta.apiVersion,
+					exportedFileSize: 300_000
+				},
+				map: {
+					name: "root1",
+					type: NodeType.FOLDER,
+					path: "/root1",
+					attributes: { rloc: 170, functions: 1010, mcc: 11 },
+					children: []
+				}
+			}
+		} as unknown as FileState
+		const fileState2 = {
+			file: {
+				fileMeta: {
+					fileName: "file2",
+					fileChecksum: "md5-file2",
+					projectName: "Sample Project2",
+					apiVersion: packageJson.codecharta.apiVersion,
+					exportedFileSize: 300_000
+				},
+				map: {
+					name: "root2",
+					type: NodeType.FOLDER,
+					path: "/root2",
+					attributes: { rloc: 170, functions: 1010, mcc: 11 },
+					children: []
+				}
+			}
+		} as unknown as FileState
+
+		beforeEach(() => {
+			fileState1.selectedAs = FileSelectionState.None
+			fileState2.selectedAs = FileSelectionState.None
+		})
+
+		it("should wrap multiple selected files in a root path", () => {
+			fileState1.selectedAs = FileSelectionState.Partial
+			fileState2.selectedAs = FileSelectionState.Partial
+			const accumulatedData = _getUndecoratedAccumulatedData([fileState1, fileState2])
+			expect(accumulatedData.map.path).toBe("/root")
+		})
+
+		it("should not wrap a single selected file in a root path", () => {
+			fileState1.selectedAs = FileSelectionState.Partial
+			const accumulatedData = _getUndecoratedAccumulatedData([fileState1])
+			expect(accumulatedData.map.path).toBe("/root1")
+		})
+
+		it("should wrap a root path for delta mode", () => {
+			fileState1.selectedAs = FileSelectionState.Reference
+			fileState2.selectedAs = FileSelectionState.Comparison
+			const accumulatedData = _getUndecoratedAccumulatedData([fileState1, fileState2])
+			expect(accumulatedData.map.path).toBe("/root")
+		})
+
+		it("should not wrap a root path, when there is no comparison file in delta mode", () => {
+			fileState1.selectedAs = FileSelectionState.Reference
+			const accumulatedData = _getUndecoratedAccumulatedData([fileState1])
+			expect(accumulatedData.map.path).toBe("/root1")
+		})
+	})
+})

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

@@ -2,7 +2,6 @@ import { CodeMapNode, FileMeta } from "../../../codeCharta.model"
 import { FileState } from "../../../model/files/files"
 import { fileStatesAvailable, isDeltaState, isPartialState } from "../../../model/files/files.helper"
 import { AggregationGenerator } from "../../../util/aggregationGenerator"
-import { clone } from "../../../util/clone"
 import { NodeDecorator } from "../../../util/nodeDecorator"
 import { CcState } from "../../store/store"
 import { metricNamesSelector } from "./metricData/metricNames.selector"
@@ -28,13 +27,13 @@ export const accumulatedDataSelector: (state: CcState) => AccumulatedData = crea
 			return accumulatedDataFallback
 		}
 
-		const data = getUndecoratedAccumulatedData(fileStates)
+		const data = _getUndecoratedAccumulatedData(fileStates)
 		if (!data?.map) {
 			return accumulatedDataFallback
 		}
 
 		NodeDecorator.decorateMap(data.map, metricData, blacklist)
-		addEdgeMetricsForLeaves(data.map, metricNames)
+		addEdgeMetricsForLeaves(metricData.nodeEdgeMetricsMap, data.map, metricNames)
 		NodeDecorator.decorateParentNodesWithAggregatedAttributes(data.map, isDeltaState(fileStates), attributeTypes)
 
 		return {
@@ -44,19 +43,15 @@ export const accumulatedDataSelector: (state: CcState) => AccumulatedData = crea
 	}
 )
 
-const getUndecoratedAccumulatedData = (fileStates: FileState[]) => {
-	// TODO this cloning shouldn't be necessary. When migrating to NgRx
-	// we should find and eliminate the responsible side effects
-	const visibleFileStates = clone(fileStates)
-
+export const _getUndecoratedAccumulatedData = (fileStates: FileState[]) => {
 	if (isPartialState(fileStates)) {
-		return AggregationGenerator.getAggregationFile(visibleFileStates.map(x => x.file))
+		return AggregationGenerator.calculateAggregationFile(fileStates)
 	}
 	if (isDeltaState(fileStates)) {
-		const [reference, comparison] = visibleFileStates
+		const [reference, comparison] = fileStates
 		if (comparison && reference.file.map.name !== comparison.file.map.name) {
-			return AggregationGenerator.getAggregationFile(visibleFileStates.map(x => x.file))
+			return AggregationGenerator.calculateAggregationFile(fileStates)
 		}
-		return getDeltaFile(visibleFileStates)
+		return getDeltaFile(fileStates)
 	}
 }

package/app/codeCharta/state/selectors/accumulatedData/metricData/edgeMetricData.calculator.spec.ts

@@ -0,0 +1,46 @@
+import { calculateEdgeMetricData } from "./edgeMetricData.calculator"
+import { FILE_STATES, VALID_NODE_WITH_PATH } from "../../../../util/dataMocks"
+import { FileState } from "../../../../model/files/files"
+import { clone } from "../../../../util/clone"
+
+describe("edgeMetricDataCalculator", () => {
+	let fileStates: FileState[]
+
+	beforeEach(() => {
+		fileStates = clone(FILE_STATES)
+		fileStates[0].file.map = clone(VALID_NODE_WITH_PATH)
+	})
+
+	it("should create correct edge Metrics", () => {
+		const { edgeMetricData } = calculateEdgeMetricData(fileStates, [])
+
+		expect(edgeMetricData.map(x => x.name)).toContain("pairingRate")
+		expect(edgeMetricData.map(x => x.name)).toContain("otherMetric")
+	})
+
+	it("should calculate correct maximum value for edge Metrics", () => {
+		const { edgeMetricData } = calculateEdgeMetricData(fileStates, [])
+
+		expect(edgeMetricData.find(x => x.name === "pairingRate").maxValue).toEqual(2)
+		expect(edgeMetricData.find(x => x.name === "otherMetric").maxValue).toEqual(1)
+	})
+
+	it("should sort the metrics after calculating them", () => {
+		const { edgeMetricData } = calculateEdgeMetricData(fileStates, [])
+
+		expect(edgeMetricData).toHaveLength(3)
+		expect(edgeMetricData[0].name).toBe("avgCommits")
+		expect(edgeMetricData[1].name).toBe("otherMetric")
+		expect(edgeMetricData[2].name).toBe("pairingRate")
+	})
+
+	it("should provide nodeEdgeMetricsMap", () => {
+		const { nodeEdgeMetricsMap } = calculateEdgeMetricData(fileStates, [])
+
+		const pairingRateMapKeys = [...nodeEdgeMetricsMap.get("pairingRate").keys()]
+
+		expect(pairingRateMapKeys[0]).toEqual("/root/big leaf")
+		expect(pairingRateMapKeys[1]).toEqual("/root/Parent Leaf/small leaf")
+		expect(pairingRateMapKeys[2]).toEqual("/root/Parent Leaf/other small leaf")
+	})
+})

package/app/codeCharta/state/selectors/accumulatedData/metricData/{edgeMetricData.selector.ts → edgeMetricData.calculator.ts}

@@ -1,31 +1,15 @@
 import { hierarchy } from "d3-hierarchy"
-import { BlacklistItem, BlacklistType, Edge, EdgeMetricCount, EdgeMetricData } from "../../../../codeCharta.model"
+import { BlacklistItem, Edge, EdgeMetricCount, EdgeMetricData } from "../../../../codeCharta.model"
 import { FileState } from "../../../../model/files/files"
 import { isPathBlacklisted } from "../../../../util/codeMapHelper"
-import { createSelector } from "../../../angular-redux/createSelector"
-import { blacklistSelector } from "../../../store/fileSettings/blacklist/blacklist.selector"
-import { visibleFileStatesSelector } from "../../visibleFileStates.selector"
 import { sortByMetricName } from "./sortByMetricName"
 
 export type EdgeMetricCountMap = Map<string, EdgeMetricCount>
 export type NodeEdgeMetricsMap = Map<string, EdgeMetricCountMap>
-/** @deprecated use edgeMetricMapSelector instead to ensure unidirectional data flow and prevent random manipulation */
-export let nodeEdgeMetricsMap: NodeEdgeMetricsMap = new Map()
-
-const edgeMetricDataAndMapSelector = createSelector([visibleFileStatesSelector, blacklistSelector], calculateEdgeMetricData)
-
-export const edgeMetricDataSelector = createSelector(
-	[edgeMetricDataAndMapSelector],
-	edgeMetricDataAndMap => edgeMetricDataAndMap.sortedEdgeMetricList
-)
-
-export const edgeMetricMapSelector = createSelector(
-	[edgeMetricDataAndMapSelector],
-	edgeMetricDataAndMap => edgeMetricDataAndMap.nodeEdgeMetricsMap
-)
 
 export function calculateEdgeMetricData(visibleFileStates: FileState[], blacklist: BlacklistItem[]) {
-	nodeEdgeMetricsMap = new Map()
+	const nodeEdgeMetricsMap: NodeEdgeMetricsMap = new Map()
+
 	const allFilePaths: Set<string> = new Set()
 
 	for (const { file } of visibleFileStates) {
@@ -39,28 +23,28 @@ export function calculateEdgeMetricData(visibleFileStates: FileState[], blacklis
 			if (bothNodesAssociatedAreVisible(edge, allFilePaths, blacklist)) {
 				// TODO: We likely only need the attributes once per file.
 				for (const edgeMetric of Object.keys(edge.attributes)) {
-					const edgeMetricEntry = getEntryForMetric(edgeMetric)
+					const edgeMetricEntry = updateEntryForMetric(nodeEdgeMetricsMap, edgeMetric)
 					addEdgeToNodes(edgeMetricEntry, edge.fromNodeName, edge.toNodeName)
 				}
 			}
 		}
 	}
-	const newEdgeMetricData = getMetricDataFromMap()
+	const newEdgeMetricData = getMetricDataFromMap(nodeEdgeMetricsMap)
 	sortByMetricName(newEdgeMetricData)
-	return { sortedEdgeMetricList: newEdgeMetricData, nodeEdgeMetricsMap }
+	return {
+		edgeMetricData: newEdgeMetricData,
+		nodeEdgeMetricsMap
+	}
 }
 
 function bothNodesAssociatedAreVisible(edge: Edge, filePaths: Set<string>, blacklist: BlacklistItem[]) {
 	if (filePaths.has(edge.fromNodeName) && filePaths.has(edge.toNodeName)) {
-		return (
-			!isPathBlacklisted(edge.fromNodeName, blacklist, BlacklistType.exclude) &&
-			!isPathBlacklisted(edge.toNodeName, blacklist, BlacklistType.exclude)
-		)
+		return !isPathBlacklisted(edge.fromNodeName, blacklist, "exclude") && !isPathBlacklisted(edge.toNodeName, blacklist, "exclude")
 	}
 	return false
 }
 
-function getEntryForMetric(edgeMetricName: string) {
+function updateEntryForMetric(nodeEdgeMetricsMap: NodeEdgeMetricsMap, edgeMetricName: string) {
 	let nodeEdgeMetric = nodeEdgeMetricsMap.get(edgeMetricName)
 	if (!nodeEdgeMetric) {
 		nodeEdgeMetric = new Map()
@@ -85,7 +69,7 @@ function addEdgeToNodes(edgeMetricEntry: EdgeMetricCountMap, fromNode: string, t
 	}
 }
 
-function getMetricDataFromMap() {
+function getMetricDataFromMap(nodeEdgeMetricsMap: NodeEdgeMetricsMap) {
 	const metricData: EdgeMetricData[] = []
 
 	for (const [edgeMetric, occurrences] of nodeEdgeMetricsMap) {

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

@@ -1,8 +1,12 @@
 import { createSelector } from "../../../angular-redux/createSelector"
-import { edgeMetricDataSelector } from "./edgeMetricData.selector"
-import { nodeMetricDataSelector } from "./nodeMetricData.selector"
+import { blacklistSelector } from "../../../store/fileSettings/blacklist/blacklist.selector"
+import { visibleFileStatesSelector } from "../../visibleFileStates.selector"
+import { calculateEdgeMetricData } from "./edgeMetricData.calculator"
+import { calculateNodeMetricData } from "./nodeMetricData.calculator"
 
-export const metricDataSelector = createSelector([nodeMetricDataSelector, edgeMetricDataSelector], (nodeMetricData, edgeMetricData) => ({
-	nodeMetricData,
-	edgeMetricData
-}))
+export const metricDataSelector = createSelector([visibleFileStatesSelector, blacklistSelector], (visibleFileStates, blacklist) => {
+	return {
+		nodeMetricData: calculateNodeMetricData(visibleFileStates, blacklist),
+		...calculateEdgeMetricData(visibleFileStates, blacklist)
+	}
+})

package/app/codeCharta/state/selectors/accumulatedData/metricData/metricNames.selector.spec.ts

@@ -1,15 +1,15 @@
 import { CcState } from "../../../store/store"
-import { edgeMetricDataSelector } from "./edgeMetricData.selector"
+import { metricDataSelector } from "./metricData.selector"
 import { metricNamesSelector } from "./metricNames.selector"
 
-const mockedEdgeMetricDataSelector = edgeMetricDataSelector as unknown as jest.Mock
-jest.mock("./edgeMetricData.selector", () => ({
-	edgeMetricDataSelector: jest.fn()
+const mockedMetricDataSelector = metricDataSelector as unknown as jest.Mock
+jest.mock("./metricData.selector", () => ({
+	metricDataSelector: jest.fn()
 }))
 
 describe("metricNamesSelector", () => {
 	it("should get the names of the metrics", () => {
-		mockedEdgeMetricDataSelector.mockImplementationOnce(() => [{ name: "metricOfTruth" }, { name: "otherMetric" }])
+		mockedMetricDataSelector.mockImplementationOnce(() => ({ edgeMetricData: [{ name: "metricOfTruth" }, { name: "otherMetric" }] }))
 
 		expect(metricNamesSelector({} as unknown as CcState)).toEqual(["metricOfTruth", "otherMetric"])
 	})

package/app/codeCharta/state/selectors/accumulatedData/metricData/metricNames.selector.ts

@@ -1,4 +1,4 @@
 import { createSelector } from "../../../angular-redux/createSelector"
-import { edgeMetricDataSelector } from "./edgeMetricData.selector"
+import { metricDataSelector } from "./metricData.selector"
 
-export const metricNamesSelector = createSelector([edgeMetricDataSelector], edgeMetricData => edgeMetricData.map(x => x.name))
+export const metricNamesSelector = createSelector([metricDataSelector], metricData => metricData.edgeMetricData.map(x => x.name))

package/app/codeCharta/state/selectors/accumulatedData/metricData/{nodeMetricData.selector.spec.ts → nodeMetricData.calculator.spec.ts}

@@ -1,11 +1,10 @@
 import { TEST_DELTA_MAP_A, VALID_NODE_WITH_ROOT_UNARY } from "../../../../util/dataMocks"
 import { FileSelectionState, FileState } from "../../../../model/files/files"
-import { BlacklistType } from "../../../../codeCharta.model"
 import { NodeDecorator } from "../../../../util/nodeDecorator"
 import { clone } from "../../../../util/clone"
-import { calculateNodeMetricData, UNARY_METRIC } from "./nodeMetricData.selector"
+import { calculateNodeMetricData, UNARY_METRIC } from "./nodeMetricData.calculator"
 
-describe("nodeMetricDataSelector", () => {
+describe("nodeMetricDataCalculator", () => {
 	let fileState: FileState
 
 	beforeEach(() => {
@@ -38,7 +37,7 @@ describe("nodeMetricDataSelector", () => {
 			{ maxValue: 1, minValue: 1, name: UNARY_METRIC }
 		]
 
-		const result = calculateNodeMetricData([fileState], [{ path: "root/big leaf", type: BlacklistType.exclude }])
+		const result = calculateNodeMetricData([fileState], [{ path: "root/big leaf", type: "exclude" }])
 
 		expect(result).toEqual(expected)
 	})

package/app/codeCharta/state/selectors/accumulatedData/metricData/{nodeMetricData.selector.ts → nodeMetricData.calculator.ts}

@@ -1,11 +1,8 @@
 import { hierarchy } from "d3-hierarchy"
 
-import { BlacklistItem, BlacklistType, NodeMetricData } from "../../../../codeCharta.model"
+import { BlacklistItem, NodeMetricData } from "../../../../codeCharta.model"
 import { FileState } from "../../../../model/files/files"
 import { isLeaf, isPathBlacklisted } from "../../../../util/codeMapHelper"
-import { createSelector } from "../../../angular-redux/createSelector"
-import { blacklistSelector } from "../../../store/fileSettings/blacklist/blacklist.selector"
-import { visibleFileStatesSelector } from "../../visibleFileStates.selector"
 import { sortByMetricName } from "./sortByMetricName"
 
 export const UNARY_METRIC = "unary"
@@ -20,7 +17,7 @@ export const calculateNodeMetricData = (visibleFileStates: FileState[], blacklis
 
 	for (const { file } of visibleFileStates) {
 		for (const node of hierarchy(file.map)) {
-			if (isLeaf(node) && node.data.path && !isPathBlacklisted(node.data.path, blacklist, BlacklistType.exclude)) {
+			if (isLeaf(node) && node.data.path && !isPathBlacklisted(node.data.path, blacklist, "exclude")) {
 				for (const metric of Object.keys(node.data.attributes)) {
 					const maxValue = metricMaxValues.get(metric)
 					const minValue = metricMinValues.get(metric)
@@ -54,5 +51,3 @@ export const calculateNodeMetricData = (visibleFileStates: FileState[], blacklis
 	sortByMetricName(metricData)
 	return metricData
 }
-
-export const nodeMetricDataSelector = createSelector([visibleFileStatesSelector, blacklistSelector], calculateNodeMetricData)

package/app/codeCharta/state/selectors/accumulatedData/metricData/selectedColorMetricData.selector.ts

@@ -1,7 +1,7 @@
 import { createSelector } from "../../../angular-redux/createSelector"
 import { colorMetricSelector } from "../../../store/dynamicSettings/colorMetric/colorMetric.selector"
 import { CcState } from "../../../store/store"
-import { nodeMetricDataSelector } from "./nodeMetricData.selector"
+import { metricDataSelector } from "./metricData.selector"
 
 export type MetricMinMax = {
 	minValue: number
@@ -9,9 +9,9 @@ export type MetricMinMax = {
 }
 
 export const selectedColorMetricDataSelector: (state: CcState) => MetricMinMax = createSelector(
-	[nodeMetricDataSelector, colorMetricSelector],
-	(nodeMetricData, colorMetric) => {
-		const data = nodeMetricData.find(x => x.name === colorMetric)
+	[metricDataSelector, colorMetricSelector],
+	(metricData, colorMetric) => {
+		const data = metricData.nodeMetricData.find(x => x.name === colorMetric)
 		return {
 			minValue: data?.minValue ?? 0,
 			maxValue: data?.maxValue ?? 0

package/app/codeCharta/state/selectors/accumulatedData/utils/addEdgeMetricsForLeaves.ts

@@ -1,16 +1,17 @@
 import { hierarchy } from "d3-hierarchy"
 import { CodeMapNode } from "../../../../codeCharta.model"
 import { isLeaf } from "../../../../util/codeMapHelper"
+import { NodeEdgeMetricsMap } from "../metricData/edgeMetricData.calculator"
 import { getMetricValuesForNode } from "./getMetricValuesForNode"
 
-export const addEdgeMetricsForLeaves = (map: CodeMapNode, metricNames: string[]) => {
+export const addEdgeMetricsForLeaves = (nodeEdgeMetricsMap: NodeEdgeMetricsMap, map: CodeMapNode, metricNames: string[]) => {
 	if (metricNames.length === 0) {
 		return
 	}
 
 	for (const node of hierarchy(map)) {
 		if (isLeaf(node)) {
-			const edgeMetrics = getMetricValuesForNode(node, metricNames)
+			const edgeMetrics = getMetricValuesForNode(nodeEdgeMetricsMap, node, metricNames)
 			for (const [key, value] of edgeMetrics) {
 				node.data.edgeAttributes[key] = value
 			}

package/app/codeCharta/state/selectors/accumulatedData/utils/getMetricValuesForNode.spec.ts

@@ -1,23 +1,16 @@
 import { HierarchyNode } from "d3-hierarchy"
 import { CodeMapNode } from "../../../../codeCharta.model"
+import { NodeEdgeMetricsMap, EdgeMetricCountMap } from "../metricData/edgeMetricData.calculator"
 import { getMetricValuesForNode } from "./getMetricValuesForNode"
 
-jest.mock("../metricData/edgeMetricData.selector", () => ({
-	nodeEdgeMetricsMap: {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		get: (_metricName: string) => ({
-			// eslint-disable-next-line @typescript-eslint/no-unused-vars
-			get: (_path: string) => ({ incoming: 0, outgoing: 1 })
-		})
-	}
-}))
-
 describe("getMetricValuesForNode", () => {
 	it("should return Edge Metric counts for node", () => {
 		const metricNames = ["pairingRate"]
 		const node = { data: { path: "/root/big leaf" } } as HierarchyNode<CodeMapNode>
+		const nodesEdgeMetricCountMap: EdgeMetricCountMap = new Map([["/root/big leaf", { incoming: 0, outgoing: 1 }]])
+		const nodeEdgeMetricsMap: NodeEdgeMetricsMap = new Map([["pairingRate", nodesEdgeMetricCountMap]])
 
-		const metricsForNode = getMetricValuesForNode(node, metricNames)
+		const metricsForNode = getMetricValuesForNode(nodeEdgeMetricsMap, node, metricNames)
 
 		expect(metricsForNode.get(metricNames[0])).toEqual({ incoming: 0, outgoing: 1 })
 	})

package/app/codeCharta/state/selectors/accumulatedData/utils/getMetricValuesForNode.ts

@@ -1,8 +1,8 @@
 import { HierarchyNode } from "d3-hierarchy"
 import { CodeMapNode } from "../../../../codeCharta.model"
-import { EdgeMetricCountMap, nodeEdgeMetricsMap } from "../metricData/edgeMetricData.selector"
+import { EdgeMetricCountMap, NodeEdgeMetricsMap } from "../metricData/edgeMetricData.calculator"
 
-export const getMetricValuesForNode = (node: HierarchyNode<CodeMapNode>, metricNames: string[]) => {
+export const getMetricValuesForNode = (nodeEdgeMetricsMap: NodeEdgeMetricsMap, node: HierarchyNode<CodeMapNode>, metricNames: string[]) => {
 	const nodeEdgeMetrics: EdgeMetricCountMap = new Map()
 
 	for (const metricName of metricNames) {