fix(files-actions-menu): load-then-mutate so clearing default_action persists

Signed-off-by: Jaap van der Plas <jvdplas@gmail.com>

Author: jvdp

lib/Service/UI/FilesActionsMenuService.php

@@ -51,35 +51,30 @@ public function registerFileActionMenu(string $appId, string $name, string $disp
 		string $icon, string $mime, int $permissions, int $order, string $version,
 		?string $defaultAction = null): ?FilesActionsMenu {
 		try {
-			$fileActionMenu = $this->mapper->findByAppidName($appId, $name);
+			$existing = $this->mapper->findByAppidName($appId, $name);
 		} catch (DoesNotExistException|MultipleObjectsReturnedException|Exception) {
-			$fileActionMenu = null;
+			$existing = null;
 		}
 		try {
-			$newFileActionMenu = new FilesActionsMenu([
-				'appid' => $appId,
-				'name' => $name,
-				'display_name' => $displayName,
-				'action_handler' => ltrim($actionHandler, '/'),
-				'icon' => ltrim($icon, '/'),
-				'mime' => $mime,
-				'permissions' => $permissions,
-				'order' => $order,
-				'version' => $version,
-				'default_action' => $defaultAction,
-			]);
-			if ($fileActionMenu !== null) {
-				$newFileActionMenu->setId($fileActionMenu->getId());
-			}
-			$fileActionMenu = $this->mapper->insertOrUpdate($newFileActionMenu);
+			$entity = $existing ?? new FilesActionsMenu();
+			$entity->setAppid($appId);
+			$entity->setName($name);
+			$entity->setDisplayName($displayName);
+			$entity->setActionHandler(ltrim($actionHandler, '/'));
+			$entity->setIcon(ltrim($icon, '/'));
+			$entity->setMime($mime);
+			$entity->setPermissions($permissions);
+			$entity->setOrder($order);
+			$entity->setVersion($version);
+			$entity->setDefaultAction($defaultAction);
 			$this->resetCacheEnabled();
+			return $existing === null ? $this->mapper->insert($entity) : $this->mapper->update($entity);
 		} catch (Exception $e) {
 			$this->logger->error(
 				sprintf('Failed to register ExApp %s FileActionMenu %s. Error: %s', $appId, $name, $e->getMessage()), ['exception' => $e]
 			);
 			return null;
 		}
-		return $fileActionMenu;
 	}
 
 	public function unregisterFileActionMenu(string $appId, string $name): ?FilesActionsMenu {