codecharta-visualization 1.119.0 → 1.120.0

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

@@ -1,65 +0,0 @@
-import { Component, OnDestroy, OnInit, ViewEncapsulation } from "@angular/core"
-import { experimentalFeaturesEnabledSelector } from "../../state/store/appSettings/enableExperimentalFeatures/experimentalFeaturesEnabled.selector"
-import { isDeltaStateSelector } from "../../state/selectors/isDeltaState.selector"
-import { map } from "rxjs"
-import { metricDataSelector } from "../../state/selectors/accumulatedData/metricData/metricData.selector"
-import { Store } from "@ngrx/store"
-import { CcState } from "../../codeCharta.model"
-
-type PanelSelection = "NONE" | "AREA_PANEL_OPEN" | "HEIGHT_PANEL_OPEN" | "COLOR_PANEL_OPEN" | "EDGE_PANEL_OPEN"
-
-@Component({
-	selector: "cc-ribbon-bar",
-	templateUrl: "./ribbonBar.component.html",
-	styleUrls: ["./ribbonBar.component.scss"],
-	encapsulation: ViewEncapsulation.None
-})
-export class RibbonBarComponent implements OnInit, OnDestroy {
-	panelSelection: PanelSelection = "NONE"
-	experimentalFeaturesEnabled$ = this.store.select(experimentalFeaturesEnabledSelector)
-	isDeltaState$ = this.store.select(isDeltaStateSelector)
-	hasEdgeMetric$ = this.store.select(metricDataSelector).pipe(map(metricData => metricData.edgeMetricData.length > 0))
-	constructor(private store: Store<CcState>) {}
-
-	ngOnInit(): void {
-		document.addEventListener("mousedown", this.closePanelSelectionOnOutsideClick)
-	}
-
-	ngOnDestroy(): void {
-		document.removeEventListener("mousedown", this.closePanelSelectionOnOutsideClick)
-	}
-
-	updatePanelSelection(panelSelection: PanelSelection) {
-		this.panelSelection = this.panelSelection === panelSelection ? "NONE" : panelSelection
-	}
-
-	private closePanelSelectionOnOutsideClick = (event: MouseEvent) => {
-		if (this.panelSelection !== "NONE" && this.isOutside(event)) {
-			this.panelSelection = "NONE"
-		}
-	}
-
-	private panelSelectionComponents = [
-		"CC-AREA-SETTINGS-PANEL",
-		"CC-HEIGHT-SETTINGS-PANEL",
-		"CC-COLOR-SETTINGS-PANEL",
-		"CC-EDGE-SETTINGS-PANEL",
-		"COLOR-CHROME"
-	]
-	private panelSectionTogglerTitles = [
-		"Show area metric settings",
-		"Show height metric settings",
-		"Show color metric settings",
-		"Show edge metric settings"
-	]
-	private isOutside(event: MouseEvent) {
-		return event
-			.composedPath()
-			.every(
-				element =>
-					!this.panelSelectionComponents.includes(element["nodeName"]) &&
-					!this.panelSectionTogglerTitles.includes(element["title"]) &&
-					element["id"] !== "codemap-context-menu"
-			)
-	}
-}

package/app/codeCharta/ui/ribbonBar/ribbonBar.e2e.ts

