Skip to content

Commit

Permalink
Merge branch 'main' into fix/201829
Browse files Browse the repository at this point in the history
  • Loading branch information
@dej611
dej611 authored Nov 29, 2024
2 parents ca08e54 + f336993 commit 750ad19
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 32 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2085,6 +2085,11 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-management

# Security Solution
/x-pack/test/functional/fixtures/kbn_archiver/security_solution/timelines/7.15.0_space @elastic/security-solution # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/tests/timeline_migrations.ts#L58
/x-pack/test/functional/es_archives/packetbeat @elastic/security-solution
/x-pack/test/common/services/ingest_manager.ts @elastic/security-solution # Assigned per blame
/x-pack/test/security_solution_ftr @elastic/security-solution
/x-pack/test/functional/es_archives/security_solution @elastic/security-solution
/x-pack/test/functional/es_archives/rule_exceptions @elastic/security-solution # Assigned per https://github.com/elastic/kibana/pull/199795/files/ae80bb252bc71f787c122849fcb9b01e386fc5e9#r1840233040
/x-pack/test/functional_solution_sidenav/tests/security_sidenav.ts @elastic/security-solution
/x-pack/test/common/utils/security_solution/index.ts @elastic/security-solution
Expand Down
11 changes: 7 additions & 4 deletions packages/core/saved-objects/core-saved-objects-server/src/saved_objects_type.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,11 @@ export interface SavedObjectsType<Attributes = any> {
*/
mappings: SavedObjectsTypeMappingDefinition;
/**
* An optional map of {@link SavedObjectMigrationFn | migrations} or a function returning a map of {@link SavedObjectMigrationFn | migrations} to be used to migrate the type.
* @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} instead.
* An optional map of {@link SavedObjectMigrationFn | migrations} or a function returning a map of
* {@link SavedObjectMigrationFn | migrations} to be used to migrate the type.
*
* @deprecated Use {@link SavedObjectsType.modelVersions | modelVersions} for all future migrations instead. We have no plans
* to remove legacy migrations at this point, so there's no need to migrate existing migrations to model versions.
*/
migrations?: SavedObjectMigrationMap | (() => SavedObjectMigrationMap);
/**
Expand All @@ -89,8 +92,8 @@ export interface SavedObjectsType<Attributes = any> {
*/
schemas?: SavedObjectsValidationMap | (() => SavedObjectsValidationMap);
/**
* If defined, objects of this type will be converted to a 'multiple' or 'multiple-isolated' namespace type when migrating to this
* version.
* If defined, objects of this type will be converted to a 'multiple' or 'multiple-isolated' namespace type when migrating to
* this version.
*
* Requirements:
*
Expand Down
67 changes: 44 additions & 23 deletions x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ describe('useCasesColumns ', () => {
"name": "Name",
"render": [Function],
"sortable": true,
"width": "20%",
"width": "17%",
},
Object {
"field": "assignees",
"name": "Assignees",
"render": [Function],
"width": "10%",
},
Object {
"field": "tags",
Expand All @@ -101,50 +102,54 @@ describe('useCasesColumns ', () => {
"field": "totalAlerts",
"name": "Alerts",
"render": [Function],
"width": "80px",
"width": "70px",
},
Object {
"align": "right",
"field": "totalComment",
"name": "Comments",
"render": [Function],
"width": "90px",
"width": "75px",
},
Object {
"field": "category",
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "updatedAt",
"name": "Updated on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "closedAt",
"name": "Closed on",
"render": [Function],
"sortable": true,
"width": "10%",
},
Object {
"name": "External incident",
"render": [Function],
"width": "10%",
},
Object {
"field": "status",
"name": "Status",
"render": [Function],
"sortable": true,
"width": "110px",
"width": "100px",
},
Object {
"field": "severity",
Expand Down Expand Up @@ -185,12 +190,13 @@ describe('useCasesColumns ', () => {
"name": "Name",
"render": [Function],
"sortable": true,
"width": "20%",
"width": "17%",
},
Object {
"field": "assignees",
"name": "Assignees",
"render": [Function],
"width": "10%",
},
Object {
"field": "tags",
Expand All @@ -203,44 +209,47 @@ describe('useCasesColumns ', () => {
"field": "totalAlerts",
"name": "Alerts",
"render": [Function],
"width": "80px",
"width": "70px",
},
Object {
"align": "right",
"field": "totalComment",
"name": "Comments",
"render": [Function],
"width": "90px",
"width": "75px",
},
Object {
"field": "category",
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "updatedAt",
"name": "Updated on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"name": "External incident",
"render": [Function],
"width": "10%",
},
Object {
"field": "status",
"name": "Status",
"render": [Function],
"sortable": true,
"width": "110px",
"width": "100px",
},
Object {
"field": "severity",
Expand Down Expand Up @@ -291,13 +300,14 @@ describe('useCasesColumns ', () => {
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "severity",
Expand All @@ -309,6 +319,7 @@ describe('useCasesColumns ', () => {
Object {
"align": "right",
"render": [Function],
"width": "70px",
},
],
"isLoadingColumns": false,
Expand Down Expand Up @@ -340,13 +351,14 @@ describe('useCasesColumns ', () => {
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "severity",
Expand All @@ -358,6 +370,7 @@ describe('useCasesColumns ', () => {
Object {
"align": "right",
"render": [Function],
"width": "70px",
},
],
"isLoadingColumns": false,
Expand Down Expand Up @@ -389,13 +402,14 @@ describe('useCasesColumns ', () => {
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "severity",
Expand All @@ -407,6 +421,7 @@ describe('useCasesColumns ', () => {
Object {
"align": "right",
"render": [Function],
"width": "70px",
},
],
"isLoadingColumns": false,
Expand All @@ -430,7 +445,7 @@ describe('useCasesColumns ', () => {
"name": "Name",
"render": [Function],
"sortable": true,
"width": "20%",
"width": "17%",
},
Object {
"field": "tags",
Expand All @@ -443,44 +458,47 @@ describe('useCasesColumns ', () => {
"field": "totalAlerts",
"name": "Alerts",
"render": [Function],
"width": "80px",
"width": "70px",
},
Object {
"align": "right",
"field": "totalComment",
"name": "Comments",
"render": [Function],
"width": "90px",
"width": "75px",
},
Object {
"field": "category",
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "updatedAt",
"name": "Updated on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"name": "External incident",
"render": [Function],
"width": "10%",
},
Object {
"field": "status",
"name": "Status",
"render": [Function],
"sortable": true,
"width": "110px",
"width": "100px",
},
Object {
"field": "severity",
Expand Down Expand Up @@ -538,7 +556,7 @@ describe('useCasesColumns ', () => {
"name": "Name",
"render": [Function],
"sortable": true,
"width": "20%",
"width": "17%",
},
Object {
"field": "tags",
Expand All @@ -551,44 +569,47 @@ describe('useCasesColumns ', () => {
"field": "totalAlerts",
"name": "Alerts",
"render": [Function],
"width": "80px",
"width": "70px",
},
Object {
"align": "right",
"field": "totalComment",
"name": "Comments",
"render": [Function],
"width": "90px",
"width": "75px",
},
Object {
"field": "category",
"name": "Category",
"render": [Function],
"sortable": true,
"width": "120px",
"width": "12%",
},
Object {
"field": "createdAt",
"name": "Created on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"field": "updatedAt",
"name": "Updated on",
"render": [Function],
"sortable": true,
"width": "15%",
},
Object {
"name": "External incident",
"render": [Function],
"width": "10%",
},
Object {
"field": "status",
"name": "Status",
"render": [Function],
"sortable": true,
"width": "110px",
"width": "100px",
},
Object {
"field": "severity",
Expand Down
Loading

0 comments on commit 750ad19

Please sign in to comment.