Skip to content

Feature/four 9157 #5020

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
ryancooley merged 4 commits into from
Jul 20, 2023
Merged

Feature/four 9157 #5020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab012e9
Refactor error handling logic
nolanpro Jul 18, 2023
9ec8cde
Error Handling Refactor with Mixin
pmoskrojas Jul 19, 2023
68c86f9
Error Handling taking only the three values from endpoints.
pmoskrojas Jul 19, 2023
29e628e
Merge branch 'develop' into feature/FOUR-9157
ryancooley Jul 19, 2023
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
63 changes: 63 additions & 0 deletions resources/js/processes/modeler/components/inspector/ErrorHandlingMixin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<script>
export default {
props: ['type'],
data() {
return {
value: "",
valueFromModel: "",
userHasUpdated: false,
}
},
watch: {
value: {
handler() {
this.emitValue();
}
},
},
methods: {
node() {
return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
},
valueFromNode() {
const configString = _.get(this.node(), 'errorHandling', null);
const config = JSON.parse(configString);
return _.get(config, this.configKey, null);
},
getNodeConfig(valueFromModel) {
if (this.valueFromNode()) {
return;
}

this.valueFromModel = this.value = valueFromModel[this.configKey];
},
emitValue() {
if (!this.userHasUpdated) {
return;
}
const existingSetting = JSON.parse(_.get(this.node(), 'errorHandling', '{}'));
const json = JSON.stringify({ ...existingSetting, [this.configKey]: this.value });
Vue.set(this.node(), 'errorHandling', json);
},
userHasUpdatedValue() {
this.userHasUpdated = true;
},
},
mounted() {
this.value = this.valueFromNode();
this.$root.$on("contentChanged", this.getNodeConfig);
},
beforeDestroy() {
this.$root.$off("contentChanged", this.getNodeConfig);
},
computed: {
helper() {
if (this.type === 'script') {
return this.$t(this.scriptHelperText);
} else if (this.type === 'data-connector') {
return this.$t(this.dataConnectorHelperText);
}
}
}
}
</script>
82 changes: 6 additions & 76 deletions resources/js/processes/modeler/components/inspector/ErrorHandlingRetryAttempts.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,23 @@
<template>
<div role="group">
<label for="retry_attempts">{{ $t('Retry Attempts') }}</label>
<b-form-input id="retry_attempts" type="number" v-model="config.retry_attempts" @input="updateConfig" min="0" max="50"></b-form-input>
<b-form-input id="retry_attempts" type="number" v-model="value" @input="userHasUpdatedValue" min="0" max="50"></b-form-input>
<small class="form-text text-muted">{{ helper }}</small>
</div>
</template>

<script>
import ErrorHandlingMixin from './ErrorHandlingMixin';

export default {
props: ['type'],
mixins: [ErrorHandlingMixin],
data() {
return {
config: {
retry_attempts: "",
},
valueContent: "",
configKey: 'retry_attempts',
scriptHelperText: 'Set maximum run retry attempts in seconds. Leave empty to use script default. Set to 0 for no retry attempts.',
dataConnectorHelperText: 'Set maximum run retry attempts in seconds. Leave empty to use data connector default. Set to 0 for no retry attempts.'
}
},
watch: {
config: {
deep: true,
handler() {
this.setNodeConfig();
}
},
},
methods: {
node() {
return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
},
getNodeConfig(newValue) {
this.valueContent = newValue;
const configString = _.get(this.node(), 'errorHandling', null);
if (this.config.id) {
if (this.config.id !== this.valueContent.id) {
this.config.retry_attempts = this.valueContent.retry_attempts;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.retry_attempts = _.get(config, 'retry_attempts');
}
}
} else {
this.config.id = this.valueContent.id;
if (!configString) {
this.config.retry_attempts = this.valueContent.retry_attempts;
}
if (this.valueContent.method) {
this.config.retry_attempts = this.valueContent.retry_attempts;
if (this.config.id !== this.valueContent.id) {
this.config.retry_attempts = this.valueContent.retry_attempts;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.retry_attempts = _.get(config, 'retry_attempts');
}
}
}
}
},
setNodeConfig() {
const existingSetting = JSON.parse(_.get(this.node(), 'errorHandling', '{}'));
const json = JSON.stringify({ ...existingSetting, retry_attempts: this.config.retry_attempts });
Vue.set(this.node(), 'errorHandling', json);
},
updateConfig() {
if (this.valueContent.retry_attempts !== this.config.retry_attempts) {
this.setNodeConfig();
}
},
},
mounted() {
this.$root.$on("contentChanged", this.getNodeConfig);
},
beforeDestroy() {
this.$root.$off("contentChanged", this.getNodeConfig);
},
computed: {
helper() {
if (this.type === 'script') {
return this.$t('Set maximum run retry attempts in seconds. Leave empty to use script default. Set to 0 for no retry attempts.');
} else if (this.type === 'data-connector') {
return this.$t('Set maximum run retry attempts in seconds. Leave empty to use data connector default. Set to 0 for no retry attempts.');
}
}
}
}
</script>

Expand Down
84 changes: 7 additions & 77 deletions resources/js/processes/modeler/components/inspector/ErrorHandlingRetryWaitTime.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,24 @@
<template>
<div role="group">
<label for="retry_wait_time">{{ $t('Retry Wait Time') }}</label>
<b-form-input id="retry_wait_time" type="number" v-model="config.retry_wait_time" @input="updateConfig" min="0" max="3600"></b-form-input>
<b-form-input id="retry_wait_time" type="number" v-model="value" @input="userHasUpdatedValue" min="0" max="3600"></b-form-input>
<small class="form-text text-muted">{{ helper }}</small>
</div>
</template>

<script>
import ErrorHandlingMixin from './ErrorHandlingMixin';

export default {
props: ['type'],
mixins: [ErrorHandlingMixin],
data() {
return {
config: {
retry_wait_time: "",
},
valueContent: "",
configKey: 'retry_wait_time',
scriptHelperText: 'Set maximum run retry wait time in seconds. Leave empty to use script default. Set to 0 for no retry wait time.',
dataConnectorHelperText: 'Set maximum run retry wait time in seconds. Leave empty to use data connector default. Set to 0 for no retry wait time.'
}
},
watch: {
config: {
deep: true,
handler() {
this.setNodeConfig();
}
},
},
methods: {
node() {
return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
},
getNodeConfig(newValue) {
this.valueContent = newValue;
const configString = _.get(this.node(), 'errorHandling', null);
if (this.config.id) {
if (this.config.id !== this.valueContent.id) {
this.config.retry_wait_time = this.valueContent.retry_wait_time;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.retry_wait_time = _.get(config, 'retry_wait_time');
}
}
} else {
this.config.id = this.valueContent.id;
if (!configString) {
this.config.retry_wait_time = this.valueContent.retry_wait_time;
}
if (this.valueContent.method) {
this.config.retry_wait_time = this.valueContent.retry_wait_time;
if (this.config.id !== this.valueContent.id) {
this.config.retry_wait_time = this.valueContent.retry_wait_time;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.retry_wait_time = _.get(config, 'retry_wait_time');
}
}
}
}
},
setNodeConfig() {
const existingSetting = JSON.parse(_.get(this.node(), 'errorHandling', '{}'));
const json = JSON.stringify({ ...existingSetting, retry_wait_time: this.config.retry_wait_time });
Vue.set(this.node(), 'errorHandling', json);
},
updateConfig() {
if (this.valueContent.retry_wait_time !== this.config.retry_wait_time) {
this.setNodeConfig();
}
},
},
mounted() {
this.$root.$on("contentChanged", this.getNodeConfig);
},
beforeDestroy() {
this.$root.$off("contentChanged", this.getNodeConfig);
},
computed: {
helper() {
if (this.type === 'script') {
return this.$t('Set maximum run retry wait time in seconds. Leave empty to use script default. Set to 0 for no retry wait time.');
} else if (this.type === 'data-connector') {
return this.$t('Set maximum run retry wait time in seconds. Leave empty to use data connector default. Set to 0 for no retry wait time.');
}
}
}
}
</script>

