From aaa0c8acf1669907183f608d30d83e147f625bff Mon Sep 17 00:00:00 2001 From: Peter Fitzgibbons Date: Fri, 12 Jan 2024 12:36:51 -0800 Subject: [PATCH] WIP SplitButton on Dashbaords Create Signed-off-by: Peter Fitzgibbons --- package.json | 6 ++--- packages/osd-ui-framework/package.json | 4 ++-- packages/osd-ui-shared-deps/package.json | 5 ++-- .../dashboard_listing/create_button.tsx | 23 +++++++++++-------- .../plugins/osd_tp_run_pipeline/package.json | 4 ++-- .../osd_sample_panel_action/package.json | 4 ++-- .../osd_tp_custom_visualizations/package.json | 4 ++-- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 3f73d2b780c9..24d1139e0e28 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dashboarding" ], "private": true, - "version": "3.0.0", + "version": "2.11.0", "branch": "main", "types": "./opensearch_dashboards.d.ts", "tsdocMetadata": "./build/tsdoc-metadata.json", @@ -128,7 +128,7 @@ "dependencies": { "@aws-crypto/client-node": "^3.1.1", "@elastic/datemath": "5.0.3", - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "@elastic/good": "^9.0.1-kibana3", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@elastic/request-crypto": "2.0.0", @@ -470,4 +470,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json index e0e3a2759fd8..703dd19ccf95 100644 --- a/packages/osd-ui-framework/package.json +++ b/packages/osd-ui-framework/package.json @@ -23,7 +23,7 @@ "enzyme-adapter-react-16": "^1.9.1" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "@osd/babel-preset": "1.0.0", "@osd/optimizer": "1.0.0", "comment-stripper": "^0.0.4", @@ -36,4 +36,4 @@ "postcss": "^8.4.5", "sinon": "^7.4.2" } -} +} \ No newline at end of file diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json index 417766aa2340..7210e669e4ba 100644 --- a/packages/osd-ui-shared-deps/package.json +++ b/packages/osd-ui-shared-deps/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@elastic/charts": "31.1.0", - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@opensearch/datemath": "5.0.3", "@osd/i18n": "1.0.0", @@ -51,5 +51,4 @@ "val-loader": "^2.1.2", "webpack": "npm:@amoo-miki/webpack@4.46.0-rc.2" } -} - +} \ No newline at end of file diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx b/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx index 2d6623096235..fa19b62929c3 100644 --- a/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx +++ b/src/plugins/dashboard/public/application/components/dashboard_listing/create_button.tsx @@ -10,8 +10,8 @@ import { EuiContextMenuPanel, EuiFlexItem, EuiPopover, + EuiSplitButton, } from '@elastic/eui'; -import type { DashboardProvider } from '../../../types'; interface CreateButtonProps { dashboardProviders?: { [key: string]: DashboardProvider }; @@ -47,15 +47,18 @@ const CreateButton = (props: CreateButtonProps) => { const renderCreateMenuDropDown = () => { const button = ( - - - + <> + Test + + + + ); return ( diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json index eb4f547b1459..70fe8095416d 100644 --- a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json @@ -12,10 +12,10 @@ "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "@osd/plugin-helpers": "1.0.0", "react": "^16.14.0", "react-dom": "^16.12.0", "typescript": "4.0.2" } -} +} \ No newline at end of file diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json index 61537c8bc09c..0612a0f2cd79 100644 --- a/test/plugin_functional/plugins/osd_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/osd_sample_panel_action/package.json @@ -12,8 +12,8 @@ "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "react": "^16.14.0", "typescript": "4.0.2" } -} +} \ No newline at end of file diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json index f4ff80afdb08..4a7ca0f9579c 100644 --- a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json @@ -12,9 +12,9 @@ "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.4.0", + "@elastic/eui": "npm:@pjfitzgibbons/oui@1.4.0-metrics.4", "@osd/plugin-helpers": "1.0.0", "react": "^16.14.0", "typescript": "4.0.2" } -} +} \ No newline at end of file