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

[DataSet Navigator] Rewire S3 components #7470

Merged
merged 4 commits into from
Jul 25, 2024
Merged

[DataSet Navigator] Rewire S3 components #7470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a9dee3
rewiring databases back into navigator
sejli Jul 25, 2024
405b0b8
fixing async query support
sejli Jul 25, 2024
f89c4a9
Merge branch 'feature/discover-2.0-1' into fix-s3
sejli Jul 25, 2024
6ff885a
Merge branch 'feature/discover-2.0-1' into fix-s3
sejli Jul 25, 2024
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
70 changes: 35 additions & 35 deletions src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
useLoadTablesToCache,
} from './lib/catalog_cache/cache_loader';
import { CatalogCacheManager } from './lib/catalog_cache/cache_manager';
import { CachedDataSourceStatus, DirectQueryLoadingStatus } from './lib/types';
import { CachedDataSourceStatus, CachedDatabase, DirectQueryLoadingStatus } from './lib/types';
import {
getIndexPatterns,
getNotifications,
Expand Down Expand Up @@ -181,7 +181,7 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
type: selectedPattern.dataSourceRef.type,
},
}
: { dataSource: undefined }),
: { dataSourceRef: undefined }),
database: undefined,
isExternal: false,
});
Expand Down Expand Up @@ -238,7 +238,7 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {

const handleSelectExternalDataSource = useCallback(
async (dataSource) => {
if (selectedDataSetState.isExternal && dataSource) {
if (dataSource && dataSource.type === SIMPLE_DATA_SOURCE_TYPES.EXTERNAL) {
const dataSourceCache = CatalogCacheManager.getOrCreateDataSource(
dataSource.name,
dataSource.id
Expand All @@ -257,22 +257,22 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
...prevState,
cachedDatabases: dataSourceCache.databases,
}));
setSelectedDataSetState((prevState) => ({
...prevState,
dataSource,
isExternal: true,
}));
}
setSelectedDataSetState((prevState) => ({
...prevState,
dataSourceRef: dataSource,
isExternal: true,
}));
}
},
[databasesLoadStatus, selectedDataSetState.isExternal, startLoadingDatabases]
[databasesLoadStatus, startLoadingDatabases]
);

// Start loading tables for selected database
const handleSelectExternalDatabase = useCallback(
(externalDatabase: SimpleDataSource) => {
if (selectedDataSetState.dataSourceRef && externalDatabase) {
let databaseCache;
let databaseCache: CachedDatabase;
try {
databaseCache = CatalogCacheManager.getDatabase(
selectedDataSetState.dataSourceRef.name,
Expand All @@ -292,10 +292,6 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
databaseName: externalDatabase.name,
dataSourceMDSId: selectedDataSetState.dataSourceRef.id,
});
setSelectedDataSetState((prevState) => ({
...prevState,
database: externalDatabase,
}));
} else if (databaseCache.status === CachedDataSourceStatus.Updated) {
setNavigatorState((prevState) => ({
...prevState,
Expand All @@ -315,7 +311,7 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
selectedDataSetState.database
) {
const tablesStatus = tablesLoadStatus.toLowerCase();
let databaseCache;
let databaseCache: CachedDatabase;
try {
databaseCache = CatalogCacheManager.getDatabase(
selectedDataSetState.dataSourceRef.name,
Expand Down Expand Up @@ -530,9 +526,13 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
? selectedDataSetState.dataSourceRef?.name
: 'Databases',
items: [
...navigatorState.externalDataSources.map((db) => ({
...navigatorState.cachedDatabases.map((db) => ({
name: db.name,
onClick: async () => {
setSelectedDataSetState((prevState) => ({
...prevState,
database: db,
}));
await handleSelectExternalDatabase(db);
},
panel: 6,
Expand Down Expand Up @@ -608,7 +608,7 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
...prevState,
externalDataSources: externalDataSourcesCache.externalDataSources.map(
(ds) => ({
id: ds.name,
id: ds.dataSourceRef,
name: ds.name,
type: SIMPLE_DATA_SOURCE_TYPES.EXTERNAL,
})
Expand All @@ -628,28 +628,28 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
createDatabasesPanel(),
{
id: 6,
title: selectedDataSetState.database ? selectedDataSetState.database : 'Tables',
title: selectedDataSetState.database ? selectedDataSetState.database.name : 'Tables',
items: [
...navigatorState.cachedTables.map((table) => ({
name: table.title,
name: table.name,
onClick: async () => {
setSelectedDataSetState((prevState) => ({
...prevState,
object: {
id: `${selectedDataSetState.dataSourceRef!.name}.${
selectedDataSetState.database
}.${table.title}`,
title: `${selectedDataSetState.dataSourceRef!.name}.${
selectedDataSetState.database
}.${table.title}`,
dataSource: {
id: selectedDataSetState.dataSourceRef!.id,
name: selectedDataSetState.dataSourceRef!.name,
type: selectedDataSetState.dataSourceRef!.type,
},
type: SIMPLE_DATA_SET_TYPES.TEMPORARY_ASYNC,
const tableObject = {
...selectedDataSetState,
id: `${selectedDataSetState.dataSourceRef!.name}.${
selectedDataSetState.database.name
}.${table.name}`,
title: `${selectedDataSetState.dataSourceRef!.name}.${
selectedDataSetState.database.name
}.${table.name}`,
dataSourceRef: {
id: selectedDataSetState.dataSourceRef!.id,
name: selectedDataSetState.dataSourceRef!.name,
type: selectedDataSetState.dataSourceRef!.type,
},
}));
type: SIMPLE_DATA_SET_TYPES.TEMPORARY_ASYNC,
};
setSelectedDataSetState(tableObject);
handleSelectedDataSet(tableObject);
},
})),
],
Expand Down
9 changes: 7 additions & 2 deletions src/plugins/data/public/ui/dataset_navigator/lib/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { EuiComboBoxOptionOption } from '@elastic/eui';
import { SimpleDataSet, SimpleObject } from '../../../../common';
import { SimpleDataSet } from '../../../../common';

export enum DirectQueryLoadingStatus {
SUCCESS = 'success',
Expand Down Expand Up @@ -121,9 +121,14 @@ export interface CachedColumn {
dataType: string;
}

export interface CachedTable {
name: string;
columns?: CachedColumn[];
}

export interface CachedDatabase {
name: string;
tables: SimpleObject[];
tables: CachedTable[];
lastUpdated: string; // date string in UTC format
status: CachedDataSourceStatus;
}
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/query_enhancements/public/search/sql_search_interceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ export class SQLSearchInterceptor extends SearchInterceptor {
...dataFrame.meta,
queryConfig: {
...dataFrame.meta.queryConfig,
...(this.queryService.dataSet.getDataSet() && {
dataSourceId: this.queryService.dataSet.getDataSet()?.dataSourceRef?.id,
dataSourceName: this.queryService.dataSet.getDataSet()?.dataSourceRef?.name,
}),
},
};

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/query_enhancements/server/search/sql_async_search_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const sqlAsyncSearchStrategyProvider = (
const df = request.body?.df;
request.body = {
query: request.body.query.qs,
datasource: df?.meta?.queryConfig?.dataSource,
datasource: df?.meta?.queryConfig?.dataSourceName,
lang: 'sql',
sessionId: df?.meta?.sessionId,
};
Expand Down
Loading