@@ -1,71 +0,0 @@
-import { CC_URL, goto } from "../../../puppeteer.helper"
-import { RibbonBarPageObject } from "./ribbonBar.po"
-import { SearchPanelPageObject } from "../searchPanel/searchPanel.po"
-
-//Commented out flaky test
-
-describe("RibbonBar", () => {
-	const sampleMap = `sample3.cc.json`
-	let searchPanel: SearchPanelPageObject
-	//let searchPanelModeSelector: SearchPanelModeSelectorPageObject
-	let ribbonBar: RibbonBarPageObject
-	//let metricChooser: MetricChooserPageObject
-	//let mapTreeViewLevel: MapTreeViewLevelPageObject
-
-	beforeEach(async () => {
-		searchPanel = new SearchPanelPageObject()
-		//searchPanelModeSelector = new SearchPanelModeSelectorPageObject()
-		ribbonBar = new RibbonBarPageObject()
-		//metricChooser = new MetricChooserPageObject()
-		//mapTreeViewLevel = new MapTreeViewLevelPageObject()
-
-		await goto()
-	})
-
-	/*it("hovering over a folder should display the sum of metric of all children", async () => {
-		await searchPanelModeSelector.toggleTreeView()
-
-		await mapTreeViewLevel.hoverNode("/root")
-
-		const actual = await metricChooser.getAreaMetricValue()
-		expect(actual).toContain("600")
-	})*/
-
-	it("should open a section, open the search bar and close the section again automatically", async () => {
-		const areaPanel = "area-metric"
-		const edgePanel = "edge-metric"
-
-		let isAreaSettingsPanelOpen = await ribbonBar.togglePanel(areaPanel, "cc-area-settings-panel")
-		expect(isAreaSettingsPanelOpen).toBeTruthy()
-
-		const isSearchPanelOpen = await searchPanel.toggle()
-		expect(isSearchPanelOpen).toBeTruthy()
-		expect(await ribbonBar.isPanelOpen("cc-area-settings-panel")).toBeFalsy()
-
-		isAreaSettingsPanelOpen = await ribbonBar.togglePanel(areaPanel, "cc-area-settings-panel")
-		expect(isAreaSettingsPanelOpen).toBeTruthy()
-		expect(await searchPanel.isOpen()).toBeFalsy()
-
-		const isEdgeSettingsPanelOpen = await ribbonBar.togglePanel(edgePanel, "cc-edge-settings-panel")
-		expect(isEdgeSettingsPanelOpen).toBeTruthy()
-		expect(await ribbonBar.isPanelOpen("cc-area-settings-panel")).toBeFalsy()
-	})
-
-	it("should open suspicious metrics and high risk profile menu ", async () => {
-		await page.goto(`${CC_URL}?file=codeCharta/assets/${sampleMap}`)
-		await page.click("cc-suspicious-metrics")
-		const suspiciousMetricsMenu = await page.waitForSelector(".mat-mdc-menu-panel.mat-mdc-menu-panel.ai-drop-down")
-		expect(suspiciousMetricsMenu).toBeTruthy()
-		let titleElement = await suspiciousMetricsMenu.waitForSelector(".title")
-		let titleContent = await titleElement.evaluate(element => element.textContent)
-		expect(titleContent).toBe("Suspicious Metrics")
-
-		await page.click("cc-code-charta #codeMap")
-		await page.click("cc-high-risk-profile")
-		const highRisProfileMenu = await page.waitForSelector(".mat-mdc-menu-panel.mat-mdc-menu-panel.ai-drop-down")
-		expect(highRisProfileMenu).toBeTruthy()
-		titleElement = await highRisProfileMenu.waitForSelector(".title")
-		titleContent = await titleElement.evaluate(element => element.textContent)
-		expect(titleContent).toBe("Risk Profile")
-	})
-})

package/app/codeCharta/ui/ribbonBar/ribbonBar.module.ts

@@ -1,40 +0,0 @@
-import { NgModule } from "@angular/core"
-import { RibbonBarComponent } from "./ribbonBar.component"
-import { AreaMetricChooserModule } from "./areaMetricChooser/areaMetricChooser.module"
-import { HeightMetricChooserModule } from "./heightMetricChooser/heightMetricChooser.module"
-import { ColorMetricChooserModule } from "./colorMetricChooser/colorMetricChooser.module"
-import { EdgeMetricChooserModule } from "./edgeMetricChooser/edgeMetricChooser.module"
-import { ShowScenariosButtonModule } from "./showScenariosButton/showScenariosButton.module"
-import { EdgeSettingsPanelModule } from "./edgeSettingsPanel/edgeSettingsPanel.module"
-import { ArtificialIntelligenceModule } from "./artificialIntelligence/artificialIntelligence.module"
-import { SearchPanelModule } from "../searchPanel/searchPanel.module"
-import { AreaSettingsPanelModule } from "./areaSettingsPanel/areaSettingsPanel.module"
-import { CustomConfigsModule } from "../customConfigs/customConfigs.module"
-import { HeightSettingsPanelModule } from "./heightSettingsPanel/heightSettingsPanel.module"
-import { ColorSettingsPanelModule } from "./colorSettingsPanel/colorSettingsPanel.module"
-import { CommonModule } from "@angular/common"
-import { MaterialModule } from "../../../material/material.module"
-import { LinkColorMetricToHeightMetricButtonModule } from "./linkColorMetricToHeightMetricButton/linkColorMetricToHeightMetricButton.module"
-
-@NgModule({
-	imports: [
-		CommonModule,
-		MaterialModule,
-		SearchPanelModule,
-		ShowScenariosButtonModule,
-		CustomConfigsModule,
-		ArtificialIntelligenceModule,
-		AreaMetricChooserModule,
-		AreaSettingsPanelModule,
-		HeightSettingsPanelModule,
-		HeightMetricChooserModule,
-		LinkColorMetricToHeightMetricButtonModule,
-		ColorMetricChooserModule,
-		ColorSettingsPanelModule,
-		EdgeMetricChooserModule,
-		EdgeSettingsPanelModule
-	],
-	declarations: [RibbonBarComponent],
-	exports: [RibbonBarComponent]
-})
-export class RibbonBarModule {}

