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

x-pack/plugins/beats_management/public/components/enroll_beats.tsx

@@ -144,17 +144,15 @@ 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)}> ${
-                        this.state.beatType
-                      }.exe`,
+                      value: `PS C:\\Program Files\\{{beatTypeInCaps)}}> {{beatType}}.exe`,
                       text: 'Windows',
                     },
                     {
-                      value: `./${this.state.beatType}`,
+                      value: `./{{beatType}}`,
                       text: 'MacOS',
                     },
                   ]}
@@ -188,17 +186,13 @@ 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)
+                        .replace('{{beatTypeInCaps}}', capitalize(this.state.beatType))} enroll ${
+                        window.location.protocol
+                      }://${window.location.host} ${this.props.frameworkBasePath} ${
+                        this.props.enrollmentToken
+                      }`}
                     </div>
                   </div>
                   <br />

x-pack/plugins/beats_management/public/utils/__snapshots__/page_loader.test.ts.snap

@@ -0,0 +1,143 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RouteTreeBuilder routeTreeFromPaths Should create a route tree 1`] = `
+Array [
+  Object {
+    "component": null,
+    "path": "/tag",
+  },
+  Object {
+    "component": null,
+    "path": "/beat",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/beat/detail",
+      },
+      Object {
+        "component": null,
+        "path": "/beat/tags",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "/error/enforce_security",
+  },
+  Object {
+    "component": null,
+    "path": "/error/invalid_license",
+  },
+  Object {
+    "component": null,
+    "path": "/error/no_access",
+  },
+  Object {
+    "component": null,
+    "path": "/overview",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/overview/enrolled_beats",
+      },
+      Object {
+        "component": null,
+        "path": "/overview/tag_configurations",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "/walkthrough/initial",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/beat",
+      },
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/finish",
+      },
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/tag",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "*",
+  },
+]
+`;
+
+exports[`RouteTreeBuilder routeTreeFromPaths Should create a route tree, with top level route having params 1`] = `
+Array [
+  Object {
+    "component": null,
+    "path": "/tag/:action/:tagid?",
+  },
+  Object {
+    "component": null,
+    "path": "/beat",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/beat/detail",
+      },
+      Object {
+        "component": null,
+        "path": "/beat/tags",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "/error/enforce_security",
+  },
+  Object {
+    "component": null,
+    "path": "/error/invalid_license",
+  },
+  Object {
+    "component": null,
+    "path": "/error/no_access",
+  },
+  Object {
+    "component": null,
+    "path": "/overview",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/overview/enrolled_beats",
+      },
+      Object {
+        "component": null,
+        "path": "/overview/tag_configurations",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "/walkthrough/initial",
+    "routes": Array [
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/beat",
+      },
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/finish",
+      },
+      Object {
+        "component": null,
+        "path": "/walkthrough/initial/tag",
+      },
+    ],
+  },
+  Object {
+    "component": null,
+    "path": "*",
+  },
+]
+`;

x-pack/plugins/beats_management/public/utils/page_loader.test.ts

@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RouteTreeBuilder } from './page_loader';
+
+const pages = [
+  './_404.tsx',
+  './beat/detail.tsx',
+  './beat/index.tsx',
+  './beat/tags.tsx',
+  './error/enforce_security.tsx',
+  './error/invalid_license.tsx',
+  './error/no_access.tsx',
+  './overview/enrolled_beats.tsx',
+  './overview/index.tsx',
+  './overview/tag_configurations.tsx',
+  './tag.tsx',
+  './walkthrough/initial/beat.tsx',
+  './walkthrough/initial/finish.tsx',
+  './walkthrough/initial/index.tsx',
+  './walkthrough/initial/tag.tsx',
+];
+
+describe('RouteTreeBuilder', () => {
+  describe('routeTreeFromPaths', () => {
+    it('Should fail to create a route tree due to no exported *Page component', () => {
+      const mockRequire = jest.fn(path => ({
+        path,
+        testComponent: null,
+      }));
+
+      const treeBuilder = new RouteTreeBuilder(mockRequire);
+
+      expect(() => {
+        treeBuilder.routeTreeFromPaths(pages);
+      }).toThrowError(/in the pages folder does not include an exported/);
+    });
+
+    it('Should create a route tree', () => {
+      const mockRequire = jest.fn(path => ({
+        path,
+        testPage: null,
+      }));
+
+      const treeBuilder = new RouteTreeBuilder(mockRequire);
+
+      let tree;
+      expect(() => {
+        tree = treeBuilder.routeTreeFromPaths(pages);
+      }).not.toThrow();
+      expect(tree).toMatchSnapshot();
+    });
+
+    it('Should fail to create a route tree due to no exported custom *Component component', () => {
+      const mockRequire = jest.fn(path => ({
+        path,
+        testComponent: null,
+      }));
+
+      const treeBuilder = new RouteTreeBuilder(mockRequire, /Component$/);
+
+      expect(() => {
+        treeBuilder.routeTreeFromPaths(pages);
+      }).not.toThrow();
+    });
+
+    it('Should create a route tree, with top level route having params', () => {
+      const mockRequire = jest.fn(path => ({
+        path,
+        testPage: null,
+      }));
+
+      const treeBuilder = new RouteTreeBuilder(mockRequire);
+      const tree = treeBuilder.routeTreeFromPaths(pages, {
+        '/tag': ['action', 'tagid?'],
+      });
+      expect(tree).toMatchSnapshot();
+    });
+
+    it('Should create a route tree, with a nested route having params', () => {
+      const mockRequire = jest.fn(path => ({
+        path,
+        testPage: null,
+      }));
+
+      const treeBuilder = new RouteTreeBuilder(mockRequire);
+      const tree = treeBuilder.routeTreeFromPaths(pages, {
+        '/beat': ['beatId'],
+      });
+      expect(tree[1].path).toEqual('/beat/:beatId');
+    });
+  });
+  it('Should create a route tree, with a deep nested route having params', () => {
+    const mockRequire = jest.fn(path => ({
+      path,
+      testPage: null,
+    }));
+
+    const treeBuilder = new RouteTreeBuilder(mockRequire);
+    const tree = treeBuilder.routeTreeFromPaths(pages, {
+      '/beat': ['beatId'],
+      '/beat/detail': ['other'],
+    });
+    expect(tree[1].path).toEqual('/beat/:beatId');
+    expect(tree[1].routes![0].path).toEqual('/beat/:beatId/detail/:other');
+    expect(tree[1].routes![1].path).toEqual('/beat/:beatId/tags');
+  });
+  it('Should throw an error on invalid mapped path', () => {
+    const mockRequire = jest.fn(path => ({
+      path,
+      testPage: null,
+    }));
+
+    const treeBuilder = new RouteTreeBuilder(mockRequire);
+    expect(() => {
+      treeBuilder.routeTreeFromPaths(pages, {
+        '/non-existant-path': ['beatId'],
+      });
+    }).toThrowError(/Invalid overideMap provided to 'routeTreeFromPaths', \/non-existant-path /);
+  });
+  it('Should rended 404.tsx as a 404 route not /404', () => {
+    const mockRequire = jest.fn(path => ({
+      path,
+      testPage: null,
+    }));
+
+    const treeBuilder = new RouteTreeBuilder(mockRequire);
+    const tree = treeBuilder.routeTreeFromPaths(pages);
+    const firstPath = tree[0].path;
+    const lastPath = tree[tree.length - 1].path;
+
+    expect(firstPath).not.toBe('/_404');
+    expect(lastPath).toBe('*');
+  });
+});