Feature/2708/show changed files in delta mode

visualization/app/codeCharta/codeCharta.model.ts

@@ -37,6 +37,7 @@ export interface FileCount {
 	all?: number
 	added: number
 	removed: number
+	metricsChanged: number
 }
 
 interface squarifiedNode {

visualization/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/attributeSideBarHeaderSection.component.scss

@@ -55,6 +55,10 @@ cc-attribute-side-bar-header-section {
 			.removed-files {
 				color: rgb(255, 14, 14);
 			}
+
+			.changed-files {
+				color: rgb(14, 46, 255);
+			}
 		}
 	}
 

visualization/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/fileCountSelector.ts

@@ -10,7 +10,8 @@ export const getFileCount = (node?: Pick<CodeMapNode, "attributes" | "fileCount"
 	return {
 		all: node.attributes?.unary ?? 0,
 		added: node.fileCount?.added ?? 0,
-		removed: node.fileCount?.removed ?? 0
+		removed: node.fileCount?.removed ?? 0,
+		metricsChanged: node.fileCount?.metricsChanged ?? 0
 	}
 }
 

visualization/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/nodePath.component.html

@@ -3,12 +3,11 @@
 		{{ node.path }}
 		<span *ngIf="node.children?.length && fileCount$ | async as fileCount" class="cc-node-file-count">
 			(
-			{{ fileCount.all > 1 ? fileCount.all + " files" : fileCount.all + " file" }}
+			{{ fileCount.all }} {{ fileCount.all === 1 ? "file" : "files" }}
 			<span *ngIf="node.children?.length && (isDeltaMode$ | async)" class="cc-node-file-count">
 				| <span class="added-files" title="Number of added files"> Δ{{ fileCount.added }}</span> |
-				<span class="removed-files" title="Number of removed files">
-					Δ{{ fileCount.removed > 0 ? -fileCount.removed : 0 }}</span
-				></span
+				<span class="removed-files" title="Number of removed files"> Δ{{ fileCount.removed > 0 ? -fileCount.removed : 0 }}</span> |
+				<span class="files-with-metric-changes" title="Number of files with metric changes"> Δ{{ 0 }}</span> </span
 			>)
 		</span>
 	</span>

visualization/app/codeCharta/ui/attributeSideBar/attributeSideBarHeaderSection/nodePath/nodePath.component.spec.ts

@@ -62,6 +62,40 @@ describe("nodePathComponent", () => {
 
 		const { container } = await render(NodePathComponent, { componentProperties: { node } })
 
-		expect(container.textContent.replace(/\s+/g, " ")).toContain("some/folder ( 2 files | Δ1 | Δ-2)")
+		expect(container.textContent.replace(/\s+/g, " ")).toContain("some/folder ( 2 files | Δ1 | Δ-2 | Δ0)")
+	})
+	it("should display amount of files with correct english grammar, when an empty folder is selected and delta mode is enabled", async () => {
+		const node = {
+			children: [{}] as CodeMapNode[],
+			path: "some/emptyFolder",
+			attributes: { unary: 0 },
+			fileCount: {
+				added: 0,
+				removed: 2
+			}
+		}
+		isDeltaStateSelectorMock.mockImplementationOnce(() => true)
+		selectedNodeSelectorMock.mockImplementation(() => node)
+
+		const { container } = await render(NodePathComponent, { componentProperties: { node } })
+
+		expect(container.textContent).toContain(" 0 files ") // because "zero file" is not grammatically correct
+	})
+	it("should display amount of files with correct english grammar, when a folder with 1 file is selected and delta mode is enabled", async () => {
+		const node = {
+			children: [{}] as CodeMapNode[],
+			path: "some/folderWithOneFile",
+			attributes: { unary: 1 },
+			fileCount: {
+				added: 1,
+				removed: 0
+			}
+		}
+		isDeltaStateSelectorMock.mockImplementationOnce(() => true)
+		selectedNodeSelectorMock.mockImplementation(() => node)
+
+		const { container } = await render(NodePathComponent, { componentProperties: { node } })
+
+		expect(container.textContent).toContain(" 1 file ") // because "one files" is not grammatically correct
 	})
 })

visualization/app/codeCharta/util/dataMocks.ts

@@ -1238,7 +1238,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 	name: "root",
 	attributes: {},
 	deltas: {},
-	fileCount: { added: 0, removed: 0 },
+	fileCount: { added: 0, removed: 0, metricsChanged: 0 },
 	type: NodeType.FOLDER,
 	path: "/root",
 	isExcluded: false,
@@ -1250,7 +1250,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 			path: "/root/big leaf.jpg",
 			attributes: { rloc: 100, functions: 10, mcc: 1 },
 			deltas: { rloc: 300, functions: -15, mcc: 12 },
-			fileCount: { added: 0, removed: 1 },
+			fileCount: { added: 0, removed: 1, metricsChanged: 0 },
 			isExcluded: false,
 			isFlattened: false
 		},
@@ -1260,7 +1260,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 			path: "/root/another big leaf.java",
 			attributes: { rloc: 120, functions: 20, mcc: 2 },
 			deltas: { rloc: -150, functions: 9, mcc: 33 },
