Merge pull request #43211 from nextcloud/feature/person-files-view/42…

…919/base-draft

apps/files/src/init.ts

@@ -37,6 +37,7 @@ import { registerTemplateEntries } from './newMenu/newFromTemplate.ts'
 
 import registerFavoritesView from './views/favorites'
 import registerRecentView from './views/recent'
+import registerPersonalFilesView from './views/personal-files'
 import registerFilesView from './views/files'
 import registerPreviewServiceWorker from './services/ServiceWorker.js'
 
@@ -64,6 +65,7 @@ registerTemplateEntries()
 registerFavoritesView()
 registerFilesView()
 registerRecentView()
+registerPersonalFilesView()
 
 // Register preview service worker
 registerPreviewServiceWorker()

apps/files/src/services/Favorites.ts

@@ -22,22 +22,14 @@
 import type { ContentsWithRoot } from '@nextcloud/files'
 import type { FileStat, ResponseDataDetailed } from 'webdav'
 
-import { Folder, getDavNameSpaces, getDavProperties, davGetDefaultPropfind } from '@nextcloud/files'
+import { Folder, davGetDefaultPropfind, davGetFavoritesReport } from '@nextcloud/files'
 
 import { getClient } from './WebdavClient'
 import { resultToNode } from './Files'
 
 const client = getClient()
 
-const reportPayload = `<?xml version="1.0"?>
-<oc:filter-files ${getDavNameSpaces()}>
-	<d:prop>
-		${getDavProperties()}
-	</d:prop>
-	<oc:filter-rules>
-		<oc:favorite>1</oc:favorite>
-	</oc:filter-rules>
-</oc:filter-files>`
+const reportPayload = davGetFavoritesReport()
 
 export const getContents = async (path = '/'): Promise<ContentsWithRoot> => {
 	const propfindPayload = davGetDefaultPropfind()

apps/files/src/services/PersonalFiles.ts

@@ -0,0 +1,54 @@
+/**
+ * @copyright Copyright (c) 2024 Eduardo Morales <emoral435@gmail.com>
+ *
+ * @author Eduardo Morales <emoral435@gmail.com>
+ *
+ * @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, type ContentsWithRoot } from '@nextcloud/files'
+import { getCurrentUser } from '@nextcloud/auth';
+
+import { getContents as getFiles } from './Files';
+
+const currUserID = getCurrentUser()?.uid
+
+/**
+ * NOTE MOVE TO @nextcloud/files 
+ * @brief filters each file/folder on its shared status
+ * 	A personal file is considered a file that has all of the following properties:
+ * 		a.) the current user owns
+ * 		b.) the file is not shared with anyone
+ * 		c.) the file is not a group folder
+ * @param {FileStat} node that contains  
+ * @return {Boolean}
+ */
+export const personalFile = function(node: File): Boolean {
+	const isNotShared = currUserID ? node.owner === currUserID : true
+						&& node.attributes['mount-type'] !== 'group'
+						&& node.attributes['mount-type'] !== 'shared'
+	return isNotShared
+}
+
+export const getContents = (path: string = "/"): Promise<ContentsWithRoot> => {
+	// get all the files from the current path as a cancellable promise
+	// then filter the files that the user does not own, or has shared / is a group folder
+    return getFiles(path)
+		.then(c => {
+			c.contents = c.contents.filter(personalFile) as File[]
+			return c
+		})
+}

apps/files/src/views/favorites.spec.ts

@@ -75,7 +75,7 @@ describe('Favorites view definition', () => {
 		expect(favoritesView?.name).toBe('Favorites')
 		expect(favoritesView?.caption).toBeDefined()
 		expect(favoritesView?.icon).toBe('<svg>SvgMock</svg>')
-		expect(favoritesView?.order).toBe(5)
+		expect(favoritesView?.order).toBe(15)
 		expect(favoritesView?.columns).toStrictEqual([])
 		expect(favoritesView?.getContents).toBeDefined()
 	})

apps/files/src/views/favorites.ts

@@ -80,7 +80,7 @@ export default () => {
 		emptyCaption: t('files', 'Files and folders you mark as favorite will show up here'),
 
 		icon: StarSvg,
-		order: 5,
+		order: 15,
 
 		columns: [],
 

apps/files/src/views/personal-files.ts

@@ -0,0 +1,43 @@
+/**
+ * @copyright Copyright (c) 2024 Eduardo Morales <emoral435@gmail.com>
+ *
+ * @author Eduardo Morales <emoral435@gmail.com>
+ *
+ * @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 { translate as t } from '@nextcloud/l10n'
+import { View, getNavigation } from '@nextcloud/files'
+
+import { getContents } from '../services/PersonalFiles'
+import AccountIcon from '@mdi/svg/svg/account.svg?raw'
+
+export default () => {
+	const Navigation = getNavigation()
+	Navigation.register(new View({
+		id: 'personal',
+		name: t('files', 'Personal Files'),
+		caption: t('files', 'List of your files and folders that are not shared.'),
+
+		emptyTitle: t('files', 'No personal files found'),
+		emptyCaption: t('files', 'Files that are not shared will show up here.'),
+
+		icon: AccountIcon,
+		order: 5,
+
+		getContents,
+	}))
+}

apps/files/src/views/recent.ts

@@ -36,7 +36,7 @@ export default () => {
 		emptyCaption: t('files', 'Files and folders you recently modified will show up here.'),
 
 		icon: HistorySvg,
-		order: 2,
+		order: 10,
 
 		defaultSortKey: 'mtime',