package/app/codeCharta/ui/ribbonBar/ribbonBar.po.ts

@@ -1,17 +0,0 @@
-import { clickButtonOnPageElement } from "../../../puppeteer.helper"
-
-export class RibbonBarPageObject {
-	async isPanelOpen(elementName: string) {
-		await page.waitForFunction(elementName => document.querySelector(elementName), {}, elementName)
-		return page.$eval(elementName, element => !element.classList.contains("hidden"))
-	}
-
-	async togglePanel(selector: string, elementName: string) {
-		const wasOpen = await this.isPanelOpen(elementName)
-		await clickButtonOnPageElement(`#${selector}-card .section .section-title`)
-
-		await (wasOpen ? page.waitForSelector(`#${selector}-card`) : page.waitForSelector(`#${selector}-card.expanded`))
-
-		return !wasOpen
-	}
-}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/addCustomScenario.component.html

@@ -1,33 +0,0 @@
-<mat-toolbar color="primary">Add Scenario</mat-toolbar>
-
-<div class="cc-add-custom-scenario-content">
-	<mat-form-field class="cc-add-custom-scenario-name-field">
-		<label>Scenario Name</label>
-		<input matInput [formControl]="scenarioName" />
-		<mat-error *ngIf="scenarioName.invalid">{{ scenarioName.getError("Error") }}</mat-error>
-	</mat-form-field>
-
-	<p>The scenario includes:</p>
-
-	<div class="cc-add-custon-scenario-toggles">
-		<mat-slide-toggle
-			*ngFor="let property of scenarioContent"
-			[checked]="property.isSelected"
-			(change)="handleScenarioMetricPropertySelectionChange(property)"
-		>
-			{{ property.metricName ? property.metricType + " (" + property.metricName + ")" : property.metricType }}
-		</mat-slide-toggle>
-		<mat-error *ngIf="!areAnyScenarioMetricPropertiesSelected">You cannot create an empty Scenario</mat-error>
-	</div>
-
-	<div class="cc-add-custom-scenario-buttons">
-		<button
-			mat-button
-			mat-dialog-close
-			[disabled]="scenarioName.invalid || !areAnyScenarioMetricPropertiesSelected"
-			(click)="addCustomScenario()"
-		>
-			ADD
-		</button>
-	</div>
-</div>

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/addCustomScenario.component.scss

@@ -1,23 +0,0 @@
-.cc-add-custom-scenario .mat-mdc-dialog-container {
-	width: 50vw;
-	padding: 0;
-
-	.cc-add-custom-scenario-content {
-		.cc-add-custon-scenario-toggles {
-			display: flex;
-			flex-direction: column;
-			gap: 8px;
-			mat-slide-toggle {
-				display: block;
-			}
-		}
-		.cc-add-custom-scenario-name-field {
-			width: 75%;
-		}
-
-		.cc-add-custom-scenario-buttons {
-			display: flex;
-			justify-content: flex-end;
-		}
-	}
-}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/addCustomScenario.component.spec.ts

