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

[Data Explorer] Fix ciGroup 2 with adding data-shared-item tags on save search #5119

Merged
merged 1 commit into from
Sep 26, 2023
Merged

[Data Explorer] Fix ciGroup 2 with adding data-shared-item tags on save search #5119

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
11 changes: 10 additions & 1 deletion src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export interface DataGridTableProps {
sort: SortOrder[];
displayTimeColumn: boolean;
services: DiscoverServices;
title?: string;
description?: string;
isToolbarVisible?: boolean;
isContextView?: boolean;
isLoading?: boolean;
Expand All @@ -46,6 +48,8 @@ export const DataGridTable = ({
sort,
rows,
displayTimeColumn,
title = '',
description = '',
isToolbarVisible = true,
isContextView = false,
isLoading = false,
Expand Down Expand Up @@ -168,7 +172,12 @@ export const DataGridTable = ({
indexPattern,
}}
>
<div data-render-complete={!isLoading} data-shared-item="">
<div
data-render-complete={!isLoading}
data-shared-item=""
data-title={title}
data-description={description}
>
<EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
<EuiPanel paddingSize="s" style={{ height: '100%' }}>
{table}
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/discover/public/application/view_components/canvas/discover_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
useDispatch,
useSelector,
} from '../../utils/state_management';
import { ResultStatus, SearchData } from '../utils/use_search';
import { ResultStatus, SearchData, useSearch } from '../utils/use_search';
import { IndexPatternField, opensearchFilters } from '../../../../../data/public';
import { DocViewFilterFn } from '../../doc_views/doc_views_types';
import { SortOrder } from '../../../saved_searches/types';
Expand Down Expand Up @@ -71,6 +71,7 @@ export const DiscoverTable = ({ history }: Props) => {
);

const { rows } = fetchState || {};
const { savedSearch } = useSearch(services);

useEffect(() => {
const subscription = data$.subscribe((next) => {
Expand Down Expand Up @@ -107,6 +108,8 @@ export const DiscoverTable = ({ history }: Props) => {
rows={rows}
displayTimeColumn={displayTimeColumn}
services={services}
title={savedSearch?.id ? savedSearch.title : ''}
description={savedSearch?.id ? savedSearch.description : ''}
/>
);
};
2 changes: 2 additions & 0 deletions src/plugins/discover/public/embeddable/search_embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export interface SearchProps {
isLoading?: boolean;
displayTimeColumn?: boolean;
services: DiscoverServices;
title?: string;
}

interface SearchEmbeddableConfig {
Expand Down Expand Up @@ -226,6 +227,7 @@ export class SearchEmbeddable
inspectorAdapters: this.inspectorAdaptors,
rows: [],
description: this.savedSearch.description,
title: this.savedSearch.title,
services: this.services,
indexPattern,
isLoading: false,
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/discover/public/embeddable/search_embeddable_component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export function SearchEmbeddableComponent({ searchProps }: SearchEmbeddableProps
displayTimeColumn: searchProps.displayTimeColumn,
services: searchProps.services,
totalHitCount: searchProps.totalHitCount,
title: searchProps.title,
description: searchProps.description,
} as DiscoverEmbeddableProps;

return (
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/dashboard/dashboard_query_bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.dashboard.loadSavedDashboard('dashboard with filter');
});

it('causes panels to reload when refresh is clicked', async () => {
// https://github.com/opensearch-project/OpenSearch-Dashboards/issues/5116
it.skip('causes panels to reload when refresh is clicked', async () => {
await opensearchArchiver.unload('dashboard/current/data');

await queryBar.clickQuerySubmitButton();
Expand Down
Loading