codecharta-visualization 1.86.0 → 1.89.0

package/Dockerfile

@@ -1,3 +1,3 @@
-FROM nginx:1.21.4-alpine
+FROM nginx:1.21.5-alpine
 
 COPY ./dist/webpack /usr/share/nginx/html

package/app/app.module.ts

@@ -4,7 +4,8 @@ import { Inject, NgModule } from "@angular/core"
 import { BrowserModule } from "@angular/platform-browser"
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"
 import { UpgradeModule } from "@angular/upgrade/static"
-
+import { FormsModule } from "@angular/forms"
+import { MaterialModule } from "./material/material.module"
 import { MapTreeViewModule } from "./codeCharta/ui/mapTreeView/mapTreeView.module"
 import { MapTreeViewComponent } from "./codeCharta/ui/mapTreeView/mapTreeView.component"
 import { MatchingFilesCounterComponent } from "./codeCharta/ui/matchingFilesCounter/matchingFilesCounter.component"
@@ -18,22 +19,41 @@ import { LegendPanelComponent } from "./codeCharta/ui/legendPanel/legendPanel.co
 import { LegendPanelModule } from "./codeCharta/ui/legendPanel/legendPanel.module"
 import { ColorPickerForMapColorModule } from "./codeCharta/ui/colorPickerForMapColor/colorPickerForMapColor.module"
 import { ColorPickerForMapColorComponent } from "./codeCharta/ui/colorPickerForMapColor/colorPickerForMapColor.component"
