From 4e6812a3e1248e711edf7c08ec0accfa4a92a738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Thu, 27 Jun 2024 11:31:13 -0300
Subject: [PATCH 1/2] Change Flow Genie Icon. Do not show error 422 for
FlowGenie Create
---
resources/img/flowGenieIcon.svg | 7 +++++++
resources/js/app-layout.js | 5 +++++
resources/js/processes/designer/Asset.vue | 9 ++++++++-
resources/js/processes/designer/Assets.vue | 12 +++++++-----
4 files changed, 27 insertions(+), 6 deletions(-)
create mode 100644 resources/img/flowGenieIcon.svg
diff --git a/resources/img/flowGenieIcon.svg b/resources/img/flowGenieIcon.svg
new file mode 100644
index 0000000000..421bbf535d
--- /dev/null
+++ b/resources/img/flowGenieIcon.svg
@@ -0,0 +1,7 @@
+
diff --git a/resources/js/app-layout.js b/resources/js/app-layout.js
index fd51785742..00547bbf01 100644
--- a/resources/js/app-layout.js
+++ b/resources/js/app-layout.js
@@ -324,6 +324,11 @@ window.ProcessMaker.apiClient.interceptors.response.use((response) => {
}
return response;
}, (error) => {
+ // Set in your .catch to false to not show the alert inside window.ProcessMaker.apiClient
+ if (!error.response.showAlert) {
+ return Promise.reject(error);
+ }
+
if (error.code && error.code === "ERR_CANCELED") {
return Promise.reject(error);
}
diff --git a/resources/js/processes/designer/Asset.vue b/resources/js/processes/designer/Asset.vue
index 4615faa51b..f8070fc34f 100644
--- a/resources/js/processes/designer/Asset.vue
+++ b/resources/js/processes/designer/Asset.vue
@@ -1,7 +1,13 @@
+
@@ -15,7 +21,8 @@ export default {
props: [
"color",
"asset_name",
- "icon"
+ "icon",
+ "image_icon",
],
data() {
return { };
diff --git a/resources/js/processes/designer/Assets.vue b/resources/js/processes/designer/Assets.vue
index 3bd0630f21..d966ca5f55 100644
--- a/resources/js/processes/designer/Assets.vue
+++ b/resources/js/processes/designer/Assets.vue
@@ -23,6 +23,7 @@
@@ -52,6 +53,7 @@
@@ -131,11 +133,11 @@ export default {
urlAsset: "/designer/data-sources?create=true",
},
{
- color: "#4B667C",
- icon: "fas fa-magic",
- asset_name: "Flow Genies",
- asset_name_all: `${this.$t("View All")} Flow Genies`,
- asset_name_new: `${this.$t("New")} Flow Genie`,
+ color: "#556271",
+ image_icon: require("../../../img/flowGenieIcon.svg"),
+ asset_name: "FlowGenies",
+ asset_name_all: `${this.$t("View All")} Genies`,
+ asset_name_new: `${this.$t("New")} Genie`,
urlPath: "/designer/flow-genies",
urlAsset: "/designer/flow-genies?create=true",
},
From 2b587de15d5fab9c92709d579dd93da2ec043277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
<90727999+agustinbusso@users.noreply.github.com>
Date: Thu, 27 Jun 2024 13:05:12 -0300
Subject: [PATCH 2/2] Fox code smell
---
resources/views/processes/edit.blade.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php
index bb60166511..cbddcf4f37 100644
--- a/resources/views/processes/edit.blade.php
+++ b/resources/views/processes/edit.blade.php
@@ -230,7 +230,7 @@ class="invalid-feedback"
label="title"
>
- {{ __('Oops! No elements found. Consider changing the search query.') }}
+ @{{ __(noElementsFoundMsg) }}
{{ __('No Data Available') }}
@@ -261,8 +261,8 @@ class="invalid-feedback"
label="title"
>
- {{
- __('Oops! No elements found. Consider changing the search query.')
+ @{{
+ __(noElementsFoundMsg)
}}
@@ -293,8 +293,8 @@ class="invalid-feedback"
group-label="label"
>
- {{
- __('Oops! No elements found. Consider changing the search query.')
+ @{{
+ noElementsFoundMsg
}}
@@ -317,8 +317,8 @@ class="invalid-feedback"
group-label="label"
>
- {{
- __('Oops! No elements found. Consider changing the search query.')
+ @{{
+ __(noElementsFoundMsg)
}}
@@ -632,6 +632,7 @@ class="custom-control-input">
translatedLanguages: [],
editTranslation: null,
activeTab: "",
+ noElementsFoundMsg: 'Oops! No elements found. Consider changing the search query.',
}
},
mounted() {