fix: import groups

lib/Data/ImportExport.js

@@ -791,9 +791,7 @@ class DataImportExport extends CoreBase {
 					}
 
 					if (!config || config.surfaces) {
-						for (const [id, surface] of Object.entries(data.surfaces || {})) {
-							this.surfaces.importSurface(id, surface)
-						}
+						this.surfaces.importSurfaces(data.surfaceGroups || {}, data.surfaces || {})
 					}
 
 					if (!config || config.triggers) {

lib/Surface/Controller.js

@@ -1124,15 +1124,61 @@ class SurfaceController extends CoreBase {
 	 * @param {*} config
 	 * @returns {void}
 	 */
-	importSurface(surfaceId, config) {
-		const device = this.#getSurfaceHandlerForId(surfaceId, true)
-		if (device) {
+	#importSurface(surfaceId, config) {
+		const surface = this.#getSurfaceHandlerForId(surfaceId, true)
+		if (surface) {
 			// Device is currently loaded
-			device.setPanelConfig(config)
+			surface.setPanelConfig(config.config)
+			surface.saveGroupConfig(config.groupConfig)
+			surface.setPanelName(config.name)
+
+			// Update the groupId
+			const newGroupId = config.groupId ?? null
+			if (surface.getGroupId() !== newGroupId && this.#getGroupForId(newGroupId)) {
+				this.#detachSurfaceFromGroup(surface)
+				surface.setGroupId(newGroupId)
+				this.#attachSurfaceToGroup(surface)
+			}
 		} else {
 			// Device is not loaded
 			this.setDeviceConfig(surfaceId, config)
 		}
+	}
+
+	/**
+	 * Import a surface configuration
+	 * @param {Record<string, *>} surfaceGroups
+	 * @param {Record<string, *>} surfaces
+	 * @returns {void}
+	 */
+	importSurfaces(surfaceGroups, surfaces) {
+		// try {
+		// 	this.#detachSurfaceFromGroup(surface)
+
+		// 	this.#attachSurfaceToGroup(surface)
+		// } catch (e) {
+		// 	this.logger.warn('Could not reattach a surface')
+		// }
+
+		for (const [id, surfaceGroup] of Object.entries(surfaceGroups)) {
+			let group = this.#getGroupForId(id, true)
+			if (!group) {
+				// Group does not exist
+				group = new SurfaceGroup(this.registry, id, null, this.isPinLockEnabled())
+				this.#surfaceGroups.set(id, group)
+			}
+
+			// Sync config
+			group.setName(surfaceGroup.name ?? '')
+			for (const [key, value] of Object.entries(surfaceGroup)) {
+				if (key === 'name') continue
+				group.setGroupConfigValue(key, value)
+			}
+		}
+
+		for (const [id, surface] of Object.entries(surfaces)) {
+			this.#importSurface(id, surface)
+		}
 
 		this.updateDevicesList()
 	}