Skip to content
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.

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

FOUR-18762: Added PI Process Import to New Process modal #7319

Merged
merged 5 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions resources/img/wf-to-pm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 7 additions & 29 deletions resources/js/components/templates/ButtonCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,14 @@
<i v-if="button.icon" class="icon mb-2 text-primary" :class="button.icon" :style="button.iconStyle"></i>
<img v-if="button.svgIcon" :src="button.svgIcon" class="mb-2" :style="button.svgIconStyle" :alt="button.title">
<h5 class="m-0">{{ button.title }}</h5>
<div v-if="button.description" class="mb-2">
<div class="mt-1 description text-secondary">{{ button.description }}</div>
</div>
</div>
<div v-if="button.showAiSlogan" class="ai-slogan-container mb-2">
<div class="ai-slogan"><img src="/img/favicon.svg" :alt="$t('ProcessMaker')"> {{ $t("Powered by ProcessMaker AI") }}</div>
</div>
</b-card>

<div v-if="button.helperEnabled" class="helper-container col-6 p-0">
<div class="arrow-left"></div>
<b-card no-body class="button-card card-helper p-4">
<div class="card-body card-helper text-center d-flex justify-content-center flex-column">
<h4 class="m-0 text-left card-title">{{ button.helperTitle }}</h4>
<p class="m-0 text-left card-text">{{ button.helperDescription }}</p>
</div>
</b-card>
</div>
</div>
</template>

Expand Down Expand Up @@ -93,26 +86,11 @@ export default {
font-size: 1.5rem;
}

