Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into kibanathemeprovider…
Browse files Browse the repository at this point in the history
…-kibana-app-services
  • Loading branch information
shivindera committed Jan 7, 2022
2 parents b0a13ac + 5316d08 commit 183e20a
Show file tree
Hide file tree
Showing 34 changed files with 657 additions and 65 deletions.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
"autoMergeMethod": "squash"
"autoMergeMethod": "squash",
"backportBinary": "node scripts/backport"
}
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -477,3 +477,8 @@ x-pack/test/security_solution_cypress @elastic/security-engineering-productivity

# EUI design
/src/plugins/kibana_react/public/page_template/ @elastic/eui-design @elastic/kibana-app-services

# Application Experience

## Shared UX
/src/plugins/shared_ux @elastic/shared-ux
1 change: 0 additions & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ jobs:
commit_email: [email protected]
auto_merge: 'true'
auto_merge_method: 'squash'
manual_backport_command_template: 'node scripts/backport --pr %pullNumber%'
63 changes: 32 additions & 31 deletions .i18nrc.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,84 @@
{
"paths": {
"advancedSettings": "src/plugins/advanced_settings",
"alerts": "packages/kbn-alerts/src",
"apmOss": "src/plugins/apm_oss",
"autocomplete": "packages/kbn-securitysolution-autocomplete/src",
"kbnConfig": "packages/kbn-config/src",
"bfetch": "src/plugins/bfetch",
"charts": "src/plugins/charts",
"console": "src/plugins/console",
"core": "src/core",
"customIntegrations": "src/plugins/custom_integrations",
"discover": "src/plugins/discover",
"bfetch": "src/plugins/bfetch",
"dashboard": "src/plugins/dashboard",
"controls": "src/plugins/controls",
"data": "src/plugins/data",
"dataViews": "src/plugins/data_views",
"devTools": "src/plugins/dev_tools",
"discover": "src/plugins/discover",
"embeddableApi": "src/plugins/embeddable",
"embeddableExamples": "examples/embeddable_examples",
"fieldFormats": "src/plugins/field_formats",
"uiActionsExamples": "examples/ui_action_examples",
"share": "src/plugins/share",
"home": "src/plugins/home",
"flot": "packages/kbn-ui-shared-deps-src/src/flot_charts",
"charts": "src/plugins/charts",
"esQuery": "packages/kbn-es-query/src",
"esUi": "src/plugins/es_ui_shared",
"devTools": "src/plugins/dev_tools",
"expressions": "src/plugins/expressions",
"expressionError": "src/plugins/expression_error",
"expressionGauge": "src/plugins/chart_expressions/expression_gauge",
"expressionHeatmap": "src/plugins/chart_expressions/expression_heatmap",
"expressionImage": "src/plugins/expression_image",
"expressionMetric": "src/plugins/expression_metric",
"expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
"expressionPie": "src/plugins/chart_expressions/expression_pie",
"expressionRepeatImage": "src/plugins/expression_repeat_image",
"expressionRevealImage": "src/plugins/expression_reveal_image",
"expressions": "src/plugins/expressions",
"expressionShape": "src/plugins/expression_shape",
"expressionHeatmap": "src/plugins/chart_expressions/expression_heatmap",
"expressionGauge": "src/plugins/chart_expressions/expression_gauge",
"expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
"expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
"expressionPie": "src/plugins/chart_expressions/expression_pie",
"fieldFormats": "src/plugins/field_formats",
"flot": "packages/kbn-ui-shared-deps-src/src/flot_charts",
"home": "src/plugins/home",
"indexPatternEditor": "src/plugins/data_view_editor",
"indexPatternFieldEditor": "src/plugins/data_view_field_editor",
"indexPatternManagement": "src/plugins/data_view_management",
"inputControl": "src/plugins/input_control_vis",
"inspector": "src/plugins/inspector",
"inspectorViews": "src/legacy/core_plugins/inspector_views",
"interactiveSetup": "src/plugins/interactive_setup",
"interpreter": "src/legacy/core_plugins/interpreter",
"kbn": "src/legacy/core_plugins/kibana",
"kbnConfig": "packages/kbn-config/src",
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"kibana_utils": "src/plugins/kibana_utils",
"kibana-react": "src/plugins/kibana_react",
"kibanaOverview": "src/plugins/kibana_overview",
"lists": "packages/kbn-securitysolution-list-utils/src",
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
"monaco": "packages/kbn-monaco/src",
"esQuery": "packages/kbn-es-query/src",
"presentationUtil": "src/plugins/presentation_util",
"indexPatternEditor": "src/plugins/data_view_editor",
"indexPatternFieldEditor": "src/plugins/data_view_field_editor",
"indexPatternManagement": "src/plugins/data_view_management",
"interactiveSetup": "src/plugins/interactive_setup",
"advancedSettings": "src/plugins/advanced_settings",
"kibanaOverview": "src/plugins/kibana_overview",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"kibana-react": "src/plugins/kibana_react",
"kibana_utils": "src/plugins/kibana_utils",
"navigation": "src/plugins/navigation",
"newsfeed": "src/plugins/newsfeed",
"presentationUtil": "src/plugins/presentation_util",
"savedObjects": "src/plugins/saved_objects",
"savedObjectsManagement": "src/plugins/saved_objects_management",
"server": "src/legacy/server",
"share": "src/plugins/share",
"sharedUX": "src/plugins/shared_ux",
"statusPage": "src/legacy/core_plugins/status_page",
"telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
"timelion": ["src/plugins/vis_types/timelion"],
"uiActions": "src/plugins/ui_actions",
"uiActionsExamples": "examples/ui_action_examples",
"usageCollection": "src/plugins/usage_collection",
"visDefaultEditor": "src/plugins/vis_default_editor",
"visTypeHeatmap": "src/plugins/vis_types/heatmap",
"visTypeMarkdown": "src/plugins/vis_type_markdown",
"visTypeMetric": "src/plugins/vis_types/metric",
"visTypePie": "src/plugins/vis_types/pie",
"visTypeTable": "src/plugins/vis_types/table",
"visTypeTagCloud": "src/plugins/vis_types/tagcloud",
"visTypeTimeseries": "src/plugins/vis_types/timeseries",
"visTypeVega": "src/plugins/vis_types/vega",
"visTypeVislib": "src/plugins/vis_types/vislib",
"visTypeXy": "src/plugins/vis_types/xy",
"visTypePie": "src/plugins/vis_types/pie",
"visTypeHeatmap": "src/plugins/vis_types/heatmap",
"visualizations": "src/plugins/visualizations",
"visualize": "src/plugins/visualize",
"apmOss": "src/plugins/apm_oss",
"usageCollection": "src/plugins/usage_collection"
"visualize": "src/plugins/visualize"
},
"translations": []
}
4 changes: 4 additions & 0 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ oss plugins.
generating deep links to other apps, and creating short URLs.
|{kib-repo}blob/{branch}/src/plugins/shared_ux/README.md[sharedUX]
|Our mission is to make consistency in our user experience a product.
|{kib-repo}blob/{branch}/src/plugins/telemetry/README.md[telemetry]
|Telemetry allows Kibana features to have usage tracked in the wild. The general term "telemetry" refers to multiple things:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^2.0.2",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "^6.1.1",
"backport": "^6.1.3",
"callsites": "^3.1.0",
"chai": "3.5.0",
"chance": "1.0.18",
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,4 @@ pageLoadAssetSize:
expressionGauge: 25000
controls: 34788
expressionPie: 26338
sharedUX: 16225
19 changes: 10 additions & 9 deletions src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,30 @@
export const storybookAliases = {
apm: 'x-pack/plugins/apm/.storybook',
canvas: 'x-pack/plugins/canvas/storybook',
codeeditor: 'src/plugins/kibana_react/public/code_editor/.storybook',
ci_composite: '.ci/.storybook',
codeeditor: 'src/plugins/kibana_react/public/code_editor/.storybook',
controls: 'src/plugins/controls/storybook',
custom_integrations: 'src/plugins/custom_integrations/storybook',
url_template_editor: 'src/plugins/kibana_react/public/url_template_editor/.storybook',
dashboard: 'src/plugins/dashboard/.storybook',
dashboard_enhanced: 'x-pack/plugins/dashboard_enhanced/.storybook',
dashboard: 'src/plugins/dashboard/.storybook',
data_enhanced: 'x-pack/plugins/data_enhanced/.storybook',
embeddable: 'src/plugins/embeddable/.storybook',
expression_error: 'src/plugins/expression_error/.storybook',
expression_image: 'src/plugins/expression_image/.storybook',
expression_metric_vis: 'src/plugins/chart_expressions/expression_metric/.storybook',
expression_metric: 'src/plugins/expression_metric/.storybook',
expression_pie: 'src/plugins/chart_expressions/expression_pie/.storybook',
expression_repeat_image: 'src/plugins/expression_repeat_image/.storybook',
expression_reveal_image: 'src/plugins/expression_reveal_image/.storybook',
expression_shape: 'src/plugins/expression_shape/.storybook',
expression_tagcloud: 'src/plugins/chart_expressions/expression_tagcloud/.storybook',
expression_metric_vis: 'src/plugins/chart_expressions/expression_metric/.storybook',
expression_pie: 'src/plugins/chart_expressions/expression_pie/.storybook',
fleet: 'x-pack/plugins/fleet/.storybook',
infra: 'x-pack/plugins/infra/.storybook',
security_solution: 'x-pack/plugins/security_solution/.storybook',
ui_actions_enhanced: 'x-pack/plugins/ui_actions_enhanced/.storybook',
lists: 'x-pack/plugins/lists/.storybook',
observability: 'x-pack/plugins/observability/.storybook',
presentation: 'src/plugins/presentation_util/storybook',
controls: 'src/plugins/controls/storybook',
lists: 'x-pack/plugins/lists/.storybook',
security_solution: 'x-pack/plugins/security_solution/.storybook',
shared_ux: 'src/plugins/shared_ux/.storybook',
ui_actions_enhanced: 'x-pack/plugins/ui_actions_enhanced/.storybook',
url_template_editor: 'src/plugins/kibana_react/public/url_template_editor/.storybook',
};
9 changes: 9 additions & 0 deletions src/plugins/shared_ux/.i18nrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"prefix": "sharedUX",
"paths": {
"sharedUX": "."
},
"translations": [
"translations/ja-JP.json"
]
}
11 changes: 11 additions & 0 deletions src/plugins/shared_ux/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { defaultConfig } from '@kbn/storybook';

