Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Jump to bottom

Issues/1798 #1802

Merged
merged 3 commits into from
Nov 28, 2022
Merged

Issues/1798 #1802

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
2c913d6
Merge pull request #1792 from hypersign-protocol/develop
Raj6939 Nov 25, 2022
7f2974d
Merge pull request #1796 from hypersign-protocol/develop
varsha766 Nov 26, 2022
247049c
bug fixed fro UI
Raj6939 Nov 28, 2022
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
24 changes: 20 additions & 4 deletions src/components/admin/createProjectSlider/components/CustomApiEventActionConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
active
>
<b-card-text>
<div class="selected-media-wrapper d-flex p-2 mb-4" style="overflow-y: auto" v-if="queryParameterAttributeArray.length > 0">
<div class="selected-media-wrapper d-flex p-2 mb-4 m-1" style="overflow-y: auto" v-if="queryParameterAttributeArray.length > 0">
<div v-for="(attr,fieldName) in queryParameterAttributeArray" v-bind:key="attr.fieldName">
<div :class="
querryAttrFlash == attr.fieldName
Expand Down Expand Up @@ -338,7 +338,7 @@
<div class="text-left col-lg-3 col-md-3 text-left">
<tool-tips infoMessage="Configure condition which you want Fyre server to apply upon getting response from your API"></tool-tips>
<label for="title" class="col-form-label"
>Match Condition<span style="color: red">*</span>:
>Condition<span style="color: red">*</span>:
</label>
</div>
<div class="col-lg-2 col-md-2 px-0">
Expand Down Expand Up @@ -464,6 +464,13 @@
</div>
</template>
<style scoped>
.card-body{
padding: 0rem !important;
margin-top: 2rem;
}
.bv-no-focus-ring{
margin-left:1rem !important;
}
.inputInfo {
color: #808080b5;
font-size: smaller;
Expand Down Expand Up @@ -669,7 +676,7 @@ export default {
{ text: "integer", value: "NUMBER" },
{ text: "float", value: "FLOAT" },],
},{
label:"Wallet Connect",
label:"Blockchain type",
options: [
{ text: "Ethereum", value: "BLOCKCHAIN_ETH" },
{ text: "Cosmos blockchain", value: "BLOCKCHAIN_COSMOS" },
Expand Down Expand Up @@ -827,6 +834,9 @@ export default {
} else if(this.showQueryAttrChainIdField === true && isEmpty(this.chainId)) {
isValid = false
return this.notifyErr('Enter Chain Id')
} else if(this.showQueryAttrChainIdField === true && isValidURL(this.chainId)) {
isValid = false
return this.notifyErr('Enter valid Chain Id')
} else if(isEmpty(this.queryParamAttributeData.fieldPlaceHolder)) {
isValid = false
return this.notifyErr('Enter Label')
Expand Down Expand Up @@ -998,6 +1008,9 @@ export default {
} else if(this.showBodyAttrChainIdField === true && isEmpty(this.bodyAttrChainId)) {
isValid = false
return this.notifyErr('Enter Chain Id')
} else if(this.showBodyAttrChainIdField === true && isValidURL(this.bodyAttrChainId)) {
isValid = false
return this.notifyErr('Enter valid Chain Id')
} else if(isEmpty(this.attributeData.fieldPlaceHolder)) {
isValid = false
return this.notifyErr('Enter Label')
Expand Down Expand Up @@ -1044,7 +1057,10 @@ export default {
inputCondtion(e){
if(e === "REGEXP") {
this.showRegexInputField = true
} else {
} else {
if(typeof(this.apiData.conditionValue)==="object") {
this.apiData.conditionValue = ""
}
this.showRegexInputField = false
}
this.apiData.condition = e
Expand Down
4 changes: 2 additions & 2 deletions src/components/participant/ActionInputs/CustomApi.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,14 @@ computed:{
if(attribute.fieldValue === null || attribute.fieldValue === "") {
throw new Error(`Please fill ${attribute.fieldPlaceHolder} field`)
} else if(!Number.isInteger(parseFloat((attribute.fieldValue)))) {
throw new Error('Enter Integer value')
throw new Error(`Enter Integer value for ${attribute.fieldPlaceHolder}`)
}
break;
case "FLOAT":
if(attribute.fieldValue === null || attribute.fieldValue === "") {
throw new Error(`Please fill ${attribute.fieldPlaceHolder} field`)
} else if(!isFloat(attribute.fieldValue)) {
throw new Error('Enter Float value')
throw new Error(`Enter Float value for ${attribute.fieldPlaceHolder}`)
}
break;
case "BOOLEAN":
Expand Down