@@ -1,79 +0,0 @@
-import { TestbedHarnessEnvironment } from "@angular/cdk/testing/testbed"
-import { TestBed } from "@angular/core/testing"
-import { MatDialogRef } from "@angular/material/dialog"
-import { MatInputHarness } from "@angular/material/input/testing"
-import { MatButtonHarness } from "@angular/material/button/testing"
-import { render, screen } from "@testing-library/angular"
-import userEvent from "@testing-library/user-event"
-import { Vector3 } from "three"
-import { setState } from "../../../../state/store/state.actions"
-import { SCENARIO_ATTRIBUTE_CONTENT, STATE } from "../../../../util/dataMocks"
-import { ThreeCameraService } from "../../../codeMap/threeViewer/threeCamera.service"
-import { ThreeOrbitControlsService } from "../../../codeMap/threeViewer/threeOrbitControls.service"
-import { ScenarioHelper } from "../scenarioHelper"
-import { AddCustomScenarioComponent } from "./addCustomScenario.component"
-import { AddCustomScenarioModule } from "./addCustomScenario.module"
-import { appReducers, setStateMiddleware } from "../../../../state/store/state.manager"
-import { State, Store, StoreModule } from "@ngrx/store"
-
-describe("AddCustomScenarioComponent", () => {
-	beforeEach(async () => {
-		return TestBed.configureTestingModule({
-			imports: [AddCustomScenarioModule, StoreModule.forRoot(appReducers, { metaReducers: [setStateMiddleware] })],
-			providers: [
-				{ provide: ThreeCameraService, useValue: { camera: { position: new Vector3(0, 300, 1000) } } },
-				{ provide: ThreeOrbitControlsService, useValue: { controls: { target: new Vector3(177, 0, 299) } } },
-				{ provide: MatDialogRef, useValue: { close: jest.fn() } },
-				{ provide: State, useValue: { getValue: () => STATE } }
-			]
-		}).compileComponents()
-	})
-
-	it("should enable the user to add a custom scenario, with all properties set initially", async () => {
-		ScenarioHelper.addScenario = jest.fn()
-		const { fixture } = await render(AddCustomScenarioComponent, { excludeComponentDeclaration: true })
-		const loader = TestbedHarnessEnvironment.loader(fixture)
-
-		const closeDialog = TestBed.inject(MatDialogRef).close
-		const nameInput = await loader.getHarness(MatInputHarness)
-		const createButton = await loader.getHarness(MatButtonHarness.with({ text: "ADD" }))
-
-		await nameInput.setValue("my-custom-scenario")
-		await createButton.click()
-
-		expect(ScenarioHelper.addScenario).toHaveBeenCalled()
-		expect((ScenarioHelper.addScenario as jest.Mock).mock.calls[0][0]).toBe("my-custom-scenario")
-		expect((ScenarioHelper.addScenario as jest.Mock).mock.calls[0][1]).toEqual(SCENARIO_ATTRIBUTE_CONTENT)
-		expect(closeDialog).toHaveBeenCalled()
-	})
-
-	it("should validate scenario's name", async () => {
-		ScenarioHelper.isScenarioExisting = (name: string) => name === "I-already-exist"
-		const { container } = await render(AddCustomScenarioComponent, { excludeComponentDeclaration: true })
-
-		const scenarioNameInput = container.querySelector("input")
-		await userEvent.click(scenarioNameInput)
-		scenarioNameInput.blur()
-		expect(await screen.findByText("Scenario name is required")).toBeTruthy()
-
-		await userEvent.type(scenarioNameInput, "I-already-exist")
-		expect(await screen.findByText("A Scenario with this name already exists")).toBeTruthy()
-
-		await userEvent.type(scenarioNameInput, "my-custom-scenario")
-		expect(screen.queryByText("A Scenario with this name already exists")).toBeFalsy()
-	})
-
-	it("should show an error message, when no properties are selected", async () => {
-		const { detectChanges } = await render(AddCustomScenarioComponent, { excludeComponentDeclaration: true })
-		const store = TestBed.inject(Store)
-		store.dispatch(setState({ value: STATE }))
-		detectChanges()
-
-		await userEvent.click(screen.getByText("Camera-Position"))
-		await userEvent.click(screen.getByText("Area-Metric (rloc)"))
-		await userEvent.click(screen.getByText("Height-Metric (mcc)"))
-		await userEvent.click(screen.getByText("Color-Metric (mcc)"))
-		await userEvent.click(screen.getByText("Edge-Metric (pairingRate)"))
-		expect(await screen.findByText("You cannot create an empty Scenario")).toBeTruthy()
-	})
-})

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/addCustomScenario.component.ts

