codecharta-visualization 1.115.0 → 1.116.0

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

@@ -3,8 +3,6 @@
 		[node]="selectedNode$ | async"
 		[fileName]="fileName$ | async"
 	></cc-attribute-side-bar-header-section>
-
 	<cc-attribute-side-bar-primary-metrics></cc-attribute-side-bar-primary-metrics>
-
 	<cc-attribute-side-bar-secondary-metrics></cc-attribute-side-bar-secondary-metrics>
 </div>

package/app/codeCharta/ui/attributeSideBar/attributeSideBar.component.scss

@@ -46,6 +46,10 @@ cc-attribute-side-bar {
 			}
 
 			table {
+				th {
+					text-align: left;
+				}
+
 				&.primary-metrics {
 					table-layout: fixed;
 					width: 100%;
@@ -63,54 +67,71 @@ cc-attribute-side-bar {
 						}
 					}
 
+					.primary-metric-box {
+						display: flex;
+						flex-direction: column;
+						height: 100%;
+						width: 100%;
+					}
+
+					.metric-name {
+						margin-top: 5px;
+					}
+
+					.primary-metric-value {
+						margin-right: -5px;
+					}
+
 					i.fa {
 						font-size: 12pt;
 						min-width: 17px;
 						text-align: center;
 					}
-
-					.metric-name {
-						margin: 5px 0 0 0;
-					}
 				}
 
-				th {
-					text-align: left;
-				}
+				&.secondary-metrics {
+					td {
+						padding-left: 5px;
 
-				td {
-					text-align: left;
-					vertical-align: initial;
-					margin: 0;
-				}
+						&:first-child {
+							padding-left: 4px;
+						}
+					}
+
+					.secondary-metric-box {
+						border-radius: 3px;
+						padding: 4px 4px;
+						vertical-align: middle;
+						background: #d5d5d5;
+					}
 
-				.metric-summary,
-				.metric-delta {
-					border-radius: 3px;
-					padding: 4px 4px;
+					.secondary-metric-row {
+						flex-wrap: nowrap;
+					}
 				}
 
-				.metric-summary {
-					align-content: flex-end;
-					background: #d5d5d5;
+				.primary-metric-row,
+				.secondary-metric-row {
 					display: flex;
-					flex-direction: row;
-					gap: 4px;
-					justify-content: space-between;
-					text-align: right;
-					vertical-align: center;
+					align-items: center;
+					flex-wrap: wrap;
+					gap: 5px;
 				}
 
 				.metric-name {
 					color: grey;
 					word-break: break-word;
+					vertical-align: middle;
 				}
 
-				.metric-value {
-					display: inline-block;
-					margin-left: 4px;
+				.delta-value-box {
+					vertical-align: middle;
 				}
 			}
+
+			cc-metric-delta-selected:has(span) {
+				margin-top: 5px;
+			}
 		}
 	}
 }

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

