codecharta-visualization 1.86.0 → 1.87.0

package/package.json

@@ -10,7 +10,7 @@
 		"url": "https://github.com/MaibornWolff/codecharta.git"
 	},
 	"name": "codecharta-visualization",
-	"version": "1.86.0",
+	"version": "1.87.0",
 	"engines": {
 		"node": ">=16"
 	},
@@ -133,6 +133,7 @@
 		"remark": "^13.0.0",
 		"remark-html": "^13.0.1",
 		"remark-loader": "^4.0.0",
+		"rxjs": "^7.5.1",
 		"shelljs": "^0.8.4",
 		"three": "^0.126.1",
 		"three-orbit-controls": "^82.1.0",
@@ -157,8 +158,8 @@
 		"@types/node": "^16.0.0",
 		"@types/puppeteer": "^5.4.3",
 		"@types/three": "^0.126.0",
-		"@typescript-eslint/eslint-plugin": "^4.22.0",
-		"@typescript-eslint/parser": "^4.22.0",
+		"@typescript-eslint/eslint-plugin": "^5.0.0",
+		"@typescript-eslint/parser": "^5.0.0",
 		"babel-loader": "^8.2.2",
 		"babel-plugin-angularjs-annotate": "^0.10.0",
 		"bestzip": "^2.2.0",
@@ -166,9 +167,9 @@
 		"clean-webpack-plugin": "^4.0.0",
 		"cross-env": "^7.0.3",
 		"css-loader": "^6.0.0",
-		"eslint": "^7.28.0",
+		"eslint": "^8.0.0",
 		"eslint-config-prettier": "^8.2.0",
-		"eslint-plugin-unicorn": "^36.0.0",
+		"eslint-plugin-unicorn": "^40.0.0",
 		"file-loader": "^6.2.0",
 		"html-loader": "^1.1.0",
 		"html-loader-jest": "^0.2.1",

package/app/codeCharta/state/store/dynamicSettings/focusedNodePath/focusedNodePath.splitter.ts

@@ -1,8 +0,0 @@
-import { focusNode, unfocusNode } from "./focusedNodePath.actions"
-
-export function splitFocusedNodePathAction(payload: string) {
-	if (payload === "") {
-		return unfocusNode()
-	}
-	return focusNode(payload)
-}

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

