Rename parameters to arguments for consistency

The backend and the callback are now referring to parameters as
arguments.
Also "Arguments" appears to be a reserved variable so use "Args"
instead where necessary.

Depends-On: https://review.openstack.org/610389
Change-Id: I5f8f16983c8e61dde911ec84fe748eb804641116
This commit is contained in:
David Moreau Simard 2018-10-14 12:41:17 -04:00
parent 248a3508f6
commit 1179bb8901
No known key found for this signature in database
GPG Key ID: CBEB466764A9E621
2 changed files with 26 additions and 26 deletions

View File

@ -1,7 +1,7 @@
import React, { Component } from "react";
import { Row, Col, ListView, Icon } from "patternfly-react";
import { Link } from "react-router-dom";
import PlaybookParameters from "./PlaybookParameters";
import PlaybookArgs from "./PlaybookArgs";
export default class Playbook extends Component {
constructor(props) {
@ -49,13 +49,13 @@ export default class Playbook extends Component {
}
leftContent={LeftIcon}
additionalInfo={[
<ListView.InfoItem key="parameters">
<ListView.InfoItem key="args">
<ListView.Expand
expanded={expanded && selection === "parameters"}
toggleExpanded={() => this._toggleExpanded("parameters")}
expanded={expanded && selection === "args"}
toggleExpanded={() => this._toggleExpanded("args")}
>
<Icon name="cogs" />
Parameters
Arguments
</ListView.Expand>
</ListView.InfoItem>,
<ListView.InfoItem key="hosts">
@ -94,8 +94,8 @@ export default class Playbook extends Component {
>
<Row>
<Col xs={12} sm={8} smOffset={2} md={6} mdOffset={3}>
{selection === "parameters" ? (
<PlaybookParameters playbook={playbook} />
{selection === "args" ? (
<PlaybookArgs playbook={playbook} />
) : (
selection
)}

View File

@ -9,15 +9,15 @@ export class ParamatersHelpIcon extends Component {
overlay={
<Tooltip id="tooltip">
<div>
<h3>Tips: Parameters</h3>
<h3>Tips: Arguments</h3>
<hr />
<p>
This panel contains all the parameters and options passed to
This panel contains all the arguments and options passed to
the ansible-playbook command.
</p>
<p>
You can control which parameters ARA should ignore with the{" "}
<code>ARA_IGNORE_PARAMETERS</code> configuration.
You can control which arguments ARA should ignore with the{" "}
<code>ignored_arguments</code> configuration.
</p>
</div>
</Tooltip>
@ -31,7 +31,7 @@ export class ParamatersHelpIcon extends Component {
}
}
export default class PlaybookParameters extends Component {
export default class PlaybookArgs extends Component {
constructor(props) {
super(props);
this.state = {
@ -39,20 +39,20 @@ export default class PlaybookParameters extends Component {
};
}
_renderParameter = parameter => {
if (parameter instanceof Array) {
return parameter.join(", ");
_renderArg = arg => {
if (arg instanceof Array) {
return arg.join(", ");
} else {
return parameter;
return arg;
}
};
render() {
const { playbook } = this.props;
const { search } = this.state;
const parameters = Object.keys(playbook.parameters);
const filteredParameters = parameters.filter(
parameter => parameter.toLowerCase().indexOf(search.toLowerCase()) !== -1
const args = Object.keys(playbook.arguments);
const filteredArgs = args.filter(
arg => arg.toLowerCase().indexOf(search.toLowerCase()) !== -1
);
console.log(search);
return (
@ -61,30 +61,30 @@ export default class PlaybookParameters extends Component {
<div className="dataTables_filter">
<input
className="form-control"
placeholder="Search a parameter"
placeholder="Search an argument"
type="search"
value={search}
onChange={e => this.setState({ search: e.target.value })}
/>
</div>
<div className="dataTables_info">
Showing <b>{filteredParameters.length}</b> of{" "}
<b>{parameters.length}</b> parameters
Showing <b>{filteredArgs.length}</b> of{" "}
<b>{args.length}</b> args
<ParamatersHelpIcon />
</div>
</div>
<table className="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>Parameter</th>
<th>Argument</th>
<th>Value</th>
</tr>
</thead>
<tbody>
{filteredParameters.map((parameter, i) => (
{filteredArgs.map((arg, i) => (
<tr key={i}>
<td>{parameter}</td>
<td>{this._renderParameter(playbook.parameters[parameter])}</td>
<td>{arg}</td>
<td>{this._renderArg(playbook.arguments[arg])}</td>
</tr>
))}
</tbody>