From dacdb44cd29fa08073ba3408cbc1c0b5e2db4b3c Mon Sep 17 00:00:00 2001 From: Abrar Al Hasan Date: Sat, 10 Jun 2023 11:42:18 +0530 Subject: [PATCH 1/2] dashboard Reset button disable --- .../customize_panel_editor.tsx | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx index 0c19452867038..f31e63ca6e5eb 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx @@ -125,8 +125,14 @@ export const CustomizePanelEditor = (props: CustomizePanelProps) => { setPanelTitle(embeddable.getOutput().defaultTitle)} - disabled={hideTitle || !editMode} + onClick={() => { + setPanelTitle(embeddable.getInput().title ?? embeddable.getOutput().defaultTitle); + }} + disabled={ + hideTitle || !editMode || embeddable.getInput().title != undefined + ? embeddable.getInput().title === panelTitle + : embeddable.getOutput().defaultTitle === panelTitle || panelTitle === '' + } aria-label={i18n.translate( 'embeddableApi.customizePanel.flyout.optionsMenuForm.resetCustomTitleButtonAriaLabel', { @@ -170,9 +176,16 @@ export const CustomizePanelEditor = (props: CustomizePanelProps) => { size="xs" data-test-subj="resetCustomEmbeddablePanelDescriptionButton" onClick={() => { - setPanelDescription(embeddable.getOutput().defaultDescription); + setPanelDescription( + embeddable.getInput().description ?? embeddable.getOutput().defaultDescription + ); }} - disabled={hideTitle || !editMode} + disabled={ + hideTitle || !editMode || embeddable.getInput().description != undefined + ? embeddable.getInput().description === panelDescription + : embeddable.getOutput().defaultDescription === panelDescription || + panelDescription === '' + } aria-label={i18n.translate( 'embeddableApi.customizePanel.flyout.optionsMenuForm.resetCustomDescriptionButtonAriaLabel', { From 3eb79f32417bf116725c212dc0d0d189b2f22475 Mon Sep 17 00:00:00 2001 From: Abrar Al Hasan Date: Mon, 12 Jun 2023 22:07:49 +0530 Subject: [PATCH 2/2] Fix reset button behavior based on feedback --- .../customize_panel_editor.tsx | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx index f31e63ca6e5eb..f51828159f895 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_panel/customize_panel_editor.tsx @@ -125,13 +125,9 @@ export const CustomizePanelEditor = (props: CustomizePanelProps) => { { - setPanelTitle(embeddable.getInput().title ?? embeddable.getOutput().defaultTitle); - }} + onClick={() => setPanelTitle(embeddable.getOutput().defaultTitle)} disabled={ - hideTitle || !editMode || embeddable.getInput().title != undefined - ? embeddable.getInput().title === panelTitle - : embeddable.getOutput().defaultTitle === panelTitle || panelTitle === '' + hideTitle || !editMode || embeddable.getOutput().defaultTitle === panelTitle } aria-label={i18n.translate( 'embeddableApi.customizePanel.flyout.optionsMenuForm.resetCustomTitleButtonAriaLabel', @@ -176,15 +172,12 @@ export const CustomizePanelEditor = (props: CustomizePanelProps) => { size="xs" data-test-subj="resetCustomEmbeddablePanelDescriptionButton" onClick={() => { - setPanelDescription( - embeddable.getInput().description ?? embeddable.getOutput().defaultDescription - ); + setPanelDescription(embeddable.getOutput().defaultDescription); }} disabled={ - hideTitle || !editMode || embeddable.getInput().description != undefined - ? embeddable.getInput().description === panelDescription - : embeddable.getOutput().defaultDescription === panelDescription || - panelDescription === '' + hideTitle || + !editMode || + embeddable.getOutput().defaultDescription === panelDescription } aria-label={i18n.translate( 'embeddableApi.customizePanel.flyout.optionsMenuForm.resetCustomDescriptionButtonAriaLabel',