fix: Open Viewer when clicking on photo in folder

Signed-off-by: Christopher Ng <[email protected]> Signed-off-by: Louis Chemineau <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
nextcloud · Apr 17, 2024 · 746dc6e · 746dc6e
1 parent edba0d8
commit 746dc6e
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 18 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Folders_vue.js b/js/photos-src_views_Folders_vue.js
diff --git a/js/photos-src_views_Folders_vue.js.map b/js/photos-src_views_Folders_vue.js.map
diff --git a/js/photos-vendors-node_modules_nextcloud_files_dist_index_mjs.js b/js/photos-vendors-node_modules_nextcloud_files_dist_index_mjs.js
diff --git a/js/photos-vendors-node_modules_nextcloud_files_dist_index_mjs.js.map b/js/photos-vendors-node_modules_nextcloud_files_dist_index_mjs.js.map
diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
@@ -30,6 +30,7 @@
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\Constants;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
@@ -109,14 +110,36 @@ private function formatData(iterable $nodes): array {
 				'mime' => $node->getMimetype(),
 				'size' => $node->getSize(),
 				'type' => $node->getType(),
-				'permissions' => $node->getPermissions(),
+				'permissions' => $this->formatPermissions($node->getPermissions()),
 				'hasPreview' => $this->previewManager->isAvailable($node),
 			];
 		}
 
 		return $result;
 	}
 
+	private function formatPermissions(int $permissions): string {
+		$strPermissions = '';
+		if ($permissions) {
+			if ($permissions & Constants::PERMISSION_CREATE) {
+				$strPermissions .= 'CK';
+			}
+			if ($permissions & Constants::PERMISSION_READ) {
+				$strPermissions .= 'G';
+			}
+			if ($permissions & Constants::PERMISSION_UPDATE) {
+				$strPermissions .= 'W';
+			}
+			if ($permissions & Constants::PERMISSION_DELETE) {
+				$strPermissions .= 'D';
+			}
+			if ($permissions & Constants::PERMISSION_SHARE) {
+				$strPermissions .= 'R';
+			}
+		}
+		return $strPermissions;
+	}
+
 	private function scanCurrentFolder(Folder $folder, bool $shared): iterable {
 		$nodes = $folder->getDirectoryListing();
 

diff --git a/src/views/AlbumContent.vue b/src/views/AlbumContent.vue
@@ -165,7 +165,7 @@
 <script>
 import { mapActions } from 'vuex'
 
-import { Folder, addNewFileMenuEntry, removeNewFileMenuEntry } from '@nextcloud/files'
+import { Folder, addNewFileMenuEntry, removeNewFileMenuEntry, davParsePermissions } from '@nextcloud/files'
 import { getCurrentUser } from '@nextcloud/auth'
 import { NcActions, NcActionButton, NcButton, NcDialog, NcModal, NcEmptyContent, NcActionSeparator, NcLoadingIcon, isMobile } from '@nextcloud/vue'
 import { UploadPicker, getUploader } from '@nextcloud/upload'
@@ -317,6 +317,7 @@ export default {
 				...this.album,
 				owner: getCurrentUser()?.uid ?? '',
 				source: this.album?.source ?? '',
+				permissions: davParsePermissions(this.album.permissions),
 			})
 		},
 	},

diff --git a/src/views/Folders.vue b/src/views/Folders.vue
@@ -70,7 +70,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { Upload, UploadPicker, getUploader } from '@nextcloud/upload'
-import { Folder as NcFolder } from '@nextcloud/files'
+import { Folder as NcFolder, davParsePermissions } from '@nextcloud/files'
 import { NcEmptyContent } from '@nextcloud/vue'
 import VirtualGrid from 'vue-virtual-grid'
 
@@ -147,6 +147,7 @@ export default {
 			return new NcFolder({
 				...this.folder,
 				source: decodeURI(this.folder.source),
+				permissions: davParsePermissions(this.folder.permissions),
 			})
 		},
 		folderContent() {