@@ -1,147 +0,0 @@
-import "./codeMap.module"
-import "../../codeCharta.module"
-import { CodeMapActionsService } from "./codeMap.actions.service"
-import { getService, instantiateModule } from "../../../../mocks/ng.mockhelper"
-import { CodeMapNode } from "../../codeCharta.model"
-import { VALID_NODE_WITH_PATH } from "../../util/dataMocks"
-import { StoreService } from "../../state/store.service"
-import { setMarkedPackages } from "../../state/store/fileSettings/markedPackages/markedPackages.actions"
-import { EdgeMetricDataService } from "../../state/store/metricData/edgeMetricData/edgeMetricData.service"
-import { clone } from "../../util/clone"
-
-describe("CodeMapActionService", () => {
-	let codeMapActionsService: CodeMapActionsService
-	let edgeMetricDataService: EdgeMetricDataService
-	let storeService: StoreService
-
-	let nodeA: CodeMapNode
-
-	function restartSystem() {
-		instantiateModule("app.codeCharta.ui.codeMap")
-
-		edgeMetricDataService = getService<EdgeMetricDataService>("edgeMetricDataService")
-		storeService = getService<StoreService>("storeService")
-
-		nodeA = clone(VALID_NODE_WITH_PATH)
-		storeService.dispatch(setMarkedPackages())
-	}
-
-	function rebuildService() {
-		codeMapActionsService = new CodeMapActionsService(edgeMetricDataService, storeService)
-	}
-
-	beforeEach(() => {
-		restartSystem()
-		rebuildService()
-	})
-
-	describe("markFolder", () => {
-		it("should mark a folder that is not marked yet and has no marked children packages", () => {
-			const expected = [{ color: "0x000000", path: "/root" }]
-
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(1)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual(expected)
-		})
-
-		it("should remove the children of a marked package if color is the same", () => {
-			const expected = [{ color: "0x000000", path: "/root" }]
-
-			codeMapActionsService.markFolder(nodeA.children[0], "0x000000")
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(1)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual(expected)
-		})
-
-		it("should not remove the children of a marked package if color is different", () => {
-			const expected = [
-				{ color: "0x000000", path: "/root" },
-				{ color: "0x000001", path: "/root/big leaf" }
-			]
-
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-			codeMapActionsService.markFolder(nodeA.children[0], "0x000001")
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(2)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual(expected)
-		})
-
-		it("should not mark with a new color if sub-nodes are already marked", () => {
-			const expected = [
-				{ color: "0x000003", path: "/root" },
-				{ color: "0x000001", path: "/root/big leaf" },
-				{ color: "0x000002", path: "/root/Parent Leaf" }
-			]
-
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-			codeMapActionsService.markFolder(nodeA.children[0], "0x000001")
-			codeMapActionsService.markFolder(nodeA.children[1], "0x000002")
-
-			codeMapActionsService.markFolder(nodeA, "0x000003")
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(3)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual(expected)
-		})
-	})
-
-	describe("unmarkFolder", () => {
-		it("should unmark a folder that is marked and has no marked children packages", () => {
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-
-			codeMapActionsService.unmarkFolder(nodeA)
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(0)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual([])
-		})
-
-		it("should not unmark marked children nodes", () => {
-			const expected = [
-				{ color: "0x000000", path: "/root/big leaf" },
-				{ color: "0x000000", path: "/root/Parent Leaf" }
-			]
-
-			codeMapActionsService.markFolder(nodeA.children[0], "0x000000")
-			codeMapActionsService.markFolder(nodeA.children[1], "0x000000")
-
-			codeMapActionsService.unmarkFolder(nodeA)
-
-			expect(storeService.getState().fileSettings.markedPackages).toHaveLength(2)
-			expect(storeService.getState().fileSettings.markedPackages).toEqual(expected)
-		})
-	})
-
-	describe("getParentMarkedPackageIndex", () => {
-		it("should return null if there are no marked packages", () => {
-			const result = codeMapActionsService.getParentMarkedPackageIndex(nodeA.path)
-
-			expect(result).toEqual(-1)
-		})
-
-		it("should return null if node is a marked package", () => {
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-
-			const result = codeMapActionsService.getParentMarkedPackageIndex(nodeA.path)
-
-			expect(result).toEqual(-1)
-		})
-
-		it("should return marked package of root", () => {
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-
-			const result = codeMapActionsService.getParentMarkedPackageIndex(nodeA.children[0].path)
-
-			expect(result).toEqual(0)
-		})
-
-		it("should return the correct parent marked package", () => {
-			codeMapActionsService.markFolder(nodeA, "0x000000")
-			codeMapActionsService.markFolder(nodeA.children[1], "0x000001")
-
-			const result = codeMapActionsService.getParentMarkedPackageIndex(nodeA.children[1].children[0].path)
-
-			expect(result).toEqual(1)
-		})
-	})
-})

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

@@ -1,15 +0,0 @@
-<div layout="column">
-	<md-button aria-label="Remove Focus from node" ng-click="$ctrl.removeFocusedNode()" title="Show previous focused node"
-		><i class="fa fa-bullseye"></i>
-		<span ng-show="$ctrl.isParentFocused">Unfocus Parent</span>
-		<span ng-show="$ctrl.isNodeFocused">Unfocus</span>
-	</md-button>
-	<md-button
-		aria-label="Remove Focus from all nodes"
-		ng-click="$ctrl.removeFocusedNode(true)"
-		title="Show complete map"
-		ng-show="$ctrl._viewModel.focusedNodes.length > 1"
-		><i class="fa fa-bullseye"></i>
-		<span>Unfocus All</span>
-	</md-button>
-</div>

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

