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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
Copy Markdown
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 numberDiff line numberDiff 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