Skip to content

Commit

Permalink
[8.x] [Security Solution][Notes] - fix an issue that breaks the notes…
Browse files Browse the repository at this point in the history
… management page, an enum value was missing from the api (#196912) (#196936)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Security Solution][Notes] - fix an issue that breaks the notes
management page, an enum value was missing from the api
(#196912)](#196912)

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

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

<!--BACKPORT [{"author":{"name":"Philippe
Oberti","email":"philippe.oberti@elastic.co"},"sourceCommit":{"committedDate":"2024-10-18T18:09:02Z","message":"[Security
Solution][Notes] - fix an issue that breaks the notes management page,
an enum value was missing from the api (#196912)\n\n##
Summary\r\n\r\n_**Notes: please ignore the spaces introduced in the
first commit,\r\nWebstorm is trying to be smart... CI should take care
of fixing that in\r\na second commit shortly**_\r\n\r\nThis PR fixes a
small issue that prevents the notes management page to\r\nload. The
issue comes from the fact that one of the enum values passed\r\nto
filter notes was missing from the open api spec. This issue
was\r\nintroduced in this
recent\r\n[PR](https://github.com/elastic/kibana/pull/195501).\r\n\r\nCurrent
notes management borken page\r\n![Screenshot 2024-10-18 at 10
30\r\n13 AM](https://github.com/user-attachments/assets/4926a62f-1ebf-4698-8a13-bf761d77f4ba)\r\n\r\nThis
is the error in the network tab\r\n![Screenshot 2024-10-18 at 10
30\r\n29 AM](https://github.com/user-attachments/assets/90b56246-c116-4050-bcfa-2c6668274e74)\r\n\r\nThis
PR fixes the issue\r\n![Screenshot 2024-10-18 at 10
27\r\n01 AM](https://github.com/user-attachments/assets/7d3338ce-ad73-4be5-b94c-15bcf0234680)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"bf7c5aaf29e475979023a607a4f318b5f005d0d8","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","Team:Threat
Hunting:Investigations","v8.16.0"],"title":"[Security Solution][Notes] -
fix an issue that breaks the notes management page, an enum value was
missing from the
api","number":196912,"url":"https://github.com/elastic/kibana/pull/196912","mergeCommit":{"message":"[Security
Solution][Notes] - fix an issue that breaks the notes management page,
an enum value was missing from the api (#196912)\n\n##
Summary\r\n\r\n_**Notes: please ignore the spaces introduced in the
first commit,\r\nWebstorm is trying to be smart... CI should take care
of fixing that in\r\na second commit shortly**_\r\n\r\nThis PR fixes a
small issue that prevents the notes management page to\r\nload. The
issue comes from the fact that one of the enum values passed\r\nto
filter notes was missing from the open api spec. This issue
was\r\nintroduced in this
recent\r\n[PR](https://github.com/elastic/kibana/pull/195501).\r\n\r\nCurrent
notes management borken page\r\n![Screenshot 2024-10-18 at 10
30\r\n13 AM](https://github.com/user-attachments/assets/4926a62f-1ebf-4698-8a13-bf761d77f4ba)\r\n\r\nThis
is the error in the network tab\r\n![Screenshot 2024-10-18 at 10
30\r\n29 AM](https://github.com/user-attachments/assets/90b56246-c116-4050-bcfa-2c6668274e74)\r\n\r\nThis
PR fixes the issue\r\n![Screenshot 2024-10-18 at 10
27\r\n01 AM](https://github.com/user-attachments/assets/7d3338ce-ad73-4be5-b94c-15bcf0234680)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"bf7c5aaf29e475979023a607a4f318b5f005d0d8"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196912","number":196912,"mergeCommit":{"message":"[Security
Solution][Notes] - fix an issue that breaks the notes management page,
an enum value was missing from the api (#196912)\n\n##
Summary\r\n\r\n_**Notes: please ignore the spaces introduced in the
first commit,\r\nWebstorm is trying to be smart... CI should take care
of fixing that in\r\na second commit shortly**_\r\n\r\nThis PR fixes a
small issue that prevents the notes management page to\r\nload. The
issue comes from the fact that one of the enum values passed\r\nto
filter notes was missing from the open api spec. This issue
was\r\nintroduced in this
recent\r\n[PR](https://github.com/elastic/kibana/pull/195501).\r\n\r\nCurrent
notes management borken page\r\n![Screenshot 2024-10-18 at 10
30\r\n13 AM](https://github.com/user-attachments/assets/4926a62f-1ebf-4698-8a13-bf761d77f4ba)\r\n\r\nThis
is the error in the network tab\r\n![Screenshot 2024-10-18 at 10
30\r\n29 AM](https://github.com/user-attachments/assets/90b56246-c116-4050-bcfa-2c6668274e74)\r\n\r\nThis
PR fixes the issue\r\n![Screenshot 2024-10-18 at 10
27\r\n01 AM](https://github.com/user-attachments/assets/7d3338ce-ad73-4be5-b94c-15bcf0234680)\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"bf7c5aaf29e475979023a607a4f318b5f005d0d8"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Philippe Oberti <philippe.oberti@elastic.co>
  • Loading branch information
kibanamachine and PhilippeOberti authored Oct 18, 2024
1 parent 17ddf8d commit 49ba76b
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions oas_docs/output/kibana.serverless.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31687,6 +31687,7 @@ components:
Security_Timeline_API_AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31687,6 +31687,7 @@ components:
Security_Timeline_API_AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40452,6 +40452,7 @@ components:
Security_Timeline_API_AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40452,6 +40452,7 @@ components:
Security_Timeline_API_AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { Note } from '../model/components.gen';
*/
export type AssociatedFilterType = z.infer<typeof AssociatedFilterType>;
export const AssociatedFilterType = z.enum([
'all',
'document_only',
'saved_object_only',
'document_and_saved_object',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ components:
AssociatedFilterType:
type: string
enum:
- document_only
- saved_object_only
- document_and_saved_object
- orphan
- all
- document_only
- saved_object_only
- document_and_saved_object
- orphan
description: Filter notes based on their association with a document or saved object.
DocumentIds:
oneOf:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,7 @@ components:
AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,7 @@ components:
AssociatedFilterType:
description: Filter notes based on their association with a document or saved object.
enum:
- all
- document_only
- saved_object_only
- document_and_saved_object
Expand Down

0 comments on commit 49ba76b

Please sign in to comment.