Skip to content

Change Flow Genie Icon. Do not show error 422 for FlowGenie Create #6993

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Change Flow Genie Icon. Do not show error 422 for FlowGenie Create #6993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e6812a
Change Flow Genie Icon. Do not show error 422 for FlowGenie Create
agustinbusso Jun 27, 2024
224b2e8
Merge branch 'epic/FOUR-15548' into task/FOUR-16853
agustinbusso Jun 27, 2024
2b587de
Fox code smell
agustinbusso Jun 27, 2024
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
7 changes: 7 additions & 0 deletions resources/img/flowGenieIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions resources/js/app-layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,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);
}
Expand Down
9 changes: 8 additions & 1 deletion resources/js/processes/designer/Asset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
<template>
<b-card-text class="asset">
<span>
<img
v-if="image_icon"
:src="image_icon"
:alt="asset_name"
>
<i
v-if="icon"
:class="icon"
:style="{color: color}"
/>
Expand All @@ -15,7 +21,8 @@ export default {
props: [
"color",
"asset_name",
"icon"
"icon",
"image_icon",
],
data() {
return { };
Expand Down
12 changes: 7 additions & 5 deletions resources/js/processes/designer/Assets.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<asset
:color="asset.color"
:icon="asset.icon"
:image_icon="asset.image_icon"
:asset_name="asset.asset_name"
/>
</template>
Expand Down Expand Up @@ -52,6 +53,7 @@
<asset
:color="asset.color"
:icon="asset.icon"
:image_icon="asset.image_icon"
:asset_name="asset.asset_name"
/>
</template>
Expand Down Expand Up @@ -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",
},
Expand Down
15 changes: 8 additions & 7 deletions resources/views/processes/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ class="invalid-feedback"
label="title"
>
<span slot="noResult">
{{ __('Oops! No elements found. Consider changing the search query.') }}
@{{ __(noElementsFoundMsg) }}
</span>
<template slot="noOptions">
{{ __('No Data Available') }}
Expand Down Expand Up @@ -261,8 +261,8 @@ class="invalid-feedback"
label="title"
>
<span slot="noResult">
{{
__('Oops! No elements found. Consider changing the search query.')
@{{
__(noElementsFoundMsg)
}}
</span>
<template slot="noOptions">
Expand Down Expand Up @@ -293,8 +293,8 @@ class="invalid-feedback"
group-label="label"
>
<span slot="noResult">
{{
__('Oops! No elements found. Consider changing the search query.')
@{{
noElementsFoundMsg
}}
</span>
<template slot="noOptions">
Expand All @@ -317,8 +317,8 @@ class="invalid-feedback"
group-label="label"
>
<span slot="noResult">
{{
__('Oops! No elements found. Consider changing the search query.')
@{{
__(noElementsFoundMsg)
}}
</span>
<template slot="noOptions">
Expand Down Expand Up @@ -632,6 +632,7 @@ class="custom-control-input">
translatedLanguages: [],
editTranslation: null,
activeTab: "",
noElementsFoundMsg: 'Oops! No elements found. Consider changing the search query.',
}
},
mounted() {
Expand Down
Loading