fix: keep selected metrics when excluding buildings

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 -   Fix SonarImporter requesting no metrics from SonarQube when the list of metrics was left empty [#2913](https://github.com/MaibornWolff/codecharta/pull/2913)
 -   Exclude edge metrics from custom scenarios, when there are no edge metrics available. Before it was impossible to apply those custom configs [#2928](https://github.com/MaibornWolff/codecharta/pull/2928)
 -   Fix of NoSuchMethodException due to a call of method `readNBytes()` that is not available in Java 9 with replacement call `read()` [#2930](https://github.com/MaibornWolff/codecharta/pull/2930)
+-   Keep selected metrics when excluding buildings [#2935](https://github.com/MaibornWolff/codecharta/pull/2935)
 -   Update UI correctly when toggling between standard and delta mode [#2937](https://github.com/MaibornWolff/codecharta/pull/2937)
 
 ## [1.101.1] - 2022-07-27

visualization/app/codeCharta/state/effects/resetChosenMetrics/resetChosenMetrics.effect.spec.ts

@@ -1,8 +1,10 @@
 import { ApplicationInitStatus } from "@angular/core"
 import { TestBed } from "@angular/core/testing"
-import { Subject } from "rxjs"
+import { BehaviorSubject, Subject } from "rxjs"
 import { EffectsModule } from "../../angular-redux/effects/effects.module"
 import { Store } from "../../angular-redux/store"
+import { nodeMetricDataSelector } from "../../selectors/accumulatedData/metricData/nodeMetricData.selector"
+import { areChosenMetricsAvailableSelector } from "../../selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector"
 import { setAreaMetric } from "../../store/dynamicSettings/areaMetric/areaMetric.actions"
 import { setColorMetric } from "../../store/dynamicSettings/colorMetric/colorMetric.actions"
 import { setDistributionMetric } from "../../store/dynamicSettings/distributionMetric/distributionMetric.actions"
@@ -11,8 +13,18 @@ import { ResetChosenMetricsEffect } from "./resetChosenMetrics.effect"
 
 describe("resetChosenMetricsEffect", () => {
 	let mockedNodeMetricDataSelector = new Subject()
+	const mockedAreChosenMetricsAvailableSelector = new BehaviorSubject(false)
 	const mockedStore = {
-		select: () => mockedNodeMetricDataSelector,
+		select: (selector: unknown) => {
+			switch (selector) {
+				case nodeMetricDataSelector:
+					return mockedNodeMetricDataSelector
+				case areChosenMetricsAvailableSelector:
+					return mockedAreChosenMetricsAvailableSelector
+				default:
+					throw new Error("selector is not mocked")
+			}
+		},
 		dispatch: jest.fn()
 	}
 
@@ -60,4 +72,14 @@ describe("resetChosenMetricsEffect", () => {
 		expect(mockedStore.dispatch).toHaveBeenCalledWith(setHeightMetric("loc"))
 		expect(mockedStore.dispatch).toHaveBeenCalledWith(setColorMetric("loc"))
 	})
+
+	it("should do nothing, when chosen metrics are still available", () => {
+		mockedAreChosenMetricsAvailableSelector.next(true)
+		mockedNodeMetricDataSelector.next([
+			{ name: "rloc", maxValue: 9001 },
+			{ name: "loc", maxValue: 9001 }
+		])
+
+		expect(mockedStore.dispatch).not.toHaveBeenCalled()
+	})
 })

visualization/app/codeCharta/state/effects/resetChosenMetrics/resetChosenMetrics.effect.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from "@angular/core"
-import { filter, tap } from "rxjs"
+import { filter, tap, withLatestFrom } from "rxjs"
 import { defaultNMetrics, isAnyMetricAvailable, preselectCombination } from "./utils/metricHelper"
 import { createEffect } from "../../angular-redux/effects/createEffect"
 import { Store } from "../../angular-redux/store"
@@ -9,6 +9,7 @@ import { getDefaultDistribution } from "./utils/getDefaultDistributionMetric"
 import { setAreaMetric } from "../../store/dynamicSettings/areaMetric/areaMetric.actions"
 import { setHeightMetric } from "../../store/dynamicSettings/heightMetric/heightMetric.actions"
 import { setColorMetric } from "../../store/dynamicSettings/colorMetric/colorMetric.actions"
+import { areChosenMetricsAvailableSelector } from "../../selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector"
 
 @Injectable()
 export class ResetChosenMetricsEffect {
@@ -18,7 +19,9 @@ export class ResetChosenMetricsEffect {
 		() =>
 			this.store.select(nodeMetricDataSelector).pipe(
 				filter(isAnyMetricAvailable),
-				tap(nodeMetricData => {
+				withLatestFrom(this.store.select(areChosenMetricsAvailableSelector)),
+				filter(([, areChosenMetricsAvailable]) => !areChosenMetricsAvailable),
+				tap(([nodeMetricData]) => {
 					this.store.dispatch(setDistributionMetric(getDefaultDistribution(nodeMetricData)))
 
 					let [defaultedAreaMetric, defaultedHeightMetric, defaultedColorMetric] = preselectCombination(nodeMetricData)

visualization/app/codeCharta/state/selectors/accumulatedData/metricData/nodeMetricData.selector.spec.ts

@@ -57,4 +57,9 @@ describe("nodeMetricDataSelector", () => {
 
 		expect(result.filter(x => x.name === NodeMetricDataService.UNARY_METRIC).length).toBe(1)
 	})
+
+	it("should return empty metricData when there are no files selected. If it would contain default metrics someone might falsely assume all parsing was already done", () => {
+		const result = calculateNodeMetricData([], [])
+		expect(result.length).toBe(0)
+	})
 })

visualization/app/codeCharta/state/selectors/accumulatedData/metricData/nodeMetricData.selector.ts

@@ -10,6 +10,10 @@ import { visibleFileStatesSelector } from "../../visibleFileStates.selector"
 import { sortByMetricName } from "./sortByMetricName"
 
 export const calculateNodeMetricData = (visibleFileStates: FileState[], blacklist: BlacklistItem[]) => {
+	if (visibleFileStates.length === 0) {
+		return []
+	}
+
 	const metricMaxValues: Map<string, number> = new Map()
 	const metricMinValues: Map<string, number> = new Map()
 

visualization/app/codeCharta/state/selectors/allNecessaryRenderDataAvailable/areAllNecessaryRenderDataAvailable.selector.ts

@@ -11,7 +11,7 @@ import { areMetricsAvailable } from "./utils/areMetricsAvailable"
 
 const areFileStatesAvailableSelector = createSelector([filesSelector], files => fileStatesAvailable(files))
 
-const areChosenMetricsAvailableSelector = createSelector(
+export const areChosenMetricsAvailableSelector = createSelector(
 	[nodeMetricDataSelector, areaMetricSelector, colorMetricSelector, heightMetricSelector],
 	(nodeMetricData, areaMetric, colorMetric, heightMetric) => areMetricsAvailable(nodeMetricData, [areaMetric, colorMetric, heightMetric])
 )