Skip to content

Commit 58d0308

Browse files
authored
Merge pull request #6993 from ProcessMaker/task/FOUR-16853
Change Flow Genie Icon. Do not show error 422 for FlowGenie Create
2 parents 1ee79c7 + 2b587de commit 58d0308

5 files changed

Lines changed: 35 additions & 13 deletions

File tree

‎resources/img/flowGenieIcon.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎resources/js/app-layout.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ window.ProcessMaker.apiClient.interceptors.response.use((response) => {
325325
}
326326
return response;
327327
}, (error) => {
328+
// Set in your .catch to false to not show the alert inside window.ProcessMaker.apiClient
329+
if (!error.response.showAlert) {
330+
return Promise.reject(error);
331+
}
332+
328333
if (error.code && error.code === "ERR_CANCELED") {
329334
return Promise.reject(error);
330335
}

‎resources/js/processes/designer/Asset.vue‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<template>
22
<b-card-text class="asset">
33
<span>
4+
<img
5+
v-if="image_icon"
6+
:src="image_icon"
7+
:alt="asset_name"
8+
>
49
<i
10+
v-if="icon"
511
:class="icon"
612
:style="{color: color}"
713
/>
@@ -15,7 +21,8 @@ export default {
1521
props: [
1622
"color",
1723
"asset_name",
18-
"icon"
24+
"icon",
25+
"image_icon",
1926
],
2027
data() {
2128
return { };

‎resources/js/processes/designer/Assets.vue‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<asset
2424
:color="asset.color"
2525
:icon="asset.icon"
26+
:image_icon="asset.image_icon"
2627
:asset_name="asset.asset_name"
2728
/>
2829
</template>
@@ -52,6 +53,7 @@
5253
<asset
5354
:color="asset.color"
5455
:icon="asset.icon"
56+
:image_icon="asset.image_icon"
5557
:asset_name="asset.asset_name"
5658
/>
5759
</template>
@@ -131,11 +133,11 @@ export default {
131133
urlAsset: "/designer/data-sources?create=true",
132134
},
133135
{
134-
color: "#4B667C",
135-
icon: "fas fa-magic",
136-
asset_name: "Flow Genies",
137-
asset_name_all: `${this.$t("View All")} Flow Genies`,
138-
asset_name_new: `${this.$t("New")} Flow Genie`,
136+
color: "#556271",
137+
image_icon: require("../../../img/flowGenieIcon.svg"),
138+
asset_name: "FlowGenies",
139+
asset_name_all: `${this.$t("View All")} Genies`,
140+
asset_name_new: `${this.$t("New")} Genie`,
139141
urlPath: "/designer/flow-genies",
140142
urlAsset: "/designer/flow-genies?create=true",
141143
},

‎resources/views/processes/edit.blade.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class="invalid-feedback"
230230
label="title"
231231
>
232232
<span slot="noResult">
233-
{{ __('Oops! No elements found. Consider changing the search query.') }}
233+
@{{ __(noElementsFoundMsg) }}
234234
</span>
235235
<template slot="noOptions">
236236
{{ __('No Data Available') }}
@@ -261,8 +261,8 @@ class="invalid-feedback"
261261
label="title"
262262
>
263263
<span slot="noResult">
264-
{{
265-
__('Oops! No elements found. Consider changing the search query.')
264+
@{{
265+
__(noElementsFoundMsg)
266266
}}
267267
</span>
268268
<template slot="noOptions">
@@ -293,8 +293,8 @@ class="invalid-feedback"
293293
group-label="label"
294294
>
295295
<span slot="noResult">
296-
{{
297-
__('Oops! No elements found. Consider changing the search query.')
296+
@{{
297+
noElementsFoundMsg
298298
}}
299299
</span>
300300
<template slot="noOptions">
@@ -317,8 +317,8 @@ class="invalid-feedback"
317317
group-label="label"
318318
>
319319
<span slot="noResult">
320-
{{
321-
__('Oops! No elements found. Consider changing the search query.')
320+
@{{
321+
__(noElementsFoundMsg)
322322
}}
323323
</span>
324324
<template slot="noOptions">
@@ -632,6 +632,7 @@ class="custom-control-input">
632632
translatedLanguages: [],
633633
editTranslation: null,
634634
activeTab: "",
635+
noElementsFoundMsg: 'Oops! No elements found. Consider changing the search query.',
635636
}
636637
},
637638
mounted() {

0 commit comments

Comments
 (0)