@@ -71,7 +71,7 @@ describe("AttributeSideBarComponent", () => {
 		expect(pathName).toMatch("/root/big leaf")
 
 		const firstPrimaryMetricEntry = container.querySelector("cc-attribute-side-bar-primary-metric").textContent
-		const expectedPrimaryMetricTextContent = "20 a"
+		const expectedPrimaryMetricTextContent = "20a"
 		expect(firstPrimaryMetricEntry).toMatch(expectedPrimaryMetricTextContent)
 
 		const expectedSecondaryMetricTextContent = "15b"
@@ -79,7 +79,7 @@ describe("AttributeSideBarComponent", () => {
 			.querySelector("cc-attribute-side-bar-primary-metric")
 			.textContent.includes(expectedSecondaryMetricTextContent)
 		expect(isSecondaryMetricInPrimaryMetricSection).toBe(false)
-		const firstSecondaryMetricEntry = container.querySelector("cc-attribute-side-bar-secondary-metrics .metric-row").textContent
+		const firstSecondaryMetricEntry = container.querySelector("cc-attribute-side-bar-secondary-metrics").textContent
 		expect(firstSecondaryMetricEntry).toMatch(expectedSecondaryMetricTextContent)
 
 		expect(isAttributeTypeSelectorShown(container)).toBe(false)
@@ -88,13 +88,12 @@ describe("AttributeSideBarComponent", () => {
 	it("should display deltas if node has delta values", async () => {
 		mockedSelectedNodeSelector.mockImplementation(() => klona(TEST_NODE_LEAF))
 		const { container } = await render(AttributeSideBarComponent, { excludeComponentDeclaration: true })
-
 		const firstPrimaryMetricEntry = container.querySelector("cc-attribute-side-bar-primary-metric").textContent
 		const expectedPrimaryMetricTextContent = /20\s+Δ1.0\s+a/
 		expect(firstPrimaryMetricEntry).toMatch(expectedPrimaryMetricTextContent)
 
 		const expectedSecondaryMetricTextContent = /15\s+Δ2.0\s+b/
-		const firstSecondaryMetricEntry = container.querySelector("cc-attribute-side-bar-secondary-metrics .metric-row").textContent
+		const firstSecondaryMetricEntry = container.querySelector("cc-attribute-side-bar-secondary-metrics").textContent
 		expect(firstSecondaryMetricEntry).toMatch(expectedSecondaryMetricTextContent)
 	})
 
@@ -148,19 +147,15 @@ describe("AttributeSideBarComponent", () => {
 		})
 
 		const { container } = await render(AttributeSideBarComponent, { excludeComponentDeclaration: true })
-
 		const attributeTypeSelectorWithinPrimaryMetrics = container.querySelectorAll("cc-attribute-side-bar-primary-metrics td")
-		const attributeTypeSelectorWithinSecondaryMetrics = container.querySelectorAll(
-			"cc-attribute-side-bar-secondary-metrics .metric-row"
-		)
-
+		const attributeTypeSelectorWithinSecondaryMetrics = container.querySelectorAll("cc-attribute-side-bar-secondary-metrics tr")
 		expect(attributeTypeSelectorWithinPrimaryMetrics[0].getAttribute("title")).toBe("a_testTitle (a):\na_testDescription")
 		expect(attributeTypeSelectorWithinPrimaryMetrics[1].getAttribute("title")).toBe("b_testTitle (b)")
 		expect(attributeTypeSelectorWithinPrimaryMetrics[2].getAttribute("title")).toBe("someColor")
 		expect(attributeTypeSelectorWithinPrimaryMetrics[3].getAttribute("title")).toBe("someEdge")
 
-		expect(attributeTypeSelectorWithinSecondaryMetrics[0].getAttribute("title")).toBe("c:\nc_testDescription")
-		expect(attributeTypeSelectorWithinSecondaryMetrics.length).toBe(1)
+		expect(attributeTypeSelectorWithinSecondaryMetrics[1].getAttribute("title")).toBe("c:\nc_testDescription")
+		expect(attributeTypeSelectorWithinSecondaryMetrics.length).toBe(2)
 	})
 })
 

package/app/codeCharta/ui/attributeSideBar/attributeSideBarPrimaryMetrics/attributeSideBarPrimaryMetric/attributeSideBarPrimaryMetric.component.html

@@ -1,14 +1,14 @@
-<i [class]="iconName"></i>
-<div class="metric-value">
-	<cc-attribute-type-selector
-		*ngIf="showAttributeTypeSelector$ | async"
-		class="attribute-type-select"
-		[metricName]="metric.name"
-		[metricType]="'nodes'"
-	></cc-attribute-type-selector>
-	<span>
-		{{ metric.value | number: "1.0-0" }}
-	</span>
+<div class="primary-metric-box">
+	<div class="primary-metric-row">
+		<i [class]="iconName"></i>
+		<cc-attribute-type-selector
+			*ngIf="showAttributeTypeSelector$ | async"
+			class="attribute-type-select"
+			[metricName]="metric.name"
+			[metricType]="'nodes'"
+		></cc-attribute-type-selector>
+		<span class="primary-metric-value">{{ metric.value | number: "1.0-0" }}</span>
+	</div>
+	<cc-metric-delta-selected [metricName]="metric.name"></cc-metric-delta-selected>
+	<span class="metric-name">{{ metric.name }}</span>
 </div>
-<cc-metric-delta-selected [metricName]="metric.name"></cc-metric-delta-selected>
-<p class="metric-name">{{ metric.name }}</p>

package/app/codeCharta/ui/attributeSideBar/attributeSideBarPrimaryMetrics/attributeSideBarPrimaryMetrics.component.html

@@ -16,7 +16,6 @@
 				></cc-attribute-side-bar-primary-metric>
 			</td>
 		</tr>
-
 		<tr>
 			<td [title]="primaryMetrics.color.descriptors | metricDescriptorTitle">
 				<cc-attribute-side-bar-primary-metric
@@ -26,26 +25,28 @@
 			</td>
 			<ng-container *ngIf="primaryMetrics.edge as edge; else sidebarPrimaryMetricsEdgeElse">
 				<td [title]="edge.descriptors | metricDescriptorTitle">
-					<i class="fa fa-exchange"></i>
-					<div class="metric-value">
-						<cc-attribute-type-selector
-							*ngIf="showAttributeTypeSelector$ | async"
-							class="attribute-type-select"
-							[metricName]="edge.name"
-							[metricType]="'edges'"
-						></cc-attribute-type-selector>
-						<span class="metric-value">
-							{{ edge.incoming | number: "1.0-0" }}
-							<span>/</span>
-							{{ edge.outgoing | number: "1.0-0" }}
-						</span>
+					<div class="primary-metric-box">
+						<div class="primary-metric-row">
+							<i class="fa fa-exchange"></i>
+							<cc-attribute-type-selector
+								*ngIf="showAttributeTypeSelector$ | async"
+								class="attribute-type-select"
+								[metricName]="edge.name"
+								[metricType]="'edges'"
+							></cc-attribute-type-selector>
+							<span>
+								{{ edge.incoming | number: "1.0-0" }}
+								<span>/</span>
+								{{ edge.outgoing | number: "1.0-0" }}
+							</span>
+						</div>
+						<span class="metric-name">{{ edge.name }} (in/out)</span>
 					</div>
-					<p class="metric-name">{{ edge.name }} (in/out)</p>
 				</td>
 			</ng-container>
 			<ng-template #sidebarPrimaryMetricsEdgeElse>
 				<td>
-					<p class="metric-name">No edge metric available</p>
+					<span class="metric-name">No edge metric available</span>
 				</td>
 			</ng-template>
 		</tr>

package/app/codeCharta/ui/attributeSideBar/attributeSideBarSecondaryMetrics/attributeSideBarSecondaryMetrics.component.html

@@ -5,13 +5,9 @@
 				<tr>
 					<th scope="col" colspan="2">Secondary Metrics</th>
 				</tr>
-				<tr
-					*ngFor="let secondaryMetric of secondaryMetrics$ | async"
-					class="metric-row"
-					[title]="secondaryMetric.descriptors | metricDescriptorTitle"
-				>
-					<td class="metric-summary">
-						<span class="metric-type">
+				<tr *ngFor="let secondaryMetric of secondaryMetrics$ | async" [title]="secondaryMetric.descriptors | metricDescriptorTitle">
+					<td class="secondary-metric-box">
+						<div class="secondary-metric-row">
 							<cc-attribute-type-selector
 								*ngIf="showAttributeTypeSelector$ | async"
 								class="attribute-type-select"
@@ -19,13 +15,15 @@
 								[metricType]="'nodes'"
 							>
 							</cc-attribute-type-selector>
-						</span>
-						<span class="metric-value">{{ secondaryMetric.value | number: "1.0-0" }}</span>
+							<span class="metric-value">{{ secondaryMetric.value | number: "1.0-0" }}</span>
+						</div>
 					</td>
-					<td [hidden]="!(showDeltaValue$ | async)">
+					<td class="delta-value-box" [hidden]="!(showDeltaValue$ | async)">
 						<cc-metric-delta-selected [metricName]="secondaryMetric.name"></cc-metric-delta-selected>
 					</td>
-					<td class="metric-name">{{ secondaryMetric.name }}</td>
+					<td>
+						<span class="metric-name">{{ secondaryMetric.name }}</span>
+					</td>
 				</tr>
 			</table>
 		</div>

package/app/codeCharta/ui/attributeSideBar/attributeTypeSelector/attributeTypeSelector.component.scss

@@ -1,14 +1,24 @@
+@use "../../../../material/theme";
 cc-attribute-type-selector {
-	.mat-mdc-button-toggle-group {
-		height: 18px;
+	.mat-button-toggle-appearance-standard .mat-button-toggle-label-content {
+		display: flex;
 		align-items: center;
-		justify-content: space-evenly;
+		height: 100%;
 	}
-	.mat-mdc-button-toggle-appearance-standard .mat-button-toggle-label-content {
-		padding: 0 7px 0 7px;
+
+	button {
+		align-items: center;
+		height: 100%;
+
+		&:hover {
+			background-color: rgba(0, 0, 0, 0.05);
+			color: theme.$cc-primary-color;
+		}
 	}
-	.mat-mdc-button-toggle-standalone.mat-button-toggle-appearance-standard,
-	.mat-mdc-button-toggle-group-appearance-standard {
-		border: 0.1px solid darkgrey;
+
+	.mat-button-toggle-standalone.mat-button-toggle-appearance-standard:not([class*="mat-elevation-z"]),
+	.mat-button-toggle-group-appearance-standard:not([class*="mat-elevation-z"]) {
+		height: 22px;
+		border: 0.5px solid darkgrey;
 	}
 }

package/app/codeCharta/ui/attributeSideBar/metricDeltaSelected/metricDeltaSelected.component.html

@@ -1,5 +1,5 @@
 <ng-container *ngIf="(selectedNode$ | async )?.deltas?.[metricName] as deltaValue">
-	<span [style.color]="(mapColors$ | async)[deltaValue > 0 ? 'positiveDelta' : 'negativeDelta']" class="metric-delta">
+	<span [style.color]="(mapColors$ | async)[deltaValue > 0 ? 'positiveDelta' : 'negativeDelta']">
 		&Delta;{{ deltaValue | number: "1.1-2" }}
 	</span>
 </ng-container>

package/app/codeCharta/ui/dialogs/changelogDialog/changelogDialog.component.ts

@@ -1,6 +1,7 @@
 import markdownFile from "../../../../../../CHANGELOG.md"
 import { Component, Inject, ViewEncapsulation } from "@angular/core"
 import { MAT_DIALOG_DATA } from "@angular/material/dialog"
+import { marked } from "marked"
 
 @Component({
 	templateUrl: "./changelogDialog.component.html",
@@ -11,7 +12,12 @@ export class ChangelogDialogComponent {
 	changes: Record<string, string>
 
 	constructor(@Inject(MAT_DIALOG_DATA) public data: { previousVersion: string; currentVersion: string }) {
-		let changelogLines = markdownFile.split("\n")
+		this.changes = this.getChangelogChanges()
+	}
+
+	private getChangelogChanges() {
+		const parsedMarkdownFile = marked.parse(markdownFile, { headerIds: false })
+		let changelogLines = parsedMarkdownFile.split("\n")
 		const currentVersionFirstLine = this.findVersionLine(changelogLines, this.data.currentVersion)
 		const lastOpenedVersionFirstLine = this.findVersionLine(changelogLines, this.data.previousVersion)
 		//Add 1 to keep the version line so that it detects the end of the last set of changes
@@ -21,7 +27,7 @@ export class ChangelogDialogComponent {
 		for (const title of titles) {
 			const titlePattern = new RegExp(`<h3>${title}</h3>`)
 			const titleLinesIndexes = this.getAllIndexes(changelogLines, titlePattern)
-			const changelogTypes = []
+			const changelogTypes: string[] = []
 			for (const lineIndex of titleLinesIndexes) {
 				// Add 2 to remove the headline and the <ul> tag
 				const start = lineIndex + 2
@@ -34,11 +40,11 @@ export class ChangelogDialogComponent {
 				changes[title] = changelogTypes.join("\n")
 			}
 		}
-		this.changes = changes
+		return changes
 	}
 
 	private getAllIndexes(titles: string[], pattern: RegExp) {
-		return titles.reduce((matchingTitleIndexes, title, index) => {
+		return titles.reduce((matchingTitleIndexes: number[], title, index) => {
 			if (pattern.test(title)) {
 				matchingTitleIndexes.push(index)
 			}

package/app/codeCharta/ui/dialogs/changelogDialog/changelogDialog.e2e.ts

@@ -0,0 +1,26 @@
+import { goto } from "../../../../puppeteer.helper"
+import changelog from "../../../../../../CHANGELOG.md"
+
+function getSecondLatestCodeChartaVersion() {
+	const versionPattern = /\[(\d+\.\d+\.\d+)]/g
+	const versions = changelog.match(versionPattern) || []
+	const secondLatestVersion = versions[1]?.slice(1, -1)
+	return secondLatestVersion
+}
+
+describe("changelogDialog", () => {
+	beforeEach(async () => {
+		const version = getSecondLatestCodeChartaVersion() ?? ""
+		await page.evaluateOnNewDocument(version => {
+			localStorage.setItem("codeChartaVersion", version)
+		}, version)
+		await goto()
+	})
+	it("should show entries between the last und newest release version", async () => {
+		const changelogDialog = await page.waitForSelector(".mat-mdc-dialog-container", { timeout: 6000 })
+		const contentElement = await changelogDialog?.waitForSelector(".content")
+		const changelogContent = await contentElement?.evaluate(element => element.textContent)
+
+		expect(changelogContent?.length).not.toBe(0)
+	})
+})

package/app/codeCharta/ui/filePanel/filePanelFileSelector/filePanelFileSelector.component.html

@@ -6,10 +6,10 @@
 	class="standard-select"
 	multiple
 >
-	<div class="actions">
-		<button mat-button (click)="handleSelectAllFiles()">All</button>
-		<button mat-button (click)="handleSelectZeroFiles()">None</button>
-		<button mat-button (click)="handleInvertSelectedFiles()">Invert</button>
+	<div class="file-selection-actions">
+		<button class="file-select-action-button" (click)="handleSelectAllFiles()">All</button>
+		<button class="file-select-action-button" (click)="handleSelectZeroFiles()">None</button>
+		<button class="file-select-action-button" (click)="handleInvertSelectedFiles()">Invert</button>
 	</div>
 	<mat-option class="filenames" *ngFor="let file of fileStates" [value]="file.file">
 		{{ file.file.fileMeta.fileName | removeExtension }}

package/app/codeCharta/ui/filePanel/filePanelFileSelector/filePanelFileSelector.component.scss

@@ -1,5 +1,42 @@
+@use "../../../../material/theme";
 .file-select {
 	&.mat-mdc-select-panel {
 		min-width: max-content;
+		padding: 0;
+
+		.mat-mdc-option .mdc-list-item__primary-text {
+			flex: 1;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.file-selection-actions {
+			display: flex;
+		}
+
+		button {
+			width: 100%;
+			font-size: 16px;
+			margin: 0;
+			background-color: transparent;
+
+			&:hover {
+				background-color: rgba(0, 0, 0, 0.05);
+				color: theme.$cc-primary-color;
+			}
+
+			&.file-select-action-button {
+				padding: 15px 10px;
+			}
+
+			&.remove-button {
+				padding: 8px 10px;
+
+				&:hover {
+					border-radius: 50%;
+				}
+			}
+		}
 	}
 }

package/app/codeCharta/ui/filePanel/filePanelFileSelector/removeFileButton/removeFileButton.component.html

@@ -1,3 +1,3 @@
-<button mat-button (click)="onRemoveFile(filename, $event)" title="Remove map">
+<button class="remove-button" (click)="onRemoveFile(filename, $event)" title="Remove map">
 	<i class="fa fa-trash delete-symbol"></i>
 </button>

package/app/codeCharta/ui/filePanel/filePanelFileSelector/removeFileButton/removeFileButton.component.ts

@@ -5,7 +5,6 @@ import { removeFile } from "../../../../state/store/files/files.actions"
 @Component({
 	selector: "cc-remove-file-button",
 	templateUrl: "./removeFileButton.component.html",
-	styleUrls: ["./removeFileButton.component.scss"],
 	encapsulation: ViewEncapsulation.None
 })
 export class RemoveFileButtonComponent {

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

@@ -34,8 +34,6 @@
 </div>
 
 <button
-	mat-button
-	mat-raised-button
 	color="primary"
 	class="panel-button"
 	(click)="toggleIsLegendVisible()"

package/app/codeCharta/ui/legendPanel/legendPanel.component.scss

@@ -1,3 +1,4 @@
+@use "../../../material/theme";
 cc-legend-panel {
 	$fixedHeight: 35;
 
@@ -10,6 +11,12 @@ cc-legend-panel {
 		height: 36px;
 		width: 88px;
 		margin: 6px 8px;
+		color: white;
+		background-color: theme.$cc-primary-color;
+
+		&:hover {
+			background-color: theme.$cc-emphasized-color;
+		}
 
 		&.isAttributeSideBarVisible {
 			right: 316px;

package/app/codeCharta/ui/ribbonBar/artificialIntelligence/selectors/artificialIntelligence.selector.spec.ts

@@ -3,6 +3,12 @@ import { VALID_NODE_JAVA } from "../../../../util/dataMocks"
 import { BlacklistItem, NodeType } from "../../../../codeCharta.model"
 
 describe("ArtificialIntelligenceSelector", () => {
+	it("should return undefined when no unifiedMapNode is available", () => {
+		const actual = calculate({ unifiedMapNode: undefined }, [])
+
+		expect(actual).toBeUndefined()
+	})
+
 	it("should calculate suspicious metrics and risk profile when experimental features are enabled ", () => {
 		const actual = calculate({ unifiedMapNode: VALID_NODE_JAVA }, [])
 

package/app/codeCharta/ui/ribbonBar/artificialIntelligence/selectors/artificialIntelligence.selector.ts

@@ -34,6 +34,10 @@ export const calculate = (
 	accumulatedData: Pick<AccumulatedData, "unifiedMapNode">,
 	blacklist: BlacklistItem[]
 ): ArtificialIntelligenceData | undefined => {
+	if (!accumulatedData.unifiedMapNode) {
+		return
+	}
+
 	const artificialIntelligenceViewModel: ArtificialIntelligenceData = {
 		analyzedProgrammingLanguage: undefined,
 		suspiciousMetricSuggestionLinks: [],

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

@@ -83,7 +83,6 @@ cc-ribbon-bar {
 			display: inline-block;
 			height: 100%;
 			width: 100%;
-			border-right: $border;
 			vertical-align: top;
 			overflow: hidden;
 

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

@@ -1,10 +1,11 @@
-import { goto } from "../../../puppeteer.helper"
+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
@@ -49,4 +50,22 @@ describe("RibbonBar", () => {
 		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/util/customConfigHelper.ts

@@ -38,23 +38,7 @@ export class CustomConfigHelper {
 
 	static loadCustomConfigsFromLocalStorage() {
 		const ccLocalStorage = this.getCcLocalStorage()
-		const configs = new Map(ccLocalStorage?.customConfigs)
-		this.mapOldConfigStructureToNew(configs)
-		return configs
-	}
-
-	// TODO [2023-04-01] remove support
-	private static mapOldConfigStructureToNew(configs: Map<string, CustomConfig>) {
-		for (const config of configs.values()) {
-			if (config["mapChecksum"]) {
-				const checksums = config["mapChecksum"].split(";")
-				config.assignedMaps = new Map(checksums.map((checksum, index) => [checksum, config["assignedMaps"][index]]))
-			}
-			// @ts-ignore
-			if (config.mapSelectionMode === "MULTIPLE") {
-				config.mapSelectionMode = CustomConfigMapSelectionMode.MULTIPLE
-			}
-		}
+		return new Map(ccLocalStorage?.customConfigs)
 	}
 
 	private static getCcLocalStorage() {
@@ -113,8 +97,6 @@ export class CustomConfigHelper {
 	static importCustomConfigs(content: string) {
 		const importedCustomConfigsFile: CustomConfigsDownloadFile = JSON.parse(content, stateObjectReviver)
 
-		this.mapOldConfigStructureToNew(importedCustomConfigsFile.customConfigs)
-
 		for (const exportedConfig of importedCustomConfigsFile.customConfigs.values()) {
 			const alreadyExistingConfig = CustomConfigHelper.getCustomConfigSettings(exportedConfig.id)
 
@@ -215,8 +197,6 @@ export class CustomConfigHelper {
 		threeOrbitControlsService: ThreeOrbitControlsService
 	) {
 		const customConfig = this.getCustomConfigSettings(configId)
-		CustomConfigHelper.deleteUnusedKeyPropsOfCustomConfig(customConfig)
-
 		store.dispatch(setState(customConfig.stateSettings))
 
 		// TODO: remove this dirty timeout and set camera settings properly
@@ -228,12 +208,4 @@ export class CustomConfigHelper {
 			}, 100)
 		}
 	}
-
-	// TODO [2023-04-01] remove support
-	private static deleteUnusedKeyPropsOfCustomConfig(customConfig: any) {
-		if (customConfig.stateSettings.treeMap || customConfig.stateSettings.fileSettings.attributeTypes) {
-			delete customConfig.stateSettings.treeMap
-			delete customConfig.stateSettings.fileSettings.attributeTypes
-		}
-	}
 }

package/app/codeCharta/util/testUtils/markdown-transformer.js

@@ -0,0 +1,11 @@
+const marked = require("marked")
+
+module.exports = {
+	process(source) {
+		const html = marked.parse(source)
+		return {
+			module: "commonjs",
+			code: `module.exports = ${JSON.stringify(html)};`
+		}
+	}
+}