From 448fb410cb4bd1a901d5be16d3ca395aad343dee Mon Sep 17 00:00:00 2001 From: TinCodes Date: Thu, 16 Nov 2023 11:45:27 -0400 Subject: [PATCH 1/3] FOUR-12003: Modeler now detects if process was generated by AI --- .../Http/Controllers/Process/ModelerController.php | 1 + resources/js/processes/components/CreateProcessModal.vue | 8 ++++++-- resources/views/processes/modeler/index.blade.php | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/Http/Controllers/Process/ModelerController.php b/ProcessMaker/Http/Controllers/Process/ModelerController.php index ef0bdd4419..716dabecfe 100644 --- a/ProcessMaker/Http/Controllers/Process/ModelerController.php +++ b/ProcessMaker/Http/Controllers/Process/ModelerController.php @@ -74,6 +74,7 @@ public function show(ModelerManager $manager, Process $process, Request $request 'countScreenCategories' => $countScreenCategories, 'countScriptCategories' => $countScriptCategories, 'isProjectsInstalled' => $isProjectsInstalled, + 'isAiGenerated' => request()->query('ai'), ]); } diff --git a/resources/js/processes/components/CreateProcessModal.vue b/resources/js/processes/components/CreateProcessModal.vue index b8b64605e7..b13f15d7d4 100644 --- a/resources/js/processes/components/CreateProcessModal.vue +++ b/resources/js/processes/components/CreateProcessModal.vue @@ -115,7 +115,8 @@ "categoryType", "callFromAiModeler", "isProjectSelectionRequired", - "projectId" + "projectId", + "isAiGenerated" ], data: function() { return { @@ -286,7 +287,10 @@ const url = `/package-ai/processes/create/${response.data.id}`; this.$emit("process-created-from-modeler", url, response.data.id, response.data.name); } else { - window.location = `/modeler/${response.data.id}`; + console.log('wut', this.isAiGenerated, response.data.id); + this.isAiGenerated + ? window.location = "/modeler/" + response.data.id + "?ai=1" + : window.location = "/modeler/" + response.data.id; } }) .catch(error => { diff --git a/resources/views/processes/modeler/index.blade.php b/resources/views/processes/modeler/index.blade.php index 5fbf3ece13..682aeb99ed 100644 --- a/resources/views/processes/modeler/index.blade.php +++ b/resources/views/processes/modeler/index.blade.php @@ -87,6 +87,7 @@ screenTypes: @json($screenTypes), scriptExecutors: @json($scriptExecutors), isProjectsInstalled: @json($isProjectsInstalled), + isAiGenerated: @json($isAiGenerated) } const warnings = @json($process->warnings); From 5c840f89ec4a51e5412607a8783334204e225bba Mon Sep 17 00:00:00 2001 From: TinCodes Date: Fri, 17 Nov 2023 13:22:40 -0400 Subject: [PATCH 2/3] Deleted leftover console.log --- resources/js/processes/components/CreateProcessModal.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/js/processes/components/CreateProcessModal.vue b/resources/js/processes/components/CreateProcessModal.vue index b13f15d7d4..859b208b2e 100644 --- a/resources/js/processes/components/CreateProcessModal.vue +++ b/resources/js/processes/components/CreateProcessModal.vue @@ -287,7 +287,6 @@ const url = `/package-ai/processes/create/${response.data.id}`; this.$emit("process-created-from-modeler", url, response.data.id, response.data.name); } else { - console.log('wut', this.isAiGenerated, response.data.id); this.isAiGenerated ? window.location = "/modeler/" + response.data.id + "?ai=1" : window.location = "/modeler/" + response.data.id; From 68b90df184316ab1c9bedebd585e6ab752c03c31 Mon Sep 17 00:00:00 2001 From: TinCodes Date: Fri, 17 Nov 2023 14:59:12 -0400 Subject: [PATCH 3/3] Removed code smells and changed isAiGenerated value to Boolean --- resources/js/processes/components/CreateProcessModal.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/js/processes/components/CreateProcessModal.vue b/resources/js/processes/components/CreateProcessModal.vue index 859b208b2e..db3ca87bec 100644 --- a/resources/js/processes/components/CreateProcessModal.vue +++ b/resources/js/processes/components/CreateProcessModal.vue @@ -287,9 +287,10 @@ const url = `/package-ai/processes/create/${response.data.id}`; this.$emit("process-created-from-modeler", url, response.data.id, response.data.name); } else { - this.isAiGenerated - ? window.location = "/modeler/" + response.data.id + "?ai=1" - : window.location = "/modeler/" + response.data.id; + window.location = + this.isAiGenerated + ? "/modeler/" + response.data.id + "?ai=true" + : "/modeler/" + response.data.id; } }) .catch(error => {