Merge pull request #1462 from nextcloud/feat/support-files-27

feat: migrate files app integration to new API

Author: susnux

.eslintignore

@@ -1,5 +1,4 @@
 js/
 l10n/
 src/adminSettings.js
-src/filetypes.js
 src/utils.js

css/filetypes.css

@@ -13,23 +13,27 @@
 namespace OCA\Maps\Controller;
 
 use OCA\Files\Event\LoadSidebar;
+use OCA\Maps\Service\MyMapsService;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
-use OCP\IInitialStateService;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 
 class PageController extends Controller {
 
 	public function __construct(
 		string $appName,
 		IRequest $request,
+		private string $userId,
 		private IEventDispatcher $eventDispatcher,
 		private IConfig $config,
-		private IInitialStateService $initialStateService,
-		private string $userId,
+		private IInitialState $initialState,
+		private IURLGenerator $urlGenerator,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -50,7 +54,7 @@ public function index(): TemplateResponse {
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$params = ['user' => $this->userId];
-		$this->initialStateService->provideInitialState($this->appName, 'photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
+		$this->initialState->provideInitialState('photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
 		$response = new TemplateResponse('maps', 'main', $params);
 
 		$this->addCsp($response);
@@ -62,12 +66,21 @@ public function index(): TemplateResponse {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function indexMyMap($myMapId): TemplateResponse {
+	public function indexMyMap(int $myMapId, MyMapsService $service): TemplateResponse|RedirectResponse {
+		$map = $service->getMyMap($myMapId, $this->userId);
+		if ($map !== null && $map['id'] !== $myMapId) {
+			// Instead of the id of the map containing folder the '.index.maps' file id was passed so redirect
+			// this happens if coming from the files app integration
+			return new RedirectResponse(
+				$this->urlGenerator->linkToRouteAbsolute('maps.page.indexMyMap', ['myMapId' => $map['id']]),
+			);
+		}
+
 		$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$params = ['user' => $this->userId];
-		$this->initialStateService->provideInitialState($this->appName, 'photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
+		$this->initialState->provideInitialState('photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
 		$response = new TemplateResponse('maps', 'main', $params);
 
 		$this->addCsp($response);

lib/Controller/PageController.php

@@ -40,7 +40,6 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		Util::addScript('maps', 'maps-filetypes');
-		Util::addStyle('maps', 'filetypes');
+		Util::addInitScript('maps', 'maps-init-files');
 	}
 }

lib/Listener/LoadAdditionalScriptsListener.php

@@ -148,6 +148,30 @@ public function getAllMyMaps($userId) {
 		return $MyMaps;
 	}
 
+	/**
+	 * Try to lookup a my map by id
+	 *
+	 * @param int $id The map id to lookup
+	 * @param string $userId The current user id
+	 * @return null|array Either the MyMap or null if not found with that id for the given user
+	 */
+	public function getMyMap(int $id, string $userId) {
+		$userFolder = $this->root->getUserFolder($userId);
+		$node = $userFolder->getFirstNodeById($id);
+		if ($node instanceof Folder) {
+			try {
+				$node = $node->get('.index.maps');
+			} catch (NotFoundException) {
+				return null;
+			}
+		}
+
+		if ($node->getMimetype() === 'application/x-nextcloud-maps') {
+			return $this->node2MyMap($node, $userFolder);
+		}
+		return null;
+	}
+
 	public function updateMyMap($id, $values, $userId) {
 		$userFolder = $this->root->getUserFolder($userId);
 		$folders = $userFolder->getById($id);
@@ -158,7 +182,7 @@ public function updateMyMap($id, $values, $userId) {
 		try {
 			$file = $folder->get('.index.maps');
 		} catch (NotFoundException $e) {
-			$file = $folder->newFile('.index.maps', $content = '{}');
+			$file = $folder->newFile('.index.maps', '{}');
 		}
 		$mapData = json_decode($file->getContent(), true);
 		$renamed = false;

lib/Service/MyMapsService.php

@@ -38,10 +38,12 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@maplibre/maplibre-gl-leaflet": "^0.1.2",
+    "@mdi/svg": "^7.4.47",
     "@nextcloud/auth": "^2.5.1",
     "@nextcloud/axios": "^2.5.1",
     "@nextcloud/dialogs": "^6.3.2",
     "@nextcloud/event-bus": "^3.3.1",
+    "@nextcloud/files": "^3.12.0",
     "@nextcloud/l10n": "^3.1.0",
     "@nextcloud/moment": "^1.3.4",
     "@nextcloud/paths": "^2.1.0",
@@ -84,6 +86,8 @@
     "@nextcloud/eslint-config": "^8.4.1",
     "@nextcloud/stylelint-config": "^3.1.0",
     "@nextcloud/webpack-vue-config": "^6.3.0",
-    "@types/leaflet": "^1.9.20"
+    "@types/leaflet": "^1.9.20",
+    "@vue/tsconfig": "^0.5.1",
+    "typescript": "^5.9.2"
   }
 }

package-lock.json

@@ -0,0 +1,49 @@
+import axios from '@nextcloud/axios'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { FileAction, Permission } from '@nextcloud/files'
+import { n, t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
+
+import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
+
+export default new FileAction({
+	id: 'maps:import-device',
+
+	displayName() {
+		return t('maps', 'Import as devices in Maps')
+	},
+
+	enabled(files) {
+		if (files.length !== 1) {
+			return false
+		}
+
+		const [file] = files
+		if (!(file.permissions & Permission.READ)) {
+			return false
+		}
+		return [
+			'application/gpx+xml',
+			'application/vnd.google-earth.kmz',
+			'application/vnd.google-earth.kml+xml',
+		].includes(file.mime)
+	},
+
+	async exec(file) {
+		const path = file.path
+		const url = generateUrl('/apps/maps/import/devices')
+		try {
+			const { data } = await axios.post(url, { path })
+			const number = typeof data === 'number' ? data : data.nbImported
+			showSuccess(n('maps', 'One device imported', '%n devices imported', number))
+		} catch (error) {
+			showError(t('maps', 'Failed to import devices'))
+			console.error('Failed to import devices', { error })
+		}
+		return null
+	},
+
+	iconSvgInline() {
+		return svgMapMarker
+	},
+})

package.json

@@ -0,0 +1,50 @@
+import axios from '@nextcloud/axios'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { FileAction, Permission } from '@nextcloud/files'
+import { n, t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
+
+import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
+
+export default new FileAction({
+	id: 'maps:import-as-favorite',
+
+	displayName() {
+		return t('maps', 'Import as favorites in Maps')
+	},
+
+	enabled(files) {
+		if (files.length !== 1) {
+			return false
+		}
+
+		const [file] = files
+		if (!(file.permissions & Permission.READ)) {
+			return false
+		}
+		return [
+			'application/geo+json',
+			'application/gpx+xml',
+			'application/vnd.google-earth.kmz',
+			'application/vnd.google-earth.kml+xml',
+		].includes(file.mime)
+	},
+
+	async exec(file) {
+		const path = file.path
+		const url = generateUrl('/apps/maps/import/favorites')
+		try {
+			const { data } = await axios.post(url, { path })
+			const number = typeof data === 'number' ? data : data.nbImported
+			showSuccess(n('maps', 'One favorite imported', '%n favorites imported', number))
+		} catch (error) {
+			showError(t('maps', 'Failed to import favorites'))
+			console.error('Failed to import favorites', { error })
+		}
+		return null
+	},
+
+	iconSvgInline() {
+		return svgMapMarker
+	},
+})