@@ -1,41 +0,0 @@
-import { Component, ViewEncapsulation } from "@angular/core"
-import { UntypedFormControl } from "@angular/forms"
-import { ScenarioHelper, ScenarioMetricProperty } from "../scenarioHelper"
-import { ThreeCameraService } from "../../../codeMap/threeViewer/threeCamera.service"
-import { ThreeOrbitControlsService } from "../../../codeMap/threeViewer/threeOrbitControls.service"
-import { customScenarioNameValidator } from "./utils/customScenarioName.validator"
-import { getInitialScenarioMetricProperties } from "./utils/getInitialScenarioMetricProperties"
-import { State } from "@ngrx/store"
-import { CcState } from "../../../../codeCharta.model"
-
-@Component({
-	templateUrl: "./addCustomScenario.component.html",
-	styleUrls: ["./addCustomScenario.component.scss"],
-	encapsulation: ViewEncapsulation.None
-})
-export class AddCustomScenarioComponent {
-	scenarioName = new UntypedFormControl("", [customScenarioNameValidator()])
-	scenarioNameErrorField: string | null = "Scenario name is required"
-	scenarioContent: ScenarioMetricProperty[]
-	areAnyScenarioMetricPropertiesSelected = true
-
-	constructor(
-		private state: State<CcState>,
-		threeCameraService: ThreeCameraService,
-		threeOrbitControlsService: ThreeOrbitControlsService
-	) {
-		this.scenarioContent = getInitialScenarioMetricProperties(this.state.getValue(), {
-			camera: threeCameraService.camera.position,
-			cameraTarget: threeOrbitControlsService.controls.target
-		})
-	}
-
-	handleScenarioMetricPropertySelectionChange(scenarioMetricProperty: ScenarioMetricProperty) {
-		scenarioMetricProperty.isSelected = !scenarioMetricProperty.isSelected
-		this.areAnyScenarioMetricPropertiesSelected = this.scenarioContent.some(property => property.isSelected)
-	}
-
-	addCustomScenario() {
-		ScenarioHelper.addScenario(this.scenarioName.value, this.scenarioContent)
-	}
-}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/addCustomScenario.module.ts

@@ -1,11 +0,0 @@
-import { CommonModule } from "@angular/common"
-import { NgModule } from "@angular/core"
-import { FormsModule, ReactiveFormsModule } from "@angular/forms"
-import { MaterialModule } from "../../../../../material/material.module"
-import { AddCustomScenarioComponent } from "./addCustomScenario.component"
-
-@NgModule({
-	imports: [CommonModule, FormsModule, ReactiveFormsModule, MaterialModule],
-	declarations: [AddCustomScenarioComponent]
-})
-export class AddCustomScenarioModule {}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/utils/customScenarioName.validator.ts

@@ -1,14 +0,0 @@
-import { ValidatorFn, AbstractControl, ValidationErrors } from "@angular/forms"
-import { ScenarioHelper } from "../../scenarioHelper"
-
-export function customScenarioNameValidator(): ValidatorFn {
-	return (control: AbstractControl): ValidationErrors | null => {
-		if (control.value.length === 0) {
-			return { Error: "Scenario name is required" }
-		}
-		if (ScenarioHelper.isScenarioExisting(control.value)) {
-			return { Error: "A Scenario with this name already exists" }
-		}
-		return null
-	}
-}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/utils/getInitialScenarioMetricProperties.spec.ts

@@ -1,21 +0,0 @@
-import { Vector3 } from "three"
-import { DEFAULT_STATE, STATE } from "../../../../../util/dataMocks"
-import { getInitialScenarioMetricProperties } from "./getInitialScenarioMetricProperties"
-
-describe("getInitialScenarioMetricProperties", () => {
-	it("should INCLUDE 'Edge-Metric' when there are edge metrics available", () => {
-		const initialScenarioMetricProperties = getInitialScenarioMetricProperties(STATE, {
-			camera: new Vector3(0, 300, 1000),
-			cameraTarget: new Vector3(1, 1, 1)
-		})
-		expect(initialScenarioMetricProperties.find(p => p.metricType === "Edge-Metric")).not.toBe(undefined)
-	})
-
-	it("should EXCLUDE 'Edge-Metric' when there are no edge metrics available", () => {
-		const initialScenarioMetricProperties = getInitialScenarioMetricProperties(DEFAULT_STATE, {
-			camera: new Vector3(0, 300, 1000),
-			cameraTarget: new Vector3(1, 1, 1)
-		})
-		expect(initialScenarioMetricProperties.find(p => p.metricType === "Edge-Metric")).toBe(undefined)
-	})
-})

