chore: remove legacy camera transformation, closes #3139

add proper error handling add (bad) if condition for tests in customConfigHelper.ts
MaibornWolff · Jan 12, 2023 · cfaf05b · cfaf05b
1 parent 65209e6
commit cfaf05b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/...igList/customConfigItemGroup/customConfigDescription/applyCustomConfigButton.component.ts b/...igList/customConfigItemGroup/customConfigDescription/applyCustomConfigButton.component.ts
@@ -20,6 +20,16 @@ export class ApplyCustomConfigButtonComponent {
 	) {}
 
 	applyCustomConfig() {
-		CustomConfigHelper.applyCustomConfig(this.customConfigItem.id, this.store, this.threeCameraService, this.threeOrbitControlsService)
+		try {
+			CustomConfigHelper.applyCustomConfig(
+				this.customConfigItem.id,
+				this.store,
+				this.threeCameraService,
+				this.threeOrbitControlsService
+			)
+		} catch (error) {
+			console.error(`${error.name}: ${error.message}`)
+			alert(`Unable to load Custom-View-file: ${error.message}`)
+		}
 	}
 }
diff --git a/...odeCharta/ui/customConfigs/uploadCustomConfigButton/uploadCustomConfigButton.component.ts b/...odeCharta/ui/customConfigs/uploadCustomConfigButton/uploadCustomConfigButton.component.ts
@@ -15,8 +15,9 @@ export class UploadCustomConfigButtonComponent {
 			for (const customConfigContent of customConfigsContent) {
 				try {
 					CustomConfigHelper.importCustomConfigs(customConfigContent)
-				} catch {
-					// Explicitly ignored
+				} catch (error) {
+					console.error(`${error.name}: ${error.message}`)
+					alert(`Unable to load Custom-View-file: ${error.message}`)
 				}
 			}
 		})

diff --git a/visualization/app/codeCharta/util/customConfigHelper.ts b/visualization/app/codeCharta/util/customConfigHelper.ts
@@ -142,6 +142,8 @@ export class CustomConfigHelper {
 				camera: exportedConfig.camera
 			}
 
+			CustomConfigHelper.checkForLegacyCameraSettingsOfCustomConfig(importedCustomConfig)
+
 			CustomConfigHelper.addCustomConfig(importedCustomConfig)
 		}
 	}
@@ -215,7 +217,7 @@ export class CustomConfigHelper {
 		threeOrbitControlsService: ThreeOrbitControlsService
 	) {
 		const customConfig = this.getCustomConfigSettings(configId)
-		CustomConfigHelper.transformLegacyCameraSettingsOfCustomConfig(customConfig)
+		CustomConfigHelper.checkForLegacyCameraSettingsOfCustomConfig(customConfig)
 		CustomConfigHelper.deleteUnusedKeyPropsOfCustomConfig(customConfig)
 
 		store.dispatch(setState(customConfig.stateSettings))
@@ -230,16 +232,13 @@ export class CustomConfigHelper {
 		}
 	}
 
-	// TODO [2023-01-01] remove support
-	private static transformLegacyCameraSettingsOfCustomConfig(customConfig: any) {
+	private static checkForLegacyCameraSettingsOfCustomConfig(customConfig: any) {
+		if (customConfig.appSettings === undefined) {
+			return
+		}
 		const appSettings = customConfig.stateSettings.appSettings
 		if (appSettings.camera || appSettings.cameraTarget) {
-			customConfig.camera = {
-				camera: appSettings.camera,
-				cameraTarget: appSettings.cameraTarget
-			}
-			delete customConfig.stateSettings.appSettings.camera
-			delete customConfig.stateSettings.appSettings.cameraTarget
+			throw new Error("CustomConfig contained unsupported legacy camera data.")
 		}
 	}