diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-07-03 09:51:20 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:47:22 +0200 |
| commit | 107a48e1a7fa0ec56faad8d8e90f76521f39f3b2 (patch) | |
| tree | bd14a9d7a19c4e6ae371f819404949c35d0f3b4f /frontend/src/components/app/sidebars/topology | |
| parent | f119fc78dda4d1e828dde04f378a63a93e3a0a7e (diff) | |
Get entire topology editing process working
Diffstat (limited to 'frontend/src/components/app/sidebars/topology')
| -rw-r--r-- | frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js | 8 | ||||
| -rw-r--r-- | frontend/src/components/app/sidebars/topology/machine/UnitComponent.js | 34 |
2 files changed, 17 insertions, 25 deletions
diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js index e8722506..98238de7 100644 --- a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js +++ b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js @@ -17,13 +17,7 @@ class UnitAddComponent extends React.Component { > {this.props.units.map(unit => ( <option value={unit._id} key={unit._id}> - {unit.manufacturer + - ' ' + - unit.family + - ' ' + - unit.model + - ' ' + - unit.generation} + {unit.name} </option> ))} </select> diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js index 647c8e5c..bde6d444 100644 --- a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js +++ b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js @@ -39,31 +39,29 @@ class UnitComponent extends React.Component { return ( <li className="d-flex list-group-item justify-content-between align-items-center"> - <span style={{ maxWidth: '60%' }}> - {this.props.unit.name} - </span> + <span style={{ maxWidth: '60%' }}> + {this.props.unit.name} + </span> <span> - <span - tabIndex="0" - className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle" - role="button" - data-toggle="popover" - data-trigger="focus" - title="Unit information" - data-content={unitInfo} - data-html="true" - /> + <span + tabIndex="0" + className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle" + role="button" + data-toggle="popover" + data-trigger="focus" + title="Unit information" + data-content={unitInfo} + data-html="true" + /> {this.props.inSimulation ? ( undefined ) : ( <span - className="btn btn-outline-danger" + className="btn btn-outline-danger fa fa-trash" onClick={this.props.onDelete} - > - <span className="fa fa-trash"/> - </span> + /> )} - </span> + </span> </li> ) } |