From d7ac68edb678abba108472e566108f99a274f722 Mon Sep 17 00:00:00 2001 From: TinCodes Date: Tue, 10 Sep 2024 17:07:20 -0400 Subject: [PATCH 1/4] PI Process creation and redirect to modeler --- .../import/components/ImportPIModal.vue | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/resources/js/processes/import/components/ImportPIModal.vue b/resources/js/processes/import/components/ImportPIModal.vue index e0228a700d..97c3d5e5dc 100644 --- a/resources/js/processes/import/components/ImportPIModal.vue +++ b/resources/js/processes/import/components/ImportPIModal.vue @@ -83,7 +83,7 @@ export default { this.file = ''; this.fileIsValid = false; }, - importNewPI() { + async importNewPI() { if (!this.file) { return; } @@ -93,16 +93,14 @@ export default { ProcessMaker.apiClient .post(`/package-ai/pi_process/import`, formData) - .then((response) => { - // TODO: Make import and redirect to Modeler + .then(response => { + ProcessMaker.alert(this.$t("The PI process was created."), "success"); + window.location = `/modeler/${response.data.id}`; }) - .catch((error) => { - window.ProcessMaker.alert( - this.$t("An error ocurred while importing the current PI Process."), - "danger", - ); + .catch(error => { + console.error(error); }); - } + }, }, computed: { title() { From 008187305f29d7fad5d97ad01d0235a5d794fd04 Mon Sep 17 00:00:00 2001 From: TinCodes Date: Tue, 10 Sep 2024 17:21:35 -0400 Subject: [PATCH 2/4] Added data-test and removed async from method --- resources/js/processes/import/components/ImportPIModal.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/js/processes/import/components/ImportPIModal.vue b/resources/js/processes/import/components/ImportPIModal.vue index 97c3d5e5dc..e35b7a5fa4 100644 --- a/resources/js/processes/import/components/ImportPIModal.vue +++ b/resources/js/processes/import/components/ImportPIModal.vue @@ -6,6 +6,7 @@ :subtitle="subtitle" :setCustomButtons="true" :customButtons="buttons" + data-test="import-pi-modal" @importNewPI="importNewPI()" @hidden="onClose()" size="lg" @@ -83,7 +84,7 @@ export default { this.file = ''; this.fileIsValid = false; }, - async importNewPI() { + importNewPI() { if (!this.file) { return; } From d7e517c103e5c6666382bdde8553e7a0229ff983 Mon Sep 17 00:00:00 2001 From: TinCodes Date: Wed, 11 Sep 2024 10:46:03 -0400 Subject: [PATCH 3/4] Remove file on cancel --- resources/js/processes/import/components/ImportPIModal.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/processes/import/components/ImportPIModal.vue b/resources/js/processes/import/components/ImportPIModal.vue index e35b7a5fa4..8bc4b995f8 100644 --- a/resources/js/processes/import/components/ImportPIModal.vue +++ b/resources/js/processes/import/components/ImportPIModal.vue @@ -67,6 +67,7 @@ export default { this.$bvModal.show('importPI'); }, hide() { + this.removeFile(); this.$bvModal.hide('importPI'); }, onClose() { From 27dc03838cfd3142cb9ffb948226119bab50d50c Mon Sep 17 00:00:00 2001 From: TinCodes Date: Wed, 11 Sep 2024 12:48:37 -0400 Subject: [PATCH 4/4] Fixed spinner not showing on file upload --- resources/js/components/shared/DraggableFileUpload.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/js/components/shared/DraggableFileUpload.vue b/resources/js/components/shared/DraggableFileUpload.vue index a375efec04..3ea8c9b848 100644 --- a/resources/js/components/shared/DraggableFileUpload.vue +++ b/resources/js/components/shared/DraggableFileUpload.vue @@ -15,7 +15,7 @@ - {{ $t('or') }} - {{ $t('Select file from computer') }} -
+
@@ -51,10 +51,12 @@ export default { }, data() { return { + loadingFile: false }; }, methods: { addFile(file) { + this.loadingFile = false; if (this.accept) { file.ignored = true; if (this.accept.indexOf(file.fileType) !== -1) { @@ -64,13 +66,15 @@ export default { ProcessMaker.alert(this.$t("The selected file is invalid or not supported. Please verify that this file is in JSON format."), "danger"); return false } + this.loadingFile = true; } file.ignored = false; return true; }, fileUploaded(rootFile, file, message) { - this.$emit('input', file.file); + this.loadingFile = false; + this.$emit('input', file.file); }, } };