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);
},
}
};
diff --git a/resources/js/processes/import/components/ImportPIModal.vue b/resources/js/processes/import/components/ImportPIModal.vue
index e0228a700d..8bc4b995f8 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"
@@ -66,6 +67,7 @@ export default {
this.$bvModal.show('importPI');
},
hide() {
+ this.removeFile();
this.$bvModal.hide('importPI');
},
onClose() {
@@ -93,16 +95,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() {