fix(files): title and inline actions

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Sep 21, 2023 · 216804f · 216804f
1 parent a5a8655
commit 216804f
Show file tree

Hide file tree

Showing 89 changed files with 229 additions and 173 deletions.
diff --git a/apps/comments/src/actions/inlineUnreadCommentsAction.spec.ts b/apps/comments/src/actions/inlineUnreadCommentsAction.spec.ts
@@ -44,7 +44,8 @@ describe('Inline unread comments action display name tests', () => {
 
 		expect(action).toBeInstanceOf(FileAction)
 		expect(action.id).toBe('comments-unread')
-		expect(action.displayName([file], view)).toBe('1 new comment')
+		expect(action.displayName([file], view)).toBe('')
+		expect(action.title!([file], view)).toBe('1 new comment')
 		expect(action.iconSvgInline([], view)).toBe('<svg>SvgMock</svg>')
 		expect(action.enabled!([file], view)).toBe(true)
 		expect(action.inline!(file, view)).toBe(true)
@@ -64,7 +65,8 @@ describe('Inline unread comments action display name tests', () => {
 			},
 		})
 
-		expect(action.displayName([file], view)).toBe('2 new comments')
+		expect(action.displayName([file], view)).toBe('')
+		expect(action.title!([file], view)).toBe('2 new comments')
 	})
 })
 

