-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[visualize embeddable] fix panel disappears from dashboard when cance…
…ling edit after dashboard save (#193914) Part of #193905. Broke work into separate PRs to backport map embeddable changes to 8.15. Resolves issue for Visualize embeddable and dashboard empty screen. The problem is that Visualize embeddable is using a stale result from `parentApi.getAppContext`. Dashboard's `getAppContext` changes the `getCurrentPath` when the dashboard has a saved object id. By using the stale results, `getCurrentPath` returned `#/create` instead of `#/view/`. The fix is to get a current version of `getAppContext` when required. ### Test steps 1. create new dashboard 2. Click "Add panel" (problem also exists when using "Add from library") 3. Select "Aggregation based" 4. In editor, click "Save and return" 5. Save dashboard 6. Click "Edit" in panel context menu 7. In editor, click "Cancel" 8. Ensure visualize panel is still displayed in dashboard (cherry picked from commit d6c8840)
- Loading branch information
Showing
4 changed files
with
102 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/plugins/visualizations/public/embeddable/initialize_edit_api.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| import { i18n } from '@kbn/i18n'; | ||
| import { | ||
| PublishingSubject, | ||
| apiHasAppContext, | ||
| apiPublishesTimeRange, | ||
| } from '@kbn/presentation-publishing'; | ||
| import { TimeRange } from '@kbn/es-query'; | ||
| import type { Vis } from '../vis'; | ||
| import { urlFor } from '../utils/saved_visualize_utils'; | ||
| import { getCapabilities, getEmbeddable } from '../services'; | ||
|
|
||
| export function initializeEditApi({ | ||
| customTimeRange$, | ||
| description$, | ||
| parentApi, | ||
| savedObjectId$, | ||
| searchSessionId$, | ||
| title$, | ||
| vis$, | ||
| uuid, | ||
| }: { | ||
| customTimeRange$: PublishingSubject<TimeRange | undefined>; | ||
| description$: PublishingSubject<string | undefined>; | ||
| parentApi?: unknown; | ||
| savedObjectId$: PublishingSubject<string | undefined>; | ||
| searchSessionId$: PublishingSubject<string | undefined>; | ||
| title$: PublishingSubject<string | undefined>; | ||
| vis$: PublishingSubject<Vis>; | ||
| uuid: string; | ||
| }) { | ||
| return !parentApi || !apiHasAppContext(parentApi) | ||
| ? {} | ||
| : { | ||
| getTypeDisplayName: () => | ||
| i18n.translate('visualizations.displayName', { | ||
| defaultMessage: 'visualization', | ||
| }), | ||
| onEdit: async () => { | ||
| const stateTransferService = getEmbeddable().getStateTransfer(); | ||
| const visId = savedObjectId$.getValue(); | ||
| const editPath = visId ? urlFor(visId) : '#/edit_by_value'; | ||
| const parentTimeRange = apiPublishesTimeRange(parentApi) | ||
| ? parentApi.timeRange$.getValue() | ||
| : {}; | ||
| const customTimeRange = customTimeRange$.getValue(); | ||
| const parentApiContext = parentApi.getAppContext(); | ||
|
|
||
| await stateTransferService.navigateToEditor('visualize', { | ||
| path: editPath, | ||
| state: { | ||
| embeddableId: uuid, | ||
| valueInput: { | ||
| savedVis: vis$.getValue().serialize(), | ||
| title: title$.getValue(), | ||
| description: description$.getValue(), | ||
| timeRange: customTimeRange ?? parentTimeRange, | ||
| }, | ||
| originatingApp: parentApiContext?.currentAppId, | ||
| searchSessionId: searchSessionId$.getValue() || undefined, | ||
| originatingPath: parentApiContext?.getCurrentPath?.(), | ||
| }, | ||
| }); | ||
| }, | ||
| isEditingEnabled: () => { | ||
| const readOnly = Boolean(vis$.getValue().type.disableEdit); | ||
| if (readOnly) return false; | ||
| const capabilities = getCapabilities(); | ||
| const isByValue = !savedObjectId$.getValue(); | ||
| if (isByValue) | ||
| return Boolean( | ||
| capabilities.dashboard?.showWriteControls && capabilities.visualize?.show | ||
| ); | ||
| else return Boolean(capabilities.visualize?.save); | ||
| }, | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters