Skip to content

FOUR-11382: AI Unified Generation - Processes, screens, scripts #5718

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 5 commits into from
Dec 1, 2023
Merged

FOUR-11382: AI Unified Generation - Processes, screens, scripts #5718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
448fb41
FOUR-12003: Modeler now detects if process was generated by AI
TinCodes Nov 16, 2023
5c840f8
Deleted leftover console.log
TinCodes Nov 17, 2023
68b90df
Removed code smells and changed isAiGenerated value to Boolean
TinCodes Nov 17, 2023
99ce17c
Merge pull request #5655 from ProcessMaker/FOUR-11429
agustinbusso Nov 23, 2023
15948d7
Merge branch 'next' of github.com:ProcessMaker/processmaker into epic…
TinCodes Nov 30, 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
1 change: 1 addition & 0 deletions ProcessMaker/Http/Controllers/Process/ModelerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public function show(ModelerManager $manager, Process $process, Request $request
'countScreenCategories' => $countScreenCategories,
'countScriptCategories' => $countScriptCategories,
'isProjectsInstalled' => $isProjectsInstalled,
'isAiGenerated' => request()->query('ai'),
]);
}

Expand Down
47 changes: 26 additions & 21 deletions resources/js/processes/components/CreateProcessModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,22 @@ import AssetRedirectMixin from "../../components/shared/AssetRedirectMixin";
import ProjectSelect from "../../components/shared/ProjectSelect.vue";

export default {
components: {
Modal, Required, ProjectSelect,
},
mixins: [FormErrorsMixin, AssetRedirectMixin],
components: { Modal, Required, ProjectSelect },
mixins: [ FormErrorsMixin, AssetRedirectMixin ],
props: [
"countCategories",
"blankTemplate",
"selectedTemplate",
"templateData",
"generativeProcessData",
"isProjectsInstalled",
"categoryType",
"countCategories",
"blankTemplate",
"selectedTemplate",
"templateData",
"generativeProcessData",
"isProjectsInstalled",
"categoryType",
"callFromAiModeler",
"isProjectSelectionRequired",
"projectId",
"isAiGenerated"
],
data() {
data: function() {
return {
showModal: false,
name: "",
Expand All @@ -139,12 +138,8 @@ export default {
bpmn: "",
disabled: false,
customModalButtons: [
{
content: "Cancel", action: "hide()", variant: "outline-secondary", disabled: false, hidden: false,
},
{
content: "Create", action: "createTemplate", variant: "primary", disabled: false, hidden: false,
},
{"content": "Cancel", "action": "hide()", "variant": "outline-secondary", "disabled": false, "hidden": false},
{"content": "Create", "action": "createTemplate", "variant": "primary", "disabled": false, "hidden": false},
],
manager: "",
};
Expand Down Expand Up @@ -299,9 +294,19 @@ export default {

ProcessMaker.alert(this.$t("The process was created."), "success");

const url = new URL(`/modeler/${data.id}`, window.location.origin);
this.appendProjectIdToURL(url, this.projectId);
this.handleRedirection(url, data);
if (this.callFromAiModeler) {
const url = `/package-ai/processes/create/${response.data.id}`;
this.$emit("process-created-from-modeler", url, response.data.id, response.data.name);
} else if (this.projectId) {
const url = new URL(`/modeler/${data.id}`, window.location.origin);
this.appendProjectIdToURL(url, this.projectId);
this.handleRedirection(url, data);
} else {
window.location =
this.isAiGenerated
? "/modeler/" + response.data.id + "?ai=true"
: "/modeler/" + response.data.id;
}
})
.catch((error) => {
this.disabled = false;
Expand Down
1 change: 1 addition & 0 deletions resources/views/processes/modeler/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
screenTypes: @json($screenTypes),
scriptExecutors: @json($scriptExecutors),
isProjectsInstalled: @json($isProjectsInstalled),
isAiGenerated: @json($isAiGenerated)
}
const warnings = @json($process->warnings);

Expand Down