Skip to content
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

[7.12] [Fleet] Surface package version used in a package policy in UI (#93712) #93966

Merged
merged 1 commit into from
Mar 8, 2021
+15 −13
Merged

[7.12] [Fleet] Surface package version used in a package policy in UI (#93712) #93966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions ...sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
EuiButton,
EuiFlexGroup,
EuiFlexItem,
EuiText,
} from '@elastic/eui';
import { AgentPolicy, PackagePolicy } from '../../../../../types';
import { PackageIcon, ContextMenuActions } from '../../../../../components';
Expand Down Expand Up @@ -132,6 +133,17 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>{packageTitle}</EuiFlexItem>
{packagePolicy.package && (
<EuiFlexItem grow={false}>
<EuiText color="subdued" size="xs" className="eui-textNoWrap">
<FormattedMessage
id="xpack.fleet.policyDetails.packagePoliciesTable.packageVersion"
defaultMessage="v{version}"
values={{ version: packagePolicy.package.version }}
/>
</EuiText>
</EuiFlexItem>
)}
</EuiFlexGroup>
);
},
Expand Down
14 changes: 3 additions & 11 deletions ...fleet/public/applications/fleet/sections/epm/screens/detail/policies/package_policies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,10 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
},
},
{
field: 'packagePolicy.description',
name: i18n.translate('xpack.fleet.epm.packageDetails.integrationList.description', {
defaultMessage: 'Description',
field: 'packagePolicy.package.version',
name: i18n.translate('xpack.fleet.epm.packageDetails.integrationList.version', {
defaultMessage: 'Version',
}),
truncateText: true,
render(description) {
return (
<span className="eui-textTruncate" title={description}>
{description}
</span>
);
},
},
{
field: 'packagePolicy.policy_id',
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8678,7 +8678,6 @@
"xpack.fleet.epm.loadingIntegrationErrorTitle": "統合詳細の読み込みエラー",
"xpack.fleet.epm.packageDetails.integrationList.agentCount": "エージェント",
"xpack.fleet.epm.packageDetails.integrationList.agentPolicy": "エージェントポリシー",
"xpack.fleet.epm.packageDetails.integrationList.description": "説明",
"xpack.fleet.epm.packageDetails.integrationList.loadingPoliciesMessage": "統合ポリシーを読み込んでいます...",
"xpack.fleet.epm.packageDetails.integrationList.name": "統合",
"xpack.fleet.epm.packageDetails.integrationList.updatedAt": "最終更新",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8760,7 +8760,6 @@
"xpack.fleet.epm.loadingIntegrationErrorTitle": "加载集成详情时出错",
"xpack.fleet.epm.packageDetails.integrationList.agentCount": "代理",
"xpack.fleet.epm.packageDetails.integrationList.agentPolicy": "代理策略",
"xpack.fleet.epm.packageDetails.integrationList.description": "描述",
"xpack.fleet.epm.packageDetails.integrationList.loadingPoliciesMessage": "正在加载集成策略……",
"xpack.fleet.epm.packageDetails.integrationList.name": "集成",
"xpack.fleet.epm.packageDetails.integrationList.updatedAt": "上次更新时间",
Expand Down