package/app/codeCharta/ui/ribbonBar/showScenariosButton/addCustomScenario/utils/getInitialScenarioMetricProperties.ts

@@ -1,55 +0,0 @@
-import { Scenario, CcState } from "../../../../../codeCharta.model"
-import { ScenarioMetricProperty } from "../../scenarioHelper"
-
-export const getInitialScenarioMetricProperties = (state: CcState, camera: Scenario["camera"]): ScenarioMetricProperty[] => {
-	const { dynamicSettings, appSettings, fileSettings } = state
-	const properties: ScenarioMetricProperty[] = [
-		{
-			metricType: "Camera-Position",
-			metricName: "",
-			savedValues: { ...camera },
-			isSelected: true,
-			isDisabled: false
-		},
-		{
-			metricType: "Area-Metric",
-			metricName: dynamicSettings.areaMetric,
-			savedValues: dynamicSettings.margin,
-			isSelected: true,
-			isDisabled: false
-		},
-		{
-			metricType: "Height-Metric",
-			metricName: dynamicSettings.heightMetric,
-			savedValues: {
-				heightSlider: appSettings.scaling,
-				labelSlider: appSettings.amountOfTopLabels
-			},
-			isSelected: true,
-			isDisabled: false
-		},
-		{
-			metricType: "Color-Metric",
-			metricName: dynamicSettings.colorMetric,
-			savedValues: {
-				colorRange: dynamicSettings.colorRange,
-				mapColors: appSettings.mapColors
-			},
-			isSelected: true,
-			isDisabled: false
-		}
-	]
-	if (fileSettings.edges.length > 0) {
-		properties.push({
-			metricType: "Edge-Metric",
-			metricName: dynamicSettings.edgeMetric,
-			savedValues: {
-				edgePreview: appSettings.amountOfEdgePreviews,
-				edgeHeight: appSettings.edgeHeight
-			},
-			isSelected: true,
-			isDisabled: false
-		})
-	}
-	return properties
-}

package/app/codeCharta/ui/ribbonBar/showScenariosButton/scenario.service.spec.ts

@@ -1,84 +0,0 @@
-import { MatDialog } from "@angular/material/dialog"
-import { setState } from "../../../state/store/state.actions"
-import { ThreeCameraService } from "../../codeMap/threeViewer/threeCamera.service"
-import { ThreeOrbitControlsService } from "../../codeMap/threeViewer/threeOrbitControls.service"
-import { ErrorDialogComponent } from "../../dialogs/errorDialog/errorDialog.component"
-import { ScenarioService } from "./scenario.service"
-import { ScenarioHelper } from "./scenarioHelper"
-import { State, Store } from "@ngrx/store"
-import { CcState } from "../../../codeCharta.model"
-
-describe("scenarioService", () => {
-	let scenarioService: ScenarioService
-	let mockedStore: Store<CcState>
-	let mockedDialog: MatDialog
-	let mockedThreeCameraService: ThreeCameraService
-	let mockedThreeOrbitControlsService: ThreeOrbitControlsService
-
-	beforeEach(() => {
-		const mockedState = {} as unknown as State<CcState>
-		mockedStore = { dispatch: jest.fn() } as unknown as Store<CcState>
-		mockedDialog = { open: jest.fn() } as unknown as MatDialog
-		mockedThreeCameraService = { setPosition: jest.fn() } as unknown as ThreeCameraService
-		mockedThreeOrbitControlsService = { setControlTarget: jest.fn() } as unknown as ThreeOrbitControlsService
-		scenarioService = new ScenarioService(
-			mockedState,
-			mockedStore,
-			mockedDialog,
-			mockedThreeCameraService,
-			mockedThreeOrbitControlsService
-		)
-
-		ScenarioHelper.scenarios.set("Scenario1", {
-			name: "Scenario1",
-			area: { areaMetric: "rloc", margin: 50 },
-			edge: { edgeHeight: 42 },
-			camera: {
-				camera: { x: 1, y: 1, z: 1 },
-				cameraTarget: { x: 2, y: 2, z: 2 }
-			}
-		})
-	})
-
-	it("should apply a scenario", () => {
-		scenarioService.applyScenario("Scenario1")
-		expect(mockedStore.dispatch).toHaveBeenCalledWith(
-			setState({
-				value: {
-					dynamicSettings: { areaMetric: "rloc", margin: 50 },
-					appSettings: { edgeHeight: 42 }
-				}
-			})
-		)
-		expect(mockedThreeCameraService.setPosition).toHaveBeenCalledWith({ x: 1, y: 1, z: 1 })
-		expect(mockedThreeOrbitControlsService.setControlTarget).toHaveBeenCalledWith({ x: 2, y: 2, z: 2 })
-	})
-
-	describe("removeScenario", () => {
-		beforeEach(() => {
-			ScenarioHelper.deleteScenario = jest.fn()
-		})
-
-		it("should call deleteScenario", () => {
-			scenarioService.removeScenario("Scenario1")
-			expect(ScenarioHelper.deleteScenario).toHaveBeenCalledWith("Scenario1")
-			expect(mockedDialog.open).toHaveBeenCalledWith(ErrorDialogComponent, {
-				data: {
-					title: "Info",
-					message: "Scenario1 deleted."
-				}
-			})
-		})
-
-		it("should not delete default 'Complexity' scenario", () => {
-			scenarioService.removeScenario("Complexity")
-			expect(ScenarioHelper.deleteScenario).not.toHaveBeenCalled()
-			expect(mockedDialog.open).toHaveBeenCalledWith(ErrorDialogComponent, {
-				data: {
-					title: "Error",
-					message: "Complexity cannot be deleted as it is the default Scenario."
-				}
-			})
-		})
-	})
-})

