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

[8.16] [Discover Session] Fix "Untitled" export title when exporting CSV on a dashboard (#210143) #210880

Merged
merged 3 commits into from
Feb 25, 2025
Merged

[8.16] [Discover Session] Fix "Untitled" export title when exporting CSV on a dashboard (#210143) #210880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b05d853
[Discover Session] Fix "Untitled" export title when exporting CSV on …
kertal Feb 12, 2025
f2bcce6
Fix backport
kibanamachine Feb 24, 2025
a43fc25
Merge branch '8.16' into backport/8.16/pr-210143
elasticmachine Feb 25, 2025
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
9 changes: 5 additions & 4 deletions packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ describe('GetCsvReportPanelAction', () => {
embeddable: {
type: 'search',
savedSearch$: new BehaviorSubject({ searchSource: mockSearchSource }),
getTitle: () => `The Dude`,
getInspectorAdapters: () => null,
getInput: () => ({
viewMode: 'list',
Expand All @@ -104,6 +103,8 @@ describe('GetCsvReportPanelAction', () => {
},
}),
hasTimeRange: () => true,
panelTitle: new BehaviorSubject('embeddable title'),
hidePanelTitle: new BehaviorSubject(false),
parentApi: {
viewMode: new BehaviorSubject('view'),
},
Expand Down Expand Up @@ -133,7 +134,7 @@ describe('GetCsvReportPanelAction', () => {
columns: [],
objectType: 'search',
searchSource: {},
title: '',
title: 'embeddable title',
version: '7.15.0',
});
});
Expand Down Expand Up @@ -168,7 +169,7 @@ describe('GetCsvReportPanelAction', () => {
columns: ['column_a', 'column_b'],
objectType: 'search',
searchSource: { testData: 'testDataValue' },
title: '',
title: 'embeddable title',
version: '7.15.0',
});
});
Expand All @@ -187,7 +188,7 @@ describe('GetCsvReportPanelAction', () => {
await panel.execute(context);

expect(core.http.post).toHaveBeenCalledWith('/internal/reporting/generate/csv_searchsource', {
body: '{"jobParams":"(columns:!(),objectType:search,searchSource:(),title:\'\',version:\'7.15.0\')"}',
body: '{"jobParams":"(columns:!(),objectType:search,searchSource:(),title:\'embeddable title\',version:\'7.15.0\')"}',
method: 'POST',
});
});
Expand Down
14 changes: 10 additions & 4 deletions packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ import {
apiCanAccessViewMode,
apiHasType,
apiIsOfType,
apiPublishesPanelTitle,
CanAccessViewMode,
EmbeddableApiContext,
getInheritedViewMode,
HasType,
PublishesPanelTitle,
} from '@kbn/presentation-publishing';
import { toMountPoint } from '@kbn/react-kibana-mount';
import { CSV_REPORTING_ACTION, JobAppParamsCSV } from '@kbn/reporting-export-types-csv-common';
Expand All @@ -44,7 +46,6 @@ import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
import type { ClientConfigType } from '@kbn/reporting-public/types';
import { checkLicense } from '@kbn/reporting-public/license_check';
import type { ReportingAPIClient } from '@kbn/reporting-public/reporting_api_client';

import { getI18nStrings } from './strings';

export interface PanelActionDependencies {
Expand Down Expand Up @@ -83,15 +84,20 @@ interface ExecutionParams {
i18nStart: I18nStart;
}

type GetCsvActionApi = HasType & PublishesSavedSearch & CanAccessViewMode & HasTimeRange;
type GetCsvActionApi = HasType &
PublishesSavedSearch &
CanAccessViewMode &
HasTimeRange &
PublishesPanelTitle;

const compatibilityCheck = (api: EmbeddableApiContext['embeddable']): api is GetCsvActionApi => {
return (
apiHasType(api) &&
apiIsOfType(api, SEARCH_EMBEDDABLE_TYPE) &&
apiPublishesSavedSearch(api) &&
apiCanAccessViewMode(api) &&
Boolean((api as unknown as HasTimeRange).hasTimeRange)
Boolean((api as unknown as HasTimeRange).hasTimeRange) &&
apiPublishesPanelTitle(api)
);
};

Expand Down Expand Up @@ -275,7 +281,7 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
addGlobalTimeFilter: !embeddable.hasTimeRange(),
absoluteTime: true,
});
const title = savedSearch.title || '';
const title = embeddable.panelTitle.getValue() ?? '';
const executionParams = { searchSource, columns, title, savedSearch, i18nStart, analytics };

if (this.enablePanelActionDownload) {
Expand Down