module.exports = defaultConfig;
21 changes: 21 additions & 0 deletions src/plugins/shared_ux/.storybook/manager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { addons } from '@storybook/addons';
import { create } from '@storybook/theming';
import { PANEL_ID } from '@storybook/addon-actions';

addons.setConfig({
theme: create({
base: 'light',
brandTitle: 'Shared UX Storybook',
brandUrl: 'https://github.com/elastic/kibana/tree/main/src/plugins/shared_ux',
}),
showPanel: true.valueOf,
selectedPanel: PANEL_ID,
});
29 changes: 29 additions & 0 deletions src/plugins/shared_ux/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# sharedUX

Our mission is to make consistency in our user experience a product.

## Areas of Focus

### UX Infrastructure

- Create and maintain a discoverable home for shared UX code.
- Encourage contribution and usage.

### UX Patterns

- Work with design specialists to understand and communicate new and existing designs.
- Foster adoption of design principles by codifying them in shared resources.

### UX Solutions

- Drive common projects.
- Build and support common plugins.
- Help teams to create consistent user experiences.

## The sharedUX Plugin

This plugin contains common code that is shared among other plugins.

## Contribution

Contributions are welcome and encouraged!
10 changes: 10 additions & 0 deletions src/plugins/shared_ux/common/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