-			fileCount: { added: 0, removed: 1 },
+			fileCount: { added: 0, removed: 1, metricsChanged: 0 },
 			isExcluded: false,
 			isFlattened: false
 		},
@@ -1269,7 +1269,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 			type: NodeType.FOLDER,
 			attributes: {},
 			deltas: {},
-			fileCount: { added: 0, removed: 0 },
+			fileCount: { added: 0, removed: 0, metricsChanged: 0 },
 			path: "/root/Parent Leaf",
 			isExcluded: false,
 			isFlattened: false,
@@ -1280,7 +1280,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 					path: "/root/Parent Leaf/small leaf.json",
 					attributes: { rloc: 30, functions: 100, mcc: 100 },
 					deltas: { rloc: -55, functions: 38, mcc: -40 },
-					fileCount: { added: 0, removed: 1 },
+					fileCount: { added: 0, removed: 1, metricsChanged: 1 },
 					isExcluded: false,
 					isFlattened: false
 				},
@@ -1290,7 +1290,7 @@ export const VALID_NODE_WITH_PATH_AND_DELTAS: CodeMapNode = {
 					path: "/root/Parent Leaf/other small leaf.json",
 					attributes: { rloc: 70, functions: 1000, mcc: 10 },
 					deltas: { rloc: 200, functions: -27, mcc: 65 },
-					fileCount: { added: 1, removed: 0 },
+					fileCount: { added: 1, removed: 0, metricsChanged: 2 },
 					isExcluded: false,
 					isFlattened: false
 				}
@@ -1576,21 +1576,6 @@ export const TEST_DELTA_MAP_D: CCFile = {
 						attributes: { rloc: 400, functions: 30, mcc: 20, more: 20 },
 						isExcluded: false,
 						isFlattened: false
-					},
-					{
-						name: "D file 1.2",
-						type: NodeType.FILE,
-						attributes: { rloc: 40, functions: 3 },
-						isExcluded: false,
-						isFlattened: false
-					},
-					{
-						name: "D file 1.3",
-						type: NodeType.FILE,
-						attributes: { rloc: 200, functions: 20, mcc: 30 },
-						link: "https://www.google.de",
-						isExcluded: false,
-						isFlattened: false
 					}
 				]
 			}
@@ -1606,6 +1591,107 @@ export const TEST_DELTA_MAP_D: CCFile = {
 	}
 }
 
