Skip to content

[Ingest] Fix order of key in the agent config YAML view #63488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2020
Merged

[Ingest] Fix order of key in the agent config YAML view #63488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c253c5
[Ingest] Fix agent config key sorting
nchaulet Apr 14, 2020
e85e43d
Merge branch 'master' into fleet-fix-config-yaml-key-sorting
elasticmachine Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions .../applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -47,7 +55,17 @@ export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
<EuiCodeBlock language="yaml" isCopyable>
Copy link
Contributor

@jen-huang jen-huang Apr 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be done in a separate PR but it would be nice to have overflowHeight prop set, currently the page scrolls very long depending on the config

{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>
Expand Down