@@ -1,5 +0,0 @@
-unfocus-button-component {
-	.md-button {
-		margin-bottom: 0;
-	}
-}

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

@@ -1,106 +0,0 @@
-import "./unfocusButton.module"
-import { UnfocusButtonController } from "./unfocusButton.component"
-import { getService, instantiateModule } from "../../../../mocks/ng.mockhelper"
-import { IRootScopeService } from "angular"
-import { StoreService } from "../../state/store.service"
-import { focusNode } from "../../state/store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
-import { TEST_DELTA_MAP_A } from "../../util/dataMocks"
-import { setIdToNode } from "../../state/store/lookUp/idToNode/idToNode.actions"
-import { NodeDecorator } from "../../util/nodeDecorator"
-import { FocusedNodePathService } from "../../state/store/dynamicSettings/focusedNodePath/focusedNodePath.service"
-
-describe("UnfocusButtonController", () => {
-	let unfocusButtonController: UnfocusButtonController
-	let $rootScope: IRootScopeService
-	let storeService: StoreService
-
-	beforeEach(() => {
-		restartSystem()
-		rebuildController()
-	})
-
-	function restartSystem() {
-		instantiateModule("app.codeCharta.ui.unfocusButton")
-
-		$rootScope = getService<IRootScopeService>("$rootScope")
-		storeService = getService<StoreService>("storeService")
-
-		NodeDecorator.decorateMapWithPathAttribute(TEST_DELTA_MAP_A)
-		NodeDecorator.decorateMap(
-			TEST_DELTA_MAP_A.map,
-			{
-				nodeMetricData: [],
-				edgeMetricData: []
-			},
-			[]
-		)
-		const map = new Map([
-			[TEST_DELTA_MAP_A.map.children[0].id, TEST_DELTA_MAP_A.map.children[0]],
-			[TEST_DELTA_MAP_A.map.children[1].id, TEST_DELTA_MAP_A.map.children[1]],
-			[TEST_DELTA_MAP_A.map.children[1].children[0].id, TEST_DELTA_MAP_A.map.children[1].children[0]]
-		])
-		storeService.dispatch(setIdToNode(map))
-	}
-
-	function rebuildController() {
-		unfocusButtonController = new UnfocusButtonController($rootScope, storeService)
-	}
-
-	describe("constructor", () => {
-		it("should subscribe to focus node", () => {
-			FocusedNodePathService.subscribeToFocusNode = jest.fn()
-
-			rebuildController()
-
-			expect(FocusedNodePathService.subscribeToFocusNode).toHaveBeenCalledWith($rootScope, unfocusButtonController)
-		})
-	})
-
-	describe("on focus node", () => {
-		it("should add the node to focusedNodes", function () {
-			unfocusButtonController.onFocusNode("/root/app")
-			expect(unfocusButtonController["_viewModel"].focusedNodes.length).toBeGreaterThan(0)
-		})
-		it("should not add the node to focusedNodes", function () {
-			unfocusButtonController.onFocusNode("/root/app")
-			unfocusButtonController.onFocusNode("/root/app")
-			expect(unfocusButtonController["_viewModel"].focusedNodes.length).toBe(1)
-
-			unfocusButtonController.onFocusNode("")
-			expect(unfocusButtonController["_viewModel"].focusedNodes.length).toBe(1)
-		})
-	})
-
-	describe("removeFocusedNode", () => {
-		it("should apply previous focusedNodePath in storeService", () => {
-			unfocusButtonController["_viewModel"].focusedNodes = ["/root", "/root/app"]
-			storeService.dispatch(focusNode("/root/app"))
-
-			unfocusButtonController.removeFocusedNode()
-
-			expect(unfocusButtonController["_viewModel"].focusedNodes.length).toBe(1)
-			expect(unfocusButtonController["_viewModel"].focusedNodes).toEqual(["/root"])
-		})
-
-		it("should clear focusedNodePath in storeService", () => {
-			unfocusButtonController["_viewModel"].focusedNodes = ["/root", "/root/app"]
-			storeService.dispatch(focusNode("/root/app"))
-
-			unfocusButtonController.removeFocusedNode(true)
-
-			expect(unfocusButtonController["_viewModel"].focusedNodes.length).toBe(0)
-			expect(storeService.getState().dynamicSettings.focusedNodePath).toBe("")
-		})
-	})
-
-	describe("onIsLoadingFileChanged", () => {
-		it("should clear focusedNodes", () => {
-			unfocusButtonController["_viewModel"].focusedNodes = ["/root", "/root/app"]
-
-			unfocusButtonController.onIsLoadingFileChanged(true)
-
-			expect(unfocusButtonController["_viewModel"].isLoadingFile).toBe(true)
-			expect(unfocusButtonController["_viewModel"].focusedNodes).toEqual([])
-		})
-	})
-})

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

