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.

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

fix(#2310): change UI to insert normalized lower case request headers to align with TTK #102

Merged
merged 2 commits into from
Jun 28, 2021
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
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ml-testing-toolkit-ui",
"version": "12.2.4",
"version": "12.2.5",
"description": "Mojaloop Testing Toolkit Web User Interface",
"main": "index.js",
"repository": {
Expand Down
32 changes: 16 additions & 16 deletions src/views/outbound/RequestBuilder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ConfigurableParameter extends React.Component {
)
})
}

// handleParamTypeChange = async (paramType) => {
// var factData = null
// switch(paramType) {
Expand Down Expand Up @@ -280,15 +280,15 @@ class ConfigurableParameter extends React.Component {
finalValue = '{$request.body.' + this.inputValue + '}'
break
case 2:
finalValue = '{$request.header.' + this.inputValue + '}'
finalValue = '{$request.header.' + this.inputValue.toLowerCase() + '}'
break
case 3:
finalValue = '{$session.negotiatedContentType}'
break
default:
finalValue = this.inputValue
}


this.props.onChange(finalValue)
}
Expand Down Expand Up @@ -347,7 +347,7 @@ class PathBuilder extends React.Component {
updatePath = () => {
let operationPath = this.props.request.operationPath
for (let k in this.state.params) {
operationPath = operationPath.replace('{'+k+'}', this.state.params[k])
operationPath = operationPath.replace('{'+k+'}', this.state.params[k])
}
this.props.request.path = operationPath
this.props.onChange()
Expand Down Expand Up @@ -497,7 +497,7 @@ class OptionsBuilder extends React.Component {
)
}
}