package/app/codeCharta/ui/ribbonBar/showScenariosButton/scenario.service.ts

@@ -1,61 +0,0 @@
-import { Injectable } from "@angular/core"
-import { MatDialog } from "@angular/material/dialog"
-import { ColorRange, MapColors, CcState } from "../../../codeCharta.model"
-import { metricDataSelector } from "../../../state/selectors/accumulatedData/metricData/metricData.selector"
-import { setMapColors } from "../../../state/store/appSettings/mapColors/mapColors.actions"
-import { setColorRange } from "../../../state/store/dynamicSettings/colorRange/colorRange.actions"
-import { ScenarioHelper } from "./scenarioHelper"
-import { ThreeCameraService } from "../../codeMap/threeViewer/threeCamera.service"
-import { ThreeOrbitControlsService } from "../../codeMap/threeViewer/threeOrbitControls.service"
-import { ErrorDialogComponent } from "../../dialogs/errorDialog/errorDialog.component"
-import { Store, State } from "@ngrx/store"
-import { setState } from "../../../state/store/state.actions"
-
-@Injectable()
-export class ScenarioService {
-	constructor(
-		private state: State<CcState>,
-		private store: Store<CcState>,
-		private dialog: MatDialog,
-		private threeCameraService: ThreeCameraService,
-		private threeOrbitControlsService: ThreeOrbitControlsService
-	) {}
-
-	getScenarios() {
-		return ScenarioHelper.getScenarioItems(metricDataSelector(this.state.getValue()))
-	}
-
-	applyScenario(name: string) {
-		const scenario = ScenarioHelper.scenarios.get(name)
-		const scenarioSettings = ScenarioHelper.getScenarioSettings(scenario)
-		this.store.dispatch(setState({ value: scenarioSettings }))
-		this.store.dispatch(setColorRange({ value: scenarioSettings.dynamicSettings.colorRange as ColorRange }))
-		this.store.dispatch(setMapColors({ value: scenarioSettings.appSettings.mapColors as MapColors }))
-
-		if (scenario.camera) {
-			// @ts-ignore -- we know that it is not a partial when it is set
-			this.threeCameraService.setPosition(scenario.camera.camera)
-			// @ts-ignore -- we know that it is not a partial when it is set
-			this.threeOrbitControlsService.setControlTarget(scenario.camera.cameraTarget)
-		}
-	}
-
-	removeScenario(name) {
-		if (name !== "Complexity") {
-			ScenarioHelper.deleteScenario(name)
-			this.dialog.open(ErrorDialogComponent, {
-				data: {
-					title: "Info",
-					message: `${name} deleted.`
-				}
-			})
-		} else {
-			this.dialog.open(ErrorDialogComponent, {
-				data: {
-					title: "Error",
-					message: `${name} cannot be deleted as it is the default Scenario.`
-				}
-			})
-		}
-	}
-}