[BeatsCM] Fixes elastic#26016 - beat type always updates in command now

To test, select a beat type, select an OS, then re-select a diferent beat type
mattapperson · Dec 6, 2018 · ca6082b · ca6082b
1 parent 301491d
commit ca6082b
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/x-pack/plugins/beats_management/public/components/enroll_beats.tsx b/x-pack/plugins/beats_management/public/components/enroll_beats.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import {
-  // @ts-ignore typings for EuiBasicTable not present in current version
   EuiBasicTable,
   EuiFlexGroup,
   EuiFlexItem,
@@ -144,17 +143,17 @@ export class EnrollBeat extends React.Component<ComponentProps, ComponentState>
                   value={this.state.command}
                   options={[
                     {
-                      value: `sudo ${this.state.beatType}`,
+                      value: `sudo {{beatType}}`,
                       text: 'DEB / RPM',
                     },
                     {
-                      value: `PS C:\\Program Files\\${capitalize(this.state.beatType)}> ${
+                      value: `PS C:\\Program Files\\${capitalize(
                         this.state.beatType
-                      }.exe`,
+                      )}> {{beatType}}.exe`,
                       text: 'Windows',
                     },
                     {
-                      value: `./${this.state.beatType}`,
+                      value: `./{{beatType}}`,
                       text: 'MacOS',
                     },
                   ]}
@@ -188,17 +187,12 @@ export class EnrollBeat extends React.Component<ComponentProps, ComponentState>
                       className="euiFieldText euiFieldText--fullWidth"
                       style={{ textAlign: 'left' }}
                     >
-                      <FormattedMessage
-                        id="xpack.beatsManagement.enrollBeat.stateCommandEnrollLocationProtocolTitle"
-                        defaultMessage="$ {stateCommand} enroll {locationProtocol}"
-                        values={{
-                          stateCommand: this.state.command,
-                          locationProtocol: window.location.protocol,
-                        }}
-                      />
-                      {`//`}
-                      {window.location.host}
-                      {this.props.frameworkBasePath} {this.props.enrollmentToken}
+                      {`$ ${this.state.command.replace(
+                        '{{beatType}}',
+                        this.state.beatType
+                      )} enroll ${window.location.protocol}://${window.location.host} ${
+                        this.props.frameworkBasePath
+                      } ${this.props.enrollmentToken}`}
                     </div>
                   </div>
                   <br />