return (
<>
<Row className="mb-2">
Expand Down Expand Up @@ -668,7 +668,7 @@ class QueryParamsBuilder extends React.Component {

const addQueryParamDialogContent = (
<>
<Input
<Input
placeholder="Enter name"
type="text"
value={this.state.newQueryParamName}
Expand Down Expand Up @@ -751,7 +751,7 @@ class QueryParamsBuilder extends React.Component {
{this.getQueryParamItems()}
</>
)
}
}
</Col>
</Row>
</Card>
Expand Down Expand Up @@ -814,7 +814,7 @@ class QueryParamsInputComponent extends React.Component {
this.props.onDelete(this.props.itemKey)
}


render() {
return (
<>
Expand All @@ -833,7 +833,7 @@ class QueryParamsInputComponent extends React.Component {
/>
</Tooltip>
</Col>

<Col span={14}>
<Input
className="form-control-alternative"
Expand Down Expand Up @@ -1067,7 +1067,7 @@ class HeaderBodyBuilder extends React.Component {
<>
<Row>
<Col span={24}>
<Input
<Input
placeholder="Enter name"
type="text"
value={this.state.newCustomHeaderName}
Expand Down Expand Up @@ -1194,7 +1194,7 @@ class HeaderBodyBuilder extends React.Component {
</Row>
</>
)
}
}
</Col>
</Row>
</Card>
Expand Down Expand Up @@ -1291,7 +1291,7 @@ class HeaderInputComponent extends React.Component {
this.props.onDelete(this.props.itemKey)
}


render() {
return (
<>
Expand All @@ -1310,7 +1310,7 @@ class HeaderInputComponent extends React.Component {
/>
</Tooltip>
</Col>

<Col span={14}>
<Input
className="form-control-alternative"
Expand Down Expand Up @@ -1404,7 +1404,7 @@ class CurlImporter extends React.Component {
</Row>
</>
)

return (
<Popover
content={importCurlCommandDialogContent}
Expand Down Expand Up @@ -1442,7 +1442,7 @@ class RequestBuilder extends React.Component {
// this.setState({overrideChecked: true})
// }
// }

// }

handleRequestChange = () => {
Expand Down Expand Up @@ -1470,7 +1470,7 @@ class RequestBuilder extends React.Component {
onChange={this.handleRequestChange}
resourceDefinition={this.props.resourceDefinition}
/>
<OptionsBuilder
<OptionsBuilder
request={this.props.request}
inputValues={this.props.inputValues}
onChange={this.handleRequestChange}
Expand Down
22 changes: 11 additions & 11 deletions src/views/rules/EventBuilder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ConfigurableParameter extends React.Component {
)
})
}

handleModeChange = async (mode) => {
var factData = null
switch(mode) {
Expand Down Expand Up @@ -131,15 +131,15 @@ class ConfigurableParameter extends React.Component {
finalValue = '{$request.body.' + this.inputValue + '}'
break
case 2:
finalValue = '{$request.header.' + this.inputValue + '}'
finalValue = '{$request.header.' + this.inputValue.toLowerCase() + '}'
break
case 3:
finalValue = '{$session.negotiatedContentType}'
break
default:
finalValue = this.inputValue
}


this.props.onChange(finalValue)
}
Expand Down Expand Up @@ -211,7 +211,7 @@ class FixedCallbackBuilder extends React.Component {
// // console.log(this.props.callbackRootParameters)
// // console.log(this.props.resourceDefinition.parameters)
// // console.log(this.props.callbackDefinition)



// }
Expand Down Expand Up @@ -260,7 +260,7 @@ class FixedCallbackBuilder extends React.Component {
this.addHeaderItem(event.item.props.children);
};

headerItemsMenu = () => {
headerItemsMenu = () => {
const headerParams = this.state.allParamsFromDefinition.filter(item => {
return item.in === 'header'
})
Expand Down Expand Up @@ -487,7 +487,7 @@ class HeaderInputComponent extends React.Component {
this.props.onDelete(this.props.itemKey)
}


render() {

const content = (
Expand All @@ -500,7 +500,7 @@ class HeaderInputComponent extends React.Component {
/>
)


return (
<>
<Row>
Expand All @@ -516,7 +516,7 @@ class HeaderInputComponent extends React.Component {
/>
</Tooltip>
</Col>

<Col span={12} className="pl-2">
<Input
placeholder="Name"
Expand Down Expand Up @@ -562,7 +562,7 @@ class MockCallbackBuilder extends React.Component {
this.setState({overrideChecked: true})
}
}

}

handleOverrideChecked = (event) => {
Expand All @@ -576,7 +576,7 @@ class MockCallbackBuilder extends React.Component {
// const paramsObject = {}
// paramsObject.header = this.getHeaderObject()
// paramsObject.body = this.state.body

this.props.onChange(paramsObject)
}

Expand Down Expand Up @@ -611,7 +611,7 @@ class MockCallbackBuilder extends React.Component {
}

class ParamsBuilder extends React.Component {

render() {
if (this.props.eventType === 'FIXED_CALLBACK' || this.props.eventType === 'FIXED_ERROR_CALLBACK') {
return (
Expand Down
22 changes: 11 additions & 11 deletions src/views/rules/EventResponseBuilder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ConfigurableParameter extends React.Component {
)
})
}

handleModeChange = async (mode) => {
var factData = null
let allParameters = []
Expand Down Expand Up @@ -146,15 +146,15 @@ class ConfigurableParameter extends React.Component {
finalValue = '{$request.body.' + this.inputValue + '}'
break
case 2:
finalValue = '{$request.header.' + this.inputValue + '}'
finalValue = '{$request.header.' + this.inputValue.toLowerCase() + '}'
break
case 3:
finalValue = '{$session.negotiatedContentType}'
break
default:
finalValue = this.inputValue
}


this.props.onChange(finalValue)
}
Expand Down Expand Up @@ -273,7 +273,7 @@ class FixedCallbackBuilder extends React.Component {
this.addHeaderItem(event.item.props.children);
};

headerItemsMenu = () => {
headerItemsMenu = () => {
const menuItems = this.allHeadersArray.map((item, key) => {
return (
<Menu.Item key={key}>{item.name}</Menu.Item>
Expand Down Expand Up @@ -499,7 +499,7 @@ class HeaderInputComponent extends React.Component {
this.props.onDelete(this.props.itemKey)
}


render() {

const content = (
Expand All @@ -512,7 +512,7 @@ class HeaderInputComponent extends React.Component {
/>
)


return (
<>
<Row>
Expand All @@ -528,7 +528,7 @@ class HeaderInputComponent extends React.Component {
/>
</Tooltip>
</Col>

<Col span={12} className="pl-2">
<Input
placeholder="Name"
Expand Down Expand Up @@ -574,7 +574,7 @@ class MockCallbackBuilder extends React.Component {
this.setState({overrideChecked: true})
}
}

}

handleOverrideChecked = (event) => {
Expand All @@ -588,7 +588,7 @@ class MockCallbackBuilder extends React.Component {
// const paramsObject = {}
// paramsObject.header = this.getHeaderObject()
// paramsObject.body = this.state.body

this.props.onChange(paramsObject)
}

Expand Down Expand Up @@ -623,7 +623,7 @@ class MockCallbackBuilder extends React.Component {
}

class ParamsBuilder extends React.Component {

componentDidMount = () => {
if (this.props.eventParams && !this.props.eventParams.statusCode) {
this.props.eventParams.statusCode = (new FactDataGenerator()).pickSuccessCodeFromResponsesObject(this.props.responses)
Expand Down Expand Up @@ -653,7 +653,7 @@ class ParamsBuilder extends React.Component {
<Row className="mt-2">
<Col span={24}>
<Row>
<Col><Text>Response Code</Text></Col>
<Col><Text>Response Code</Text></Col>
<Col className="pl-2">
<Select
value={this.props.eventParams.statusCode}
Expand Down