From fe85bf8c8877e7f072ab53eb480e898044253bf6 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 12 May 2017 10:41:52 -0700 Subject: [PATCH] Consolidate into one registry --- .../getting_started/getting_started.js | 14 ++++++++------ src/core_plugins/testbed/public/index.js | 16 ++++++++++------ src/ui/public/getting_started/constants.js | 7 ++++++- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/core_plugins/getting_started/public/components/getting_started/getting_started.js b/src/core_plugins/getting_started/public/components/getting_started/getting_started.js index 4a6a77ab11497da..7eb0b3118ee8388 100644 --- a/src/core_plugins/getting_started/public/components/getting_started/getting_started.js +++ b/src/core_plugins/getting_started/public/components/getting_started/getting_started.js @@ -2,8 +2,8 @@ import { uiModules } from 'ui/modules'; import uiChrome from 'ui/chrome'; import 'ui/filters/trust_as_html'; import 'ui/getting_started/opt_out_directive'; -import { GettingStartedTopMessagesRegistryProvider } from 'ui/getting_started/top_messages_registry'; -import { GettingStartedMonitorAndManageMessagesRegistryProvider } from 'ui/getting_started/monitor_and_manage_messages_registry'; +import { GettingStartedRegistryProvider } from 'ui/getting_started/registry'; +import { GETTING_STARTED_REGISTRY_TYPES } from 'ui/getting_started/constants'; import { hasOptedOutOfGettingStarted } from 'ui/getting_started/opt_out_helpers'; import { documentationLinks } from 'ui/documentation_links'; @@ -22,8 +22,7 @@ const app = uiModules.get('kibana'); app.directive('gettingStarted', function ($injector) { const Private = $injector.get('Private'); - const topMessagesRegistry = Private(GettingStartedTopMessagesRegistryProvider); - const manageAndMonitorMessagesRegistry = Private(GettingStartedMonitorAndManageMessagesRegistryProvider); + const registry = Private(GettingStartedRegistryProvider); return { restrict: 'E', @@ -40,8 +39,11 @@ app.directive('gettingStarted', function ($injector) { uiChrome.setVisible(false); } - this.topMessages = topMessagesRegistry.raw.map(item => item.template); - this.manageAndMonitorMessages = manageAndMonitorMessagesRegistry.raw.map(item => item.template); + const registeredTopMessages = registry.byType[GETTING_STARTED_REGISTRY_TYPES.TOP_MESSAGE] || []; + this.topMessages = registeredTopMessages.map(item => item.template); + + const registeredManageAndMonitorMessages = registry.byType[GETTING_STARTED_REGISTRY_TYPES.MANAGE_AND_MONITOR_MESSAGE] || []; + this.manageAndMonitorMessages = registeredManageAndMonitorMessages.map(item => item.template); this.imageUrls = { kibanaLogo, diff --git a/src/core_plugins/testbed/public/index.js b/src/core_plugins/testbed/public/index.js index 5b6ee23bb855441..67a8d0dc21d2b11 100644 --- a/src/core_plugins/testbed/public/index.js +++ b/src/core_plugins/testbed/public/index.js @@ -2,20 +2,24 @@ import './testbed'; import './components/blahblah'; -import { GettingStartedTopMessagesRegistryProvider } from 'ui/getting_started/top_messages_registry'; -import { GettingStartedMonitorAndManageMessagesRegistryProvider } from 'ui/getting_started/monitor_and_manage_messages_registry'; +import { GettingStartedRegistryProvider } from 'ui/getting_started/registry'; +import { GETTING_STARTED_REGISTRY_TYPES } from 'ui/getting_started/constants'; -GettingStartedTopMessagesRegistryProvider.register(() => ({ +GettingStartedRegistryProvider.register(() => ({ + type: GETTING_STARTED_REGISTRY_TYPES.TOP_MESSAGE, template: `` })); -GettingStartedTopMessagesRegistryProvider.register(() => ({ +GettingStartedRegistryProvider.register(() => ({ + type: GETTING_STARTED_REGISTRY_TYPES.TOP_MESSAGE, template: `Nam hendrerit augue id egestas ultricies.` })); -GettingStartedMonitorAndManageMessagesRegistryProvider.register(() => ({ +GettingStartedRegistryProvider.register(() => ({ + type: GETTING_STARTED_REGISTRY_TYPES.MANAGE_AND_MONITOR_MESSAGE, template: `Lorem ipsum dolor sit amet, consectetur consectetur adipiscing elit.` })); -GettingStartedMonitorAndManageMessagesRegistryProvider.register(() => ({ +GettingStartedRegistryProvider.register(() => ({ + type: GETTING_STARTED_REGISTRY_TYPES.MANAGE_AND_MONITOR_MESSAGE, template: `Nam luctus mattis urna, ac fringilla tellus efficitur at.` })); diff --git a/src/ui/public/getting_started/constants.js b/src/ui/public/getting_started/constants.js index 892b1a7178f8f34..a1b839d00ed6707 100644 --- a/src/ui/public/getting_started/constants.js +++ b/src/ui/public/getting_started/constants.js @@ -1 +1,6 @@ -export const GETTING_STARTED_OPT_OUT_FLAG = 'kibana.isGettingStartedOptedOut'; \ No newline at end of file +export const GETTING_STARTED_OPT_OUT_FLAG = 'kibana.isGettingStartedOptedOut'; + +export const GETTING_STARTED_REGISTRY_TYPES = { + TOP_MESSAGE: 'topMessage', + MANAGE_AND_MONITOR_MESSAGE: 'monitorAndManageMessage' +}; \ No newline at end of file