Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use dashboard factory directly instead of pulling from registry #193480

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use dashboard factory directly instead of pulling from registry #193480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';

import { LocatorPublic } from '@kbn/share-plugin/common';
import { useStateFromPublishingSubject } from '@kbn/presentation-publishing';
import { DASHBOARD_CONTAINER_TYPE } from '..';
import { DashboardContainerInput } from '../../../common';
import type { DashboardContainer } from '../embeddable/dashboard_container';
import {
DashboardContainerFactory,
DashboardContainerFactoryDefinition,
DashboardCreationOptions,
} from '../embeddable/dashboard_container_factory';
Expand Down Expand Up @@ -61,6 +59,10 @@ export function DashboardRenderer({

const id = useMemo(() => uuidv4(), []);

const dashboardFactory = useMemo(() => {
return new DashboardContainerFactoryDefinition(embeddable);
}, [embeddable])

useEffect(() => {
/* In case the locator prop changes, we need to reassign the value in the container */
if (dashboardContainer) dashboardContainer.locator = locator;
Expand Down Expand Up @@ -93,12 +95,7 @@ export function DashboardRenderer({
(async () => {
const creationOptions = await getCreationOptions?.();

const dashboardFactory = embeddable.getEmbeddableFactory(
DASHBOARD_CONTAINER_TYPE
) as DashboardContainerFactory & {
create: DashboardContainerFactoryDefinition['create'];
};
const container = await dashboardFactory?.create(
const container = await dashboardFactory.create(
{ id } as unknown as DashboardContainerInput, // Input from creationOptions is used instead.
undefined,
creationOptions,
Expand Down
9 changes: 0 additions & 9 deletions src/plugins/dashboard/public/plugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ import type {

import { CustomBrandingStart } from '@kbn/core-custom-branding-browser';
import { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
import { DashboardContainerFactoryDefinition } from './dashboard_container/embeddable/dashboard_container_factory';
import { registerDashboardPanelPlacementSetting } from './dashboard_container/panel_placement';
import {
type DashboardAppLocator,
Expand Down Expand Up @@ -239,14 +238,6 @@ export class DashboardPlugin
},
});

core.getStartServices().then(([, deps]) => {
const dashboardContainerFactory = new DashboardContainerFactoryDefinition(deps.embeddable);
embeddable.registerEmbeddableFactory(
dashboardContainerFactory.type,
dashboardContainerFactory
);
});

this.stopUrlTracking = () => {
stopUrlTracker();
};
Expand Down