feat(files): migrate recent view

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

apps/files/js/merged-index.json

@@ -20,7 +20,6 @@
   "newfilemenu.js",
   "operationprogressbar.js",
   "recentfilelist.js",
-  "recentplugin.js",
   "semaphore.js",
   "sidebarpreviewmanager.js",
   "sidebarpreviewtext.js",

apps/files/lib/AppInfo/Application.php

@@ -163,15 +163,6 @@ private function registerNavigation(IL10N $l10n): void {
 				'name' => $l10n->t('All files')
 			];
 		});
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
-			return [
-				'id' => 'recent',
-				'appname' => 'files',
-				'script' => 'recentlist.php',
-				'order' => 2,
-				'name' => $l10n->t('Recent')
-			];
-		});
 	}
 
 	private function registerHooks(): void {

apps/files/src/components/FileEntry.vue

@@ -154,6 +154,7 @@ import { formatFileSize, Permission } from '@nextcloud/files'
 import { Fragment } from 'vue-frag'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
 import { vOnClickOutside } from '@vueuse/components'
 import axios from '@nextcloud/axios'
 import CancelablePromise from 'cancelable-promise'
@@ -361,10 +362,16 @@ export default Vue.extend({
 		},
 		previewUrl() {
 			try {
-				const url = new URL(window.location.origin + this.source.attributes.previewUrl)
+				const previewUrl = this.source.attributes.previewUrl
+					|| generateUrl('/core/preview?fileId={fileid}', {
+						fileid: this.source.fileid,
+					})
+				const url = new URL(window.location.origin + previewUrl)
+
 				// Request tiny previews
 				url.searchParams.set('x', '32')
 				url.searchParams.set('y', '32')
+
 				// Handle cropping
 				url.searchParams.set('a', this.cropPreviews === true ? '0' : '1')
 				return url.href

apps/files/src/main.ts

@@ -18,6 +18,7 @@ import NavigationService from './services/Navigation'
 import NavigationView from './views/Navigation.vue'
 import processLegacyFilesViews from './legacy/navigationMapper.js'
 import registerFavoritesView from './views/favorites'
+import registerRecentView from './views/recent'
 import registerPreviewServiceWorker from './services/ServiceWorker.js'
 import router from './router/router.js'
 import RouterService from './services/RouterService'
@@ -78,6 +79,7 @@ FilesList.$mount('#app-content-vue')
 // Init legacy and new files views
 processLegacyFilesViews()
 registerFavoritesView()
+registerRecentView()
 
 // Register preview service worker
 registerPreviewServiceWorker()

apps/files/src/services/Recent.ts

@@ -0,0 +1,149 @@
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+import { File, Folder, Permission, parseWebdavPermissions } from '@nextcloud/files'
+import { generateRemoteUrl } from '@nextcloud/router'
+import { getClient, rootPath } from './WebdavClient'
+import { getCurrentUser } from '@nextcloud/auth'
+import { getDavNameSpaces, getDavProperties } from './DavProperties'
+import type { ContentsWithRoot } from './Navigation'
+import type { FileStat, ResponseDataDetailed, DAVResultResponseProps } from 'webdav'
+
+const client = getClient(generateRemoteUrl('dav'))
+
+const lastTwoWeeksTimestamp = Math.round((Date.now() / 1000) - (60 * 60 * 24 * 14))
+const searchPayload = `<?xml version="1.0" encoding="UTF-8"?>
+<d:searchrequest ${getDavNameSpaces()}
+	xmlns:ns="https://github.com/icewind1991/SearchDAV/ns">
+	<d:basicsearch>
+		<d:select>
+			<d:prop>
+				${getDavProperties()}
+			</d:prop>
+		</d:select>
+		<d:from>
+			<d:scope>
+				<d:href>/files/${getCurrentUser()?.uid}/</d:href>
+				<d:depth>infinity</d:depth>
+			</d:scope>
+		</d:from>
+		<d:where>
+			<d:and>
+				<d:or>
+					<d:not>
+						<d:eq>
+							<d:prop>
+								<d:getcontenttype/>
+							</d:prop>
+							<d:literal>httpd/unix-directory</d:literal>
+						</d:eq>
+					</d:not>
+					<d:eq>
+						<d:prop>
+							<oc:size/>
+						</d:prop>
+						<d:literal>0</d:literal>
+					</d:eq>
+				</d:or>
+				<d:gt>
+					<d:prop>
+						<d:getlastmodified/>
+					</d:prop>
+					<d:literal>${lastTwoWeeksTimestamp}</d:literal>
+				</d:gt>
+			</d:and>
+		</d:where>
+		<d:orderby>
+			<d:order>
+				<d:prop>
+					<d:getlastmodified/>
+				</d:prop>
+				<d:descending/>
+			</d:order>
+		</d:orderby>
+		<d:limit>
+			<d:nresults>100</d:nresults>
+			<ns:firstresult>0</ns:firstresult>
+		</d:limit>
+	</d:basicsearch>
+</d:searchrequest>`
+
+interface ResponseProps extends DAVResultResponseProps {
+	permissions: string,
+	fileid: number,
+	size: number,
+}
+
+const resultToNode = function(node: FileStat): File | Folder {
+	const props = node.props as ResponseProps
+	const permissions = parseWebdavPermissions(props?.permissions)
+	const owner = getCurrentUser()?.uid as string
+
+	const nodeData = {
+		id: props?.fileid as number || 0,
+		source: generateRemoteUrl('dav' + node.filename),
+		mtime: new Date(node.lastmod),
+		mime: node.mime as string,
+		size: props?.size as number || 0,
+		permissions,
+		owner,
+		root: rootPath,
+		attributes: {
+			...node,
+			...props,
+			hasPreview: props?.['has-preview'],
+		},
+	}
+
+	delete nodeData.attributes.props
+
+	return node.type === 'file'
+		? new File(nodeData)
+		: new Folder(nodeData)
+}
+
+export const getContents = async (path = '/'): Promise<ContentsWithRoot> => {
+	const contentsResponse = await client.getDirectoryContents(path, {
+		details: true,
+		// Only filter favorites if we're at the root
+		data: searchPayload,
+		headers: {
+			// Patched in WebdavClient.ts
+			method: 'SEARCH',
+			// Somehow it's needed to get the correct response
+			'Content-Type': 'application/xml; charset=utf-8',
+		},
+		deep: true,
+	}) as ResponseDataDetailed<FileStat[]>
+
+	const contents = contentsResponse.data
+
+	return {
+		folder: new Folder({
+			id: 0,
+			source: generateRemoteUrl('dav' + rootPath),
+			root: rootPath,
+			owner: getCurrentUser()?.uid || null,
+			permissions: Permission.READ,
+		}),
+		contents: contents.map(resultToNode),
+	}
+}