Skip to content

Commit adea576

Browse files
Merge branch 'master' into implement/run-server-integration-tests-in-ci
2 parents 19fbf42 + c974f56 commit adea576

File tree

146 files changed

+6175
-1423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+6175
-1423
lines changed

.github/CODEOWNERS

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
/src/plugins/expressions/ @elastic/kibana-app-arch
6161
/src/plugins/inspector/ @elastic/kibana-app-arch
6262
/src/plugins/kibana_react/ @elastic/kibana-app-arch
63-
/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
63+
/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
6464
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
6565
/src/plugins/navigation/ @elastic/kibana-app-arch
6666
/src/plugins/share/ @elastic/kibana-app-arch
@@ -104,19 +104,19 @@
104104
/x-pack/legacy/plugins/beats_management/ @elastic/beats
105105
#CC# /x-pack/plugins/beats_management/ @elastic/beats
106106

107-
# Canvas
108-
/src/plugins/dashboard/ @elastic/kibana-canvas
109-
/src/plugins/input_control_vis/ @elastic/kibana-canvas
110-
/src/plugins/vis_type_markdown/ @elastic/kibana-canvas
111-
/x-pack/plugins/canvas/ @elastic/kibana-canvas
112-
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-canvas
113-
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
114-
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-canvas
115-
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-canvas
116-
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
117-
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
118-
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-canvas
119-
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-canvas
107+
# Presentation
108+
/src/plugins/dashboard/ @elastic/kibana-presentation
109+
/src/plugins/input_control_vis/ @elastic/kibana-presentation
110+
/src/plugins/vis_type_markdown/ @elastic/kibana-presentation
111+
/x-pack/plugins/canvas/ @elastic/kibana-presentation
112+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
113+
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
114+
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-presentation
115+
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-presentation
116+
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
117+
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
118+
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
119+
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-presentation
120120

121121
# Core UI
122122
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

.github/workflows/pr-project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818

1919
# { "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
2020
# { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
21-
# { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
21+
# { "label": "Feature:Canvas", "projectNumber": 38, "columnName": "Review in progress" }

.github/workflows/project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/[email protected]
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Team:Canvas", "projectNumber": 38, "columnName": "Inbox"}]'
14+
issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"}, {"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"}, {"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"}]'
1515
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
1616

1717

packages/kbn-release-notes/src/release_notes_config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ export const AREAS: Area[] = [
119119
title: 'Maps',
120120
labels: ['Team:Geo'],
121121
},
122-
{
123-
title: 'Canvas',
124-
labels: ['Team:Canvas'],
125-
},
126122
{
127123
title: 'QA',
128124
labels: ['Team:QA'],
@@ -138,6 +134,10 @@ export const AREAS: Area[] = [
138134
'Feature:Security/Feature Controls',
139135
],
140136
},
137+
{
138+
title: 'Canvas',
139+
labels: ['Feature:Canvas'],
140+
},
141141
{
142142
title: 'Dashboard',
143143
labels: ['Feature:Dashboard', 'Feature:Drilldowns'],

src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.js.snap

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/dashboard/public/application/listing/dashboard_listing.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export class DashboardListing extends React.Component {
4343
<I18nProvider>
4444
<TableListView
4545
headingId="dashboardListingHeading"
46+
rowHeader="title"
4647
createItem={this.props.hideWriteControls ? null : this.props.createItem}
4748
findItems={this.props.findItems}
4849
deleteItems={this.props.hideWriteControls ? null : this.props.deleteItems}
@@ -61,6 +62,9 @@ export class DashboardListing extends React.Component {
6162
tableListTitle={i18n.translate('dashboard.listing.dashboardsTitle', {
6263
defaultMessage: 'Dashboards',
6364
})}
65+
tableCaption={i18n.translate('dashboard.listing.dashboardsTitle', {
66+
defaultMessage: 'Dashboards',
67+
})}
6468
toastNotifications={this.props.core.notifications.toasts}
6569
uiSettings={this.props.core.uiSettings}
6670
searchFilters={

src/plugins/kibana_react/public/table_list_view/table_list_view.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ export interface TableListViewProps {
6666
* If the table is not empty, this component renders its own h1 element using the same id.
6767
*/
6868
headingId?: string;
69+
/**
70+
* Indicates which column should be used as the identifying cell in each row.
71+
*/
72+
rowHeader: string;
73+
/**
74+
* Describes the content of the table. If not specified, the caption will be "This table contains {itemCount} rows."
75+
*/
76+
tableCaption: string;
6977
searchFilters?: SearchFilterConfig[];
7078
}
7179

@@ -471,6 +479,8 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
471479
search={search}
472480
sorting={true}
473481
data-test-subj="itemsInMemTable"
482+
rowHeader={this.props.rowHeader}
483+
tableCaption={this.props.tableCaption}
474484
/>
475485
);
476486
}

src/plugins/visualize/public/application/components/visualize_listing.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,17 @@ export const VisualizeListing = () => {
154154
// we allow users to create visualizations even if they can't save them
155155
// for data exploration purposes
156156
createItem={createNewVis}
157+
tableCaption={i18n.translate('visualize.listing.table.listTitle', {
158+
defaultMessage: 'Visualizations',
159+
})}
157160
findItems={fetchItems}
158161
deleteItems={visualizeCapabilities.delete ? deleteItems : undefined}
159162
editItem={visualizeCapabilities.save ? editItem : undefined}
160163
tableColumns={tableColumns}
161164
listingLimit={listingLimit}
162165
initialPageSize={savedObjectsPublic.settings.getPerPage()}
163166
initialFilter={''}
167+
rowHeader="title"
164168
noItemsFragment={noItemsFragment}
165169
entityName={i18n.translate('visualize.listing.table.entityName', {
166170
defaultMessage: 'visualization',

test/functional/apps/discover/_sidebar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ export default function ({ getService, getPageObjects }) {
2525
const kibanaServer = getService('kibanaServer');
2626
const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
2727

28-
// FLAKY: https://github.com/elastic/kibana/issues/80914
29-
describe.skip('discover sidebar', function describeIndexTests() {
28+
describe('discover sidebar', function describeIndexTests() {
3029
before(async function () {
3130
// delete .kibana index and update configDoc
3231
await kibanaServer.uiSettings.replace({

test/functional/page_objects/discover_page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
349349

350350
public async closeSidebarFieldFilter() {
351351
await testSubjects.click('toggleFieldFilterButton');
352-
await testSubjects.missingOrFail('filterSelectionPanel', { allowHidden: true });
352+
await testSubjects.missingOrFail('filterSelectionPanel');
353353
}
354354

355355
public async waitForChartLoadingComplete(renderCount: number) {

0 commit comments

Comments
 (0)