codecharta-visualization 1.86.0 → 1.87.0

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

@@ -2,27 +2,26 @@ import "./artificialIntelligence.module"
 import { instantiateModule, getService } from "../../../../mocks/ng.mockhelper"
 import { IRootScopeService } from "angular"
 import { StoreService } from "../../state/store.service"
-import { ThreeOrbitControlsService } from "../codeMap/threeViewer/threeOrbitControlsService"
-import { ThreeCameraService } from "../codeMap/threeViewer/threeCameraService"
 import { ArtificialIntelligenceController } from "./artificialIntelligence.component"
 import { FilesService } from "../../state/store/files/files.service"
-import { CustomConfig } from "../../model/customConfig/customConfig.api.model"
-import { CustomConfigHelper } from "../../util/customConfigHelper"
 import { setFiles } from "../../state/store/files/files.actions"
-import { FILE_STATES, FILE_STATES_JAVA, FILE_STATES_UNSELECTED } from "../../util/dataMocks"
-import { setState } from "../../state/store/state.actions"
+import { FILE_STATES, FILE_STATES_JAVA, FILE_STATES_UNSELECTED, STATE } from "../../util/dataMocks"
 import { klona } from "klona"
-import { BlacklistType } from "../../codeCharta.model"
+import { BlacklistType, ColorRange } from "../../codeCharta.model"
 import { BlacklistService } from "../../state/store/fileSettings/blacklist/blacklist.service"
 import { ExperimentalFeaturesEnabledService } from "../../state/store/appSettings/enableExperimentalFeatures/experimentalFeaturesEnabled.service"
 import { setExperimentalFeaturesEnabled } from "../../state/store/appSettings/enableExperimentalFeatures/experimentalFeaturesEnabled.actions"
+import { setColorRange } from "../../state/store/dynamicSettings/colorRange/colorRange.actions"
+import { setColorMetric } from "../../state/store/dynamicSettings/colorMetric/colorMetric.actions"
+import { setHeightMetric } from "../../state/store/dynamicSettings/heightMetric/heightMetric.actions"
+import { setAreaMetric } from "../../state/store/dynamicSettings/areaMetric/areaMetric.actions"
+import { setMapColors } from "../../state/store/appSettings/mapColors/mapColors.actions"
+import { setState } from "../../state/store/state.actions"
 
 describe("ArtificialIntelligenceController", () => {
 	let artificialIntelligenceController: ArtificialIntelligenceController
 	let $rootScope: IRootScopeService
 	let storeService: StoreService
-	let threeOrbitControlsService: ThreeOrbitControlsService
-	let threeCameraService: ThreeCameraService
 
 	beforeEach(() => {
 		restartSystem()
@@ -34,19 +33,12 @@ describe("ArtificialIntelligenceController", () => {
 
 		$rootScope = getService<IRootScopeService>("$rootScope")
 		storeService = getService<StoreService>("storeService")
-		threeOrbitControlsService = getService<ThreeOrbitControlsService>("storeService")
-		threeCameraService = getService<ThreeCameraService>("storeService")
 
 		storeService.dispatch(setFiles(FILE_STATES))
 	}
 
 	function rebuildController() {
-		artificialIntelligenceController = new ArtificialIntelligenceController(
-			$rootScope,
-			storeService,
-			threeOrbitControlsService,
-			threeCameraService
-		)
+		artificialIntelligenceController = new ArtificialIntelligenceController($rootScope, storeService)
 
 		// Overwrite debounce with original function, otherwise calculate() will not be called
 		artificialIntelligenceController["debounceCalculation"] = artificialIntelligenceController["calculate"]
@@ -83,7 +75,7 @@ describe("ArtificialIntelligenceController", () => {
 			artificialIntelligenceController["getMostFrequentLanguage"] = jest.fn()
 			artificialIntelligenceController["clearRiskProfile"] = jest.fn()
 			artificialIntelligenceController["calculateRiskProfile"] = jest.fn()
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 			artificialIntelligenceController["fileState"] = FILE_STATES_JAVA[0]
 
 			storeService.dispatch(setExperimentalFeaturesEnabled(false))
@@ -92,14 +84,14 @@ describe("ArtificialIntelligenceController", () => {
 			expect(artificialIntelligenceController["getMostFrequentLanguage"]).not.toHaveBeenCalled()
 			expect(artificialIntelligenceController["clearRiskProfile"]).not.toHaveBeenCalled()
 			expect(artificialIntelligenceController["calculateRiskProfile"]).not.toHaveBeenCalled()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).not.toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).not.toHaveBeenCalled()
 		})
 
 		it("should calculate suspicious metrics when experimental features are enabled", function () {
 			artificialIntelligenceController["getMostFrequentLanguage"] = jest.fn().mockReturnValue("java")
 			artificialIntelligenceController["clearRiskProfile"] = jest.fn()
 			artificialIntelligenceController["calculateRiskProfile"] = jest.fn()
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 			artificialIntelligenceController["fileState"] = FILE_STATES_JAVA[0]
 
 			storeService.dispatch(setExperimentalFeaturesEnabled(true))
@@ -109,28 +101,72 @@ describe("ArtificialIntelligenceController", () => {
 			expect(artificialIntelligenceController["_viewModel"].analyzedProgrammingLanguage).toBe("java")
 			expect(artificialIntelligenceController["clearRiskProfile"]).toHaveBeenCalled()
 			expect(artificialIntelligenceController["calculateRiskProfile"]).toHaveBeenCalled()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).toHaveBeenCalled()
 		})
 	})
 
-	describe("apply custom Config", () => {
-		it("should call store.dispatch", () => {
-			const customConfigStub = {
-				stateSettings: {
-					dynamicSettings: {
-						margin: 1,
-						colorRange: { from: 1, to: 2 }
-					}
-				}
-			} as CustomConfig
+	describe("apply suspicious metric", () => {
+		it("should call store.dispatch with all needed states for desired suspicious metric view", () => {
+			storeService.dispatch(setState(STATE))
+			const testMetricSuggestionParameters = {
+				metric: "loc",
+				from: 365,
+				to: 554,
+				max: 0,
+				min: 0,
+				isOutlier: undefined
+			}
+
+			const colorRange: ColorRange = {
+				from: testMetricSuggestionParameters.from,
+				to: testMetricSuggestionParameters.to,
+				max: 0,
+				min: 0
+			}
 
-			CustomConfigHelper.getCustomConfigSettings = jest.fn().mockReturnValue(customConfigStub)
+			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks = [testMetricSuggestionParameters]
 			storeService.dispatch = jest.fn()
-			threeOrbitControlsService.setControlTarget = jest.fn()
+			artificialIntelligenceController.applySuspiciousMetric(testMetricSuggestionParameters, false)
 
-			artificialIntelligenceController.applyCustomConfig("CustomConfig1")
+			expect(storeService.dispatch).toHaveBeenCalledWith(setAreaMetric("rloc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setHeightMetric("loc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setColorMetric("loc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setColorRange(colorRange))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setMapColors(STATE.appSettings.mapColors))
+		})
 
-			expect(storeService.dispatch).toHaveBeenCalledWith(setState(customConfigStub.stateSettings))
+		it("should call store.dispatch with all needed states for desired very high risk metric view", () => {
+			storeService.dispatch(setState(STATE))
+			const mapColors = { ...STATE.appSettings.mapColors }
+			mapColors.positive = "#ffffff"
+			mapColors.neutral = "#ffffff"
+			mapColors.negative = "#A900C0"
+
+			const testMetricSuggestionParameters = {
+				metric: "loc",
+				from: 365,
+				to: 554,
+				max: 0,
+				min: 0,
+				isOutlier: true
+			}
+
+			const colorRange: ColorRange = {
+				from: testMetricSuggestionParameters.from,
+				to: testMetricSuggestionParameters.to,
+				max: 0,
+				min: 0
+			}
+
+			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks = [testMetricSuggestionParameters]
+			storeService.dispatch = jest.fn()
+			artificialIntelligenceController.applySuspiciousMetric(testMetricSuggestionParameters, true)
+
+			expect(storeService.dispatch).toHaveBeenCalledWith(setAreaMetric("rloc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setHeightMetric("loc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setColorMetric("loc"))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setColorRange(colorRange))
+			expect(storeService.dispatch).toHaveBeenCalledWith(setMapColors(mapColors))
 		})
 	})
 
@@ -141,7 +177,7 @@ describe("ArtificialIntelligenceController", () => {
 			expect(artificialIntelligenceController["getMostFrequentLanguage"]).not.toHaveBeenCalled()
 		})
 
-		it("should not calculate risk profile and suggest custom configs on empty main programming language", () => {
+		it("should not calculate risk profile and suspicious metrics on empty main programming language", () => {
 			artificialIntelligenceController["clearRiskProfile"] = jest.fn()
 			artificialIntelligenceController["calculateRiskProfile"] = jest.fn()
 			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
@@ -155,7 +191,7 @@ describe("ArtificialIntelligenceController", () => {
 
 		it("should clear and calculate risk profile for Java map", () => {
 			artificialIntelligenceController["clearRiskProfile"] = jest.fn()
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 
 			storeService.dispatch(setExperimentalFeaturesEnabled(true))
 			artificialIntelligenceController.onFilesSelectionChanged(FILE_STATES_JAVA)
@@ -163,7 +199,7 @@ describe("ArtificialIntelligenceController", () => {
 			expect(artificialIntelligenceController["_viewModel"].analyzedProgrammingLanguage).toBe("java")
 			expect(artificialIntelligenceController["clearRiskProfile"]).toHaveBeenCalled()
 			expect(artificialIntelligenceController["_viewModel"].riskProfile).toMatchSnapshot()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).toHaveBeenCalled()
 		})
 
 		it("should calculate risk profile and should not exceed 100 percent", () => {
@@ -182,7 +218,7 @@ describe("ArtificialIntelligenceController", () => {
 			expect(sumOfRiskPercentage).toEqual(100)
 		})
 
-		it("should create custom config suggestions sorted by outlierCustomConfigId", () => {
+		it("should calculate suspicious metrics sorted by isOutlier", () => {
 			artificialIntelligenceController["clearRiskProfile"] = jest.fn()
 			artificialIntelligenceController["calculateRiskProfile"] = jest.fn()
 
@@ -193,18 +229,12 @@ describe("ArtificialIntelligenceController", () => {
 			expect(artificialIntelligenceController["clearRiskProfile"]).toHaveBeenCalled()
 			expect(artificialIntelligenceController["calculateRiskProfile"]).toHaveBeenCalled()
 
-			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks[0].generalCustomConfigId = "mocked"
-			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks[0].outlierCustomConfigId = "mocked"
-			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks[1].generalCustomConfigId = "mocked"
-			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks[1].outlierCustomConfigId = "mocked"
-			artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks[2].generalCustomConfigId = "mocked"
-
 			expect(artificialIntelligenceController["_viewModel"].suspiciousMetricSuggestionLinks).toMatchSnapshot()
 			expect(artificialIntelligenceController["_viewModel"].unsuspiciousMetrics).toMatchSnapshot()
 		})
 
 		it("should calculate risk profile for not excluded files only", () => {
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 
 			const codeMapNodeToExclude = FILE_STATES_JAVA[0].file.map.children[0].children[0]
 
@@ -220,11 +250,11 @@ describe("ArtificialIntelligenceController", () => {
 
 			expect(artificialIntelligenceController["_viewModel"].analyzedProgrammingLanguage).toBe("java")
 			expect(artificialIntelligenceController["_viewModel"].riskProfile).toMatchSnapshot()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).toHaveBeenCalled()
 		})
 
 		it("should calculate risk profile but skip files with missing metrics", () => {
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 
 			const FILE_STATES_MISSING_METRICS = klona(FILE_STATES_JAVA)
 			for (const codeMapNode of FILE_STATES_MISSING_METRICS[0].file.map.children) {
@@ -238,12 +268,12 @@ describe("ArtificialIntelligenceController", () => {
 
 			expect(artificialIntelligenceController["_viewModel"].analyzedProgrammingLanguage).toBe("java")
 			expect(artificialIntelligenceController["_viewModel"].riskProfile).toBeUndefined()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).toHaveBeenCalled()
 		})
 
-		it("should calculate risk profile and add custom configs for maps with other programming languages", () => {
+		it("should calculate risk profile and suspicious metrics for maps with other programming languages", () => {
 			artificialIntelligenceController["calculateRiskProfile"] = jest.fn()
-			artificialIntelligenceController["createCustomConfigSuggestions"] = jest.fn()
+			artificialIntelligenceController["calculateSuspiciousMetrics"] = jest.fn()
 
 			const FILE_STATES_OTHER = klona(FILE_STATES_JAVA)
 			for (const codeMapNode of FILE_STATES_OTHER[0].file.map.children) {
@@ -257,7 +287,7 @@ describe("ArtificialIntelligenceController", () => {
 
 			expect(artificialIntelligenceController["_viewModel"].analyzedProgrammingLanguage).toBe("other")
 			expect(artificialIntelligenceController["calculateRiskProfile"]).toHaveBeenCalled()
-			expect(artificialIntelligenceController["createCustomConfigSuggestions"]).toHaveBeenCalled()
+			expect(artificialIntelligenceController["calculateSuspiciousMetrics"]).toHaveBeenCalled()
 		})
 	})
 

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

@@ -3,19 +3,13 @@ import debounce from "lodash.debounce"
 import { FilesSelectionSubscriber, FilesService } from "../../state/store/files/files.service"
 import { FileState } from "../../model/files/files"
 import { IRootScopeService } from "angular"
-import { buildCustomConfigFromState } from "../../util/customConfigBuilder"
-import { CustomConfigHelper } from "../../util/customConfigHelper"
 import { StoreService } from "../../state/store.service"
-import { klona } from "klona"
-import { CustomConfig, CustomConfigMapSelectionMode } from "../../model/customConfig/customConfig.api.model"
 import { pushSorted } from "../../util/nodeDecorator"
-import { BlacklistItem, BlacklistType, CodeMapNode, ColorRange, NodeType, State } from "../../codeCharta.model"
+import { BlacklistItem, BlacklistType, CodeMapNode, ColorRange, NodeType } from "../../codeCharta.model"
 import { hierarchy } from "d3-hierarchy"
 import { getVisibleFileStates } from "../../model/files/files.helper"
 import { metricThresholds } from "./artificialIntelligence.metricThresholds"
-import { defaultMapColors } from "../../state/store/appSettings/mapColors/mapColors.actions"
-import { ThreeOrbitControlsService } from "../codeMap/threeViewer/threeOrbitControlsService"
-import { ThreeCameraService } from "../codeMap/threeViewer/threeCameraService"
+import { defaultMapColors, setMapColors } from "../../state/store/appSettings/mapColors/mapColors.actions"
 import { BlacklistService, BlacklistSubscriber } from "../../state/store/fileSettings/blacklist/blacklist.service"
 import { isPathBlacklisted } from "../../util/codeMapHelper"
 import {
@@ -24,6 +18,10 @@ import {
 } from "../../state/store/appSettings/enableExperimentalFeatures/experimentalFeaturesEnabled.service"
 import { metricDescriptions } from "../../util/metric/metricDescriptions"
 import percentRound from "percent-round"
+import { setColorRange } from "../../state/store/dynamicSettings/colorRange/colorRange.actions"
+import { setHeightMetric } from "../../state/store/dynamicSettings/heightMetric/heightMetric.actions"
+import { setColorMetric } from "../../state/store/dynamicSettings/colorMetric/colorMetric.actions"
+import { setAreaMetric } from "../../state/store/dynamicSettings/areaMetric/areaMetric.actions"
 
 interface MetricValues {
 	[metric: string]: number[]
@@ -39,8 +37,7 @@ interface MetricSuggestionParameters {
 	metric: string
 	from: number
 	to: number
-	generalCustomConfigId: string
-	outlierCustomConfigId?: string
+	isOutlier?: boolean
 }
 
 export class ArtificialIntelligenceController
@@ -56,7 +53,6 @@ export class ArtificialIntelligenceController
 			highRisk: number
 			veryHighRisk: number
 		}
-		isHighRiskFilesModeEnabled: boolean
 	} = {
 		analyzedProgrammingLanguage: undefined,
 		suspiciousMetricSuggestionLinks: [],
@@ -66,20 +62,14 @@ export class ArtificialIntelligenceController
 			moderateRisk: 0,
 			highRisk: 0,
 			veryHighRisk: 0
-		},
-		isHighRiskFilesModeEnabled: false
+		}
 	}
 
 	private debounceCalculation: () => void
 	private fileState: FileState
 	private blacklist: BlacklistItem[] = []
 
-	constructor(
-		private $rootScope: IRootScopeService,
-		private storeService: StoreService,
-		private threeOrbitControlsService: ThreeOrbitControlsService,
-		private threeCameraService: ThreeCameraService
-	) {
+	constructor(private $rootScope: IRootScopeService, private storeService: StoreService) {
 		"ngInject"
 		FilesService.subscribe(this.$rootScope, this)
 		BlacklistService.subscribe(this.$rootScope, this)
@@ -96,8 +86,32 @@ export class ArtificialIntelligenceController
 		}
 	}
 
-	applyCustomConfig(configId: string) {
-		CustomConfigHelper.applyCustomConfig(configId, this.storeService, this.threeCameraService, this.threeOrbitControlsService)
+	applySuspiciousMetric(metric: MetricSuggestionParameters, isOutlier: boolean) {
+		if (this._viewModel.suspiciousMetricSuggestionLinks.includes(metric)) {
+			const mapColors = { ...this.storeService.getState().appSettings.mapColors }
+			const colorRange: ColorRange = {
+				from: metric.from,
+				to: metric.to,
+				max: 0,
+				min: 0
+			}
+
+			if (metric.isOutlier === isOutlier) {
+				mapColors.positive = "#ffffff"
+				mapColors.neutral = "#ffffff"
+				mapColors.negative = "#A900C0"
+			} else {
+				mapColors.positive = defaultMapColors.positive
+				mapColors.neutral = defaultMapColors.neutral
+				mapColors.negative = defaultMapColors.negative
+			}
+
+			this.storeService.dispatch(setAreaMetric("rloc"))
+			this.storeService.dispatch(setHeightMetric(metric.metric))
+			this.storeService.dispatch(setColorMetric(metric.metric))
+			this.storeService.dispatch(setColorRange(colorRange))
+			this.storeService.dispatch(setMapColors(mapColors))
+		}
 	}
 
 	onBlacklistChanged(blacklist: BlacklistItem[]) {
@@ -132,7 +146,7 @@ export class ArtificialIntelligenceController
 
 		if (mainProgrammingLanguage !== undefined) {
 			this.calculateRiskProfile(this.fileState, mainProgrammingLanguage, "mcc")
-			this.createCustomConfigSuggestions(this.fileState, mainProgrammingLanguage)
+			this.calculateSuspiciousMetrics(this.fileState, mainProgrammingLanguage)
 		}
 	}
 
@@ -198,43 +212,23 @@ export class ArtificialIntelligenceController
 		}
 	}
 
-	private createCustomConfigSuggestions(fileState: FileState, programmingLanguage) {
+	private calculateSuspiciousMetrics(fileState: FileState, programmingLanguage) {
 		const metricValues = this.getSortedMetricValues(fileState, programmingLanguage)
 		const metricAssessmentResults = this.findGoodAndBadMetrics(metricValues, programmingLanguage)
-
 		const noticeableMetricSuggestionLinks = new Map<string, MetricSuggestionParameters>()
-		const newCustomConfigs: CustomConfig[] = []
 
 		for (const [metricName, colorRange] of metricAssessmentResults.suspiciousMetrics) {
-			const suspiciousMetricConfig = this.createOrUpdateCustomConfig(
-				`Suspicious Files - Metric ${metricName.toUpperCase()} - (AI)`,
-				this.prepareOverviewConfigState(metricName, colorRange.from, colorRange.to),
-				fileState
-			)
-
-			newCustomConfigs.push(suspiciousMetricConfig)
-
 			noticeableMetricSuggestionLinks.set(metricName, {
 				metric: metricName,
-				...colorRange,
-				generalCustomConfigId: suspiciousMetricConfig.id
+				...colorRange
 			})
 
 			const outlierThreshold = metricAssessmentResults.outliersThresholds.get(metricName)
 			if (outlierThreshold > 0) {
-				const highRiskMetricConfig = this.createOrUpdateCustomConfig(
-					`Very High Risk Files - Metric ${metricName.toUpperCase()} - (AI)`,
-					this.prepareOutlierConfigState(metricName, outlierThreshold - 1, outlierThreshold),
-					fileState
-				)
-
-				newCustomConfigs.push(highRiskMetricConfig)
-
-				noticeableMetricSuggestionLinks.get(metricName).outlierCustomConfigId = highRiskMetricConfig.id
+				noticeableMetricSuggestionLinks.get(metricName).isOutlier = true
 			}
 		}
 
-		CustomConfigHelper.addCustomConfigs(newCustomConfigs)
 		this._viewModel.suspiciousMetricSuggestionLinks = [...noticeableMetricSuggestionLinks.values()].sort(
 			this.compareSuspiciousMetricSuggestionLinks
 		)
@@ -242,8 +236,8 @@ export class ArtificialIntelligenceController
 	}
 
 	private compareSuspiciousMetricSuggestionLinks(a: MetricSuggestionParameters, b: MetricSuggestionParameters): number {
-		if (a.outlierCustomConfigId && !b.outlierCustomConfigId) return -1
-		if (!a.outlierCustomConfigId && b.outlierCustomConfigId) return 1
+		if (a.isOutlier && !b.isOutlier) return -1
+		if (!a.isOutlier && b.isOutlier) return 1
 		return 0
 	}
 
@@ -284,60 +278,6 @@ export class ArtificialIntelligenceController
 		return metricAssessmentResults
 	}
 
-	private createOrUpdateCustomConfig(configName: string, state: State, fileState: FileState) {
-		const customConfig = CustomConfigHelper.getCustomConfigByName(
-			CustomConfigMapSelectionMode.SINGLE,
-			[fileState.file.fileMeta.fileName],
-			configName
-		)
-
-		// If it exists, create a fresh one with current thresholds
-		if (customConfig !== null) {
-			CustomConfigHelper.deleteCustomConfig(customConfig.id)
-		}
-
-		return buildCustomConfigFromState(configName, state)
-	}
-
-	private prepareOverviewConfigState(metricName: string, colorRangeFrom: number, colorRangeTo: number) {
-		const state = klona(this.storeService.getState())
-
-		// Just use rloc as area metric
-		state.dynamicSettings.areaMetric = "rloc"
-
-		// Use bad metric as height and color metric
-		state.dynamicSettings.heightMetric = metricName
-		state.dynamicSettings.colorMetric = metricName
-		state.dynamicSettings.colorRange.from = colorRangeFrom
-		state.dynamicSettings.colorRange.to = colorRangeTo
-
-		state.appSettings.mapColors.positive = defaultMapColors.positive
-		state.appSettings.mapColors.neutral = defaultMapColors.neutral
-		state.appSettings.mapColors.negative = defaultMapColors.negative
-
-		return state
-	}
-
-	private prepareOutlierConfigState(metricName: string, colorRangeFrom: number, colorRangeTo: number) {
-		const state = klona(this.storeService.getState())
-
-		// just use rloc as area metric
-		state.dynamicSettings.areaMetric = "rloc"
-
-		// use bad metric as height and color metric
-		state.dynamicSettings.heightMetric = metricName
-		state.dynamicSettings.colorMetric = metricName
-
-		state.dynamicSettings.colorRange.to = colorRangeTo
-		state.dynamicSettings.colorRange.from = colorRangeFrom
-
-		state.appSettings.mapColors.positive = "#ffffff"
-		state.appSettings.mapColors.neutral = "#ffffff"
-		state.appSettings.mapColors.negative = "#A900C0"
-
-		return state
-	}
-
 	private getSortedMetricValues(fileState: FileState, programmingLanguage): MetricValues {
 		const metricValues: MetricValues = {}
 

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

@@ -1,8 +1,6 @@
-import { CodeMapNode, EdgeVisibility, MarkedPackage } from "../../codeCharta.model"
+import { EdgeVisibility } from "../../codeCharta.model"
 import { StoreService } from "../../state/store.service"
 import { setEdges } from "../../state/store/fileSettings/edges/edges.actions"
-import { unmarkPackage, setMarkedPackages } from "../../state/store/fileSettings/markedPackages/markedPackages.actions"
-import { addMarkedPackage } from "../../state/store/fileSettings/markedPackages/util/addMarkedPackage"
 import { EdgeMetricDataService } from "../../state/store/metricData/edgeMetricData/edgeMetricData.service"
 
 export class CodeMapActionsService {
@@ -10,26 +8,6 @@ export class CodeMapActionsService {
 		"ngInject"
 	}
 
-	markFolder({ path }: { path?: string }, color: string) {
-		const { markedPackages } = this.storeService.getState().fileSettings
-		const markedPackagesMap = new Map(markedPackages.map(entry => [entry.path, entry]))
-		addMarkedPackage(markedPackagesMap, { path, color })
-
-		this.storeService.dispatch(setMarkedPackages([...markedPackagesMap.values()]))
-	}
-
-	unmarkFolder(node: CodeMapNode) {
-		let index = this.storeService.getState().fileSettings.markedPackages.findIndex(mp => mp.path === node.path)
-
-		if (index === -1) {
-			index = this.getParentMarkedPackageIndex(node.path)
-		}
-
-		if (index !== -1) {
-			this.storeService.dispatch(unmarkPackage(index))
-		}
-	}
-
 	updateEdgePreviews() {
 		const state = this.storeService.getState()
 		const { edges } = state.fileSettings
@@ -58,21 +36,4 @@ export class CodeMapActionsService {
 
 		this.storeService.dispatch(setEdges(edges))
 	}
-
-	getParentMarkedPackageIndex(path: string) {
-		const markedPackages: MarkedPackage[] = this.storeService.getState().fileSettings.markedPackages
-		let index = -1
-		for (let loopIndex = 0; loopIndex < markedPackages.length; loopIndex++) {
-			const markedPackage = markedPackages[loopIndex]
-			if (
-				path.startsWith(markedPackage.path) &&
-				path !== markedPackage.path &&
-				(index === -1 || markedPackages[index].path.length < markedPackage.path.length)
-			) {
-				index = loopIndex
-			}
-		}
-
-		return index
-	}
 }

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

@@ -18,6 +18,7 @@ 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 type { BUILDING_RIGHT_CLICKED_EVENT_TYPE } from "../../../../src/globals"
 
 interface Coordinates {
 	x: number
@@ -32,10 +33,6 @@ export interface BuildingUnhoveredSubscriber {
 	onBuildingUnhovered()
 }
 
-export interface BuildingRightClickedEventSubscriber {
-	onBuildingRightClicked(building: CodeMapBuilding, x: number, y: number)
-}
-
 export enum ClickType {
 	LeftClick = 0,
 	RightClick = 2
@@ -51,7 +48,6 @@ export enum CursorType {
 export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscriber, FilesSelectionSubscriber, BlacklistSubscriber {
 	private static readonly BUILDING_HOVERED_EVENT = "building-hovered"
 	private static readonly BUILDING_UNHOVERED_EVENT = "building-unhovered"
-	private static readonly BUILDING_RIGHT_CLICKED_EVENT = "building-right-clicked"
 	private readonly THRESHOLD_FOR_MOUSE_MOVEMENT_TRACKING = 3
 
 	private highlightedInTreeView: CodeMapBuilding
@@ -115,12 +111,6 @@ export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscri
 		})
 	}
 
-	static subscribeToBuildingRightClickedEvents($rootScope: IRootScopeService, subscriber: BuildingRightClickedEventSubscriber) {
-		$rootScope.$on(this.BUILDING_RIGHT_CLICKED_EVENT, (_event, data) => {
-			subscriber.onBuildingRightClicked(data.building, data.x, data.y)
-		})
-	}
-
 	start() {
 		// TODO: Check if these event listeners should ever be removed again.
 		this.threeRendererService.renderer.domElement.addEventListener("mousemove", event => this.onDocumentMouseMove(event))
@@ -365,11 +355,15 @@ export class CodeMapMouseEventService implements ViewCubeEventPropagationSubscri
 		// Check if mouse moved to prevent the node context menu to show up
 		// after moving the map, when the cursor ends on a building.
 		if (building && !this.hasMouseMovedMoreThanThreePixels(this.mouseOnLastClick)) {
-			this.$rootScope.$broadcast(CodeMapMouseEventService.BUILDING_RIGHT_CLICKED_EVENT, {
-				building,
-				x: this.mouse.x,
-				y: this.mouse.y
-			})
+			document.dispatchEvent(
+				new CustomEvent<BUILDING_RIGHT_CLICKED_EVENT_TYPE>("building-right-clicked", {
+					detail: {
+						building,
+						x: this.mouse.x,
+						y: this.mouse.y
+					}
+				})
+			)
 		}
 		this.threeUpdateCycleService.update()
 	}

package/app/codeCharta/ui/colorPicker/colorPicker.component.html

@@ -1,7 +1,16 @@
-<color-chrome
-	role="colorpicker"
-	(click)="$event.stopPropagation()"
-	[disableAlpha]="true"
-	[color]="hexColor"
-	(onChangeComplete)="handleChangeComplete($event.color.hex)"
-></color-chrome>
+<ng-container
+	[ngTemplateOutlet]="triggerTemplate"
+	[ngTemplateOutletContext]="{ isOpen: colorPickerMenuTrigger.menuOpen, isHovered: isHovered }"
+>
+</ng-container>
+
+<span [matMenuTriggerFor]="menu" #colorPickerMenuTrigger="matMenuTrigger"></span>
+<mat-menu #menu="matMenu" class="cc-color-picker-menu" [xPosition]="openXPosition" [hasBackdrop]="false">
+	<color-chrome
+		role="colorpicker"
+		(click)="$event.stopPropagation()"
+		[disableAlpha]="true"
+		[color]="hexColor"
+		(onChangeComplete)="handleChangeComplete($event.color.hex)"
+	></color-chrome>
+</mat-menu>