@@ -1,62 +0,0 @@
-import "./unfocusButton.component.scss"
-import { IRootScopeService } from "angular"
-import { focusNode, unfocusNode } from "../../state/store/dynamicSettings/focusedNodePath/focusedNodePath.actions"
-import { StoreService } from "../../state/store.service"
-import { NodeContextMenuController } from "../nodeContextMenu/nodeContextMenu.component"
-import { IsLoadingFileService, IsLoadingFileSubscriber } from "../../state/store/appSettings/isLoadingFile/isLoadingFile.service"
-import { FocusedNodePathService, FocusNodeSubscriber } from "../../state/store/dynamicSettings/focusedNodePath/focusedNodePath.service"
-
-export class UnfocusButtonController implements IsLoadingFileSubscriber, FocusNodeSubscriber {
-	private _viewModel: {
-		isLoadingFile: boolean
-		isNodeFocused: boolean
-		isParentFocused: boolean
-		focusedNodes: string[]
-	} = {
-		isLoadingFile: false,
-		isNodeFocused: false,
-		isParentFocused: false,
-		focusedNodes: []
-	}
-
-	// @ts-ignore
-	private isNodeFocused: boolean
-	// @ts-ignore
-	private isParentFocused: boolean
-
-	constructor(private $rootScope: IRootScopeService, private storeService: StoreService) {
-		"ngInject"
-		IsLoadingFileService.subscribe(this.$rootScope, this)
-		FocusedNodePathService.subscribeToFocusNode(this.$rootScope, this)
-	}
-
-	onFocusNode(focusedNodePath: string) {
-		if (focusedNodePath && !this._viewModel.focusedNodes.includes(focusedNodePath)) {
-			this._viewModel.focusedNodes.push(focusedNodePath)
-		}
-	}
-
-	removeFocusedNode(removeAll = false) {
-		this.storeService.dispatch(unfocusNode())
-		if (!removeAll) {
-			this._viewModel.focusedNodes.pop()
-			const lastFocusedNode = this._viewModel.focusedNodes[this._viewModel.focusedNodes.length - 1]
-			this.storeService.dispatch(focusNode(lastFocusedNode))
-		} else {
-			this._viewModel.focusedNodes = []
-		}
-		NodeContextMenuController.broadcastHideEvent(this.$rootScope)
-	}
-
-	onIsLoadingFileChanged(isLoadingFile: boolean) {
-		this._viewModel.isLoadingFile = isLoadingFile
-		this._viewModel.focusedNodes = []
-	}
-}
-
-export const unfocusButtonComponent = {
-	selector: "unfocusButtonComponent",
-	template: require("./unfocusButton.component.html"),
-	controller: UnfocusButtonController,
-	bindings: { isNodeFocused: "<", isParentFocused: "<" }
-}

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

@@ -1,7 +0,0 @@
-import "../../state/state.module"
-import angular from "angular"
-import { unfocusButtonComponent } from "./unfocusButton.component"
-
-angular
-	.module("app.codeCharta.ui.unfocusButton", ["app.codeCharta.state"])
-	.component(unfocusButtonComponent.selector, unfocusButtonComponent)