codecharta-visualization 1.88.0 → 1.89.0

package/package.json

@@ -10,7 +10,7 @@
 		"url": "https://github.com/MaibornWolff/codecharta.git"
 	},
 	"name": "codecharta-visualization",
-	"version": "1.88.0",
+	"version": "1.89.0",
 	"engines": {
 		"node": ">=16"
 	},
@@ -171,7 +171,7 @@
 		"eslint-config-prettier": "^8.2.0",
 		"eslint-plugin-unicorn": "^40.0.0",
 		"file-loader": "^6.2.0",
-		"html-loader": "^1.1.0",
+		"html-loader": "^3.0.0",
 		"html-loader-jest": "^0.2.1",
 		"html-webpack-plugin": "^5.3.1",
 		"jest": "^26.6.3",

package/app/codeCharta/ui/attributeSideBar/attributeTypeSelector/aggregationSymbol.pipe.spec.ts

@@ -1,19 +0,0 @@
-import { AttributeTypeValue } from "../../../codeCharta.model"
-import { AggregationSymbolPipe } from "./aggregationSymbol.pipe"
-
-describe("aggregationSymbolPipe", () => {
-	it("should map `AttributeTypeValue.relative` to x͂", () => {
-		const getAttributeTypeOfNodesByMetricSelector = () => AttributeTypeValue.relative
-		expect(new AggregationSymbolPipe().transform("some-metric-name", getAttributeTypeOfNodesByMetricSelector)).toBe("x͂")
-	})
-
-	it("should map `AttributeTypeValue.absolute` to Σ", () => {
-		const getAttributeTypeOfNodesByMetricSelector = () => AttributeTypeValue.absolute
-		expect(new AggregationSymbolPipe().transform("some-metric-name", getAttributeTypeOfNodesByMetricSelector)).toBe("Σ")
-	})
-
-	it("should default to Σ", () => {
-		const getAttributeTypeOfNodesByMetricSelector = () => "" as AttributeTypeValue
-		expect(new AggregationSymbolPipe().transform("some-metric-name", getAttributeTypeOfNodesByMetricSelector)).toBe("Σ")
-	})
-})

package/app/codeCharta/ui/nodeContextMenu/markFolderRow/selectors/markFolderItems.selector.ts

@@ -1,29 +0,0 @@
-import { MarkedPackage, Node } from "../../../../codeCharta.model"
-import { createSelector } from "../../../../state/angular-redux/createSelector"
-import { mapColorsSelector } from "../../../../state/store/appSettings/mapColors/mapColors.selector"
-import { markedPackagesSelector } from "../../../../state/store/fileSettings/markedPackages/markedPackages.selector"
-import { findIndexOfMarkedPackageOrParent } from "../../../../state/store/fileSettings/markedPackages/util/findIndexOfMarkedPackageOrParent"
-import { CcState } from "../../../../state/store/store"
-import { rightClickedNodeSelector } from "./rightClickedNode.selector"
-
-export type MarkFolderItem = {
-	color: string
-	isMarked: boolean
-}
-
-const markingColorsSelector = createSelector([mapColorsSelector], mapColors => mapColors.markingColors)
-
-export const _getMarkFolderItems = (node: Pick<Node, "path">, markingColors: string[], markedPackages: MarkedPackage[]) => {
-	if (node === null) return markingColors.map(color => ({ color, isMarked: false }))
-
-	const nodeIndexWithinMarkedPackages = findIndexOfMarkedPackageOrParent(markedPackages, node.path)
-	return markingColors.map(color => ({
-		color,
-		isMarked: nodeIndexWithinMarkedPackages !== -1 && color === markedPackages[nodeIndexWithinMarkedPackages].color
-	}))
-}
-
-export const markFolderItemsSelector: (state: CcState) => MarkFolderItem[] = createSelector(
-	[rightClickedNodeSelector, markingColorsSelector, markedPackagesSelector],
-	_getMarkFolderItems
-)

