Skip to content

Commit

Permalink
[Ingest] Return associated policy IDs in data source info (elastic#53350
Browse files Browse the repository at this point in the history 
)

* Return number of policies from data source, surface in assign data source UI

* Update snapshots
  • Loading branch information
@jen-huang @brianseeders
jen-huang authored and brianseeders committed Jan 2, 2020
1 parent 8474491 commit fedfaa9
Show file tree
Hide file tree
Showing 6 changed files with 231 additions and 142 deletions.
14 changes: 14 additions & 0 deletions x-pack/legacy/plugins/fleet/public/pages/policy_details/components/assign_datasources.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ export const AssignDatasourcesFlyout: React.FC<Props> = ({
<EuiFlyoutBody>
<DatasourcesTable
datasources={datasources}
withPoliciesCount={true}
loading={isDatasourcesLoading}
message={getTableMessage()}
search={{
Expand All @@ -184,6 +185,19 @@ export const AssignDatasourcesFlyout: React.FC<Props> = ({
incremental: true,
schema: true,
},
filters: [
{
type: 'field_value_toggle',
field: 'policies',
value: 0,
name: (
<FormattedMessage
id="xpack.fleet.assignDatasources.unassignedFilterButtonLabel"
defaultMessage="Unassigned"
/>
),
},
],
}}
selection={{
onSelectionChange: (selection: Datasource[]) =>
Expand Down
151 changes: 85 additions & 66 deletions x-pack/legacy/plugins/fleet/public/pages/policy_details/components/datasources_table.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiInMemoryTable, EuiInMemoryTableProps, EuiLink } from '@elastic/eui';
import { EuiInMemoryTable, EuiInMemoryTableProps, EuiLink, EuiBadge } from '@elastic/eui';
import { Datasource } from '../../../../common/types/domain_data';
import { useLibs } from '../../../hooks';

interface Props extends EuiInMemoryTableProps {
datasources?: Datasource[];
datasources?: Array<Datasource & { policies?: string[] }>;
withPoliciesCount?: boolean;
}

export const DatasourcesTable: React.FC<Props> = ({
datasources: originalDatasources,
...rest
}) => {
export const DatasourcesTable: React.FC<Props> = (
{ datasources: originalDatasources, withPoliciesCount, ...rest } = {
datasources: [],
withPoliciesCount: false,
}
) => {
const { framework } = useLibs();

// Flatten some values so that they can be searched via in-memory table search
Expand All @@ -32,6 +35,7 @@ export const DatasourcesTable: React.FC<Props> = ({
version: packageVersion,
description: packageDescription,
},
policies,
}) => ({
id,
name,
Expand All @@ -40,73 +44,88 @@ export const DatasourcesTable: React.FC<Props> = ({
packageTitle,
packageVersion,
packageDescription,
policies: policies?.length || 0,
})
);

const columns: EuiInMemoryTableProps['columns'] = [
{
field: 'name',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.nameColumnTitle', {
defaultMessage: 'Name',
}),
},
{
field: 'packageTitle',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.packageNameColumnTitle', {
defaultMessage: 'Package',
}),
},
{
field: 'packageVersion',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.packageVersionColumnTitle', {
defaultMessage: 'Version',
}),
},
{
field: 'streams',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.streamsCountColumnTitle', {
defaultMessage: 'Streams',
}),
},
{
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
{
render: ({ packageName, packageVersion }: any) => {
return (
<EuiLink
color="primary"
external
target="_blank"
href={`${window.location.origin}${framework.info.basePath}/app/epm#/detail/${packageName}-${packageVersion}`}
>
<FormattedMessage
id="xpack.fleet.policyDetails.datasourcesTable.viewActionLinkText"
defaultMessage="view"
/>
</EuiLink>
);
},
},
],
width: '100px',
},
];

if (withPoliciesCount) {
columns.splice(columns.length - 1, 0, {
field: 'policies',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.policiesColumnTitle', {
defaultMessage: 'Policies',
}),
render: (policies: number) => {
return policies === 0 ? (
<EuiBadge>
<FormattedMessage
id="xpack.fleet.policyDetails.datasourcesTable.unassignedLabelText"
defaultMessage="Unassigned"
/>
</EuiBadge>
) : (
policies
);
},
});
}

return (
<EuiInMemoryTable
itemId="id"
items={datasources}
columns={[
{
field: 'name',
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.ameColumnTitle', {
defaultMessage: 'Name',
}),
},
{
field: 'packageTitle',
name: i18n.translate(
'xpack.fleet.policyDetails.datasourcesTable.packageNameColumnTitle',
{
defaultMessage: 'Package',
}
),
},
{
field: 'packageVersion',
name: i18n.translate(
'xpack.fleet.policyDetails.datasourcesTable.packageVersionColumnTitle',
{
defaultMessage: 'Version',
}
),
},
{
field: 'streams',
name: i18n.translate(
'xpack.fleet.policyDetails.datasourcesTable.streamsCountColumnTitle',
{
defaultMessage: 'Streams',
}
),
},
{
name: i18n.translate('xpack.fleet.policyDetails.datasourcesTable.actionsColumnTitle', {
defaultMessage: 'Actions',
}),
actions: [
{
render: ({ packageName, packageVersion }: any) => {
return (
<EuiLink
color="primary"
external
target="_blank"
href={`${window.location.origin}${framework.info.basePath}/app/epm#/detail/${packageName}-${packageVersion}`}
>
<FormattedMessage
id="xpack.fleet.policyDetails.datasourcesTable.viewActionLinkText"
defaultMessage="view"
/>
</EuiLink>
);
},
},
],
width: '100px',
},
]}
columns={columns}
sorting={{
field: 'name',
direction: 'asc',
Expand Down
Loading

0 comments on commit fedfaa9

Please sign in to comment.