+export const TEST_DELTA_MAP_E: CCFile = {
+	fileMeta: {
+		fileName: "fileE",
+		fileChecksum: "md5-delta-fileE",
+		projectName: "Sample Project",
+		apiVersion: packageJson.codecharta.apiVersion,
+		exportedFileSize: 300_000
+	},
+	map: {
+		name: "root",
+		type: NodeType.FOLDER,
+		attributes: {},
+		isExcluded: false,
+		isFlattened: false,
+		children: [
+			{
+				name: "File with different attributes",
+				type: NodeType.FILE,
+				attributes: { rloc: 400, functions: 12 },
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			},
+			{
+				name: "File without metric changes",
+				type: NodeType.FILE,
+				attributes: { rloc: 271 },
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			},
+			{
+				name: "File with mcc changes",
+				type: NodeType.FILE,
+				attributes: { mcc: 4 },
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			}
+		]
+	},
+	settings: {
+		fileSettings: {
+			attributeTypes: { nodes: {}, edges: {} },
+			blacklist: [],
+			edges: VALID_EDGES,
+			markedPackages: []
+		}
+	}
+}
+export const TEST_DELTA_MAP_F: CCFile = {
+	fileMeta: {
+		fileName: "fileF",
+		fileChecksum: "md5-delta-fileF",
+		projectName: "Sample Project",
+		apiVersion: packageJson.codecharta.apiVersion,
+		exportedFileSize: 300_000
+	},
+	map: {
+		name: "root",
+		type: NodeType.FOLDER,
+		attributes: {},
+		isExcluded: false,
+		isFlattened: false,
+		children: [
+			{
+				name: "File with different attributes",
+				type: NodeType.FILE,
+				attributes: { rloc: 400, mcc: 7 },
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			},
+			{
+				name: "File without metric changes",
+				type: NodeType.FILE,
+				attributes: { rloc: 271 },
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			},
+			{
+				name: "File with mcc changes",
+				type: NodeType.FILE,
+				attributes: { mcc: 9001 }, // its over 9000!!!
+				link: "https://www.google.de",
+				isExcluded: false,
+				isFlattened: false
+			}
+		]
+	},
+	settings: {
+		fileSettings: {
+			attributeTypes: { nodes: {}, edges: {} },
+			blacklist: [],
+			edges: VALID_EDGES,
+			markedPackages: []
+		}
+	}
+}
+
 export const TEST_FILE_DATA_DOWNLOADED = {
 	projectName: "Sample Project",
 	apiVersion: packageJson.codecharta.apiVersion,

visualization/app/codeCharta/util/deltaGenerator.spec.ts

@@ -1,6 +1,6 @@
 import { DeltaGenerator } from "./deltaGenerator"
-import { TEST_DELTA_MAP_A, TEST_DELTA_MAP_B, TEST_DELTA_MAP_C, TEST_DELTA_MAP_D } from "./dataMocks"
-import { CCFile, KeyValuePair, NodeType } from "../codeCharta.model"
+import { TEST_DELTA_MAP_A, TEST_DELTA_MAP_B, TEST_DELTA_MAP_C, TEST_DELTA_MAP_D, TEST_DELTA_MAP_E, TEST_DELTA_MAP_F } from "./dataMocks"
+import { CCFile, CodeMapNode, FileCount, NodeType } from "../codeCharta.model"
 import { NodeDecorator } from "./nodeDecorator"
 import { clone } from "./clone"
 import { hierarchy } from "d3-hierarchy"
@@ -99,7 +99,7 @@ describe("deltaGenerator", () => {
 	})
 
 	it("should detect added and removed files and add result to delta attributes", () => {
-		const actualAmountOfChangedFiles: KeyValuePair = { added: 0, removed: 0 }
+		const actualAmountOfChangedFiles: Pick<FileCount, "added" | "removed"> = { added: 0, removed: 0 }
 		const referenceMap = { ...TEST_DELTA_MAP_C }
 		const comparisonMap = { ...TEST_DELTA_MAP_D }
 		NodeDecorator.decorateMapWithPathAttribute(referenceMap)
@@ -112,7 +112,75 @@ describe("deltaGenerator", () => {
 			actualAmountOfChangedFiles.removed += data.fileCount.removed
 		}
 
-		expect(actualAmountOfChangedFiles).toEqual({ added: 5, removed: 5 })
+		expect(actualAmountOfChangedFiles).toEqual({ added: 3, removed: 5 })
+	})
+
+	it("should detect value differences in common attributes of two files", () => {
+		const fileA: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 5, functions: 0 }, name: "A" }
+		const fileB: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 0 }, name: "A" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](fileA, fileB)
+
+		expect(result).toEqual({ differenceExists: true })
+	})
+
+	it("should not detect differences when comparing a folder and a file", () => {
+		const file: CodeMapNode = { type: NodeType.FOLDER, attributes: { mcc: 5 }, name: "one" }
+		const folder: CodeMapNode = { type: NodeType.FILE, attributes: { functions: 0 }, name: "two" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](file, folder)
+
+		expect(result).toEqual({ differenceExists: false })
+	})
+
+	it("should not detect differences when comparing two folders", () => {
+		const folderA: CodeMapNode = { type: NodeType.FOLDER, attributes: { mcc: 12 }, name: "folder" }
+		const folderB: CodeMapNode = { type: NodeType.FOLDER, attributes: { mcc: 7 }, name: "other folder" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](folderA, folderB)
+
+		expect(result).toEqual({ differenceExists: false })
+	})
+	it("should not detect differences when comparing a file withouit attributes to another file", () => {
+		const folderA: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 12 }, name: "folder" }
+		const folderB: CodeMapNode = { type: NodeType.FILE, name: "other folder" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](folderA, folderB)
+
+		expect(result).toEqual({ differenceExists: false })
+	})
+
+	it("should not detect differences when comparing a file to a clone with less attributes", () => {
+		const file: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 5, functions: -3 }, name: "file" }
+		const cloneWithLessAttributes: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 5 }, name: "smaller clone" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](file, cloneWithLessAttributes)
+
+		expect(result).toEqual({ differenceExists: false })
+	})
+	it("should not detect differences when comparing two files which have no attributes in common", () => {
+		const file: CodeMapNode = { type: NodeType.FILE, attributes: { mcc: 5, functions: 10 }, name: "file" }
+		const cloneWithLessAttributes: CodeMapNode = { type: NodeType.FILE, attributes: { comments: 2, staticMethods: 7 }, name: "file" }
+
+		const result = DeltaGenerator["compareCommonAttributes"](file, cloneWithLessAttributes)
+
+		expect(result).toEqual({ differenceExists: false })
+	})
+
+	it("should detect files with metric changes and add result to delta attributes", () => {
+		const actualAmountOfChangedFiles: Pick<FileCount, "metricsChanged"> = { metricsChanged: 0 }
+		const referenceMap = { ...TEST_DELTA_MAP_E }
+		const comparisonMap = { ...TEST_DELTA_MAP_F }
+		NodeDecorator.decorateMapWithPathAttribute(referenceMap)
+		NodeDecorator.decorateMapWithPathAttribute(comparisonMap)
+
+		const actualDeltaMap = DeltaGenerator.getDeltaFile(referenceMap, comparisonMap)
+
+		for (const { data } of hierarchy(actualDeltaMap.map)) {
+			actualAmountOfChangedFiles.metricsChanged += data.fileCount.metricsChanged
+		}
+
+		expect(actualAmountOfChangedFiles).toEqual({ metricsChanged: 1 })
 	})
 
 	it("should sum exported file size of the comparison and reference File", () => {