<style scoped></style>
<style scoped></style>
84 changes: 7 additions & 77 deletions resources/js/processes/modeler/components/inspector/ErrorHandlingTimeout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,24 @@
<template>
<div role="group">
<label for="timeout">{{ $t('Timeout') }}</label>
<b-form-input id="timeout" type="number" min="0" max="3600" v-model="config.timeout" @input="updateConfig"></b-form-input>
<b-form-input id="timeout" type="number" min="0" max="3600" v-model="value" @input="userHasUpdatedValue"></b-form-input>
<small class="form-text text-muted">{{ helper }}</small>
</div>
</template>

<script>
import ErrorHandlingMixin from './ErrorHandlingMixin';

export default {
props: ['type'],
mixins: [ErrorHandlingMixin],
data() {
return {
config: {
timeout: "",
},
valueContent: ""
configKey: 'timeout',
scriptHelperText: 'Set maximum run time in seconds. Leave empty to use script default. Set to 0 for no timeout.',
dataConnectorHelperText: 'Set maximum run time in seconds. Leave empty to use data connector default. Set to 0 for no timeout.'
}
},
watch: {
config: {
deep: true,
handler() {
this.setNodeConfig();
}
},
},
methods: {
node() {
return this.$root.$children[0].$refs.modeler.highlightedNode.definition;
},
getNodeConfig(newValue) {
this.valueContent = newValue;
const configString = _.get(this.node(), 'errorHandling', null);
if (this.config.id) {
if (this.config.id !== this.valueContent.id) {
this.config.timeout = this.valueContent.timeout;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.timeout = _.get(config, 'timeout');
}
}
} else {
this.config.id = this.valueContent.id;
if (!configString) {
this.config.timeout = this.valueContent.timeout;
}
if (this.valueContent.method) {
this.config.timeout = this.valueContent.timeout;
if (this.config.id !== this.valueContent.id) {
this.config.timeout = this.valueContent.timeout;
this.config.id = this.valueContent.id;
} else {
if (configString) {
const config = JSON.parse(configString);
this.config.timeout = _.get(config, 'timeout');
}
}
}
}
},
setNodeConfig() {
const existingSetting = JSON.parse(_.get(this.node(), 'errorHandling', '{}'));
const json = JSON.stringify({ ...existingSetting, timeout: this.config.timeout });
Vue.set(this.node(), 'errorHandling', json);
},
updateConfig() {
if (this.valueContent.timeout !== this.config.timeout) {
this.setNodeConfig();
}
},
},
mounted() {
this.$root.$on("contentChanged", this.getNodeConfig);
},
beforeDestroy() {
this.$root.$off("contentChanged", this.getNodeConfig);
},
computed: {
helper() {
if (this.type === 'script') {
return this.$t('Set maximum run time in seconds. Leave empty to use script default. Set to 0 for no timeout.');
} else if (this.type === 'data-connector') {
return this.$t('Set maximum run time in seconds. Leave empty to use data connector default. Set to 0 for no timeout.');
}
}
}
}
</script>

<style scoped></style>
<style scoped></style>
7 changes: 6 additions & 1 deletion resources/js/processes/modeler/components/inspector/ScriptSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@
.then(response => {
this.loading = false;
this.content = response.data;
this.$root.$emit("contentChanged", this.content);
this.error_handling = {
timeout: this.content.timeout,
retry_wait_time: this.content.retry_wait_time,
retry_attempts: this.content.retry_attempts
}
this.$root.$emit("contentChanged", this.error_handling);
})
.catch(error => {
this.loading = false;
Expand Down