From 58b7106f9f9da952bb231bc3b5ee5620e0fa2b66 Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Thu, 7 Sep 2023 16:30:34 -0700 Subject: [PATCH 01/10] 2.76.10 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9831b775..8bfefb8ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@processmaker/screen-builder", - "version": "2.76.9", + "version": "2.76.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@processmaker/screen-builder", - "version": "2.76.9", + "version": "2.76.10", "dependencies": { "axios-extensions": "^2.0.3", "lodash": "^4.17.21", diff --git a/package.json b/package.json index bb7546dff..e84cc20cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@processmaker/screen-builder", - "version": "2.76.9", + "version": "2.76.10", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", From 7ddf6955d0a6dce8cd24a81411191150470fa387 Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Mon, 25 Sep 2023 17:57:48 -0700 Subject: [PATCH 02/10] Vue Form Elements v0.49.4 --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bfefb8ee..7cfe80e24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@cypress/code-coverage": "^3.8.1", "@fortawesome/fontawesome-free": "^5.6.1", "@panter/vue-i18next": "^0.15.2", - "@processmaker/vue-form-elements": "0.49.3", + "@processmaker/vue-form-elements": "0.49.4", "@processmaker/vue-multiselect": "^2.2.0", "@vue/cli-plugin-babel": "^3.6.0", "@vue/cli-plugin-e2e-cypress": "^4.0.3", @@ -79,7 +79,7 @@ }, "peerDependencies": { "@panter/vue-i18next": "^0.15.0", - "@processmaker/vue-form-elements": "0.49.3", + "@processmaker/vue-form-elements": "0.49.4", "i18next": "^15.0.8", "vue": "^2.6.12", "vuex": "^3.1.1" @@ -4077,9 +4077,9 @@ } }, "node_modules/@processmaker/vue-form-elements": { - "version": "0.49.3", - "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.49.3.tgz", - "integrity": "sha512-IQ9fJDfIfCTdbKyf/cvyxg5NztL8HU69tuxPYaIaV1z7p0ufsAR8TZPZHKiXAkMHQxrxJ2w2YarDymxk4fTmRQ==", + "version": "0.49.4", + "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.49.4.tgz", + "integrity": "sha512-sT+uTvRY83rQpLOf5FLljydFH+E67kBYvKjRAuNeWFz+CfpFywijWMKSaJOB3VSss0WRMExrc0sObZ+yd6vybg==", "dev": true, "dependencies": { "@tinymce/tinymce-vue": "2.0.0", @@ -33963,9 +33963,9 @@ } }, "@processmaker/vue-form-elements": { - "version": "0.49.3", - "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.49.3.tgz", - "integrity": "sha512-IQ9fJDfIfCTdbKyf/cvyxg5NztL8HU69tuxPYaIaV1z7p0ufsAR8TZPZHKiXAkMHQxrxJ2w2YarDymxk4fTmRQ==", + "version": "0.49.4", + "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.49.4.tgz", + "integrity": "sha512-sT+uTvRY83rQpLOf5FLljydFH+E67kBYvKjRAuNeWFz+CfpFywijWMKSaJOB3VSss0WRMExrc0sObZ+yd6vybg==", "dev": true, "requires": { "@tinymce/tinymce-vue": "2.0.0", diff --git a/package.json b/package.json index e84cc20cb..c0dbaac2f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@cypress/code-coverage": "^3.8.1", "@fortawesome/fontawesome-free": "^5.6.1", "@panter/vue-i18next": "^0.15.2", - "@processmaker/vue-form-elements": "0.49.3", + "@processmaker/vue-form-elements": "0.49.4", "@processmaker/vue-multiselect": "^2.2.0", "@vue/cli-plugin-babel": "^3.6.0", "@vue/cli-plugin-e2e-cypress": "^4.0.3", @@ -88,7 +88,7 @@ }, "peerDependencies": { "@panter/vue-i18next": "^0.15.0", - "@processmaker/vue-form-elements": "0.49.3", + "@processmaker/vue-form-elements": "0.49.4", "i18next": "^15.0.8", "vue": "^2.6.12", "vuex": "^3.1.1" From 67688fcd2d9f6ce343b9fcfe5f324a024db74aae Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Mon, 25 Sep 2023 18:27:17 -0700 Subject: [PATCH 03/10] 2.76.11 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cfe80e24..b0b35a1e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@processmaker/screen-builder", - "version": "2.76.10", + "version": "2.76.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@processmaker/screen-builder", - "version": "2.76.10", + "version": "2.76.11", "dependencies": { "axios-extensions": "^2.0.3", "lodash": "^4.17.21", diff --git a/package.json b/package.json index c0dbaac2f..c3d660fb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@processmaker/screen-builder", - "version": "2.76.10", + "version": "2.76.11", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", From 0109614f4dd2b1501a5531bec4b8c9d91315c116 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Wed, 27 Sep 2023 15:08:38 -0400 Subject: [PATCH 04/10] Redirect to completed if request was completed --- src/components/task.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/task.vue b/src/components/task.vue index 80536e494..b02148849 100644 --- a/src/components/task.vue +++ b/src/components/task.vue @@ -167,6 +167,9 @@ export default { this.taskId = this.task.id; this.nodeId = this.task.element_id; this.listenForParentChanges(); + if (this.task.process_request.status === 'COMPLETED') { + this.$emit('completed', this.task.process_request.id); + } }, }, From e7e1f9ccd4d17a01f575b0907903a3dc899ffb59 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Mon, 2 Oct 2023 14:45:40 -0400 Subject: [PATCH 05/10] if no current screen show the interstitial screen if exists --- src/components/task.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/task.vue b/src/components/task.vue index b02148849..fcc559b4e 100644 --- a/src/components/task.vue +++ b/src/components/task.vue @@ -164,6 +164,10 @@ export default { task: { handler() { + if (!this.screen) { + // if no current screen show the interstitial screen if exists + this.screen = this.task && this.task.interstitial_screen; + } this.taskId = this.task.id; this.nodeId = this.task.element_id; this.listenForParentChanges(); @@ -528,6 +532,16 @@ export default { this.nodeId = this.initialNodeId; this.requestData = this.value; this.loopContext = this.initialLoopContext; + if ( + this.$parent.task && + !this.$parent.task.screen && + this.$parent.task.allow_interstitial && + this.$parent.task.interstitial_screen + ) { + // if interstitial screen exists, show it + console.log(this.$parent.task.interstitial_screen); + this.screen = this.$parent.task.interstitial_screen; + } }, destroyed() { this.unsubscribeSocketListeners(); From ee836a2ebef0a74122cc0a6b05b4ef77b968e854 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Mon, 2 Oct 2023 14:48:20 -0400 Subject: [PATCH 06/10] Remove debug code --- src/components/task.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/task.vue b/src/components/task.vue index fcc559b4e..87402c9fd 100644 --- a/src/components/task.vue +++ b/src/components/task.vue @@ -539,7 +539,6 @@ export default { this.$parent.task.interstitial_screen ) { // if interstitial screen exists, show it - console.log(this.$parent.task.interstitial_screen); this.screen = this.$parent.task.interstitial_screen; } }, From 256be4b2739ac55faf086ee25dfb02ff0965c74c Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Mon, 2 Oct 2023 17:53:05 -0700 Subject: [PATCH 07/10] 2.77.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f85f216d..e7247676d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@processmaker/screen-builder", - "version": "2.77.7", + "version": "2.77.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@processmaker/screen-builder", - "version": "2.77.7", + "version": "2.77.8", "dependencies": { "axios-extensions": "^2.0.3", "lodash": "^4.17.21", diff --git a/package.json b/package.json index df1baf41f..71d69a578 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@processmaker/screen-builder", - "version": "2.77.7", + "version": "2.77.8", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", From 7cd09b60e5cf12af05452d7be65033ade39945c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agust=C3=ADn=20Busso?= <90727999+agustinbusso@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:30:50 -0300 Subject: [PATCH 08/10] Add cancelled jobs to loop and multicolumn --- src/components/editor/loop.vue | 12 ++++++++++++ src/components/editor/multi-column.vue | 13 +++++++++++++ src/components/vue-form-builder.vue | 16 +++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/components/editor/loop.vue b/src/components/editor/loop.vue index 32a608794..3e9bbe75c 100644 --- a/src/components/editor/loop.vue +++ b/src/components/editor/loop.vue @@ -138,9 +138,18 @@ export default { data() { return { items: [], + cancelledJobs: [] }; }, mounted() { + if ( + !localStorage.getItem("cancelledJobs") || + localStorage.getItem("cancelledJobs") === "null" + ) { + this.cancelledJobs = []; + } else { + this.cancelledJobs = JSON.parse(localStorage.getItem("cancelledJobs")); + } this.$root.$on("ai-form-generated", (formItems, nonce) => { this.previewAiChanges(formItems, nonce); }); @@ -202,6 +211,9 @@ export default { item.component === "AiSection" && nonce === item.config.aiConfig.nonce ) { + if (this.cancelledJobs.some((element) => element === nonce)) { + return; + } this.$set(item.config.aiConfig, "progress", progress); } }); diff --git a/src/components/editor/multi-column.vue b/src/components/editor/multi-column.vue index bfefdf838..bf8399225 100644 --- a/src/components/editor/multi-column.vue +++ b/src/components/editor/multi-column.vue @@ -150,9 +150,19 @@ export default { data() { return { items: [], + cancelledJobs: [] }; }, mounted() { + if ( + !localStorage.getItem("cancelledJobs") || + localStorage.getItem("cancelledJobs") === "null" + ) { + this.cancelledJobs = []; + } else { + this.cancelledJobs = JSON.parse(localStorage.getItem("cancelledJobs")); + } + this.$root.$on("ai-form-generated", (formItems, nonce) => { this.previewAiChanges(formItems, nonce); }); @@ -241,6 +251,9 @@ export default { item.component === "AiSection" && nonce === item.config.aiConfig.nonce ) { + if (this.cancelledJobs.some((element) => element === nonce)) { + return; + } this.$set(item.config.aiConfig, "progress", progress); } }); diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue index 6ba5f0c38..f2644b6ca 100644 --- a/src/components/vue-form-builder.vue +++ b/src/components/vue-form-builder.vue @@ -549,7 +549,8 @@ export default { variablesTree: [], language: "en", collator: null, - editorContentKey: 0 + editorContentKey: 0, + cancelledJobs: [] }; }, computed: { @@ -658,7 +659,17 @@ export default { this.initiateLanguageSupport(); }, mounted() { + if ( + !localStorage.getItem("cancelledJobs") || + localStorage.getItem("cancelledJobs") === "null" + ) { + this.cancelledJobs = []; + } else { + this.cancelledJobs = JSON.parse(localStorage.getItem("cancelledJobs")); + } + this.checkForCaptchaInLoops(); + this.$root.$on("nested-screen-updated", () => { this.checkForCaptchaInLoops(); }); @@ -1142,6 +1153,9 @@ export default { item.component === "AiSection" && nonce === item.config.aiConfig.nonce ) { + if (this.cancelledJobs.some((element) => element === nonce)) { + return; + } this.$set(item.config.aiConfig, "progress", progress); } }); From ab81105934125246c944bdec0bf769f418d06079 Mon Sep 17 00:00:00 2001 From: Alex Runyan Date: Wed, 4 Oct 2023 02:09:35 -0400 Subject: [PATCH 09/10] Changed message to user in file-upload vue component --- src/components/renderer/file-upload.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/renderer/file-upload.vue b/src/components/renderer/file-upload.vue index 4bcc89205..11d29e092 100644 --- a/src/components/renderer/file-upload.vue +++ b/src/components/renderer/file-upload.vue @@ -112,7 +112,7 @@ export default { this.setPrefix(); if (this.$refs['uploader']) { this.$refs['uploader'].$forceUpdate(); - // Re-upload stored files; + // Re-upload stored files; // Files disappear when navigating between pages with the Page Navigation component if (this.files.length > 0) { this.$refs.uploader.uploader.addFiles(this.files); @@ -476,7 +476,7 @@ export default { if (file.ignored) { this.invalidFile = true; this.uploading = false; - window.ProcessMaker.alert(this.$t('File not allowed.'), 'danger'); + window.ProcessMaker.alert(this.$t('This file type is not accepted.'), 'danger'); return false; } } From ab5594c5abb98487b8499dd52ed956dafda66d66 Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Wed, 4 Oct 2023 18:08:41 -0400 Subject: [PATCH 10/10] 2.77.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7247676d..b7e67cc76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@processmaker/screen-builder", - "version": "2.77.8", + "version": "2.77.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@processmaker/screen-builder", - "version": "2.77.8", + "version": "2.77.9", "dependencies": { "axios-extensions": "^2.0.3", "lodash": "^4.17.21", diff --git a/package.json b/package.json index 71d69a578..dc4498fb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@processmaker/screen-builder", - "version": "2.77.8", + "version": "2.77.9", "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build",