diff --git a/apps/comments/src/actions/inlineUnreadCommentsAction.ts b/apps/comments/src/actions/inlineUnreadCommentsAction.ts
@@ -19,23 +19,27 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import { FileAction, Node, registerFileAction } from '@nextcloud/files'
+import { FileAction, Node } from '@nextcloud/files'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import commentProcessingSvg from '@mdi/svg/svg/comment-processing.svg?raw'
+import CommentProcessingSvg from '@mdi/svg/svg/comment-processing.svg?raw'
+
 import logger from '../logger'
 
 export const action = new FileAction({
 	id: 'comments-unread',
 
-	displayName(nodes: Node[]) {
+	title(nodes: Node[]) {
 		const unread = nodes[0].attributes['comments-unread'] as number
 		if (unread >= 0) {
 			return n('comments', '1 new comment', '{unread} new comments', unread, { unread })
 		}
 		return t('comments', 'Comment')
 	},
 
-	iconSvgInline: () => commentProcessingSvg,
+	// Empty string when rendered inline
+	displayName: () => '',
+
+	iconSvgInline: () => CommentProcessingSvg,
 
 	enabled(nodes: Node[]) {
 		const unread = nodes[0].attributes['comments-unread'] as number|undefined
@@ -57,5 +61,3 @@ export const action = new FileAction({
 
 	order: -140,
 })
-
-registerFileAction(action)
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
@@ -130,12 +130,13 @@
 					:class="'files-list__row-action-' + action.id"
 					:close-after-click="true"
 					:data-cy-files-list-row-action="action.id"
+					:title="action.title?.([source], currentView)"
 					@click="onActionClick(action)">
 					<template #icon>
 						<NcLoadingIcon v-if="loading === action.id" :size="18" />
 						<CustomSvgIconRender v-else :svg="action.iconSvgInline([source], currentView)" />
 					</template>
-					{{ action.displayName([source], currentView) }}
+					{{ actionDisplayName(action) }}
 				</NcActionButton>
 			</NcActions>
 		</td>
@@ -180,7 +181,7 @@ import { debounce } from 'debounce'
 import { emit } from '@nextcloud/event-bus'
 import { extname } from 'path'
 import { generateUrl } from '@nextcloud/router'
-import { getFileActions, DefaultType, FileType, formatFileSize, Permission, Folder, File, Node } from '@nextcloud/files'
+import { getFileActions, DefaultType, FileType, formatFileSize, Permission, Folder, File, Node, FileAction } from '@nextcloud/files'
 import { Type as ShareType } from '@nextcloud/sharing'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
@@ -918,6 +919,16 @@ export default Vue.extend({
 			return document.querySelector('.app-content > .files-list')
 		},
 
+		actionDisplayName(action: FileAction) {
+			if (this.filesListWidth < 768 && action.inline && typeof action.title === 'function') {
+				// if an inline action is rendered in the menu for
+				// lack of space we use the title first if defined
+				const title = action.title([this.source], this.currentView)
+				if (title) return title
+			}
+			return action.displayName([this.source], this.currentView)
+		},
+
 		t: translate,
 		formatFileSize,
 	},

diff --git a/apps/files_sharing/src/actions/sharingStatusAction.ts b/apps/files_sharing/src/actions/sharingStatusAction.ts
@@ -47,17 +47,28 @@ export const action = new FileAction({
 	displayName(nodes: Node[]) {
 		const node = nodes[0]
 		const shareTypes = Object.values(node?.attributes?.['share-types'] || {}).flat() as number[]
-		if (shareTypes.length > 0) {
+		const ownerId = node?.attributes?.['owner-id']
+
+		if (shareTypes.length > 0
+			|| (ownerId && ownerId !== getCurrentUser()?.uid)) {
 			return t('files_sharing', 'Shared')
 		}
 
+		return ''
+	},
+
+	title(nodes: Node[]) {
+		const node = nodes[0]
 		const ownerId = node?.attributes?.['owner-id']
+		const ownerDisplayName = node?.attributes?.['owner-display-name']
+
 		if (ownerId && ownerId !== getCurrentUser()?.uid) {
-			return t('files_sharing', 'Shared')
+			return t('files_sharing', 'Shared by {ownerDisplayName}', { ownerDisplayName })
 		}
 
 		return ''
 	},
+
 	iconSvgInline(nodes: Node[]) {
 		const node = nodes[0]
 		const shareTypes = Object.values(node?.attributes?.['share-types'] || {}).flat() as number[]

diff --git a/dist/6870-6870.js b/dist/6870-6870.js
diff --git a/dist/6870-6870.js.map b/dist/6870-6870.js.map
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-comments.js b/dist/comments-comments.js
diff --git a/dist/comments-comments.js.LICENSE.txt b/dist/comments-comments.js.LICENSE.txt
@@ -1,5 +1,3 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
-
 /**
  * @copyright Copyright (c) 2016 Roeland Jago Douma <roeland@famdouma.nl>
  *
@@ -23,28 +21,6 @@
  *
  */
 
-/**
- * @copyright Copyright (c) 2023 Lucas Azevedo <lhs_azevedo@hotmail.com>
- *
- * @author Lucas Azevedo <lhs_azevedo@hotmail.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/>.
- *
- */
-
 /**
  * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
  *

diff --git a/dist/comments-comments.js.map b/dist/comments-comments.js.map
diff --git a/dist/comments-init.js b/dist/comments-init.js
diff --git a/dist/comments-init.js.LICENSE.txt b/dist/comments-init.js.LICENSE.txt
@@ -0,0 +1,45 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.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/>.
+ *
+ */
+
+/**
+ * @copyright Copyright (c) 2023 Lucas Azevedo <lhs_azevedo@hotmail.com>
+ *
+ * @author Lucas Azevedo <lhs_azevedo@hotmail.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/>.
+ *
+ */
diff --git a/dist/comments-init.js.map b/dist/comments-init.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.js.map
diff --git a/dist/federatedfilesharing-vue-settings-admin.js b/dist/federatedfilesharing-vue-settings-admin.js
diff --git a/dist/federatedfilesharing-vue-settings-admin.js.map b/dist/federatedfilesharing-vue-settings-admin.js.map
diff --git a/dist/federatedfilesharing-vue-settings-personal.js b/dist/federatedfilesharing-vue-settings-personal.js
diff --git a/dist/federatedfilesharing-vue-settings-personal.js.map b/dist/federatedfilesharing-vue-settings-personal.js.map
diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files_external-main.js.LICENSE.txt → dist/files-init.js.LICENSE.txt b/dist/files_external-main.js.LICENSE.txt → dist/files-init.js.LICENSE.txt
@@ -1,5 +1,27 @@
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
+/**
+ * @copyright Copyright (c) 2019 Gary Kim <gary@garykim.dev>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.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/>.
+ *
+ */
+
 /**
  * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
  *

diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files-personal-settings.js b/dist/files-personal-settings.js
diff --git a/dist/files-personal-settings.js.map b/dist/files-personal-settings.js.map
diff --git a/dist/files-reference-files.js b/dist/files-reference-files.js
diff --git a/dist/files-reference-files.js.map b/dist/files-reference-files.js.map
diff --git a/dist/files-sidebar.js b/dist/files-sidebar.js
diff --git a/dist/files-sidebar.js.map b/dist/files-sidebar.js.map
diff --git a/dist/files_external-init.js b/dist/files_external-init.js
diff --git a/dist/files_external-init.js.LICENSE.txt b/dist/files_external-init.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/dist/files_external-init.js.map b/dist/files_external-init.js.map
diff --git a/dist/files_external-main.js b/dist/files_external-main.js
diff --git a/dist/files_external-main.js.map b/dist/files_external-main.js.map
diff --git a/dist/files_reminders-main.js b/dist/files_reminders-main.js
diff --git a/dist/files_reminders-main.js.map b/dist/files_reminders-main.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map
diff --git a/dist/files_sharing-init.js b/dist/files_sharing-init.js
diff --git a/dist/files_sharing-init.js.map b/dist/files_sharing-init.js.map
diff --git a/dist/files_sharing-personal-settings.js b/dist/files_sharing-personal-settings.js
diff --git a/dist/files_sharing-personal-settings.js.map b/dist/files_sharing-personal-settings.js.map
diff --git a/dist/files_trashbin-main.js b/dist/files_trashbin-main.js
diff --git a/dist/files_trashbin-main.js.LICENSE.txt b/dist/files_trashbin-main.js.LICENSE.txt
@@ -1,27 +1,5 @@
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
-/**
- * @copyright Copyright (c) 2022 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.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/>.
- *
- */
-
 /**
  * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
  *

diff --git a/dist/files_trashbin-main.js.map b/dist/files_trashbin-main.js.map
diff --git a/dist/files_versions-files_versions.js b/dist/files_versions-files_versions.js
diff --git a/dist/files_versions-files_versions.js.map b/dist/files_versions-files_versions.js.map
diff --git a/dist/settings-vue-settings-admin-basic-settings.js b/dist/settings-vue-settings-admin-basic-settings.js
diff --git a/dist/settings-vue-settings-admin-basic-settings.js.map b/dist/settings-vue-settings-admin-basic-settings.js.map
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE /