Skip to content

Implemented trusted app name truncation. #79976

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 1 commit into from
Oct 8, 2020
Merged

Implemented trusted app name truncation. #79976

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
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const GetTrustedAppsRequestSchema = {

export const PostTrustedAppCreateRequestSchema = {
body: schema.object({
name: schema.string({ minLength: 1 }),
name: schema.string({ minLength: 1, maxLength: 256 }),
Copy link
Contributor

@kevinlog kevinlog Oct 8, 2020

Choose a reason for hiding this comment

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

after some more thought, we could actually make this even shorter since it's just a name, however I don't think it will be likely that users actually create long trusted names.

I can also see from your screenshots that the table still truncates on a single line which is most important in regards to the look of the the feature, so I'm good with this as is.

description: schema.maybe(schema.string({ minLength: 0, maxLength: 256, defaultValue: '' })),
os: schema.oneOf([schema.literal('linux'), schema.literal('macos'), schema.literal('windows')]),
entries: schema.arrayOf(
Expand Down
29 changes: 20 additions & 9 deletions x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,39 @@ import { TrustedAppsListResourceStateChanged } from '../store/action';

const OS_LIST: Array<TrustedApp['os']> = ['windows', 'macos', 'linux'];

export const createSampleTrustedApp = (i: number): TrustedApp => {
const generate = <T>(count: number, generator: (i: number) => T) =>
[...new Array(count).keys()].map(generator);

export const createSampleTrustedApp = (i: number, longTexts?: boolean): TrustedApp => {
return {
id: String(i),
name: `trusted app ${i}`,
description: `Trusted App ${i}`,
name: generate(longTexts ? 10 : 1, () => `trusted app ${i}`).join(' '),
description: generate(longTexts ? 10 : 1, () => `Trusted App ${i}`).join(' '),
created_at: '1 minute ago',
created_by: 'someone',
os: OS_LIST[i % 3],
entries: [],
};
};

export const createSampleTrustedApps = (pagination: Partial<Pagination>): TrustedApp[] => {
export const createSampleTrustedApps = (
pagination: Partial<Pagination>,
longTexts?: boolean
): TrustedApp[] => {
const fullPagination = { ...createDefaultPagination(), ...pagination };

return [...new Array(fullPagination.pageSize).keys()].map(createSampleTrustedApp);
return generate(fullPagination.pageSize, (i: number) => createSampleTrustedApp(i, longTexts));
};

export const createTrustedAppsListData = (pagination: Partial<Pagination>, timestamp: number) => {
export const createTrustedAppsListData = (
pagination: Partial<Pagination>,
timestamp: number,
longTexts?: boolean
) => {
const fullPagination = { ...createDefaultPagination(), ...pagination };

return {
items: createSampleTrustedApps(fullPagination),
items: createSampleTrustedApps(fullPagination, longTexts),
pageSize: fullPagination.pageSize,
pageIndex: fullPagination.pageIndex,
totalItemsCount: fullPagination.totalItemCount,
Expand All @@ -75,10 +85,11 @@ export const createUninitialisedResourceState = (): UninitialisedResourceState =

export const createListLoadedResourceState = (
pagination: Partial<Pagination>,
timestamp: number
timestamp: number,
longTexts?: boolean
): LoadedResourceState<TrustedAppsListData> => ({
type: 'LoadedResourceState',
data: createTrustedAppsListData(pagination, timestamp),
data: createTrustedAppsListData(pagination, timestamp, longTexts),
});

export const createListFailedResourceState = (
Expand Down
1 change: 1 addition & 0 deletions ...solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
onBlur={handleDomBlurEvents}
fullWidth
required
maxLength={256}
data-test-subj={getTestId('nameTextField')}
/>
</EuiFormRow>
Expand Down
10 changes: 6 additions & 4 deletions ...ent/pages/trusted_apps/view/components/trusted_app_card/__snapshots__/index.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions ...n/public/management/pages/trusted_apps/view/components/trusted_app_card/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,10 @@ storiesOf('TrustedApps/TrustedAppCard', module)

return <TrustedAppCard trustedApp={trustedApp} onDelete={action('onClick')} />;
})
.add('trim description', () => {
const trustedApp: TrustedApp = createSampleTrustedApp(5);
.add('longs texts', () => {
const trustedApp: TrustedApp = createSampleTrustedApp(5, true);
trustedApp.created_at = '2020-09-17T14:52:33.899Z';
trustedApp.entries = [PATH_CONDITION, SIGNER_CONDITION];
trustedApp.description = [...new Array(40).keys()].map((index) => `item${index}`).join(' ');

return <TrustedAppCard trustedApp={trustedApp} onDelete={action('onClick')} />;
});
10 changes: 4 additions & 6 deletions ...tion/public/management/pages/trusted_apps/view/components/trusted_app_card/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ describe('trusted_app_card', () => {
expect(element).toMatchSnapshot();
});

it('should trim long descriptions', () => {
const trustedApp = {
...createSampleTrustedApp(4),
description: [...new Array(40).keys()].map((index) => `item${index}`).join(' '),
};
const element = shallow(<TrustedAppCard trustedApp={trustedApp} onDelete={() => {}} />);
it('should trim long texts', () => {
const element = shallow(
<TrustedAppCard trustedApp={createSampleTrustedApp(4, true)} onDelete={() => {}} />
);

expect(element).toMatchSnapshot();
});
Expand Down
6 changes: 5 additions & 1 deletion ..._solution/public/management/pages/trusted_apps/view/components/trusted_app_card/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ export const TrustedAppCard = memo(({ trustedApp, onDelete }: TrustedAppCardProp

return (
<ItemDetailsCard>
<ItemDetailsPropertySummary name={PROPERTY_TITLES.name} value={trustedApp.name} />
<ItemDetailsPropertySummary
name={PROPERTY_TITLES.name}
value={useMemo(() => trimTextOverflow(trustedApp.name || '', 100), [trustedApp.name])}
title={trustedApp.name}
/>
<ItemDetailsPropertySummary name={PROPERTY_TITLES.os} value={OS_TITLES[trustedApp.os]} />
<ItemDetailsPropertySummary
name={PROPERTY_TITLES.created_at}
Expand Down
Loading