Merge pull request #39165 from nextcloud/artonge/feat/enable_versions_features_with_groupfolders_enabled

Enable all files_versions features when groupfolders is enabled

apps/files_versions/lib/Capabilities.php

@@ -44,13 +44,11 @@ class Capabilities implements ICapability {
 	 * Return this classes capabilities
 	 */
 	public function getCapabilities() {
-		$groupFolderInstalled = $this->appManager->isInstalled('groupfolders');
-
 		return [
 			'files' => [
 				'versioning' => true,
-				'version_labeling' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_labeling', true),
-				'version_deletion' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_deletion', true),
+				'version_labeling' => $this->config->getSystemValueBool('enable_version_labeling', true),
+				'version_deletion' => $this->config->getSystemValueBool('enable_version_deletion', true),
 			]
 		];
 	}

apps/files_versions/src/components/Version.vue

@@ -46,7 +46,7 @@
 				</div>
 			</template>
 			<template #actions>
-				<NcActionButton	v-if="capabilities.files.version_labeling === true"
+				<NcActionButton	v-if="enableLabeling"
 					:close-after-click="true"
 					@click="openVersionLabelModal">
 					<template #icon>
@@ -70,7 +70,7 @@
 					</template>
 					{{ t('files_versions', 'Download version') }}
 				</NcActionLink>
-				<NcActionButton v-if="!isCurrent && capabilities.files.version_deletion === true"
+				<NcActionButton v-if="!isCurrent && enableDeletion"
 					:close-after-click="true"
 					@click="deleteVersion">
 					<template #icon>
@@ -250,6 +250,16 @@ export default {
 		formattedDate() {
 			return moment(this.version.mtime).format('LLL')
 		},
+
+		/** @return {boolean} */
+		enableLabeling() {
+			return this.capabilities.files.version_labeling === true && this.fileInfo.mountType !== 'group'
+		},
+
+		/** @return {boolean} */
+		enableDeletion() {
+			return this.capabilities.files.version_deletion === true && this.fileInfo.mountType !== 'group'
+		}
 	},
 	methods: {
 		openVersionLabelModal() {