Skip to content

Commit

Permalink
fix FileAction register logic depending on icon (#198)
Browse files Browse the repository at this point in the history 
Fixing missed bug introduced in recent filesplugin update: when no icon
set - FileAction is not registered in NC28.

Signed-off-by: Andrey Borysenko <andrey18106x@gmail.com>
  • Loading branch information
@andrey18106
andrey18106 authored Jan 5, 2024
1 parent bab7bee commit 0f0c01e
Showing 1 changed file with 65 additions and 60 deletions.
125 changes: 65 additions & 60 deletions src/filesplugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function loadExAppInlineSvgIcon(appId, route) {
}
return response.data
}).catch((error) => {
console.error('error', error)
console.error('Failed to load ExApp FileAction icon inline svg', error)
return null
})
}
Expand All @@ -29,7 +29,7 @@ function generateAppAPIProxyUrl(appId, route) {
return generateUrl(`/apps/app_api/proxy/${appId}/${route}`)
}

if (OCA.Files && OCA.Files.fileActions) {
if (OCA.Files && OCA.Files.fileActions) { // NC 27
state.fileActions.forEach(fileAction => {
const mimes = fileAction.mime.split(',').map(mime => mime.trim()) // multiple mimes are separated by comma
mimes.forEach((mimeType) => {
Expand Down Expand Up @@ -78,75 +78,80 @@ if (OCA.Files && OCA.Files.fileActions) {
OCA.Files.fileActions.registerAction(action)
})
})
} else {
} else { // NC 28+
state.fileActions.forEach(fileAction => {
let inlineSvg = loadStaticAppAPIInlineSvgIcon()
if (fileAction.icon !== '') {
if (fileAction.icon === '') {
const inlineSvgIcon = loadStaticAppAPIInlineSvgIcon()
registerFileAction28(fileAction, inlineSvgIcon)
} else {
loadExAppInlineSvgIcon(fileAction.appid, fileAction.icon).then((svg) => {
if (svg !== null) {
// Set css filter for theming
const parser = new DOMParser()
const icon = parser.parseFromString(svg, 'image/svg+xml')
icon.documentElement.setAttribute('style', 'filter: var(--background-invert-if-dark);')
// Convert back to inline string
inlineSvg = icon.documentElement.outerHTML
const inlineSvgIcon = icon.documentElement.outerHTML
registerFileAction28(fileAction, inlineSvgIcon)
}
}).finally(() => {
const action = new FileAction({
id: fileAction.name,
displayName: () => fileAction.display_name,
iconSvgInline: () => inlineSvg,
order: Number(fileAction.order),
enabled(files, view) {
if (files.length !== 1) {
return false
}
})
}
})
}

// Check for multiple mimes separated by comma
let isMimeMatch = false
fileAction.mime.split(',').forEach((mime) => {
if (files[0].mime.indexOf(mime.trim()) !== -1) {
isMimeMatch = true
}
})
function registerFileAction28(fileAction, inlineSvgIcon) {
const action = new FileAction({
id: fileAction.name,
displayName: () => fileAction.display_name,
iconSvgInline: () => inlineSvgIcon,
order: Number(fileAction.order),
enabled(files, view) {
if (files.length !== 1) {
return false
}

return isMimeMatch
},
async exec(node) {
const exAppFileActionHandler = generateAppAPIProxyUrl(fileAction.appid, fileAction.action_handler)
axios.post(exAppFileActionHandler, {
fileId: node.fileid,
name: node.basename,
directory: node.dirname,
etag: node.attributes.etag,
mime: node.mime,
favorite: Boolean(node.attributes.favorite).toString(),
permissions: node.permissions,
fileType: node.type,
size: Number(node.size),
mtime: new Date(node.mtime).getTime() / 1000, // convert ms to s
shareTypes: node.attributes.shareTypes || null,
shareAttributes: node.attributes.shareAttributes || null,
sharePermissions: node.attributes.sharePermissions || null,
shareOwner: node.attributes.ownerDisplayName || null,
shareOwnerId: node.attributes.ownerId || null,
userId: getCurrentUser().uid,
instanceId: state.instanceId,
}).then((response) => {
if (response.status === 200) {
OC.dialogs.info(t('app_api', 'Action request sent to ExApp'), t(fileAction.appid, fileAction.display_name))
} else {
OC.dialogs.info(t('app_api', 'Error while sending File action request to ExApp'), t(fileAction.appid, fileAction.display_name))
}
}).catch((error) => {
console.error('error', error)
OC.dialogs.info(t('app_api', 'Error while sending File action request to ExApp'), t(fileAction.appid, fileAction.display_name))
})
return null
},
})
registerFileAction(action)
// Check for multiple mimes separated by comma
let isMimeMatch = false
fileAction.mime.split(',').forEach((mime) => {
if (files[0].mime.indexOf(mime.trim()) !== -1) {
isMimeMatch = true
}
})
}

return isMimeMatch
},
async exec(node) {
const exAppFileActionHandler = generateAppAPIProxyUrl(fileAction.appid, fileAction.action_handler)
axios.post(exAppFileActionHandler, {
fileId: node.fileid,
name: node.basename,
directory: node.dirname,
etag: node.attributes.etag,
mime: node.mime,
favorite: Boolean(node.attributes.favorite).toString(),
permissions: node.permissions,
fileType: node.type,
size: Number(node.size),
mtime: new Date(node.mtime).getTime() / 1000, // convert ms to s
shareTypes: node.attributes.shareTypes || null,
shareAttributes: node.attributes.shareAttributes || null,
sharePermissions: node.attributes.sharePermissions || null,
shareOwner: node.attributes.ownerDisplayName || null,
shareOwnerId: node.attributes.ownerId || null,
userId: getCurrentUser().uid,
instanceId: state.instanceId,
}).then((response) => {
if (response.status === 200) {
OC.dialogs.info(t('app_api', 'Action request sent to ExApp'), t(fileAction.appid, fileAction.display_name))
} else {
OC.dialogs.info(t('app_api', 'Error while sending File action request to ExApp'), t(fileAction.appid, fileAction.display_name))
}
}).catch((error) => {
console.error('Failed to send FileAction request to ExApp', error)
OC.dialogs.info(t('app_api', 'Error while sending File action request to ExApp'), t(fileAction.appid, fileAction.display_name))
})
return null
},
})
registerFileAction(action)
}

0 comments on commit 0f0c01e

Please sign in to comment.