Skip to content

fix(files_sharing): Hide incompatible actions in shares #60151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nfebe wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(files_sharing): Hide incompatible actions in shares #60151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/files/src/actions/convertAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@ export function registerConvertActions() {
id: `convert-${from}-${to}`,
displayName: () => t('files', 'Save as {displayName}', { displayName }),
iconSvgInline: () => generateIconSvg(to),
enabled: ({ nodes, folder }) => {
enabled: ({ nodes, folder, view }) => {
if (isPublicShare() && !(folder.permissions & Permission.CREATE)) {
// cannot create the converted file in a public share if we don't have create permissions
return false
}
if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}
// Check that all nodes have the same mime type
return nodes.every((node) => from === node.mime)
},
Expand Down
4 changes: 4 additions & 0 deletions apps/files/src/actions/deleteAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export const action: IFileAction = {
},

enabled({ nodes, view }) {
if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

if (view.id === TRASHBIN_VIEW_ID) {
const config = loadState('files_trashbin', 'config', { allow_delete: true })
if (config.allow_delete === false) {
Expand Down
4 changes: 4 additions & 0 deletions apps/files/src/actions/downloadAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

// We can only download dav files and folders.
if (nodes.some((node) => !node.isDavResource)) {
return false
Expand Down
6 changes: 5 additions & 1 deletion apps/files/src/actions/favoriteAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,16 @@ export const action: IFileAction = {
: StarSvg
},

enabled({ nodes }) {
enabled({ nodes, view }) {
// Not enabled for public shares
if (isPublicShare()) {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

// We can only favorite nodes if they are located in files
return nodes.every((node) => node.root?.startsWith?.('/files'))
// and we have permissions
Expand Down
3 changes: 3 additions & 0 deletions apps/files/src/actions/moveOrCopyAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ export const action: IFileAction = {
if (view.id === 'public-file-share') {
return false
}
if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}
// We only support moving/copying files within the user folder
if (!nodes.every((node) => node.root?.startsWith('/files/'))) {
return false
Expand Down
6 changes: 5 additions & 1 deletion apps/files/src/actions/openFolderAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ export const action: IFileAction = {
},
iconSvgInline: () => FolderSvg,

enabled({ nodes }) {
enabled({ nodes, view }) {
// Only works on single node
if (nodes.length !== 1 || !nodes[0]) {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

const node = nodes[0]
if (!node.isDavResource) {
return false
Expand Down
6 changes: 5 additions & 1 deletion apps/files/src/actions/openLocallyAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const action: IFileAction = {
iconSvgInline: () => LaptopSvg,

// Only works on single files
enabled({ nodes }) {
enabled({ nodes, view }) {
// Only works on single node
if (nodes.length !== 1 || !nodes[0]) {
return false
Expand All @@ -34,6 +34,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

return isSyncable(nodes[0]!)
},

Expand Down
4 changes: 4 additions & 0 deletions apps/files/src/actions/renameAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

const node = nodes[0]
const filesStore = useFilesStore(getPinia())
const parentNode = node.dirname === '/'
Expand Down
6 changes: 5 additions & 1 deletion apps/files/src/actions/sidebarAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const action: IFileAction = {
iconSvgInline: () => InformationSvg,

// Sidebar currently supports user folder only, /files/USER
enabled: ({ nodes }) => {
enabled: ({ nodes, view }) => {
const node = nodes[0]
if (nodes.length !== 1 || !node) {
return false
Expand All @@ -34,6 +34,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

return node.root.startsWith('/files/') && node.permissions !== Permission.NONE
},

Expand Down
4 changes: 4 additions & 0 deletions apps/files/src/actions/viewInFolderAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

// Only works on single node
if (nodes.length !== 1 || !nodes[0]) {
return false
Expand Down
6 changes: 5 additions & 1 deletion apps/files_sharing/src/files_actions/sharingStatusAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const action: IFileAction = {
return AccountPlusSvg
},

enabled({ nodes }) {
enabled({ nodes, view }) {
if (nodes.length !== 1) {
return false
}
Expand All @@ -115,6 +115,10 @@ export const action: IFileAction = {
return false
}

if (view.id === 'pendingshares' || view.id === 'deletedshares') {
return false
}

const node = nodes[0]!
const shareTypes = node.attributes?.['share-types']
const isMixed = Array.isArray(shareTypes) && shareTypes.length > 0
Expand Down
Loading