[Ingest] Fix agent config key sorting (elastic#63488)

nchaulet · Apr 17, 2020 · 8a8c2d3 · 8a8c2d3
1 parent 9c370e7
commit 8a8c2d3
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/.../applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx b/.../applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
@@ -25,7 +25,15 @@ import {
 import { ShellEnrollmentInstructions } from '../../../../../components/enrollment_instructions';
 import { Loading } from '../../../../../components';
 
-const CONFIG_KEYS_ORDER = ['id', 'revision', 'outputs', 'datasources'];
+const CONFIG_KEYS_ORDER = [
+  'id',
+  'revision',
+  'outputs',
+  'datasources',
+  'enabled',
+  'package',
+  'input',
+];
 
 export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
   const core = useCore();
@@ -47,7 +55,17 @@ export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
         <EuiCodeBlock language="yaml" isCopyable>
           {dump(fullConfigRequest.data.item, {
             sortKeys: (keyA: string, keyB: string) => {
-              return CONFIG_KEYS_ORDER.indexOf(keyA) - CONFIG_KEYS_ORDER.indexOf(keyB);
+              const indexA = CONFIG_KEYS_ORDER.indexOf(keyA);
+              const indexB = CONFIG_KEYS_ORDER.indexOf(keyB);
+              if (indexA >= 0 && indexB < 0) {
+                return -1;
+              }
+
+              if (indexA < 0 && indexB >= 0) {
+                return 1;
+              }
+
+              return indexA - indexB;
             },
           })}
         </EuiCodeBlock>