Tech/move filestates to redux

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ### Fixed 🐞
 
 - Loading Gif not displayed when preparing to render a new map #857
+- Selecting zero files in Multiple mode will not trigger the 3D CodeMap creation
 
 ### Chore 👨‍💻 👩‍💻
 

visualization/app/codeCharta/codeCharta.component.spec.ts

@@ -7,7 +7,6 @@ import { CodeChartaController } from "./codeCharta.component"
 import { getService, instantiateModule } from "../../mocks/ng.mockhelper"
 import { State } from "./codeCharta.model"
 import { ScenarioHelper } from "./util/scenarioHelper"
-import { FileStateService } from "./state/fileState.service"
 import { InjectorService } from "./state/injector.service"
 import { StoreService } from "./state/store.service"
 import { STATE } from "./util/dataMocks"
@@ -20,7 +19,6 @@ describe("codeChartaController", () => {
 	let storeService: StoreService
 	let dialogService: DialogService
 	let codeChartaService: CodeChartaService
-	let fileStateService: FileStateService
 	let injectorService: InjectorService
 	let state: State
 
@@ -41,22 +39,13 @@ describe("codeChartaController", () => {
 		storeService = getService<StoreService>("storeService")
 		dialogService = getService<DialogService>("dialogService")
 		codeChartaService = getService<CodeChartaService>("codeChartaService")
-		fileStateService = getService<FileStateService>("fileStateService")
 		injectorService = getService<InjectorService>("injectorService")
 
 		state = _.cloneDeep(STATE)
 	}
 
 	function rebuildController() {
-		codeChartaController = new CodeChartaController(
-			$location,
-			$http,
-			storeService,
-			dialogService,
-			codeChartaService,
-			fileStateService,
-			injectorService
-		)
+		codeChartaController = new CodeChartaController($location, $http, storeService, dialogService, codeChartaService, injectorService)
 	}
 
 	afterEach(() => {

visualization/app/codeCharta/codeCharta.component.ts

@@ -5,7 +5,6 @@ import { CodeChartaService } from "./codeCharta.service"
 import { ScenarioHelper } from "./util/scenarioHelper"
 import { DialogService } from "./ui/dialog/dialog.service"
 import { NameDataPair } from "./codeCharta.model"
-import { FileStateService } from "./state/fileState.service"
 import { InjectorService } from "./state/injector.service"
 import { StoreService } from "./state/store.service"
 import { setState } from "./state/store/state.actions"
@@ -32,7 +31,6 @@ export class CodeChartaController {
 		private storeService: StoreService,
 		private dialogService: DialogService,
 		private codeChartaService: CodeChartaService,
-		private fileStateService: FileStateService,
 		// tslint:disable-next-line
 		private injectorService: InjectorService // We have to inject it somewhere
 	) {
@@ -86,14 +84,14 @@ export class CodeChartaController {
 
 	private setRenderStateFromUrl() {
 		const renderState: string = this.urlUtils.getParameterByName("mode")
-		const files = this.fileStateService.getCCFiles()
+		const files = this.storeService.getState().files.getCCFiles()
 
 		if (renderState === "Delta" && files.length >= 2) {
-			this.fileStateService.setDelta(files[0], files[1])
+			this.storeService.getState().files.setDelta(files[0], files[1])
 		} else if (renderState === "Multiple") {
-			this.fileStateService.setMultiple(files)
+			this.storeService.getState().files.setMultiple(files)
 		} else {
-			this.fileStateService.setSingle(files[0])
+			this.storeService.getState().files.setSingle(files[0])
 		}
 	}
 

visualization/app/codeCharta/codeCharta.model.ts

@@ -1,5 +1,6 @@
 import { Vector3 } from "three"
 import { Action } from "redux"
+import { Files } from "./model/files"
 
 export interface NameDataPair {
 	fileName: string
@@ -249,8 +250,9 @@ export interface State {
 	dynamicSettings: DynamicSettings
 	appSettings: AppSettings
 	treeMap: TreeMapSettings
+	files: Files
 }
 
 export interface CCAction extends Action {
-	payload: any
+	payload?: any
 }

visualization/app/codeCharta/codeCharta.service.spec.ts

@@ -2,29 +2,31 @@ import "./codeCharta.module"
 
 import { CodeChartaService } from "./codeCharta.service"
 import { getService, instantiateModule } from "../../mocks/ng.mockhelper"
-import { FileStateService } from "./state/fileState.service"
 import { TEST_FILE_CONTENT } from "./util/dataMocks"
 import { CCFile, BlacklistType, NodeType } from "./codeCharta.model"
 import _ from "lodash"
+import { StoreService } from "./state/store.service"
+import { resetFiles } from "./state/store/files/files.actions"
 
 describe("codeChartaService", () => {
 	let codeChartaService: CodeChartaService
+	let storeService: StoreService
 	let validFileContent
-	let fileStateService: FileStateService
 
 	beforeEach(() => {
 		restartSystem()
 		rebuildService()
 		validFileContent = _.cloneDeep(TEST_FILE_CONTENT)
+		storeService.dispatch(resetFiles())
 	})
 
 	function restartSystem() {
 		instantiateModule("app.codeCharta")
-		fileStateService = getService<FileStateService>("fileStateService")
+		storeService = getService<StoreService>("storeService")
 	}
 
 	function rebuildService() {
-		codeChartaService = new CodeChartaService(fileStateService)
+		codeChartaService = new CodeChartaService(storeService)
 	}
 
 	describe("loadFiles", () => {
@@ -65,34 +67,50 @@ describe("codeChartaService", () => {
 				path: "/root",
 				type: NodeType.FOLDER
 			},
-			settings: { fileSettings: { attributeTypes: { nodes: [], edges: [] }, blacklist: [], edges: [], markedPackages: [] } }
+			settings: {
+				fileSettings: {
+					attributeTypes: { nodes: [], edges: [] },
+					blacklist: [],
+					edges: [],
+					markedPackages: []
+				}
+			}
 		}
 
-		beforeEach(() => {
-			fileStateService.addFile = jest.fn()
-			fileStateService.setSingle = jest.fn()
-		})
-
 		function letTestFail() {
 			expect(true).toBeFalsy()
 		}
 
 		it("should load a file without edges", done => {
 			validFileContent.edges = undefined
 
-			codeChartaService.loadFiles([{ fileName: validFileContent.fileName, content: validFileContent }]).then(() => {
-				expect(fileStateService.addFile).toHaveBeenCalledWith(expected)
-				expect(fileStateService.setSingle).toHaveBeenCalled()
-				done()
-			})
+			codeChartaService
+				.loadFiles([
+					{
+						fileName: validFileContent.fileName,
+						content: validFileContent
+					}
+				])
+				.then(() => {
+					expect(storeService.getState().files.getCCFiles()[0]).toEqual(expected)
+					expect(storeService.getState().files.isSingleState()).toBeTruthy()
+					done()
+				})
 		})
 
 		it("should resolve valid file", done => {
-			codeChartaService.loadFiles([{ fileName: validFileContent.fileName, content: validFileContent }]).then(() => {
-				expect(fileStateService.addFile).toHaveBeenCalledWith(expected)
-				expect(fileStateService.setSingle).toHaveBeenCalled()
-				done()
-			})
+			codeChartaService
+				.loadFiles([
+					{
+						fileName: validFileContent.fileName,
+						content: validFileContent
+					}
+				])
+				.then(() => {
+					expect(storeService.getState().files.getCCFiles()[0]).toEqual(expected)
+					expect(storeService.getState().files.isSingleState()).toBeTruthy()
+					done()
+				})
 		})
 
 		it("should reject null", done => {
@@ -135,12 +153,18 @@ describe("codeChartaService", () => {
 		it("should convert old blacklist type", done => {
 			validFileContent.blacklist = [{ path: "foo", type: "hide" }]
 
-			codeChartaService.loadFiles([{ fileName: validFileContent.fileName, content: validFileContent }]).then(() => {
-				const expectedWithBlacklist = _.cloneDeep(expected)
-				expectedWithBlacklist.settings.fileSettings.blacklist = [{ path: "foo", type: BlacklistType.flatten }]
-				expect(fileStateService.addFile).toHaveBeenLastCalledWith(expectedWithBlacklist)
-				done()
-			})
+			codeChartaService
+				.loadFiles([
+					{
+						fileName: validFileContent.fileName,
+						content: validFileContent
+					}
+				])
+				.then(() => {
+					const blacklist = [{ path: "foo", type: BlacklistType.flatten }]
+					expect(storeService.getState().files.getCCFiles()[0].settings.fileSettings.blacklist).toEqual(blacklist)
+					done()
+				})
 		})
 	})
 })

visualization/app/codeCharta/codeCharta.service.ts

@@ -1,15 +1,16 @@
 import { FileValidator } from "./util/fileValidator"
 import { AttributeTypes, CCFile, NameDataPair, BlacklistType, BlacklistItem } from "./codeCharta.model"
-import { FileStateService } from "./state/fileState.service"
 import _ from "lodash"
 import { NodeDecorator } from "./util/nodeDecorator"
+import { StoreService } from "./state/store.service"
+import { addFile, setSingle } from "./state/store/files/files.actions"
 
 export class CodeChartaService {
 	public static ROOT_NAME = "root"
 	public static ROOT_PATH = "/" + CodeChartaService.ROOT_NAME
 	public static readonly CC_FILE_EXTENSION = ".cc.json"
 
-	constructor(private fileStateService: FileStateService) {}
+	constructor(private storeService: StoreService) {}
 
 	public loadFiles(nameDataPairs: NameDataPair[]): Promise<void> {
 		return new Promise((resolve, reject) => {
@@ -18,13 +19,12 @@ export class CodeChartaService {
 				if (errors.length === 0) {
 					const ccFile = this.getCCFile(nameDataPair.fileName, nameDataPair.content)
 					NodeDecorator.preDecorateFile(ccFile)
-					this.fileStateService.addFile(ccFile)
+					this.storeService.dispatch(addFile(ccFile))
 				} else {
 					reject(errors)
 				}
 			})
-
-			this.fileStateService.setSingle(this.fileStateService.getCCFiles()[0])
+			this.storeService.dispatch(setSingle(this.storeService.getState().files.getCCFiles()[0]))
 			resolve()
 		})
 	}