package/app/codeCharta/ui/nodeContextMenu/markFolderRow/selectors/rightClickedNode.selector.spec.ts

@@ -1,15 +0,0 @@
-import { CodeMapBuilding } from "../../../codeMap/rendering/codeMapBuilding"
-import { _getNode } from "./rightClickedNode.selector"
-
-describe("rightClickedNodeSelector's _getNode", () => {
-	it("should return null when no building was right clicked on", () => {
-		expect(_getNode(new Map(), null)).toBe(null)
-	})
-
-	it("should return node", () => {
-		const node = { id: 1 }
-		const codeMapBuilding = { node } as CodeMapBuilding
-		const idToBuilding = new Map([[1, codeMapBuilding]])
-		expect(_getNode(idToBuilding, { nodeId: 1 })).toBe(node)
-	})
-})

package/app/codeCharta/ui/nodeContextMenu/markFolderRow/selectors/rightClickedNode.selector.ts

@@ -1,9 +0,0 @@
-import { createSelector } from "../../../../state/angular-redux/createSelector"
-import { rightClickedNodeDataSelector } from "../../../../state/store/appStatus/rightClickedNodeData/rightClickedNodeData.selector"
-import { idToBuildingSelector } from "../../../../state/store/lookUp/idToBuilding/idToBuilding.selector"
-import { CodeMapBuilding } from "../../../codeMap/rendering/codeMapBuilding"
-
-export const _getNode = (idToBuilding: Map<number, CodeMapBuilding>, rightClickedNodeData: { nodeId: number }) =>
-	rightClickedNodeData !== null ? idToBuilding.get(rightClickedNodeData.nodeId).node : null
-
-export const rightClickedNodeSelector = createSelector([idToBuildingSelector, rightClickedNodeDataSelector], _getNode)

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

@@ -1,45 +0,0 @@
-<md-card id="codemap-context-menu" ng-show="$ctrl.rightClickedNodeData !== null">
-	<div ng-if="$ctrl.nodeIsFolder()">
-		<cc-mark-folder-row></cc-mark-folder-row>
-		<md-divider></md-divider>
-	</div>
-
-	<div class="button-group">
-		<md-button ng-disabled="true" title="{{ $ctrl._viewModel.nodePath }}">
-			{{ $ctrl._viewModel.lastPartOfNodePath }}
-		</md-button>
-
-		<cc-focus-buttons [code-map-node]="$ctrl._viewModel.codeMapNode"></cc-focus-buttons>
-		<md-button
-			ng-if="!$ctrl._viewModel.codeMapNode.isFlattened"
-			ng-click="$ctrl.flattenNode()"
-			id="flatten-button"
-			title="Flatten node and children-nodes, but keep an empty space"
-		>
-			<img alt="flattenIcon" class="png-icon" src="../../../assets/flatten.png" style="width: 17px; height: 17px" />
-			Flatten
-		</md-button>
-		<md-button
-			ng-if="$ctrl._viewModel.codeMapNode.isFlattened"
-			ng-click="$ctrl.showFlattenedNode()"
-			title="Show node and children-nodes"
-			><img alt="flattenIcon" class="png-icon" src="../../../assets/flatten.png" style="width: 17px; height: 17px" /> Show</md-button
-		>
-		<md-button
-			ng-if="!$ctrl.isNodeConstantlyHighlighted()"
-			title="Highlight node constantly"
-			ng-click="$ctrl.addNodeToConstantHighlight()"
-			><i class="fa fa-cubes"></i> Keep Highlight</md-button
-		>
-		<md-button
-			ng-if="$ctrl.isNodeConstantlyHighlighted()"
-			title="Remove constant highlight"
-			ng-click="$ctrl.removeNodeFromConstantHighlight()"
-			><i class="fa fa-cubes"></i> Remove Highlight</md-button
-		>
-
-		<md-button ng-click="$ctrl.excludeNode()" id="exclude-button" title="Exclude node and children-nodes and reorder the CodeMap"
-			><i class="fa fa-ban"></i> Exclude</md-button
-		>
-	</div>
-</md-card>

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

@@ -1,365 +0,0 @@
-import "./nodeContextMenu.module"
-
-import { IRootScopeService, IWindowService } from "angular"
-import { instantiateModule, getService } from "../../../../mocks/ng.mockhelper"
-import { NodeContextMenuController } from "./nodeContextMenu.component"
-import {
-	CODE_MAP_BUILDING,
-	CODE_MAP_BUILDING_TS_NODE,
-	CONSTANT_HIGHLIGHT,
-	TEST_DELTA_MAP_A,
-	VALID_FILE_NODE_WITH_ID,
-	VALID_NODE_WITH_PATH
-} from "../../util/dataMocks"
-import { CodeMapPreRenderService } from "../codeMap/codeMap.preRender.service"
-import { StoreService } from "../../state/store.service"
-import { BlacklistType, NodeType } from "../../codeCharta.model"
-import { addBlacklistItem } from "../../state/store/fileSettings/blacklist/blacklist.actions"
-import { NodeDecorator } from "../../util/nodeDecorator"
-import { ThreeSceneService } from "../codeMap/threeViewer/threeSceneService"
-import { CodeMapBuilding } from "../codeMap/rendering/codeMapBuilding"
-import { setIdToBuilding } from "../../state/store/lookUp/idToBuilding/idToBuilding.actions"
-import { DialogService } from "../dialog/dialog.service"
-import { BlacklistService } from "../../state/store/fileSettings/blacklist/blacklist.service"
-
-describe("nodeContextMenuController", () => {
-	let element: Element
-	let nodeContextMenuController: NodeContextMenuController
-	let $window: IWindowService
-	let $rootScope: IRootScopeService
-	let storeService: StoreService
-	let codeMapPreRenderService: CodeMapPreRenderService
-	let threeSceneService: ThreeSceneService
-	let dialogService: DialogService
-	let blacklistService: BlacklistService
-
-	beforeEach(() => {
-		restartSystem()
-		mockElement()
-		mockWindow()
-		withMockedCodeMapPreRenderService()
-		withMockedThreeSceneService()
-		rebuildController()
-
-		NodeDecorator.decorateMapWithPathAttribute(TEST_DELTA_MAP_A)
-	})
-
-	function restartSystem() {
-		instantiateModule("app.codeCharta.ui.nodeContextMenu")
-
-		$window = getService<IWindowService>("$window")
-		$rootScope = getService<IRootScopeService>("$rootScope")
-		storeService = getService<StoreService>("storeService")
-		codeMapPreRenderService = getService<CodeMapPreRenderService>("codeMapPreRenderService")
-		threeSceneService = getService<ThreeSceneService>("threeSceneService")
-		dialogService = getService<DialogService>("dialogService")
-		blacklistService = getService<BlacklistService>("blacklistService")
-	}
-
-	function mockElement() {
-		// @ts-ignore we only care about few properties for the test.
-		element = [{ children: [{ clientWidth: 50, clientHeight: 100 }] }]
-	}
-
-	function mockWindow() {
-		$window = { innerWidth: 800, innerHeight: 600 } as IWindowService
-	}
-
-	function rebuildController() {
-		nodeContextMenuController = new NodeContextMenuController(
-			element,
-			$window,
-			$rootScope,
-			storeService,
-			codeMapPreRenderService,
-			threeSceneService,
-			dialogService,
-			blacklistService
-		)
-	}
-
-	function withMockedCodeMapPreRenderService() {
-		codeMapPreRenderService.getRenderMap = jest.fn().mockReturnValue(TEST_DELTA_MAP_A.map)
-	}
-
-	function withMockedThreeSceneService() {
-		threeSceneService = jest.fn().mockReturnValue({
-			addNodeAndChildrenToConstantHighlight: jest.fn(),
-			removeNodeAndChildrenFromConstantHighlight: jest.fn(),
-			getConstantHighlight: jest.fn().mockReturnValue(CONSTANT_HIGHLIGHT)
-		})()
-	}
-
-	describe("onShowNodeContextMenu", () => {
-		let mockedWheelTargetElement
-		beforeEach(() => {
-			nodeContextMenuController.setPosition = jest.fn()
-			nodeContextMenuController.calculatePosition = jest.fn().mockReturnValue({ x: 1, y: 2 })
-
-			document.body.addEventListener = jest.fn()
-			mockedWheelTargetElement = { addEventListener: jest.fn(), removeEventListener: jest.fn() }
-			// @ts-ignore
-			jest.spyOn(document, "getElementById").mockImplementation(() => mockedWheelTargetElement)
-		})
-
-		it("should set the correct building after some timeout", () => {
-			nodeContextMenuController.showNodeContextMenu("/root", NodeType.FOLDER, 42, 24)
-
-			expect(nodeContextMenuController["_viewModel"].codeMapNode).toEqual(TEST_DELTA_MAP_A.map)
-			expect(nodeContextMenuController.calculatePosition).toHaveBeenCalledWith(42, 24)
-			expect(nodeContextMenuController.setPosition).toHaveBeenCalledTimes(1)
-			expect(nodeContextMenuController.setPosition).toBeCalledWith(1, 2)
-
-			expect(document.body.addEventListener).toHaveBeenNthCalledWith(1, "click", expect.anything(), expect.anything())
-			expect(document.body.addEventListener).toHaveBeenNthCalledWith(2, "mousedown", expect.anything(), expect.anything())
-
-			expect(document.getElementById).toHaveBeenCalledWith("codeMap")
-			expect(mockedWheelTargetElement.addEventListener).toHaveBeenCalledWith("wheel", expect.anything(), expect.anything())
-		})
-
-		it("should not shorten the path if it has no sub paths", () => {
-			nodeContextMenuController.showNodeContextMenu("/root", NodeType.FOLDER, 42, 24)
-
-			expect(nodeContextMenuController["_viewModel"].nodePath).toEqual(TEST_DELTA_MAP_A.map.path)
-			expect(nodeContextMenuController["_viewModel"].lastPartOfNodePath).toBe(TEST_DELTA_MAP_A.map.path)
-		})
-
-		it("should set the complete and shortened node path", () => {
-			nodeContextMenuController.showNodeContextMenu("/root/big leaf", NodeType.FILE, 521, 588)
-			const nodePath = TEST_DELTA_MAP_A.map.children[0].path
-
-			expect(nodeContextMenuController["_viewModel"].nodePath).toEqual(nodePath)
-			expect(nodeContextMenuController["_viewModel"].lastPartOfNodePath).toBe(`...${nodePath.slice(nodePath.lastIndexOf("/"))}`)
-		})
-
-		it("should remove all listener on hide", () => {
-			const documentRemoveEventListenerSpy = jest.spyOn(document.body, "removeEventListener")
-
-			nodeContextMenuController.hideNodeContextMenu()
-
-			expect(documentRemoveEventListenerSpy).toHaveBeenCalledWith(
-				"click",
-				nodeContextMenuController.onBodyLeftClickHideNodeContextMenu,
-				true
-			)
-			expect(documentRemoveEventListenerSpy).toHaveBeenCalledWith(
-				"mousedown",
-				nodeContextMenuController.onBodyRightClickHideNodeContextMenu,
-				true
-			)
-			expect(mockedWheelTargetElement.removeEventListener).toHaveBeenCalledWith(
-				"wheel",
-				nodeContextMenuController.onMapWheelHideNodeContextMenu,
-				true
-			)
-		})
-	})
-
-	describe("calculatePosition", () => {
-		function testPositionCalculation(expectedX, expectedY, mouseX, mouseY) {
-			const { x, y } = nodeContextMenuController.calculatePosition(mouseX, mouseY)
-			expect(x).toBe(expectedX)
-			expect(y).toBe(expectedY)
-		}
-
-		it("should calculate the position for the menu correctly, when it fits in the window", () => {
-			testPositionCalculation(400, 300, 400, 300)
-		})
-
-		it("should calculate the position for the menu correctly, when it doesn't fit in the window.innerWidth", () => {
-			testPositionCalculation(750, 300, 799, 300)
-		})
-
-		it("should calculate the position for the menu correctly, when it doesn't fit in the window.innerHeight", () => {
-			testPositionCalculation(400, 500, 400, 599)
-		})
-
-		it("should calculate the position for the menu correctly, when it doesn't fit in the window.innerHeight and window.innerWidth", () => {
-			testPositionCalculation(750, 500, 799, 599)
-		})
-	})
-
-	describe("removeNodeFromConstantHighlight", () => {
-		it("should call addNodeandChildrenToConstantHighlight", () => {
-			nodeContextMenuController.addNodeToConstantHighlight()
-
-			expect(threeSceneService.addNodeAndChildrenToConstantHighlight).toHaveBeenCalled()
-		})
-	})
-
-	describe("addNodeToConstantHighlight", () => {
-		it("should call addNodeandChildrenToConstantHighlight", () => {
-			nodeContextMenuController.removeNodeFromConstantHighlight()
-
-			expect(threeSceneService.removeNodeAndChildrenFromConstantHighlight).toHaveBeenCalled()
-		})
-	})
-
-	describe("isNodeConstantlyHighlighted", () => {
-		beforeEach(() => {
-			const idToBuilding = new Map<number, CodeMapBuilding>()
-			idToBuilding.set(CODE_MAP_BUILDING.id, CODE_MAP_BUILDING)
-			idToBuilding.set(CODE_MAP_BUILDING_TS_NODE.id, CODE_MAP_BUILDING_TS_NODE)
-			storeService.dispatch(setIdToBuilding(idToBuilding))
-		})
-		it("should return false if codeMapNode is not existing", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = null
-
-			const result = nodeContextMenuController.isNodeConstantlyHighlighted()
-
-			expect(result).toEqual(false)
-		})
-
-		it("should return false if codeMapNode exists but is not in constant Highlight", () => {
-			threeSceneService.getConstantHighlight = jest.fn().mockReturnValue(new Map())
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_FILE_NODE_WITH_ID
-
-			const result = nodeContextMenuController.isNodeConstantlyHighlighted()
-
-			expect(threeSceneService.getConstantHighlight).toHaveBeenCalled()
-			expect(result).toEqual(false)
-		})
-
-		it("should return true if codeMapNode exists and in constant Highlight", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_FILE_NODE_WITH_ID
-
-			const result = nodeContextMenuController.isNodeConstantlyHighlighted()
-
-			expect(result).toEqual(true)
-		})
-	})
-
-	describe("flattenNode", () => {
-		it("should add flattened blacklistItem", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITH_PATH.children[1]
-			const expected = {
-				nodeType: NodeType.FOLDER,
-				path: "/root/Parent Leaf",
-				type: BlacklistType.flatten
-			}
-			nodeContextMenuController.flattenNode()
-
-			expect(storeService.getState().fileSettings.blacklist).toContainEqual(expected)
-		})
-	})
-
-	describe("showNode", () => {
-		it("should add flattened blacklistItem", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITH_PATH.children[1]
-			const expected = {
-				path: "/root/Parent Leaf",
-				type: BlacklistType.flatten
-			}
-			storeService.dispatch(addBlacklistItem(expected))
-
-			nodeContextMenuController.showFlattenedNode()
-
-			expect(storeService.getState().fileSettings.blacklist).not.toContain(expected)
-		})
-	})
-
-	describe("excludeNode", () => {
-		beforeEach(() => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITH_PATH.children[1]
-		})
-
-		it("should add exclude blacklistItem", () => {
-			blacklistService.resultsInEmptyMap = jest.fn(() => false)
-			const expected = { nodeType: "Folder", path: "/root/Parent Leaf", type: BlacklistType.exclude }
-
-			nodeContextMenuController.excludeNode()
-
-			expect(storeService.getState().fileSettings.blacklist).toContainEqual(expected)
-		})
-
-		it("should display error dialog when no files are left", () => {
-			blacklistService.resultsInEmptyMap = jest.fn(() => true)
-			dialogService.showErrorDialog = jest.fn()
-
-			nodeContextMenuController.excludeNode()
-
-			expect(dialogService.showErrorDialog).toBeCalled()
-		})
-
-		it("should prevent duplicate blacklist object regarding issue #2419", () => {
-			blacklistService.resultsInEmptyMap = jest.fn(() => false)
-
-			nodeContextMenuController.excludeNode()
-			nodeContextMenuController.excludeNode()
-
-			expect(storeService.getState().fileSettings.blacklist.length).toEqual(1)
-		})
-	})
-
-	describe("nodeIsFolder", () => {
-		it("should return true, if contextMenuBuilding is a folder", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITH_PATH
-			const result = nodeContextMenuController.nodeIsFolder()
-
-			expect(result).toBeTruthy()
-		})
-
-		it("should return false, if contextMenuBuilding is null", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = null
-			const result = nodeContextMenuController.nodeIsFolder()
-
-			expect(result).toBeFalsy()
-		})
-
-		it("should return false, if contextMenuBuilding is undefined", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = undefined
-			const result = nodeContextMenuController.nodeIsFolder()
-
-			expect(result).toBeFalsy()
-		})
-
-		it("should return false, if contextMenuBuilding has no children property", () => {
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITH_PATH.children[0]
-			const result = nodeContextMenuController.nodeIsFolder()
-
-			expect(result).toBeFalsy()
-		})
-
-		it("should return false, if contextMenuBuilding has children property but no children", () => {
-			const VALID_NODE_WITHOUT_CHILDREN = VALID_NODE_WITH_PATH
-			VALID_NODE_WITHOUT_CHILDREN.children[0].children = []
-
-			nodeContextMenuController["_viewModel"].codeMapNode = VALID_NODE_WITHOUT_CHILDREN[0]
-			const result = nodeContextMenuController.nodeIsFolder()
-
-			expect(result).toBeFalsy()
-		})
-	})
-
-	describe("onBodyLeftClickHideNodeContextMenu", () => {
-		it("should not hide if a click on color-picker tricker occurs", () => {
-			const broadcastHideEventSpy = jest.spyOn(nodeContextMenuController, "hideNodeContextMenu")
-			const mockedMouseEvent: any = {
-				composedPath: () => [{ nodeName: "CC-COLOR-PICKER" }]
-			}
-			nodeContextMenuController.onBodyLeftClickHideNodeContextMenu(mockedMouseEvent)
-
-			expect(broadcastHideEventSpy).not.toHaveBeenCalled()
-		})
-
-		it("should not hide if a click within color-picker occurs", () => {
-			const broadcastHideEventSpy = jest.spyOn(nodeContextMenuController, "hideNodeContextMenu")
-			const mockedMouseEvent: any = {
-				composedPath: () => [{ nodeName: "COLOR-CHROME" }]
-			}
-			nodeContextMenuController.onBodyLeftClickHideNodeContextMenu(mockedMouseEvent)
-
-			expect(broadcastHideEventSpy).not.toHaveBeenCalled()
-		})
-
-		it("should hide if clicked somewhere but not within the color-picker", () => {
-			const broadcastHideEventSpy = jest.spyOn(nodeContextMenuController, "hideNodeContextMenu")
-			const mockedMouseEvent: any = {
-				composedPath: () => [{ nodeName: "DIV" }]
-			}
-			nodeContextMenuController.onBodyLeftClickHideNodeContextMenu(mockedMouseEvent)
-
-			expect(broadcastHideEventSpy).toHaveBeenCalled()
-		})
-	})
-})