Skip to content

Commit

Permalink
Merge branch 'job-saved-object-initialization' of github.com:jgowdyel…
Browse files Browse the repository at this point in the history
…astic/kibana into job-saved-object-initialization
  • Loading branch information
jgowdyelastic committed Nov 3, 2020
2 parents 8f3a094 + 7934aa8 commit dc3c384
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 24 deletions.
28 changes: 14 additions & 14 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
/src/plugins/expressions/ @elastic/kibana-app-arch
/src/plugins/inspector/ @elastic/kibana-app-arch
/src/plugins/kibana_react/ @elastic/kibana-app-arch
/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
/src/plugins/kibana_react/public/code_editor @elastic/kibana-presentation
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
/src/plugins/navigation/ @elastic/kibana-app-arch
/src/plugins/share/ @elastic/kibana-app-arch
Expand Down Expand Up @@ -104,19 +104,19 @@
/x-pack/legacy/plugins/beats_management/ @elastic/beats
#CC# /x-pack/plugins/beats_management/ @elastic/beats

# Canvas
/src/plugins/dashboard/ @elastic/kibana-canvas
/src/plugins/input_control_vis/ @elastic/kibana-canvas
/src/plugins/vis_type_markdown/ @elastic/kibana-canvas
/x-pack/plugins/canvas/ @elastic/kibana-canvas
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-canvas
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-canvas
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-canvas
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-canvas
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-canvas
# Presentation
/src/plugins/dashboard/ @elastic/kibana-presentation
/src/plugins/input_control_vis/ @elastic/kibana-presentation
/src/plugins/vis_type_markdown/ @elastic/kibana-presentation
/x-pack/plugins/canvas/ @elastic/kibana-presentation
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-presentation
/x-pack/test/functional/apps/canvas/ @elastic/kibana-presentation
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-presentation
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-presentation
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-presentation
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-presentation

# Core UI
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-project-assigner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:

# { "label": "Team:AppArch", "projectNumber": 37, "columnName": "Review in progress" },
# { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
# { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
# { "label": "Feature:Canvas", "projectNumber": 38, "columnName": "Review in progress" }
2 changes: 1 addition & 1 deletion .github/workflows/project-assigner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: elastic/github-actions/[email protected]
id: project_assigner
with:
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"}]'
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"}]'
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}


8 changes: 4 additions & 4 deletions packages/kbn-release-notes/src/release_notes_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ export const AREAS: Area[] = [
title: 'Maps',
labels: ['Team:Geo'],
},
{
title: 'Canvas',
labels: ['Team:Canvas'],
},
{
title: 'QA',
labels: ['Team:QA'],
Expand All @@ -138,6 +134,10 @@ export const AREAS: Area[] = [
'Feature:Security/Feature Controls',
],
},
{
title: 'Canvas',
labels: ['Feature:Canvas'],
},
{
title: 'Dashboard',
labels: ['Feature:Dashboard', 'Feature:Drilldowns'],
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class DashboardListing extends React.Component {
<I18nProvider>
<TableListView
headingId="dashboardListingHeading"
rowHeader="title"
createItem={this.props.hideWriteControls ? null : this.props.createItem}
findItems={this.props.findItems}
deleteItems={this.props.hideWriteControls ? null : this.props.deleteItems}
Expand All @@ -61,6 +62,9 @@ export class DashboardListing extends React.Component {
tableListTitle={i18n.translate('dashboard.listing.dashboardsTitle', {
defaultMessage: 'Dashboards',
})}
tableCaption={i18n.translate('dashboard.listing.dashboardsTitle', {
defaultMessage: 'Dashboards',
})}
toastNotifications={this.props.core.notifications.toasts}
uiSettings={this.props.core.uiSettings}
searchFilters={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ export interface TableListViewProps {
* If the table is not empty, this component renders its own h1 element using the same id.
*/
headingId?: string;
/**
* Indicates which column should be used as the identifying cell in each row.
*/
rowHeader: string;
/**
* Describes the content of the table. If not specified, the caption will be "This table contains {itemCount} rows."
*/
tableCaption: string;
searchFilters?: SearchFilterConfig[];
}

Expand Down Expand Up @@ -471,6 +479,8 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
search={search}
sorting={true}
data-test-subj="itemsInMemTable"
rowHeader={this.props.rowHeader}
tableCaption={this.props.tableCaption}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,17 @@ export const VisualizeListing = () => {
// we allow users to create visualizations even if they can't save them
// for data exploration purposes
createItem={createNewVis}
tableCaption={i18n.translate('visualize.listing.table.listTitle', {
defaultMessage: 'Visualizations',
})}
findItems={fetchItems}
deleteItems={visualizeCapabilities.delete ? deleteItems : undefined}
editItem={visualizeCapabilities.save ? editItem : undefined}
tableColumns={tableColumns}
listingLimit={listingLimit}
initialPageSize={savedObjectsPublic.settings.getPerPage()}
initialFilter={''}
rowHeader="title"
noItemsFragment={noItemsFragment}
entityName={i18n.translate('visualize.listing.table.entityName', {
defaultMessage: 'visualization',
Expand Down
3 changes: 1 addition & 2 deletions test/functional/apps/discover/_sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ export default function ({ getService, getPageObjects }) {
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);

// FLAKY: https://github.com/elastic/kibana/issues/80914
describe.skip('discover sidebar', function describeIndexTests() {
describe('discover sidebar', function describeIndexTests() {
before(async function () {
// delete .kibana index and update configDoc
await kibanaServer.uiSettings.replace({
Expand Down
2 changes: 1 addition & 1 deletion test/functional/page_objects/discover_page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider

public async closeSidebarFieldFilter() {
await testSubjects.click('toggleFieldFilterButton');
await testSubjects.missingOrFail('filterSelectionPanel', { allowHidden: true });
await testSubjects.missingOrFail('filterSelectionPanel');
}

public async waitForChartLoadingComplete(renderCount: number) {
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugins/graph/public/components/listing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ export function Listing(props: ListingProps) {
return (
<I18nProvider>
<TableListView
tableCaption={i18n.translate('xpack.graph.listing.graphsTitle', {
defaultMessage: 'Graphs',
})}
headingId="graphListingHeading"
rowHeader="title"
createItem={props.capabilities.save ? props.createItem : undefined}
findItems={props.findItems}
deleteItems={props.capabilities.delete ? props.deleteItems : undefined}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ export const FilterPopover = ({
incremental={true}
disabled={items.length === 0}
onSearch={(query) => setSearchQuery(query)}
aria-label={i18n.translate('xpack.uptime.filterPopout.searchMessage.ariaLabel', {
defaultMessage: 'Search for {title}',
values: {
title: title.toLowerCase(),
},
})}
placeholder={
loading
? i18n.translate('xpack.uptime.filterPopout.loadingMessage', {
Expand All @@ -108,7 +114,7 @@ export const FilterPopover = ({
: i18n.translate('xpack.uptime.filterPopout.searchMessage', {
defaultMessage: 'Search {title}',
values: {
title,
title: title.toLowerCase(),
},
})
}
Expand Down

0 comments on commit dc3c384

Please sign in to comment.