Merge branch 'main' into strengthen-definition-types

src/plugins/data/common/search/search_source/mocks.ts

@@ -15,7 +15,6 @@ import { ISearchStartSearchSource, ISearchSource, SearchSourceFields } from './t
 
 export const searchSourceInstanceMock: MockedKeys<ISearchSource> = {
   setOverwriteDataViewType: jest.fn(),
-  setFields: jest.fn().mockReturnThis(),
   setField: jest.fn().mockReturnThis(),
   removeField: jest.fn().mockReturnThis(),
   getId: jest.fn(),

src/plugins/data/common/search/search_source/search_source.ts

@@ -210,7 +210,7 @@ export class SearchSource {
    * @private
    * @param newFields New field array.
    */
-  setFields(newFields: SearchSourceFields) {
+  private setFields(newFields: SearchSourceFields) {
     this.fields = newFields;
     return this;
   }

src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx

@@ -293,7 +293,7 @@ export const IndexPatternTable = ({
       fill={true}
       iconType="plusInCircle"
       onClick={() => setShowCreateDialog(true)}
-      data-test-subj="createIndexPatternButton"
+      data-test-subj="createDataViewButton"
     >
       <FormattedMessage
         id="indexPatternManagement.dataViewTable.createBtn"

src/plugins/saved_objects/public/saved_object/saved_object.test.ts

@@ -426,7 +426,7 @@ describe('Saved Object', () => {
               },
             });
 
-            savedObject.searchSource!.setFields({ index: indexPattern });
+            savedObject.searchSource!.setField('index', indexPattern);
             return savedObject.save(saveOptionsMock).then(() => {
               const args = (savedObjectsClientStub.create as jest.Mock).mock.calls[0];
               expect(args[1]).toEqual({

src/plugins/saved_search/common/service/get_saved_searches.test.ts

@@ -128,7 +128,6 @@ describe('getSavedSearch', () => {
           "removeField": [MockFunction],
           "serialize": [MockFunction],
           "setField": [MockFunction],
-          "setFields": [MockFunction],
           "setOverwriteDataViewType": [MockFunction],
           "setParent": [MockFunction],
           "toExpressionAst": [MockFunction],
@@ -237,7 +236,6 @@ describe('getSavedSearch', () => {
           "removeField": [MockFunction],
           "serialize": [MockFunction],
           "setField": [MockFunction],
-          "setFields": [MockFunction],
           "setOverwriteDataViewType": [MockFunction],
           "setParent": [MockFunction],
           "toExpressionAst": [MockFunction],

src/plugins/saved_search/public/services/saved_searches/saved_search_attribute_service.test.ts

@@ -224,7 +224,6 @@ describe('getSavedSearchAttributeService', () => {
             "removeField": [MockFunction],
             "serialize": [MockFunction],
             "setField": [MockFunction],
-            "setFields": [MockFunction],
             "setOverwriteDataViewType": [MockFunction],
             "setParent": [MockFunction],
             "toExpressionAst": [MockFunction],

test/functional/page_objects/settings_page.ts

@@ -621,18 +621,7 @@ export class SettingsPageObject extends FtrService {
 
   async clickAddNewIndexPatternButton() {
     await this.common.scrollKibanaBodyTop();
-
-    // if showing no data view prompt
-    const noDataView = await this.testSubjects.exists('createDataViewButton');
-    if (noDataView) {
-      await this.testSubjects.click('createDataViewButton');
-      return;
-    }
-
-    const tableView = await this.testSubjects.exists('createIndexPatternButton');
-    if (tableView) {
-      await this.testSubjects.click('createIndexPatternButton');
-    }
+    await this.testSubjects.click('createDataViewButton');
   }
 
   async selectRollupIndexPatternType() {

x-pack/plugins/actions/docs/openapi/bundled.json

@@ -2340,11 +2340,7 @@
             "type": "string",
             "description": "A JSON payload sent to the create comment URL to create a case comment. You can use variables to add Kibana Cases data to the payload. The required variable is `case.comment`. Due to Mustache template variables (the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated once the Mustache variables have been placed when the REST method runs. Manually ensure that the JSON is valid, disregarding the Mustache variables, so the later validation will pass.\n",
             "examples": [
-              {
-                "body": {
-                  "[object Object]": null
-                }
-              }
+              "{\"body\": {{{case.comment}}}}"
             ]
           },
           "createCommentMethod": {
@@ -2368,19 +2364,7 @@
             "type": "string",
             "description": "A JSON payload sent to the create case URL to create a case. You can use variables to add case data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.\n",
             "examples": [
-              {
-                "fields": {
-                  "summary": {
-                    "[object Object]": null
-                  },
-                  "description": {
-                    "[object Object]": null
-                  },
-                  "labels": {
-                    "[object Object]": null
-                  }
-                }
-              }
+              "{\"fields\": {\"summary\": {{{case.title}}},\"description\": {{{case.description}}},\"labels\": {{{case.tags}}}}}"
             ]
           },
           "createIncidentMethod": {
@@ -2425,19 +2409,7 @@
             "type": "string",
             "description": "The JSON payload sent to the update case URL to update the case. You can use variables to add Kibana Cases data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.\n",
             "examples": [
-              {
-                "fields": {
-                  "summary": {
-                    "[object Object]": null
-                  },
-                  "description": {
-                    "[object Object]": null
-                  },
-                  "labels": {
-                    "[object Object]": null
-                  }
-                }
-              }
+              "{\"fields\": {\"summary\": {{{case.title}}},\"description\": {{{case.description}}},\"labels\": {{{case.tags}}}}}"
             ]
           },
           "updateIncidentMethod": {

x-pack/plugins/actions/docs/openapi/bundled.yaml

@@ -1574,8 +1574,7 @@ components:
           description: |
             A JSON payload sent to the create comment URL to create a case comment. You can use variables to add Kibana Cases data to the payload. The required variable is `case.comment`. Due to Mustache template variables (the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated once the Mustache variables have been placed when the REST method runs. Manually ensure that the JSON is valid, disregarding the Mustache variables, so the later validation will pass.
           examples:
-            - body:
-                '[object Object]': null
+            - '{"body": {{{case.comment}}}}'
         createCommentMethod:
           type: string
           description: |
@@ -1596,13 +1595,7 @@ components:
           description: |
             A JSON payload sent to the create case URL to create a case. You can use variables to add case data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.
           examples:
-            - fields:
-                summary:
-                  '[object Object]': null
-                description:
-                  '[object Object]': null
-                labels:
-                  '[object Object]': null
+            - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
         createIncidentMethod:
           type: string
           description: |
@@ -1641,13 +1634,7 @@ components:
           description: |
             The JSON payload sent to the update case URL to update the case. You can use variables to add Kibana Cases data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.
           examples:
-            - fields:
-                summary:
-                  '[object Object]': null
-                description:
-                  '[object Object]': null
-                labels:
-                  '[object Object]': null
+            - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
         updateIncidentMethod:
           type: string
           description: |

x-pack/plugins/actions/docs/openapi/bundled_serverless.json

@@ -1308,11 +1308,7 @@
             "type": "string",
             "description": "A JSON payload sent to the create comment URL to create a case comment. You can use variables to add Kibana Cases data to the payload. The required variable is `case.comment`. Due to Mustache template variables (the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated once the Mustache variables have been placed when the REST method runs. Manually ensure that the JSON is valid, disregarding the Mustache variables, so the later validation will pass.\n",
             "examples": [
-              {
-                "body": {
-                  "[object Object]": null
-                }
-              }
+              "{\"body\": {{{case.comment}}}}"
             ]
           },
           "createCommentMethod": {
@@ -1336,19 +1332,7 @@
             "type": "string",
             "description": "A JSON payload sent to the create case URL to create a case. You can use variables to add case data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.\n",
             "examples": [
-              {
-                "fields": {
-                  "summary": {
-                    "[object Object]": null
-                  },
-                  "description": {
-                    "[object Object]": null
-                  },
-                  "labels": {
-                    "[object Object]": null
-                  }
-                }
-              }
+              "{\"fields\": {\"summary\": {{{case.title}}},\"description\": {{{case.description}}},\"labels\": {{{case.tags}}}}}"
             ]
           },
           "createIncidentMethod": {
@@ -1393,19 +1377,7 @@
             "type": "string",
             "description": "The JSON payload sent to the update case URL to update the case. You can use variables to add Kibana Cases data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.\n",
             "examples": [
-              {
-                "fields": {
-                  "summary": {
-                    "[object Object]": null
-                  },
-                  "description": {
-                    "[object Object]": null
-                  },
-                  "labels": {
-                    "[object Object]": null
-                  }
-                }
-              }
+              "{\"fields\": {\"summary\": {{{case.title}}},\"description\": {{{case.description}}},\"labels\": {{{case.tags}}}}}"
             ]
           },
           "updateIncidentMethod": {

x-pack/plugins/actions/docs/openapi/bundled_serverless.yaml

@@ -921,8 +921,7 @@ components:
           description: |
             A JSON payload sent to the create comment URL to create a case comment. You can use variables to add Kibana Cases data to the payload. The required variable is `case.comment`. Due to Mustache template variables (the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated once the Mustache variables have been placed when the REST method runs. Manually ensure that the JSON is valid, disregarding the Mustache variables, so the later validation will pass.
           examples:
-            - body:
-                '[object Object]': null
+            - '{"body": {{{case.comment}}}}'
         createCommentMethod:
           type: string
           description: |
@@ -943,13 +942,7 @@ components:
           description: |
             A JSON payload sent to the create case URL to create a case. You can use variables to add case data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.
           examples:
-            - fields:
-                summary:
-                  '[object Object]': null
-                description:
-                  '[object Object]': null
-                labels:
-                  '[object Object]': null
+            - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
         createIncidentMethod:
           type: string
           description: |
@@ -988,13 +981,7 @@ components:
           description: |
             The JSON payload sent to the update case URL to update the case. You can use variables to add Kibana Cases data to the payload. Required variables are `case.title` and `case.description`. Due to Mustache template variables (which is the text enclosed in triple braces, for example, `{{{case.title}}}`), the JSON is not validated when you create the connector. The JSON is validated after the Mustache variables have been placed when REST method runs. Manually ensure that the JSON is valid to avoid future validation errors; disregard Mustache variables during your review.
           examples:
-            - fields:
-                summary:
-                  '[object Object]': null
-                description:
-                  '[object Object]': null
-                labels:
-                  '[object Object]': null
+            - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
         updateIncidentMethod:
           type: string
           description: |

x-pack/plugins/actions/docs/openapi/components/schemas/config_properties_cases_webhook.yaml

@@ -23,7 +23,7 @@ properties:
       placed when the REST method runs. Manually ensure that the JSON is valid,
       disregarding the Mustache variables, so the later validation will pass.
     examples:
-      - {"body": {{{case.comment}}}}
+      - '{"body": {{{case.comment}}}}'
   createCommentMethod:
     type: string
     description: >
@@ -55,7 +55,7 @@ properties:
       placed when REST method runs. Manually ensure that the JSON is valid to
       avoid future validation errors; disregard Mustache variables during your review.
     examples:
-      - {"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}
+      - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
   createIncidentMethod:
     type: string
     description: >
@@ -112,7 +112,7 @@ properties:
       placed when REST method runs. Manually ensure that the JSON is valid to
       avoid future validation errors; disregard Mustache variables during your review.
     examples:
-      - {"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}
+      - '{"fields": {"summary": {{{case.title}}},"description": {{{case.description}}},"labels": {{{case.tags}}}}}'
   updateIncidentMethod:
     type: string
     description: >

x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx

@@ -10,14 +10,7 @@ import { useRouteMatch } from 'react-router-dom';
 
 import { useValues } from 'kea';
 
-import {
-  EuiPageSidebar,
-  EuiPageBody,
-  EuiPageSection,
-  EuiCallOut,
-  EuiSpacer,
-  EuiPageTemplate,
-} from '@elastic/eui';
+import { EuiCallOut, EuiSpacer, EuiPageTemplate } from '@elastic/eui';
 
 import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
 import { FlashMessages } from '../../../../shared/flash_messages';
@@ -47,37 +40,35 @@ export const PersonalDashboardLayout: FC<PropsWithChildren<LayoutProps>> = ({
     <>
       {pageChrome && <SetWorkplaceSearchChrome trail={pageChrome} />}
       <AccountHeader />
-      <EuiPageTemplate className="personalDashboardLayout" paddingSize="none">
-        <EuiPageSidebar
+      <EuiPageTemplate className="personalDashboardLayout" paddingSize="none" panelled>
+        <EuiPageTemplate.Sidebar
           role="navigation"
           className="personalDashboardLayout__sideBar"
           sticky
           minWidth="480px"
         >
           {useRouteMatch(PRIVATE_SOURCES_PATH) && <PrivateSourcesSidebar />}
           {useRouteMatch(PERSONAL_SETTINGS_PATH) && <AccountSettingsSidebar />}
-        </EuiPageSidebar>
-        <EuiPageBody component="main" panelled role="main">
-          <EuiPageSection
-            className="personalDashboardLayout__body"
-            paddingSize="none"
-            restrictWidth
-          >
-            {readOnlyMode && (
-              <>
-                <EuiCallOut
-                  color="warning"
-                  iconType="lock"
-                  title={PERSONAL_DASHBOARD_READ_ONLY_MODE_WARNING}
-                />
-                <EuiSpacer />
-              </>
-            )}
-            <FlashMessages />
+        </EuiPageTemplate.Sidebar>
+        <EuiPageTemplate.Section
+          className="personalDashboardLayout__body"
+          paddingSize="none"
+          restrictWidth
+        >
+          {readOnlyMode && (
+            <>
+              <EuiCallOut
+                color="warning"
+                iconType="lock"
+                title={PERSONAL_DASHBOARD_READ_ONLY_MODE_WARNING}
+              />
+              <EuiSpacer />
+            </>
+          )}
+          <FlashMessages />
 
-            {isLoading ? <Loading /> : children}
-          </EuiPageSection>
-        </EuiPageBody>
+          {isLoading ? <Loading /> : children}
+        </EuiPageTemplate.Section>
       </EuiPageTemplate>
     </>
   );

x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts

@@ -30,7 +30,6 @@ export function registerLoadRoute({ router, lib: { handleEsError } }: RouteDepen
       const params = {
         expand_wildcards: 'none' as const,
         flat_settings: false,
-        local: false,
         include_defaults: true,
         index: indexName,
       };