From 1546d46d5b53c6e840eef9b226bffa3f05b77232 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 15 Nov 2023 09:04:31 -0400 Subject: [PATCH 01/21] feature/FOUR-12352 --- .../processes/scripts/components/CreateScriptModal.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index 10dc5ec963..1fcc04402d 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -236,6 +236,9 @@ export default { projects: [], }; }, + mounted() { + this.getAdminUser(); + }, computed: { modalSetUp() { if (this.copyAssetMode) { @@ -261,6 +264,13 @@ export default { show() { this.$bvModal.show("createScript"); }, + getAdminUser() { + ProcessMaker.apiClient + .get("/users/1") + .then((response) => { + this.selectedUser = response.data; + }); + }, /** * Check if the search params contains create=true which means is coming from the Modeler as a Quick Asset Creation * @returns {boolean} From df8581c3734ff15d4583c899f2871ace32b27b7a Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 15 Nov 2023 10:05:07 -0400 Subject: [PATCH 02/21] feature/FOUR-12352 --- .../js/processes/scripts/components/CreateScriptModal.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index 1fcc04402d..38a7ba5dc8 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -234,6 +234,7 @@ export default { createScriptHooks: [], script: null, projects: [], + userRunScript: 1, }; }, mounted() { @@ -266,7 +267,7 @@ export default { }, getAdminUser() { ProcessMaker.apiClient - .get("/users/1") + .get(`/users/${this.userRunScript}`) .then((response) => { this.selectedUser = response.data; }); From 25d573cec9450162680c0490aa0ef78462625225 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 15 Nov 2023 10:06:55 -0400 Subject: [PATCH 03/21] feature/FOUR-12352 --- .../js/processes/scripts/components/CreateScriptModal.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index 38a7ba5dc8..c9786c740e 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -270,6 +270,9 @@ export default { .get(`/users/${this.userRunScript}`) .then((response) => { this.selectedUser = response.data; + }) + .catch((e) => { + ProcessMaker.alert(e.response.data.errors.delete[0], "danger"); }); }, /** From 3f3f011dadc333a0a6116e8cb59c7f69e63fe8a1 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 15 Nov 2023 10:08:35 -0400 Subject: [PATCH 04/21] feature/FOUR-12352 --- .../js/processes/scripts/components/CreateScriptModal.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index c9786c740e..8b6b0d82e8 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -271,9 +271,6 @@ export default { .then((response) => { this.selectedUser = response.data; }) - .catch((e) => { - ProcessMaker.alert(e.response.data.errors.delete[0], "danger"); - }); }, /** * Check if the search params contains create=true which means is coming from the Modeler as a Quick Asset Creation From 8ca4f2f7789b138c514c943b6727bc0a83234651 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 15 Nov 2023 15:05:50 +0000 Subject: [PATCH 05/21] FOUR-11498:Initial script Modal --- .../scripts/components/CreateScriptModal.vue | 339 +++++++++--------- 1 file changed, 174 insertions(+), 165 deletions(-) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index 10dc5ec963..64869941b7 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -11,176 +11,185 @@ - - + + + + + + + + + From 7f45cea691d253d4bc7b9aef7ae9e093cc5eba4f Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 16 Nov 2023 12:14:54 -0400 Subject: [PATCH 06/21] feature/FOUR-12189 --- .../scripts/components/CreateScriptModal.vue | 173 +++++++++++------- 1 file changed, 102 insertions(+), 71 deletions(-) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index cea0712564..ac773f8ad9 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -98,79 +98,103 @@ required /> - + + +
- + + + - - - - + + +
+ + From 0c14d7ecf80adc16fd72c2a366e56e5139a2fce6 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Fri, 17 Nov 2023 12:35:30 -0400 Subject: [PATCH 07/21] feature/FOUR-12430 --- .../scripts/components/CreateScriptModal.vue | 132 +++++++++++++----- 1 file changed, 96 insertions(+), 36 deletions(-) diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index cea0712564..774e91eda6 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -120,57 +120,102 @@ name="run_as_user_id" />
- - +
+
+ +

+ {{ $t('How many seconds the script should be allowed to run (0 is unlimited).') }} +

+
+ +
+ + - +
+
+ +

+ {{ $t('Number of times to retry. Leave empty to use script default. Set to 0 for no retry attempts.') }} +

+
+ +
+
+ + > +
+
+ +

+ {{ $t('Seconds to wait before retrying. Leave empty to use script default. Set to 0 for no retry wait time.') }} +

+
+ +
+
+ + From 6aaff0e9cdcd990cafe7cad84673f27839c68e7d Mon Sep 17 00:00:00 2001 From: Fabio Date: Fri, 17 Nov 2023 16:18:49 +0000 Subject: [PATCH 08/21] FOUR-12188:Create a New Dropdwon-Card component with preview Icons sonar --- ProcessMaker/Models/ScriptExecutor.php | 2 +- resources/img/script_lang/default.svg | 5 ++ resources/img/script_lang/javascript.svg | 5 ++ resources/img/script_lang/lua.svg | 5 ++ resources/img/script_lang/php.svg | 9 +++ .../scripts/components/CreateScriptModal.vue | 23 +++--- .../scripts/components/LanguageScript.vue | 77 +++++++++++++++++++ webpack.mix.js | 1 + 8 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 resources/img/script_lang/default.svg create mode 100644 resources/img/script_lang/javascript.svg create mode 100644 resources/img/script_lang/lua.svg create mode 100644 resources/img/script_lang/php.svg create mode 100644 resources/js/processes/scripts/components/LanguageScript.vue diff --git a/ProcessMaker/Models/ScriptExecutor.php b/ProcessMaker/Models/ScriptExecutor.php index cc86f6f5e1..055374973b 100644 --- a/ProcessMaker/Models/ScriptExecutor.php +++ b/ProcessMaker/Models/ScriptExecutor.php @@ -154,7 +154,7 @@ public static function list($language = null) } foreach ($executors->get() as $executor) { - $list[$executor->id] = $executor->language . ' - ' . $executor->title; + $list[$executor->id] = $executor->language; } return $list; diff --git a/resources/img/script_lang/default.svg b/resources/img/script_lang/default.svg new file mode 100644 index 0000000000..f2e3da27cf --- /dev/null +++ b/resources/img/script_lang/default.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/img/script_lang/javascript.svg b/resources/img/script_lang/javascript.svg new file mode 100644 index 0000000000..bc0e4d5fa2 --- /dev/null +++ b/resources/img/script_lang/javascript.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/img/script_lang/lua.svg b/resources/img/script_lang/lua.svg new file mode 100644 index 0000000000..b4ed3b20ee --- /dev/null +++ b/resources/img/script_lang/lua.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/img/script_lang/php.svg b/resources/img/script_lang/php.svg new file mode 100644 index 0000000000..05d8c7574a --- /dev/null +++ b/resources/img/script_lang/php.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/js/processes/scripts/components/CreateScriptModal.vue b/resources/js/processes/scripts/components/CreateScriptModal.vue index ac773f8ad9..e534347104 100644 --- a/resources/js/processes/scripts/components/CreateScriptModal.vue +++ b/resources/js/processes/scripts/components/CreateScriptModal.vue @@ -20,7 +20,10 @@ > - +