export const PLUGIN_ID = 'sharedUX';
export const PLUGIN_NAME = 'sharedUX';
36 changes: 36 additions & 0 deletions src/plugins/shared_ux/docs/about.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
id: sharedUX/About
slug: /shared-ux/about
title: About Shared UX
summary: .
date: 2021-01-05
tags: ['shared-ux']
---

Our mission is to make consistency in our user experience a product.

## Areas of Focus

### UX Infrastructure

- Create and maintain a discoverable home for shared UX code.
- Encourage contribution and usage.

### UX Patterns

- Work with design specialists to understand and communicate new and existing designs.
- Foster adoption of design principles by codifying them in shared resources.

### UX Solutions

- Drive common projects.
- Build and support common plugins.
- Help teams to create consistent user experiences.

## The sharedUX Plugin

This plugin contains common code that is shared among other plugins.

## Contribution

Contributions are welcome and encouraged!
14 changes: 14 additions & 0 deletions src/plugins/shared_ux/kibana.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"id": "sharedUX",
"version": "1.0.0",
"kibanaVersion": "kibana",
"owner": {
"name": "Shared UX",
"githubTeam": "shared-ux"
},
"description": "A plugin providing components and services for shared user experiences in Kibana.",
"server": true,
"ui": true,
"requiredPlugins": [],
"optionalPlugins": []
}
17 changes: 17 additions & 0 deletions src/plugins/shared_ux/nav_shared_ux.docnav.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"mission": "Shared UX",
"id": "sharedUX",
"landingPageId": "sharedUX/About",
"icon": "globe",
"description": "Developer documentation for Shared UX.",
"items": [
{
"label": "About",
"items": [
{
"id": "sharedUX/About"
}
]
}
]
}
15 changes: 15 additions & 0 deletions src/plugins/shared_ux/public/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { SharedUXPlugin } from './plugin';

export function plugin() {
return new SharedUXPlugin();
}

export type { SharedUXPluginSetup, SharedUXPluginStart } from './types';
22 changes: 22 additions & 0 deletions src/plugins/shared_ux/public/plugin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
import { SharedUXPluginSetup, SharedUXPluginStart } from './types';

export class SharedUXPlugin implements Plugin<SharedUXPluginSetup, SharedUXPluginStart> {
public setup(_core: CoreSetup): SharedUXPluginSetup {
return {};
}

public start(_core: CoreStart): SharedUXPluginStart {
return {};
}

public stop() {}
}
Loading

0 comments on commit 183e20a

Please sign in to comment.