mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set operation mode according to the mime type value 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2019-12-19 13:22:27 +01:00
parent 15b64c6abb
commit 0cdcdb305e
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/workflowengine/src/components/Check.vue
View File

@ -81,7 +81,11 @@ export default {
},
operators() {
if (!this.currentOption) { return [] }
return this.checks[this.currentOption.class].operators
const operators = this.checks[this.currentOption.class].operators
if (typeof operators === 'function') {
return operators(this.check)
}
return operators
},
currentComponent() {
if (!this.currentOption) { return [] }
@ -118,7 +122,8 @@ export default {
return this.valid
},
updateCheck() {
if (this.check.class !== this.currentOption.class) {
const matchingOperator = this.operators.findIndex((operator) => this.check.operator === operator.operator)
if (this.check.class !== this.currentOption.class || matchingOperator === -1) {
this.currentOperator = this.operators[0]
}
this.check.class = this.currentOption.class

1
apps/workflowengine/src/components/Checks/FileMimeType.vue
View File

@ -120,7 +120,6 @@ export default {
return result !== null
},
setValue(value) {
// TODO: check if value requires a regex and set the check operator according to that
if (value !== null) {
this.newValue = value.pattern
this.$emit('input', this.newValue)

27
apps/workflowengine/src/components/Checks/file.js
View File

@ -24,16 +24,24 @@ import { stringValidator, validateIPv4, validateIPv6 } from './../../helpers/val
import FileMimeType from './FileMimeType'
import FileSystemTag from './FileSystemTag'
const stringOrRegexOperators = (check) => {
if (check.value.startsWith('/')) {
return [
{ operator: 'matches', name: t('workflowengine', 'matches') },
{ operator: '!matches', name: t('workflowengine', 'does not match') },
]
}
return [
{ operator: 'is', name: t('workflowengine', 'is') },
{ operator: '!is', name: t('workflowengine', 'is not') },
]
}
const FileChecks = [
{
class: 'OCA\\WorkflowEngine\\Check\\FileName',
name: t('workflowengine', 'File name'),
operators: [
{ operator: 'is', name: t('workflowengine', 'is') },
{ operator: '!is', name: t('workflowengine', 'is not') },
{ operator: 'matches', name: t('workflowengine', 'matches') },
{ operator: '!matches', name: t('workflowengine', 'does not match') },
],
operators: stringOrRegexOperators,
placeholder: (check) => {
if (check.operator === 'matches' || check.operator === '!matches') {
return '/^dummy-.+$/i'
@ -46,12 +54,7 @@ const FileChecks = [
{
class: 'OCA\\WorkflowEngine\\Check\\FileMimeType',
name: t('workflowengine', 'File MIME type'),
operators: [
{ operator: 'is', name: t('workflowengine', 'is') },
{ operator: '!is', name: t('workflowengine', 'is not') },
{ operator: 'matches', name: t('workflowengine', 'matches') },
{ operator: '!matches', name: t('workflowengine', 'does not match') },
],
operators: stringOrRegexOperators,
component: FileMimeType,
},

12
apps/workflowengine/src/workflowengine.js
View File

@ -33,9 +33,9 @@ import ShippedChecks from './components/Checks'
* @property {string} class - The PHP class name of the check
* @property {Comparison[]} operators - A list of possible comparison operations running on the check
* @property {Vue} component - A vue component to handle the rendering of options
* The component should handle the v-model directive properly,
* so it needs a value property to receive data and emit an input
* event once the data has changed
* The component should handle the v-model directive properly,
* so it needs a value property to receive data and emit an input
* event once the data has changed
* @property {callable} placeholder - Return a placeholder of no custom component is used
* @property {callable} validate - validate a check if no custom component is used
**/
@ -48,9 +48,9 @@ import ShippedChecks from './components/Checks'
* @property {string} operation - Default value for the operation field
* @property {string} color - Custom color code to be applied for the operator selector
* @property {Vue} component - A vue component to handle the rendering of options
* The component should handle the v-model directive properly,
* so it needs a value property to receive data and emit an input
* event once the data has changed
* The component should handle the v-model directive properly,
* so it needs a value property to receive data and emit an input
* event once the data has changed
*/
/**