[Cloud Security] Rules Combo Box filters Custom component #175175

animehart · 2024-01-20T02:21:21Z

Summary

This PR is for updating the current find rule API to allow multi select and search on section and rule numbers
it also add a custom component for the section and rule number filter
also some small UI fixes

animehart · 2024-01-20T02:26:16Z

/ci

animehart · 2024-01-22T00:24:11Z

/ci

elasticmachine · 2024-01-22T17:55:43Z

Pinging @elastic/kibana-cloud-security-posture (Team:Cloud Security)

animehart · 2024-01-22T18:48:45Z

/ci

JordanSh · 2024-01-23T11:25:31Z

x-pack/plugins/cloud_security_posture/common/types/rules/v5.ts

+  BulkActionBenchmarkRulesResponse,
+} from './v4';
+
+const DEFAULT_BENCHMARK_RULES_PER_PAGE = 25;


I'm not sure why this or any other instances of this value are kept here and are basically versioned. i dont see a reason

JordanSh · 2024-01-23T11:25:54Z

x-pack/plugins/cloud_security_posture/common/types/rules/v5.ts

+export type FindCspBenchmarkRuleRequest = TypeOf<typeof findCspBenchmarkRuleRequestSchema>;
+
+export interface BenchmarkRuleSelectParams {
+  section?: string[];
+  ruleNumber?: string[];
+}


types at the top

not sure if I understand this comment ?

JordanSh · 2024-01-23T11:26:09Z

x-pack/plugins/cloud_security_posture/common/types/rules/v5.ts

