Skip to content

Workflow validity checks #18612

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

Merged
rullzer merged 5 commits into from
Jan 2, 2020
Merged

Workflow validity checks #18612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75b217c
Remove style loading of non-existing file
juliusknorr Dec 30, 2019
7320de1
Refactor validity propagation
juliusknorr Dec 30, 2019
3203e81
Load polyfill in workflow engine
juliusknorr Dec 30, 2019
df54bb9
Only ask for password when updating admin rules
juliusknorr Dec 30, 2019
492ca95
Bump bundles
juliusknorr Dec 30, 2019
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
Prev Previous commit
Next Next commit
Refactor validity propagation 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jan 2, 2020
commit 7320de184b9e783dad33d0fbb5e157917f682e3d
9 changes: 5 additions & 4 deletions apps/workflowengine/src/components/Check.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
class="option"
@input="updateCheck"
@valid="(valid=true) && validate()"
@invalid="(valid=false) && validate()" />
@invalid="!(valid=false) && validate()" />
<input v-else
v-model="check.value"
type="text"
Expand Down Expand Up @@ -111,7 +111,7 @@ export default {
if (this.check.class === null) {
this.$nextTick(() => this.$refs.checkSelector.$el.focus())
}
this.check.invalid = !this.validate()
this.validate()
},
methods: {
showDelete() {
Expand All @@ -124,7 +124,8 @@ export default {
if (this.currentOption && this.currentOption.validate) {
this.valid = !!this.currentOption.validate(this.check)
}
return this.valid
this.check.invalid = !this.valid
this.$emit('validate', this.valid)
},
updateCheck() {
const matchingOperator = this.operators.findIndex((operator) => this.check.operator === operator.operator)
Expand All @@ -134,7 +135,7 @@ export default {
this.check.class = this.currentOption.class
this.check.operator = this.currentOperator.operator

this.check.invalid = !this.validate()
this.validate()

this.$emit('update', this.check)
},
Expand Down
17 changes: 13 additions & 4 deletions apps/workflowengine/src/components/Checks/RequestTime.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export default {
},
}
},
mounted() {
this.validate()
},
methods: {
updateInternalValue(value) {
try {
Expand All @@ -66,17 +69,23 @@ export default {
}
},
validate() {
return this.newValue.startTime && this.newValue.startTime.match(/^(0[0-9]|1[0-9]|2[0-3]|[0-9]):[0-5][0-9]$/i) !== null
this.valid = this.newValue.startTime && this.newValue.startTime.match(/^(0[0-9]|1[0-9]|2[0-3]|[0-9]):[0-5][0-9]$/i) !== null
&& this.newValue.endTime && this.newValue.endTime.match(/^(0[0-9]|1[0-9]|2[0-3]|[0-9]):[0-5][0-9]$/i) !== null
&& moment.tz.zone(this.newValue.timezone) !== null
if (this.valid) {
this.$emit('valid')
} else {
this.$emit('invalid')
}
return this.valid
},
update() {
if (this.newValue.timezone === null) {
this.newValue.timezone = moment.tz.guess()
}
if (this.validate()) {
const output = `["${this.newValue.startTime} ${this.newValue.timezone}","${this.newValue.endTime} ${this.newValue.timezone}"]`
this.$emit('input', output)
this.valid = true
} else {
this.valid = false
}
},
},
Expand Down
25 changes: 10 additions & 15 deletions apps/workflowengine/src/components/Rule.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Check :check="check"
:rule="rule"
@update="updateRule"
@validate="validate"
@remove="removeCheck(check)" />
</p>
<p>
Expand Down Expand Up @@ -77,7 +78,6 @@ export default {
checks: [],
error: null,
dirty: this.rule.id < 0,
checking: false,
originalRule: null,
}
},
Expand All @@ -93,7 +93,7 @@ export default {
tooltip: { placement: 'bottom', show: true, content: this.error },
}
}
if (!this.dirty || this.checking) {
if (!this.dirty) {
return { title: t('workflowengine', 'Active'), class: 'icon icon-checkmark' }
}
return { title: t('workflowengine', 'Save'), class: 'icon-confirm-white primary' }
Expand All @@ -112,22 +112,17 @@ export default {
this.$set(this.rule, 'operation', operation)
await this.updateRule()
},
async updateRule() {
this.checking = true
validate(state) {
this.error = null
this.$store.dispatch('updateRule', this.rule)
},
updateRule() {
if (!this.dirty) {
this.dirty = true
}
try {
// TODO: add new verify endpoint
// let result = await axios.post(OC.generateUrl(`/apps/workflowengine/operations/test`), this.rule)
this.error = null
this.checking = false
this.$store.dispatch('updateRule', this.rule)
} catch (e) {
console.error('Failed to update operation', e)
this.error = e.response.ocs.meta.message
this.checking = false
}

this.error = null
this.$store.dispatch('updateRule', this.rule)
},
async saveRule() {
try {
Expand Down