.helper-container {
position: relative;
}
.arrow-left {
width: 0;
height: 0;
border-top: 16px solid transparent;
border-bottom: 16px solid transparent;
border-right: 13px solid #BCDCF8;
position: absolute;
top: calc(50% - 16px);
left: 0px;
}
.button-card.card-helper {
border: 0;
background: #BCDCF8;
}
.button-card.card-helper .card-text {
color:#363A3E;
.description {
font-weight: 200;
font-size: 14px;
}

.ai-slogan-container {
position: absolute;
bottom: 0;
Expand Down
17 changes: 16 additions & 1 deletion resources/js/components/templates/SelectTemplateModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@show-details="updateModal($event)"
@blank-process-button-clicked="createBlankProcess()"
@ai-process-button-clicked="createAiProcess()"
@process-intelligence-clicked="importPI()"
:showTemplateOptionsActionBar="true"
:package-ai="packageAi" />
</modal>
Expand All @@ -38,16 +39,22 @@
@resetModal="resetModal()"
:projectId="projectId"
/>
<ImportPIModal
ref="import-pi-modal"
:userHasEditPermissions="true"
@onClose="onClosePIModal()"
/>
</div>
</template>

<script>
import Modal from "../shared/Modal.vue";
import TemplateSearch from "./TemplateSearch.vue";
import CreateProcessModal from "../../processes/components/CreateProcessModal.vue";
import ImportPIModal from "../../processes/import/components/ImportPIModal.vue";

export default {
components: { Modal, TemplateSearch, CreateProcessModal },
components: { Modal, TemplateSearch, CreateProcessModal, ImportPIModal },
props: ['type', 'countCategories', 'packageAi', 'isProjectsInstalled', 'hideAddBtn', 'projectId', 'isAbTestingInstalled'],
data: function() {
return {
Expand Down Expand Up @@ -107,6 +114,14 @@
window.location.href = "/package-ai/processes/create";
}
},
onClosePIModal() {
this.$refs["import-pi-modal"].hide();
this.$bvModal.show('selectTemplate');
},
importPI() {
this.$bvModal.hide("selectTemplate");
this.$refs["import-pi-modal"].show();
},
useSelectedTemplate() {
this.selectedTemplate = true;
this.blankTemplate = false;
Expand Down
19 changes: 15 additions & 4 deletions resources/js/components/templates/TemplateSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,21 @@
@card-button-clicked="$emit('blank-process-button-clicked')"
/>

<div v-if="packageAi" class="col-8 p-0">
<div v-if="packageAi" class="col-4 p-0">
<button-card
:button="aiProcessButton"
@show-details="showDetails($event)"
@card-button-clicked="$emit('ai-process-button-clicked')"
/>
</div>

<div v-if="packageAi" class="col-4 p-0">
<button-card
:button="processIntelligenceButton"
@show-details="showDetails($event)"
@card-button-clicked="$emit('process-intelligence-clicked')"
/>
</div>
<div class="d-flex w-100 align-items-center my-3 card-separator">
<small class="mr-2 text-secondary">{{ $t('Templates') }}</small>
<div class="flex-grow-1 border-bottom"></div>
Expand Down Expand Up @@ -140,13 +148,16 @@ export default {
},
aiProcessButton: {
title: this.$t("Generate from AI"),
helperEnabled: true,
helperTitle: this.$t("Try our new Generative AI"),
helperDescription: this.$t("Describe your process. Our AI will build the model for you. Use it immediately or tweak it as needed."),
svgIcon: "../../../img/nl-to-process.svg",
svgIconStyle: "height: 2em;",
showAiSlogan: true,
},
processIntelligenceButton: {
title: this.$t("Import a PI Process"),
description: this.$t("Process Intelligence"),
svgIcon: "../../../img/wf-to-pm.svg",
svgIconStyle: "height: 2em;",
},
showWizardTemplateDetails: false,
};
},
Expand Down
106 changes: 106 additions & 0 deletions resources/js/processes/import/components/ImportPIModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<template>
<div>
<modal
id="importPI"
:title="title"
:subtitle="subtitle"
:setCustomButtons="true"
:customButtons="buttons"
@importNewPI="importNewPI()"
@hidden="onClose()"
size="lg"
>
<template>
<div class="card-body">
<div id="pre-import">
<draggable-file-upload class="text-center" v-if="!file || file && !fileIsValid" ref="file" v-model="file" :options="{singleFile: true}" :displayUploaderList="false" :accept="['application/json']"></draggable-file-upload>
<div v-else class="text-left">
<h5> {{ $t("You are about to import") }} <strong>{{processName}}</strong></h5>
<div class="border-dotted p-3 col-4 text-center font-weight-bold my-3">
{{file.name}}
<b-button
variant="link"
@click="removeFile"
class="p-0"
aria-describedby=""
>
<i class="fas fa-times-circle text-danger"></i>
</b-button>
</div>
</div>
</div>
</div>
</template>
</modal>
</div>
</template>
<script>
import Modal from "../../../components/shared/Modal.vue";
import DraggableFileUpload from '../../../components/shared/DraggableFileUpload.vue';

export default {
components: { Modal, DraggableFileUpload },
data() {
return {
file: '',
uploaded: false,
fileIsValid: false,
processName: '',
importDisabled: true,
};
},
watch: {
file() {
this.fileIsValid = false;
if (!this.file) {
this.importDisabled = true;
return
}
this.importDisabled = false;
this.validatePIProcess();
this.processName = this.file.name.split('.').slice(0,-1).toString();
}
},
methods: {
show() {
this.$bvModal.show('importPI');
},
hide() {
this.$bvModal.hide('importPI');
},
onClose() {
this.$emit('onClose');
},
validatePIProcess() {
if (!this.file) {
return;
}
this.$root.file = this.file;

let formData = new FormData();
formData.append('file', this.file);

this.fileIsValid = true;
},
removeFile() {
this.file = '';
this.fileIsValid = false;
},
importNewPI() {}
},
computed: {
title() {
return this.$t('Import Process');
},
subtitle() {
return this.$t('Import a process from Process Intelligence to this ProcessMaker environment');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the string "Import a process from Process Intelligence to this ProcessMaker environment" to the en.json file

},
buttons() {
return [
{'content': 'Cancel', 'action': 'hide()', 'variant': 'outline-secondary', 'disabled': false, 'hidden': false},
{'content': 'Import', 'action': 'importNewPI', 'variant': 'primary', 'disabled': this.importDisabled, 'hidden': false}
];
}
}
}
</script>
2 changes: 2 additions & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,9 @@
"image width": "image width",
"Image": "Image",
"Images for carousel": "Images for carousel",
"Import a PI Process": "Import a PI Process",
"Import a Process and its associated assets into this ProcessMaker environment": "Import a Process and its associated assets into this ProcessMaker environment",
"Import a process from Process Intelligence to this ProcessMaker environment": "Import a process from Process Intelligence to this ProcessMaker environment",
"Import a Process Template and its associated assets into this ProcessMaker environment": "Import a Process Template and its associated assets into this ProcessMaker environment",
"Import all assets from the uploaded package.": "Import all assets from the uploaded package.",
"Import As New": "Import As New",
Expand Down
Loading