github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.18] [Response Ops][Cases] Cases with empty string assignees throwing error (#209973) (#210731)

Browse source 
# Backport

This will backport the following commits from `main` to `8.18`:
- [[Response Ops][Cases] Cases with empty string assignees throwing
error (#209973)](https://github.com/elastic/kibana/pull/209973)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Julian
Gernun","email":"17549662+jcger@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-02-12T06:06:44Z","message":"[Response
Ops][Cases] Cases with empty string assignees throwing error
(#209973)\n\n## Summary\nCloses
https://github.com/elastic/kibana/issues/209950\n\nTesting steps in
referenced issue\n\n## Release note\nFix error message in cases list if
case assignee is an empty
string","sha":"0897d0878622db9d9747e2bc1292d647c09ad996","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","Team:ResponseOps","v9.0.0","Feature:Cases","backport:prev-major","v8.18.0","v8.16.4","v8.17.2","v9.1.0"],"title":"[Response
Ops][Cases] Cases with empty string assignees throwing
error","number":209973,"url":"https://github.com/elastic/kibana/pull/209973","mergeCommit":{"message":"[Response
Ops][Cases] Cases with empty string assignees throwing error
(#209973)\n\n## Summary\nCloses
https://github.com/elastic/kibana/issues/209950\n\nTesting steps in
referenced issue\n\n## Release note\nFix error message in cases list if
case assignee is an empty
string","sha":"0897d0878622db9d9747e2bc1292d647c09ad996"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.16","8.17"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/209973","number":209973,"mergeCommit":{"message":"[Response
Ops][Cases] Cases with empty string assignees throwing error
(#209973)\n\n## Summary\nCloses
https://github.com/elastic/kibana/issues/209950\n\nTesting steps in
referenced issue\n\n## Release note\nFix error message in cases list if
case assignee is an empty
string","sha":"0897d0878622db9d9747e2bc1292d647c09ad996"}}]}]
BACKPORT-->

Co-authored-by: Julian Gernun <17549662+jcger@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2025-02-13 02:59:05 +11:00 • committed by GitHub
parent 78a45a1ae6
commit 1bb33e8405
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 230 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
x-pack/platform/plugins/shared/cases/public/components/all_cases/all_cases_list.test.tsx
View file

@ -90,6 +90,44 @@ const mockKibana = () => {
} as unknown as ReturnType<typeof useKibana>);
};
// eslint-disable-next-line prefer-object-spread
const originalGetComputedStyle = Object.assign({}, window.getComputedStyle);
const restoreGetComputedStyle = () => {
Object.defineProperty(window, 'getComputedStyle', originalGetComputedStyle);
};
const patchGetComputedStyle = () => {
// The JSDOM implementation is too slow
// Especially for dropdowns that try to position themselves
// perf issue - https://github.com/jsdom/jsdom/issues/3234
Object.defineProperty(window, 'getComputedStyle', {
value: (el: HTMLElement) => {
/**
* This is based on the jsdom implementation of getComputedStyle
* https://github.com/jsdom/jsdom/blob/9dae17bf0ad09042cfccd82e6a9d06d3a615d9f4/lib/jsdom/browser/Window.js#L779-L820
*
* It is missing global style parsing and will only return styles applied directly to an element.
* Will not return styles that are global or from emotion
*/
const declaration = new CSSStyleDeclaration();
const { style } = el;
Array.prototype.forEach.call(style, (property: string) => {
declaration.setProperty(
property,
style.getPropertyValue(property),
style.getPropertyPriority(property)
);
});
return declaration;
},
configurable: true,
writable: true,
});
};
// FLAKY: https://github.com/elastic/kibana/issues/192739
describe.skip('AllCasesListGeneric', () => {
const onRowClick = jest.fn();
@ -113,48 +151,18 @@ describe.skip('AllCasesListGeneric', () => {
};
const removeMsFromDate = (value: string) => moment(value).format('YYYY-MM-DDTHH:mm:ss[Z]');
// eslint-disable-next-line prefer-object-spread
const originalGetComputedStyle = Object.assign({}, window.getComputedStyle);
let appMockRenderer: AppMockRenderer;
beforeAll(() => {
// The JSDOM implementation is too slow
// Especially for dropdowns that try to position themselves
// perf issue - https://github.com/jsdom/jsdom/issues/3234
Object.defineProperty(window, 'getComputedStyle', {
value: (el: HTMLElement) => {
/**
* This is based on the jsdom implementation of getComputedStyle
* https://github.com/jsdom/jsdom/blob/9dae17bf0ad09042cfccd82e6a9d06d3a615d9f4/lib/jsdom/browser/Window.js#L779-L820
*
* It is missing global style parsing and will only return styles applied directly to an element.
* Will not return styles that are global or from emotion
*/
const declaration = new CSSStyleDeclaration();
const { style } = el;
Array.prototype.forEach.call(style, (property: string) => {
declaration.setProperty(
property,
style.getPropertyValue(property),
style.getPropertyPriority(property)
);
});
return declaration;
},
configurable: true,
writable: true,
});
patchGetComputedStyle();
mockKibana();
const actionTypeRegistry = useKibanaMock().services.triggersActionsUi.actionTypeRegistry;
registerConnectorsToMockActionRegistry(actionTypeRegistry, connectorsMock);
});
afterAll(() => {
Object.defineProperty(window, 'getComputedStyle', originalGetComputedStyle);
restoreGetComputedStyle();
});
beforeEach(() => {

9
x-pack/platform/plugins/shared/cases/public/containers/user_profiles/api.test.ts
View file

@ -66,6 +66,15 @@ describe('User profiles API', () => {
expect(res).toEqual(userProfiles);
});
it('should filter out empty user profiles', async () => {
const res = await bulkGetUserProfiles({
security,
uids: [...userProfilesIds, ''],
});
expect(res).toEqual(userProfiles);
});
it('calls bulkGet correctly', async () => {
await bulkGetUserProfiles({
security,

6
x-pack/platform/plugins/shared/cases/public/containers/user_profiles/api.ts
View file

@ -8,6 +8,7 @@
import type { HttpStart } from '@kbn/core/public';
import type { UserProfile } from '@kbn/security-plugin/common';
import type { SecurityPluginStart } from '@kbn/security-plugin/public';
import { isEmpty } from 'lodash';
import { INTERNAL_SUGGEST_USER_PROFILES_URL, DEFAULT_USER_SIZE } from '../../../common/constants';
export interface SuggestUserProfilesArgs {
@ -42,11 +43,12 @@ export const bulkGetUserProfiles = async ({
security,
uids,
}: BulkGetUserProfilesArgs): Promise<UserProfile[]> => {
if (uids.length === 0) {
const cleanUids: string[] = uids.filter((uid) => !isEmpty(uid));
if (cleanUids.length === 0) {
return [];
}
return security.userProfiles.bulkGet({ uids: new Set(uids), dataPath: 'avatar' });
return security.userProfiles.bulkGet({ uids: new Set(cleanUids), dataPath: 'avatar' });
};
export interface GetCurrentUserProfileArgs {

23
x-pack/platform/plugins/shared/cases/server/client/cases/bulk_update.test.ts
View file

@ -399,6 +399,29 @@ describe('update', () => {
Operations.updateCase,
]);
});
it('should filter out empty user profiles', async () => {
const casesWithEmptyAssignee = {
cases: [
{
...cases.cases[0],
assignees: [{ uid: '' }, { uid: '2' }],
},
],
};
await bulkUpdate(casesWithEmptyAssignee, clientArgs, casesClientMock);
expect(clientArgs.services.caseService.patchCases).toHaveBeenCalledWith(
expect.objectContaining({
cases: expect.arrayContaining([
expect.objectContaining({
updatedAttributes: expect.objectContaining({
assignees: [{ uid: '2' }],
}),
}),
]),
})
);
});
});
describe('Category', () => {

4
x-pack/platform/plugins/shared/cases/server/client/cases/bulk_update.ts
View file

@ -61,6 +61,7 @@ import type {
import { CasesPatchRequestRt } from '../../../common/types/api';
import { CasesRt, CaseStatuses, AttachmentType } from '../../../common/types/domain';
import { validateCustomFields } from './validators';
import { emptyCasesAssigneesSanitizer } from './sanitizers';
/**
* Throws an error if any of the requests attempt to update the owner of a case.
@ -384,7 +385,8 @@ export const bulkUpdate = async (
} = clientArgs;
try {
const query = decodeWithExcessOrThrow(CasesPatchRequestRt)(cases);
const rawQuery = decodeWithExcessOrThrow(CasesPatchRequestRt)(cases);
const query = emptyCasesAssigneesSanitizer(rawQuery);
const caseIds = query.cases.map((q) => q.id);
const myCases = await caseService.getCases({
caseIds,

16
x-pack/platform/plugins/shared/cases/server/client/cases/create.test.ts
View file

@ -161,6 +161,22 @@ describe('create', () => {
})
);
});
it('should filter out empty assignees', async () => {
await create(
{ ...theCase, assignees: [{ uid: '' }, { uid: '1' }] },
clientArgs,
casesClientMock
);
expect(clientArgs.services.caseService.createCase).toHaveBeenCalledWith(
expect.objectContaining({
attributes: expect.objectContaining({
assignees: [{ uid: '1' }],
}),
})
);
});
});
describe('Attributes', () => {

4
x-pack/platform/plugins/shared/cases/server/client/cases/create.ts
View file

@ -21,6 +21,7 @@ import type { CasePostRequest } from '../../../common/types/api';
import { CasePostRequestRt } from '../../../common/types/api';
import {} from '../utils';
import { validateCustomFields } from './validators';
import { emptyCaseAssigneesSanitizer } from './sanitizers';
import { normalizeCreateCaseRequest } from './utils';
/**
@ -40,7 +41,8 @@ export const create = async (
} = clientArgs;
try {
const query = decodeWithExcessOrThrow(CasePostRequestRt)(data);
const rawQuery = decodeWithExcessOrThrow(CasePostRequestRt)(data);
const query = emptyCaseAssigneesSanitizer(rawQuery);
const configurations = await casesClient.configure.get({ owner: data.owner });
const customFieldsConfiguration = configurations[0]?.customFields;

34
x-pack/platform/plugins/shared/cases/server/client/cases/sanitizers.ts Normal file
View file

@ -0,0 +1,34 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { isEmpty } from 'lodash';
import type { CaseUserProfile } from '../../../common/types/domain/user/v1';
export const emptyCaseAssigneesSanitizer = <T extends { assignees?: CaseUserProfile[] }>(
theCase: T
): T => {
if (isEmpty(theCase.assignees)) {
return theCase;
}
return {
...theCase,
assignees: theCase.assignees?.filter(({ uid }) => !isEmpty(uid)),
};
};
export const emptyCasesAssigneesSanitizer = <T extends { assignees?: CaseUserProfile[] }>({
cases,
}: {
cases: T[];
}): { cases: T[] } => {
return {
cases: cases.map((theCase) => {
return emptyCaseAssigneesSanitizer(theCase);
}),
};
};

54
x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/patch_case.ts Normal file
View file

@ -0,0 +1,54 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import expect from '@kbn/expect';
import { postCaseReq, postCaseResp } from '../../../../common/lib/mock';
import {
deleteAllCaseItems,
createCase,
removeServerGeneratedPropertiesFromCase,
updateCase,
} from '../../../../common/lib/api';
import { FtrProviderContext } from '../../../../common/ftr_provider_context';
export const defaultUser = { email: null, full_name: null, username: 'elastic' };
// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext): void => {
const supertest = getService('supertest');
const es = getService('es');
describe('patch_case', () => {
afterEach(async () => {
await deleteAllCaseItems(es);
});
it('should filter out empty assignee.uid values', async () => {
const randomUid = '7f3e9d2a-1b8c-4c5f-9e6d-8f2a4b1d3c7e';
const postedCase = await createCase(supertest, postCaseReq);
const patchedCases = await updateCase({
supertest,
params: {
cases: [
{
id: postedCase.id,
version: postedCase.version,
assignees: [{ uid: '' }, { uid: randomUid }],
},
],
},
});
const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
expect(data).to.eql({
...postCaseResp(),
assignees: [{ uid: randomUid }],
updated_by: defaultUser,
});
});
});
};

42
x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/post_case.ts Normal file
View file

@ -0,0 +1,42 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import expect from '@kbn/expect';
import { getPostCaseRequest } from '../../../../common/lib/mock';
import {
deleteAllCaseItems,
createCase,
removeServerGeneratedPropertiesFromCase,
} from '../../../../common/lib/api';
import { FtrProviderContext } from '../../../../common/ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default ({ getService }: FtrProviderContext): void => {
const supertest = getService('supertest');
const es = getService('es');
describe('post_case', () => {
afterEach(async () => {
await deleteAllCaseItems(es);
});
it('should filter out empty assignee.uid values', async () => {
const randomUid = '7f3e9d2a-1b8c-4c5f-9e6d-8f2a4b1d3c7e';
const createdCase = await createCase(
supertest,
getPostCaseRequest({
assignees: [{ uid: '' }, { uid: randomUid }],
})
);
const data = removeServerGeneratedPropertiesFromCase(createdCase);
expect(data.assignees).to.eql([{ uid: randomUid }]);
});
});
};

2
x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
View file

@ -32,6 +32,8 @@ export default ({ loadTestFile, getService }: FtrProviderContext): void => {
loadTestFile(require.resolve('./cases/user_actions/find_user_actions'));
loadTestFile(require.resolve('./cases/assignees'));
loadTestFile(require.resolve('./cases/find_cases'));
loadTestFile(require.resolve('./cases/post_case'));
loadTestFile(require.resolve('./cases/patch_case'));
loadTestFile(require.resolve('./configure'));
loadTestFile(require.resolve('./attachments_framework/registered_persistable_state_trial'));
// sub privileges are only available with a license above basic