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

Edit wizard directly on dashboard #2508

Merged
merged 2 commits into from
Oct 10, 2022
Merged

Edit wizard directly on dashboard #2508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f9f9e0
Edit wizard directly on dashboard
abbyhu2000 Sep 30, 2022
55bffea
Merge branch 'main' into edit_wizard_directly_on_dashboard
abbyhu2000 Oct 10, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* Add updated_at column to objects' tables ([#1218](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/1218))
* [Viz Builder] State validation before dispatching and loading ([#2351](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2351))
* [Viz Builder] Create a new wizard directly on a dashboard ([#2384](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2384))
* [Viz Builder] Edit wizard directly on dashboard ([#2508](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2508))

### 🐛 Bug Fixes

Expand Down
69 changes: 60 additions & 9 deletions src/plugins/wizard/public/application/utils/get_top_nav_config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import React from 'react';
import { i18n } from '@osd/i18n';
import { TopNavMenuData } from '../../../../navigation/public';
import {
OnSaveProps,
SavedObjectSaveModalOrigin,
SavedObjectSaveOpts,
showSaveModal,
} from '../../../../saved_objects/public';
import { WizardServices } from '../..';
Expand All @@ -58,7 +58,7 @@ export const getTopNavConfig = (
scopedHistory,
} = services;

const { originatingApp } =
const { originatingApp, embeddableId } =
embeddable
.getStateTransfer(scopedHistory)
.getIncomingEditorState({ keysToRemoveAfterFetch: ['id', 'input'] }) || {};
Expand All @@ -67,15 +67,20 @@ export const getTopNavConfig = (
const topNavConfig: TopNavMenuData[] = [
{
id: 'save',
iconType: 'save',
iconType: savedWizardVis?.id && originatingApp ? undefined : ('save' as const),
emphasize: savedWizardVis && !savedWizardVis.id,
description: i18n.translate('wizard.topNavMenu.saveVisualizationButtonAriaLabel', {
defaultMessage: 'Save Visualization',
}),
className: 'saveButton',
label: i18n.translate('wizard.topNavMenu.saveVisualizationButtonLabel', {
defaultMessage: 'save',
}),
className: savedWizardVis?.id && originatingApp ? 'saveAsButton' : '',
label:
savedWizardVis?.id && originatingApp
? i18n.translate('wizard.topNavMenu.saveVisualizationAsButtonLabel', {
defaultMessage: 'save as',
})
: i18n.translate('wizard.topNavMenu.saveVisualizationButtonLabel', {
defaultMessage: 'save',
}),
testId: 'wizardSaveButton',
disableButton: !!saveDisabledReason,
tooltip: saveDisabledReason,
Expand All @@ -100,6 +105,46 @@ export const getTopNavConfig = (
showSaveModal(saveModal, I18nContext);
},
},
...(originatingApp && ((savedWizardVis && savedWizardVis.id) || embeddableId)
? [
{
id: 'saveAndReturn',
label: i18n.translate('visualize.topNavMenu.saveAndReturnVisualizationButtonLabel', {
defaultMessage: 'Save and return',
}),
emphasize: true,
iconType: 'checkInCircleFilled' as const,
description: i18n.translate(
'wizard.topNavMenu.saveAndReturnVisualizationButtonAriaLabel',
{
defaultMessage: 'Finish editing wizard and return to the last app',
}
),
testId: 'wizardsaveAndReturnButton',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: Casing is off on this one.

disableButton: !!saveDisabledReason,
tooltip: saveDisabledReason,
run: async () => {
const saveOptions = {
newTitle: savedWizardVis.title,
newCopyOnSave: false,
isTitleDuplicateConfirmed: false,
newDescription: savedWizardVis.description,
returnToOrigin: true,
};

const onSave = getOnSave(
savedWizardVis,
originatingApp,
visualizationIdFromUrl,
dispatch,
services
);

return onSave(saveOptions);
},
},
]
: []),
];

return topNavConfig;
Expand All @@ -119,18 +164,24 @@ export const getOnSave = (
onTitleDuplicate,
newDescription,
returnToOrigin,
}: OnSaveProps & { returnToOrigin: boolean }) => {
}: SavedObjectSaveOpts & {
newTitle: string;
newCopyOnSave: boolean;
returnToOrigin: boolean;
newDescription?: string;
}) => {
const { embeddable, toastNotifications, application, history } = services;
const stateTransfer = embeddable.getStateTransfer();

if (!savedWizardVis) {
return;
}
const newlyCreated = !savedWizardVis.id || savedWizardVis.copyOnSave;

const currentTitle = savedWizardVis.title;
savedWizardVis.title = newTitle;
savedWizardVis.description = newDescription;
savedWizardVis.copyOnSave = newCopyOnSave;
const newlyCreated = !savedWizardVis.id || savedWizardVis.copyOnSave;

try {
const id = await savedWizardVis.save({
Expand Down