-import { MarkFolderColorPickerModule } from "./codeCharta/ui/nodeContextMenu/markFolderColorPicker/markFolderColorPicker.module"
-import { MarkFolderColorPickerComponent } from "./codeCharta/ui/nodeContextMenu/markFolderColorPicker/markFolderColorPicker.component"
+import { FilePanelFileSelectorComponent } from "./codeCharta/ui/filePanel/filePanelFileSelector/filePanelFileSelector.component"
+import { FilePanelStateButtonsComponent } from "./codeCharta/ui/filePanel/filePanelStateButtons/filePanelStateButtons.component"
+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 { 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"
 
 @NgModule({
 	imports: [
 		BrowserModule,
 		UpgradeModule,
+		EffectsModule.forRoot([UnfocusNodesOnLoadingMapEffect, AddBlacklistItemsIfNotResultsInEmptyMapEffect, OpenNodeContextMenuEffect]),
 		MapTreeViewModule,
 		MatchingFilesCounterModule,
 		AttributeSideBarModule,
+		MaterialModule,
+		FormsModule,
 		Export3DMapButtonModule,
 		LegendPanelModule,
 		ColorPickerForMapColorModule,
-		MarkFolderColorPickerModule
+		NodeContextMenuCardModule
+	],
+	providers: [threeSceneServiceProvider],
+	declarations: [
+		FilePanelFileSelectorComponent,
+		FilePanelStateButtonsComponent,
+		FilePanelDeltaSelectorComponent,
+		InvertAreaOptionComponent,
+		...dialogs
 	],
-	declarations: [],
 	entryComponents: [
 		MapTreeViewComponent,
 		MatchingFilesCounterComponent,
@@ -42,7 +62,11 @@ import { MarkFolderColorPickerComponent } from "./codeCharta/ui/nodeContextMenu/
 		LegendPanelComponent,
 		LabelledColorPickerComponent,
 		ColorPickerForMapColorComponent,
-		MarkFolderColorPickerComponent
+		FilePanelFileSelectorComponent,
+		FilePanelStateButtonsComponent,
+		FilePanelDeltaSelectorComponent,
+		InvertAreaOptionComponent,
+		...dialogs
 	]
 })
 export class AppModule {

package/app/codeCharta/codeCharta.component.html

@@ -22,6 +22,4 @@
 			</h2>
 		</div>
 	</div>
-
-	<node-context-menu-component></node-context-menu-component>
 </div>

package/app/codeCharta/codeCharta.component.ts

@@ -76,6 +76,8 @@ export class CodeChartaController {
 		this.codeChartaService.loadFiles(values)
 	}
 
+	// TODO: Please make sure that this function works fine on Github pages with
+	//  the updated file selection (no more single mode!)
 	private setRenderStateFromUrl() {
 		const renderState = this.urlUtils.getParameterByName("mode")
 		const files = getCCFiles(this.storeService.getState().files)

package/app/codeCharta/codeCharta.model.ts

@@ -5,6 +5,7 @@ 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"
+import { RightClickedNodeData } from "./state/store/appStatus/rightClickedNodeData/rightClickedNodeData.actions"
 
 export interface NameDataPair {
 	fileName: string
@@ -25,10 +26,10 @@ export enum LayoutAlgorithm {
 }
 
 export enum SharpnessMode {
-	Standard = "Standard",
-	PixelRatioNoAA = "Pixel Ratio without Antialiasing",
-	PixelRatioFXAA = "Pixel Ratio With FXAA Antialiasing",
-	PixelRatioAA = "Pixel Ratio with Antialisaing (best)"
+	Standard = "High",
+	PixelRatioNoAA = "Low",
+	PixelRatioFXAA = "Medium",
+	PixelRatioAA = "Best"
 }
 
 export interface CCFile {
@@ -119,7 +120,7 @@ export interface DynamicSettings {
 	colorMetric: string
 	distributionMetric: string
 	edgeMetric: string
-	focusedNodePath: string
+	focusedNodePath: string[]
 	searchPattern: string
 	margin: number
 	colorRange: ColorRange
@@ -135,6 +136,7 @@ export interface AppSettings {
 	cameraTarget: Vector3
 	hideFlatBuildings: boolean
 	invertHeight: boolean
+	invertArea: boolean
 	dynamicMargin: boolean
 	isWhiteBackground: boolean
 	mapColors: MapColors
@@ -404,6 +406,7 @@ export interface LookUp {
 export interface AppStatus {
 	hoveredBuildingPath: string | null
 	selectedBuildingId: number | null
+	rightClickedNodeData: RightClickedNodeData
 }
 
 export enum PanelSelection {

package/app/codeCharta/codeCharta.service.spec.ts

@@ -6,9 +6,9 @@ import { BlacklistType, CCFile, NodeMetricData, NodeType } from "./codeCharta.mo
 import { StoreService } from "./state/store.service"
 import { removeFile, resetFiles } from "./state/store/files/files.actions"
 import { ExportBlacklistType, ExportCCFile } from "./codeCharta.api.model"
-import { getCCFiles, isSingleState } from "./model/files/files.helper"
+import { getCCFiles, isPartialState } from "./model/files/files.helper"
 import { DialogService } from "./ui/dialog/dialog.service"
-import { CCValidationResult, ERROR_MESSAGES } from "./util/fileValidator"
+import { CCFileValidationResult, ERROR_MESSAGES } from "./util/fileValidator"
 import packageJson from "../../package.json"
 import { clone } from "./util/clone"
 import { nodeMetricDataSelector } from "./state/selectors/accumulatedData/metricData/nodeMetricData.selector"
@@ -53,8 +53,7 @@ describe("codeChartaService", () => {
 
 	function withMockedDialogService() {
 		dialogService = codeChartaService["dialogService"] = jest.fn().mockReturnValue({
-			showValidationErrorDialog: jest.fn(),
-			showValidationWarningDialog: jest.fn()
+			showValidationDialog: jest.fn()
 		})()
 	}
 
@@ -137,7 +136,7 @@ describe("codeChartaService", () => {
 			])
 
 			expect(getCCFiles(storeService.getState().files)[0]).toEqual(expected)
-			expect(isSingleState(storeService.getState().files)).toBeTruthy()
+			expect(isPartialState(storeService.getState().files)).toBeTruthy()
 		})
 
 		it("should load a valid file and update root data", async () => {
@@ -150,9 +149,8 @@ describe("codeChartaService", () => {
 			])
 
 			expect(getCCFiles(storeService.getState().files)[0]).toEqual(expected)
-			expect(isSingleState(storeService.getState().files)).toBeTruthy()
-			expect(dialogService.showValidationWarningDialog).not.toHaveBeenCalled()
-			expect(dialogService.showValidationErrorDialog).not.toHaveBeenCalled()
+			expect(isPartialState(storeService.getState().files)).toBeTruthy()
+			expect(dialogService.showValidationDialog).not.toHaveBeenCalled()
 
 			expect(CodeChartaService.ROOT_NAME).toEqual(expected.map.name)
 			expect(CodeChartaService.ROOT_PATH).toEqual(`/${expected.map.name}`)
@@ -253,7 +251,7 @@ describe("codeChartaService", () => {
 			await codeChartaService.loadFiles([{ fileName: "SecondFile", content: valid2ndFileContent, fileSize: 42 }])
 
 			expect(storeService.getState().files[0].selectedAs).toEqual("None")
-			expect(storeService.getState().files[1].selectedAs).toEqual("Single")
+			expect(storeService.getState().files[1].selectedAs).toEqual("Partial")
 		})
 
 		it("should load the default scenario after loading a valid file", async () => {
@@ -287,41 +285,50 @@ describe("codeChartaService", () => {
 		})
 
 		it("should show error on invalid file", async () => {
-			const expectedError: CCValidationResult = {
-				error: [ERROR_MESSAGES.fileIsInvalid],
-				warning: []
-			}
+			const expectedError: CCFileValidationResult[] = [
+				{
+					fileName,
+					errors: [ERROR_MESSAGES.fileIsInvalid],
+					warnings: []
+				}
+			]
 
 			await codeChartaService.loadFiles([{ fileName, content: null, fileSize: 0 }])
 
 			expect(storeService.getState().files).toHaveLength(0)
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledWith(expectedError)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledWith(expectedError)
 		})
 
 		it("should show error on a random string", async () => {
-			const expectedError: CCValidationResult = {
-				error: [ERROR_MESSAGES.apiVersionIsInvalid],
-				warning: []
-			}
+			const expectedError: CCFileValidationResult[] = [
+				{
+					fileName,
+					errors: [ERROR_MESSAGES.apiVersionIsInvalid],
+					warnings: []
+				}
+			]
 
 			await codeChartaService.loadFiles([{ fileName, fileSize: 42, content: "string" as unknown as ExportCCFile }])
 
 			expect(storeService.getState().files).toHaveLength(0)
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledWith(expectedError)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledWith(expectedError)
 		})
 
 		it("should show error if a file is missing a required property", async () => {
-			const expectedError: CCValidationResult = {
-				error: ["Required error:  should have required property 'projectName'"],
-				warning: []
-			}
+			const expectedError: CCFileValidationResult[] = [
+				{
+					fileName,
+					errors: ["Required error:  should have required property 'projectName'"],
+					warnings: []
+				}
+			]
 
 			const invalidFileContent = validFileContent
 			delete invalidFileContent.projectName
 			await codeChartaService.loadFiles([{ fileName, fileSize: 42, content: invalidFileContent }])
 
 			expect(storeService.getState().files).toHaveLength(0)
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledWith(expectedError)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledWith(expectedError)
 		})
 
 		it("should convert old blacklist type", async () => {
@@ -339,46 +346,30 @@ describe("codeChartaService", () => {
 			expect(getCCFiles(storeService.getState().files)[0].settings.fileSettings.blacklist).toEqual(blacklist)
 		})
 
-		it("should break the loop after the first invalid file was validated", async () => {
-			const expectedError: CCValidationResult = {
-				error: ["Required error:  should have required property 'projectName'"],
-				warning: []
-			}
-
-			const invalidFileContent = validFileContent
-			delete invalidFileContent.projectName
-
-			await codeChartaService.loadFiles([
-				{ fileName, content: invalidFileContent, fileSize: 42 },
-				{ fileName, content: invalidFileContent, fileSize: 42 }
-			])
-
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledTimes(1)
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledWith(expectedError)
-		})
-
 		it("should not show a validation error if filenames are duplicated when their path is different", async () => {
 			validFileContent.nodes[0].children[0].name = "duplicate"
 			validFileContent.nodes[0].children[1].children[0].name = "duplicate"
 
 			await codeChartaService.loadFiles([{ fileName, content: validFileContent, fileSize: 42 }])
 
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledTimes(0)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledTimes(0)
 			expect(storeService.getState().files).toHaveLength(1)
 		})
 
 		it("should show a validation error if two files in a folder have the same name", async () => {
 			validFileContent.nodes[0].children[1].children[0].name = "duplicate"
 			validFileContent.nodes[0].children[1].children[1].name = "duplicate"
-			const expectedError: CCValidationResult = {
-				error: [`${ERROR_MESSAGES.nodesNotUnique} Found duplicate of File with path: /root/Parent Leaf/duplicate`],
-				warning: []
-			}
+			const expectedError: CCFileValidationResult[] = [
+				{
+					fileName,
+					errors: [`${ERROR_MESSAGES.nodesNotUnique} Found duplicate of File with path: /root/Parent Leaf/duplicate`],
+					warnings: []
+				}
+			]
 
 			await codeChartaService.loadFiles([{ fileName, content: validFileContent, fileSize: 42 }])
 
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledTimes(1)
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledWith(expectedError)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledWith(expectedError)
 		})
 
 		it("should not show a validation error if two files in a folder have the same name but different type", async () => {
@@ -389,7 +380,7 @@ describe("codeChartaService", () => {
 
 			await codeChartaService.loadFiles([{ fileName, content: validFileContent, fileSize: 42 }])
 
-			expect(dialogService.showValidationErrorDialog).toHaveBeenCalledTimes(0)
+			expect(dialogService.showValidationDialog).toHaveBeenCalledTimes(0)
 			expect(storeService.getState().files).toHaveLength(1)
 		})
 

package/app/codeCharta/codeCharta.service.ts

@@ -1,7 +1,7 @@
-import { validate } from "./util/fileValidator"
+import { CCFileValidationResult, checkErrors, checkWarnings } from "./util/fileValidator"
 import { NodeDecorator } from "./util/nodeDecorator"
 import { StoreService } from "./state/store.service"
-import { setFiles, setSingleByName } from "./state/store/files/files.actions"
+import { setFiles, setMultipleByNames } from "./state/store/files/files.actions"
 import { DialogService } from "./ui/dialog/dialog.service"
 import { setState } from "./state/store/state.actions"
 import { ScenarioHelper } from "./util/scenarioHelper"
@@ -25,41 +25,46 @@ export class CodeChartaService {
 
 	async loadFiles(nameDataPairs: NameDataPair[]) {
 		this.fileStates = this.storeService.getState().files
-		for (const nameDataPair of nameDataPairs) {
-			try {
-				validate(nameDataPair)
-				this.addFile(nameDataPair)
-			} catch (error) {
-				if (error.error.length > 0) {
-					this.fileStates = []
-					this.recentFiles = []
-					this.storeService.dispatch(setIsLoadingFile(false))
-					await this.dialogService.showValidationErrorDialog(error)
-					break
-				}
-
-				if (error.warning.length > 0) {
-					this.addFile(nameDataPair)
-					this.addRecentFile(nameDataPair.fileName)
-					this.storeService.dispatch(setIsLoadingFile(false))
-					await this.dialogService.showValidationWarningDialog(error)
-				}
-			}
-		}
+		const fileValidationResults: CCFileValidationResult[] = []
+
+		this.getValidationResults(nameDataPairs, fileValidationResults)
+
+		this.storeService.dispatch(setIsLoadingFile(false))
 
-		if (this.fileStates.length > 0) {
+		if (fileValidationResults.length > 0) await this.dialogService.showValidationDialog(fileValidationResults)
+
+		if (this.recentFiles.length > 0) {
 			this.storeService.dispatch(setRecentFiles(this.recentFiles))
 			this.storeService.dispatch(setFiles(this.fileStates))
 
-			this.fileStates = []
-			this.recentFiles = []
-
 			const recentFile = this.storeService.getState().dynamicSettings.recentFiles[0]
 			const rootName = this.storeService.getState().files.find(f => f.file.fileMeta.fileName === recentFile).file.map.name
-			this.storeService.dispatch(setSingleByName(recentFile))
+			this.storeService.dispatch(setMultipleByNames(this.recentFiles))
 
 			CodeChartaService.updateRootData(rootName)
 			this.setDefaultScenario()
+
+			this.fileStates = []
+			this.recentFiles = []
+		}
+	}
+
+	private getValidationResults(nameDataPairs: NameDataPair[], fileValidationResults: CCFileValidationResult[]) {
+		for (const nameDataPair of nameDataPairs) {
+			const fileValidationResult: CCFileValidationResult = {
+				fileName: nameDataPair?.fileName,
+				errors: [],
+				warnings: []
+			}
+			fileValidationResult.errors.push(...checkErrors(nameDataPair?.content))
+
+			if (fileValidationResult.errors.length === 0) {
+				fileValidationResult.warnings.push(...checkWarnings(nameDataPair?.content))
+				this.addFile(nameDataPair)
+			}
+
+			if (fileValidationResult.errors.length > 0 || fileValidationResult.warnings.length > 0)
+				fileValidationResults.push(fileValidationResult)
 		}
 	}
 
@@ -129,8 +134,4 @@ export class CodeChartaService {
 		CodeChartaService.ROOT_NAME = rootName
 		CodeChartaService.ROOT_PATH = `/${CodeChartaService.ROOT_NAME}`
 	}
-
-	private addRecentFile(fileName: string) {
-		this.recentFiles.push(fileName)
-	}
 }

package/app/codeCharta/e2e/url.e2e.ts

@@ -63,7 +63,7 @@ describe("codecharta", () => {
 	it("should throw errors when file parameters in url are invalid and load sample data instead", async () => {
 		await goto(`${CC_URL}?file=invalid234`)
 		await handleErrorDialog()
-		await checkSelectedFileName("sample1.cc.json")
+		await checkSelectedFileName("sample1.cc.json, sample2.cc.json")
 		await checkAllFileNames(["sample1.cc.json", "sample2.cc.json"])
 	})
 })

package/app/codeCharta/services/ajs-upgraded-providers.ts

@@ -0,0 +1,13 @@
+import { InjectionToken, Injector } from "@angular/core"
+
+export const ThreeSceneServiceToken = new InjectionToken("ThreeSceneService")
+
+export function ThreeSceneServiceFactory(injector: Injector) {
+	return injector.get("threeSceneService")
+}
+
+export const threeSceneServiceProvider = {
+	provide: ThreeSceneServiceToken,
+	useFactory: ThreeSceneServiceFactory,
+	deps: ["$injector"]
+}

package/app/codeCharta/state/angular-redux/effects/createEffect.spec.ts

@@ -0,0 +1,37 @@
+import { mocked } from "ts-jest/utils"
+import { Subject } from "rxjs"
+import { Store } from "../../store/store"
+import { createEffect } from "./createEffect"
+
+jest.mock("../../store/store", () => ({
+	Store: {}
+}))
+const MockedStore = mocked(Store)
+
+describe("createEffect", () => {
+	let source
+
+	beforeEach(() => {
+		source = new Subject()
+		MockedStore.dispatch = jest.fn()
+	})
+
+	afterEach(() => {
+		source.complete()
+	})
+
+	it("should observe and dispatch each received value", () => {
+		createEffect(() => source)
+		source.next({ type: "some-action-type" })
+		source.next({ type: "some-other-action-type" })
+		expect(MockedStore.dispatch).toHaveBeenCalledTimes(2)
+		expect(MockedStore.dispatch.mock.calls[0][0]).toEqual({ type: "some-action-type" })
+		expect(MockedStore.dispatch.mock.calls[1][0]).toEqual({ type: "some-other-action-type" })
+	})
+
+	it("should not dispatch if dispatch is set to false", () => {
+		createEffect(() => source, { dispatch: false })
+		source.next({ type: "some-action-type" })
+		expect(MockedStore.dispatch).not.toHaveBeenCalled()
+	})
+})

package/app/codeCharta/state/angular-redux/effects/createEffect.ts

@@ -0,0 +1,25 @@
+import { Action } from "redux"
+import { Observable } from "rxjs"
+import { Store } from "../../store/store"
+
+type DontDispatchConfig = { dispatch: false }
+type DispatchConfig = { dispatch?: true }
+type Config = DispatchConfig | DontDispatchConfig
+
+/** Simple placeholder for NgRx's createEffect. The goal is to provide the
+ * same api as NgRx, so that we can switch to NgRx in the long run.
+ * Please note that its functionality is very minimal so far.
+ */
+export function createEffect(source: () => Observable<unknown>, config?: Config) {
+	source().subscribe(output => {
+		if (config?.dispatch === false) return
+
+		if (!isAction(output)) throw new Error("output must be an action")
+
+		Store.dispatch(output)
+	})
+}
+
+function isAction(something: unknown): something is Action {
+	return something && Object.prototype.hasOwnProperty.call(something, "type")
+}

package/app/codeCharta/state/angular-redux/effects/effects.module.ts

@@ -0,0 +1,36 @@
+import { APP_INITIALIZER, Inject, InjectionToken, ModuleWithProviders, NgModule, Optional, SkipSelf } from "@angular/core"
+import { Action } from "redux"
+import { Observable, Subject } from "rxjs"
+
+export type Actions = Observable<Action>
+export const ActionsToken = new InjectionToken<Actions>("Actions")
+
+/** Simple placeholder for NgRx's EffectsModule. The goal is to provide the
+ * same api as NgRx, so that we can switch to NgRx in the long run.
+ */
+@NgModule({})
+export class EffectsModule {
+	static actions$ = new Subject<Action>()
+
+	constructor(@Optional() @SkipSelf() @Inject(EffectsModule) parentModule?: EffectsModule) {
+		if (parentModule) throw new Error("EffectsModule is already loaded. Import it in the AppModule only")
+	}
+
+	static forRoot(effects = []): ModuleWithProviders<EffectsModule> {
+		return {
+			ngModule: EffectsModule,
+			providers: [
+				{ provide: ActionsToken, useValue: EffectsModule.actions$ },
+				effects,
+				{
+					provide: APP_INITIALIZER,
+					deps: effects,
+					useFactory: () => () => {
+						// initialized effects"
+					},
+					multi: true
+				}
+			]
+		}
+	}
+}

package/app/codeCharta/state/angular-redux/ofType.ts

@@ -0,0 +1,11 @@
+import { Action } from "redux"
+import { filter, map, Observable } from "rxjs"
+
+export function ofType<T extends Action>(type: string) {
+	return function (source: Observable<Action>) {
+		return source.pipe(
+			filter(action => action.type === type),
+			map(action => action as T)
+		)
+	}
+}

package/app/codeCharta/state/angular-redux/state.ts

@@ -0,0 +1,12 @@
+import { Injectable } from "@angular/core"
+
+import { Store as PlainStore } from "../store/store"
+
+@Injectable({
+	providedIn: "root"
+})
+export class State {
+	getValue() {
+		return PlainStore.store.getState()
+	}
+}

package/app/codeCharta/state/angular-redux/store.ts

@@ -28,7 +28,7 @@ export class Store {
 	}
 
 	dispatch(action: CCAction) {
-		PlainStore.store.dispatch(action)
+		PlainStore.dispatch(action)
 	}
 }
 

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

@@ -0,0 +1,60 @@
+import { ApplicationInitStatus } from "@angular/core"
+import { TestBed } from "@angular/core/testing"
+import { MatDialog } from "@angular/material/dialog"
+import { Action } from "redux"
+import { Subject } from "rxjs"
+import { BlacklistType } from "../../../codeCharta.model"
+import { FILE_STATES_JAVA } from "../../../util/dataMocks"
+
+import { EffectsModule } from "../../angular-redux/effects/effects.module"
+import { setFiles } from "../../store/files/files.actions"
+import { addBlacklistItems, addBlacklistItemsIfNotResultsInEmptyMap } from "../../store/fileSettings/blacklist/blacklist.actions"
+import { Store } from "../../store/store"
+import { AddBlacklistItemsIfNotResultsInEmptyMapEffect } from "./addBlacklistItemsIfNotResultsInEmptyMap.effect"
+
+describe("AddBlacklistItemsIfNotResultsInEmptyMapEffect", () => {
+	const mockedDialog = { open: jest.fn() }
+	let storeDispatchSpy
+
+	beforeEach(async () => {
+		Store["initialize"]()
+		storeDispatchSpy = jest.spyOn(Store, "dispatch")
+		mockedDialog.open = jest.fn()
+
+		EffectsModule.actions$ = new Subject<Action>()
+		TestBed.configureTestingModule({
+			imports: [EffectsModule.forRoot([AddBlacklistItemsIfNotResultsInEmptyMapEffect])],
+			providers: [{ provide: MatDialog, useValue: mockedDialog }]
+		})
+		await TestBed.inject(ApplicationInitStatus).donePromise
+	})
+
+	afterEach(() => {
+		EffectsModule.actions$.complete()
+	})
+
+	it("should ignore a not relevant action", () => {
+		EffectsModule.actions$.next({ type: "whatever" })
+		expect(storeDispatchSpy).not.toHaveBeenCalled()
+		expect(mockedDialog.open).not.toHaveBeenCalled()
+	})
+
+	it("should not blacklist items if it would lead to an empty map but show error dialog", () => {
+		EffectsModule.actions$.next(addBlacklistItemsIfNotResultsInEmptyMap([{ type: BlacklistType.exclude, path: "foo/bar" }]))
+		expect(storeDispatchSpy).not.toHaveBeenCalledWith(addBlacklistItems([{ type: BlacklistType.exclude, path: "foo/bar" }]))
+		expect(mockedDialog.open).toHaveBeenCalledTimes(1)
+	})
+
+	it("should blacklist items if it doesn't lead to an empty map", () => {
+		Store.dispatch(setFiles(FILE_STATES_JAVA))
+
+		EffectsModule.actions$.next(
+			addBlacklistItemsIfNotResultsInEmptyMap([{ type: BlacklistType.exclude, path: "/root/src/main/file1.java" }])
+		)
+
+		expect(storeDispatchSpy).toHaveBeenCalledWith(
+			addBlacklistItems([{ type: BlacklistType.exclude, path: "/root/src/main/file1.java" }])
+		)
+		expect(mockedDialog.open).not.toHaveBeenCalled()
+	})
+})