+
+const DEFAULT_BENCHMARK_RULES_PER_PAGE = 25;
+
+export const findCspBenchmarkRuleRequestSchema = schema.object({


can you highlight what is new here that requires a new version?

just ruleNumber and section, previously its only string because we can only filter using 1 rule number and 1 cis section. now its an array because can filter using multiple rule number and cis section

JordanSh · 2024-01-23T11:33:03Z

x-pack/plugins/cloud_security_posture/common/utils/helpers.ts

@@ -218,3 +218,29 @@ export const getBenchmarkFilterQuery = (
    : '';
  return baseQuery + sectionQuery + ruleNumberQuery;
 };
+
+export const getBenchmarkFilterQueryV2 = (


looks like we get the same params and return a string, why do we need a new version?

previously we only accept string for the rule number and section filter, but now since we add ability to filter based on multiple rule number and/or section we use array instead of string

JordanSh · 2024-01-23T11:34:18Z

x-pack/plugins/cloud_security_posture/public/common/component/multi_select_filter.tsx

+  selectedOptionKeys?: string[];
+  transparentBackground?: boolean;
+}
+export const MultiSelectFilter = <T extends string, K extends string = string>({


please add a comment with a link to the original code so we can reference to it in the future if we need to

JordanSh · 2024-01-23T11:36:24Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table.tsx

@@ -190,7 +190,7 @@ const getColumns = ({
        }}
      />
    ),
-    width: '30px',
+    width: '3%',


percentage are subject to change, on my ultrawide monitor it would be too much. any reason not to use pixels here?

ah kk, no reason regarding the not using pixels, I just thought to keep it consistent with all the other rows (all other rows are using percentage)

JordanSh · 2024-01-23T11:37:25Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table.tsx

@@ -255,13 +255,13 @@ const getColumns = ({
    name: i18n.translate('xpack.csp.rules.rulesTable.mutedColumnLabel', {
      defaultMessage: 'Enabled',
    }),
-    width: '10%',
+    width: '5%',


same here, both of there columns present a UI component with a set width. a switch and a checkbox, they can both use pixels

JordanSh · 2024-01-23T11:37:40Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table.tsx

    truncateText: true,
    render: (name, rule: CspBenchmarkRulesWithStates) => {
      const rulesObjectRequest = {
        benchmark_id: rule?.metadata.benchmark.id,
        benchmark_version: rule?.metadata.benchmark.version,
-        /* Since Packages are automatically upgraded, we can be sure that rule_number will Always exist */
+        /* Rule number always exists* from 8.7 */


Suggested change

/* Rule number always exists* from 8.7 */

/* Rule number always exists from 8.7 */

JordanSh · 2024-01-23T11:38:34Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx

-              onChange={(option) => {
-                setSelectedSection(option);
-                onSectionChange(option.length ? option[0].label : undefined);
+              id={'section'}


maybe something like cis-section-multi-select-filter

JordanSh · 2024-01-23T11:39:30Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx

-              onChange={(option) => {
-                setSelectedRuleNumber(option);
-                onRuleNumberChange(option.length ? option[0].label : undefined);
+              id={'rule-number'}


maybe something like rule-number-multi-select-filter

JordanSh · 2024-01-24T10:13:01Z

sorting is broken here

JordanSh · 2024-01-24T10:15:08Z

This might be unrelated to your pr but it seems like we dont have 1.1.9 and 1.1.10, there is a jump from 1.1.8 to 1.1.11. can you confirm this has nothing to do with maybe some filters or something like that in our code?

JordanSh · 2024-01-24T11:36:20Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table.tsx

@@ -190,7 +193,7 @@ const getColumns = ({
        }}
      />
    ),
-    width: '3%',
+    width: '40px',


40px seems too much for a 16x16 checkbox, can you add a screen shot?

I have updated the screenshot 👍

JordanSh · 2024-01-24T11:37:40Z

x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table.tsx

+              css={css`
+                padding-left: 18px;
+              `}


why? can you add a screenshot? i think making the column the same width as the widget will be better

CohenIdo · 2024-01-24T12:27:20Z

x-pack/plugins/cloud_security_posture/common/utils/helpers.ts

@@ -218,3 +218,29 @@ export const getBenchmarkFilterQuery = (
    : '';
  return baseQuery + sectionQuery + ruleNumberQuery;
 };
+
+export const getBenchmarkFilterQueryV2 = (
+  id: BenchmarkId,


Suggested change

id: BenchmarkId,

benchmarkId: BenchmarkId,

CohenIdo · 2024-01-24T12:28:47Z

x-pack/plugins/cloud_security_posture/common/utils/helpers.ts

+
+export const getBenchmarkFilterQueryV2 = (
+  id: BenchmarkId,
+  version?: string,


Suggested change

version?: string,

benchmarkVersion?: string,

CohenIdo · 2024-01-24T12:52:19Z

x-pack/plugins/cloud_security_posture/common/types/rules/v4.ts

-  section: schema.maybe(schema.string()),
-  ruleNumber: schema.maybe(schema.string()),
+  section: schema.maybe(schema.arrayOf(schema.string())),
+  ruleNumber: schema.maybe(schema.arrayOf(schema.string())),


What is the reason to modify the pervious version?

oh good catch this wasnt supposed to be modified

CohenIdo · 2024-01-24T13:00:49Z

x-pack/plugins/cloud_security_posture/server/routes/benchmark_rules/find/v2.ts

  FindCspBenchmarkRuleResponse,
 } from '../../../../common/types/latest';
+import type { FindCspBenchmarkRuleRequest } from '../../../../common/types/rules/v4';


CspBenchmarkRule and FindCspBenchmarkRuleResponse also should be imported from v4.

CohenIdo

LGTM

kibana-ci · 2024-01-24T16:59:59Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: 28fa96d

Failed CI Steps

Test Failures

[job] [logs] FTR Configs #93 / Observability Rules Rules Endpoints Custom Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED Rule creation should set correct information in the alert document
[job] [logs] FTR Configs #66 / security APIs - Audit Log Audit Log logs audit events when reading and writing saved objects

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`cloudSecurityPosture`	395	397	+2

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`cloudSecurityPosture`	386.8KB	390.7KB	+3.9KB

History

💔 Build #188961 failed 5aaeffe
💛 Build #188651 was flaky 7563a50
💛 Build #188596 was flaky fad1882
💚 Build #188370 succeeded f0aab5c
💚 Build #188341 succeeded 11a0180

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* main: (520 commits) Update Kibana code editor dependencies (#171720) [SLOs] Hide view in app in slo alerts table in slo details page (#175441) [api-docs] 2024-01-25 Daily api_docs build (#175502) [DOCS] Add buildkite links to doc preview comments (#175463) skip flaky suite (#175443) [Security Solution][Timeline] refactor timeline modal save timeline button (#175343) [RAM] Stack Management::Rules loses user selections when navigating back (#174954) [Security Solution][Timeline] refactor timeline modal attach to case button (#175163) Upgrade EUI to v92.1.1 (#174955) [Fleet]: Beta label is shown inconsistently while selecting proxy under Fleet settings. (#170634) [Cloud Security] Rules Combo Box filters Custom component (#175175) skip flaky suite (#175407) [Security Solution][Timeline] refactor timeline modal open timeline button (#175335) [Embedded Console] Introduce kbnSolutionNavOffset CSS variable (#175348) [Console] disable access to embedded console without dev tools capability (#175321) fix(x-pack/reporting): use FIPS-compliant ID generator `uuidv4` in Reporting plugin (#174809) [Security Solution] Data quality dashboard persistence (#173185) [RAM][Observability] Add alert fields table to Observability flyout (#174685) test: add missing await for connector table disappearance (#175430) [RAM][Maintenance Window] Fix maintenance window FE types and transforms (#173888) ...

…5175) ## Summary This PR is for updating the current find rule API to allow multi select and search on section and rule numbers it also add a custom component for the section and rule number filter also some small UI fixes <img width="1486" alt="Screenshot 2024-01-24 at 4 22 35 AM" src="https://github.com/elastic/kibana/assets/8703149/c78987a0-b4a8-4dcc-b1fb-71ade0853340">

animehart added 3 commits January 18, 2024 17:02

Rules API update -still dirty

03fdd91

api updates, added helper test

4a03581

added custom component for Section and Rule number filter as well as FTR

11a0180

animehart linked an issue Jan 20, 2024 that may be closed by this pull request

[Cloud Security] Rules Combo Box filters - Phase I #171220

Closed

animehart added 4 commits January 21, 2024 13:36

FTR fix

e220abc

ftr fix

4a144ef

ftr fix again

390dfe9

clean up + attempt to check ftr issue

f0aab5c

update ftr

fad1882

animehart marked this pull request as ready for review January 22, 2024 17:13

animehart requested a review from a team as a code owner January 22, 2024 17:13

animehart added v8.13.0 Team:Cloud Security Cloud Security team related labels Jan 22, 2024

animehart added the release_note:skip Skip the PR/issue when compiling release notes label Jan 22, 2024

update comment

7563a50

JordanSh reviewed Jan 23, 2024

View reviewed changes

animehart added 3 commits January 24, 2024 02:56

pr comments

05284d1

Merge branch 'main' into new-section-ruleNumber-component

f704d7b

pr comments

a41599d

JordanSh reviewed Jan 24, 2024

View reviewed changes

ui update

5aaeffe

animehart requested a review from JordanSh January 24, 2024 13:07

CohenIdo requested changes Jan 24, 2024

View reviewed changes

JordanSh approved these changes Jan 24, 2024

View reviewed changes

pr comments and ftr fix

28fa96d

animehart requested a review from CohenIdo January 24, 2024 15:50

CohenIdo approved these changes Jan 24, 2024

View reviewed changes

animehart merged commit 765cf24 into elastic:main Jan 24, 2024
20 checks passed

kibanamachine added the backport:skip This commit does not require backporting label Jan 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cloud Security] Rules Combo Box filters Custom component #175175

[Cloud Security] Rules Combo Box filters Custom component #175175

animehart commented Jan 20, 2024 •

edited

Loading

animehart commented Jan 20, 2024

animehart commented Jan 22, 2024

elasticmachine commented Jan 22, 2024

animehart commented Jan 22, 2024

JordanSh Jan 23, 2024

JordanSh Jan 23, 2024

animehart Jan 23, 2024

JordanSh Jan 23, 2024

animehart Jan 23, 2024 •

edited

Loading

JordanSh Jan 23, 2024

animehart Jan 23, 2024 •

edited

Loading

JordanSh Jan 23, 2024

JordanSh Jan 23, 2024

animehart Jan 23, 2024

JordanSh Jan 23, 2024

JordanSh Jan 23, 2024

JordanSh Jan 23, 2024

JordanSh Jan 23, 2024

JordanSh commented Jan 24, 2024

JordanSh commented Jan 24, 2024

JordanSh Jan 24, 2024

animehart Jan 24, 2024

JordanSh Jan 24, 2024

CohenIdo Jan 24, 2024

CohenIdo Jan 24, 2024

CohenIdo Jan 24, 2024

animehart Jan 24, 2024

CohenIdo Jan 24, 2024

CohenIdo left a comment

kibana-ci commented Jan 24, 2024


		const DEFAULT_BENCHMARK_RULES_PER_PAGE = 25;

		export const findCspBenchmarkRuleRequestSchema = schema.object({

	/* Rule number always exists* from 8.7 */
	/* Rule number always exists from 8.7 */

[Cloud Security] Rules Combo Box filters Custom component #175175

[Cloud Security] Rules Combo Box filters Custom component #175175

Conversation

animehart commented Jan 20, 2024 • edited Loading

Summary

animehart commented Jan 20, 2024

animehart commented Jan 22, 2024

elasticmachine commented Jan 22, 2024

animehart commented Jan 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

animehart Jan 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

animehart Jan 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JordanSh commented Jan 24, 2024

JordanSh commented Jan 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CohenIdo left a comment

Choose a reason for hiding this comment

kibana-ci commented Jan 24, 2024

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

Metrics [docs]

Module Count

Async chunks

History

animehart commented Jan 20, 2024 •

edited

Loading

animehart Jan 23, 2024 •

edited

Loading

animehart Jan 23, 2024 •

edited

Loading