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

added new changes for the sidebar #124

Closed
wants to merge 2 commits into from
Closed

added new changes for the sidebar #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f28351
added changes for sidebar
sumukhswamy Sep 16, 2023
dffcdc6
added side bar with tables indexed
sumukhswamy Sep 21, 2023
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
148 changes: 126 additions & 22 deletions public/components/Main/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle, EuiPageSideBar ,EuiSideNav, EuiPanel, EuiPageTemplate, EuiPage, EuiPageContent, EuiPageContentBody, EuiFlexGrid, EuiSplitPanel, EuiComboBox, EuiText, EuiPagination, EuiPopover, EuiFieldSearch} from '@elastic/eui';
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you run lint here

import { IHttpResponse } from 'angular';
import _ from 'lodash';
import React from 'react';
Expand All @@ -20,6 +20,7 @@ import { PPLPage } from '../PPLPage/PPLPage';
import Switch from '../QueryLanguageSwitch/Switch';
import QueryResults from '../QueryResults/QueryResults';
import { SQLPage } from '../SQLPage/SQLPage';
import {TableView} from '../SQLPage/TableView'

interface ResponseData {
ok: boolean;
Expand Down Expand Up @@ -64,7 +65,7 @@ export type DataRow = {
rowId: number;
data: { [key: string]: any };
};

interface MainProps {
httpClient: CoreStart['http'];
setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => void;
Expand All @@ -87,6 +88,7 @@ interface MainState {
itemIdToExpandedRowMap: ItemIdToExpandedRowMap;
messages: Array<QueryMessage>;
isResultFullScreen: boolean;
tablenames: string[]
}

const SUCCESS_MESSAGE = 'Success';
Expand All @@ -99,6 +101,29 @@ const errorQueryResponse = (queryResultResponseDetail: any) => {
return errorMessage;
};

function getQueryResultsForSidebar(queryResults: ResponseDetail<string>[]){
let fields;
queryResults.map((queries: ResponseDetail<string>) => {
if (!queries.fulfilled) {
return {
fulfilled: queries.fulfilled,
errorMessage: errorQueryResponse(queries),
};
} else {
const responseObj = queries.data
? JSON.parse(queries.data)
: '';

const schema: object[] = _.get(responseObj, 'schema');
const datarows: any[][] = _.get(responseObj, 'datarows');
fields = datarows.map((data)=>{
return data[2]
})
}
})
return fields
}

export function getQueryResultsForTable(
queryResults: ResponseDetail<string>[]
): ResponseDetail<QueryResult>[] {
Expand Down Expand Up @@ -218,12 +243,13 @@ export class Main extends React.Component<MainProps, MainState> {
itemIdToExpandedRowMap: {},
messages: [],
isResultFullScreen: false,
tablenames : []
};

this.httpClient = this.props.httpClient;
this.updateSQLQueries = _.debounce(this.updateSQLQueries, 250).bind(this);
this.updatePPLQueries = _.debounce(this.updatePPLQueries, 250).bind(this);
this.setIsResultFullScreen = this.setIsResultFullScreen.bind(this);
this.onRunSidebar()
}

componentDidMount() {
Expand Down Expand Up @@ -335,6 +361,44 @@ export class Main extends React.Component<MainProps, MainState> {
});
}

onRunSidebar = (): void => {
let values :string[];
const queries: string[] = getQueries(`SHOW tables LIKE '%';`)
if (queries.length > 0) {
let endpoint = '../api/sql_console/sqlquery';
const responsePromise = Promise.all(
queries.map((query: string) =>
this.httpClient
.post(endpoint, { body: JSON.stringify({ query }) })
.catch((error: any) => {
this.setState({
messages: [
{
text: error.message,
className: 'error-message',
},
],
});
})
)
);
Promise.all([responsePromise]).then(([response]) => {
const results: ResponseDetail<string>[] = response.map((response) =>
this.processQueryResponse(response as IHttpResponse<ResponseData>)
);
values = getQueryResultsForSidebar(results);
this.setState(
{
tablenames : values
},
() => console.log('Successfully updated the states')
); // added callback function to handle async issues

return values
});
}
}

onRun = (queriesString: string): void => {
const queries: string[] = getQueries(queriesString);
const language = this.state.language;
Expand Down Expand Up @@ -617,6 +681,7 @@ export class Main extends React.Component<MainProps, MainState> {
let linkTitle;

if (this.state.language == 'SQL') {
// this.onRunSidebar()
page = (
<SQLPage
onRun={this.onRun}
Expand Down Expand Up @@ -685,25 +750,61 @@ export class Main extends React.Component<MainProps, MainState> {
}

return (
<div>
<div className="sql-console-query-container">
<div className="query-language-switch">
<>
<EuiPanel>
<EuiFlexGroup direction='row' alignItems='center'>
<EuiFlexItem>
<EuiText>
Data Connection
</EuiText>
<EuiComboBox
placeholder='Connection Name'
/>
<EuiSpacer/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<Switch onChange={this.onChange} language={this.state.language} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton href={link} target="_blank" iconType="popout" iconSide="right">
{linkTitle}
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>
<EuiPage paddingSize='none'>
{(this.state.language=='SQL')?
<EuiPanel className={`col-md-3`}>
<EuiPageSideBar >
<EuiFlexGroup direction="column">
<EuiFlexItem>
<EuiFlexItem grow={1}>
<EuiButton
iconType="arrowDown"
iconSide="right"
fullWidth
>
Create
</EuiButton>
</EuiFlexItem>
<EuiSpacer/>
<EuiFlexItem>
<EuiFieldSearch
placeholder="Search this"
/>
</EuiFlexItem>
<EuiSpacer/>
<TableView
tablenames = {this.state.tablenames}/>
<EuiSpacer/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPageSideBar>
</EuiPanel> : null}
<EuiPageContent>
<EuiPageContentBody>
<EuiFlexGroup alignItems="center">
<EuiFlexItem>
<EuiTitle size="l">
<h1>Query Workbench</h1>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<Switch onChange={this.onChange} language={this.state.language} />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton href={link} target="_blank" iconType="popout" iconSide="right">
{linkTitle}
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</div>
<EuiSpacer size="l" />
<div>{page}</div>

Expand Down Expand Up @@ -746,8 +847,11 @@ export class Main extends React.Component<MainProps, MainState> {
setIsResultFullScreen={this.setIsResultFullScreen}
/>
</div>
</div>
</div>
</EuiPageContentBody>
</EuiPageContent>
</EuiPage>
</>

);
}
}
Expand Down
36 changes: 36 additions & 0 deletions public/components/SQLPage/TableView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/


import React from "react";
import {
EuiIcon,
EuiTreeView
} from "@elastic/eui";
import _ from 'lodash';

export const TableView =({tablenames}) =>{
let treeData;
if(tablenames.length >0){
treeData = tablenames.map((element,index)=>({
label: element,
icon: <EuiIcon type='tableDensityNormal' size="m" /> ,
id:'element_'+index
}))
}
return (
<>
{tablenames.length>0?
<EuiTreeView
aria-label = "Sample Folder Tree"
items = {treeData}
aria-labelledby=""
/>
:null}
</>
)

}

2 changes: 1 addition & 1 deletion public/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const WorkbenchApp = ({ basename, notifications, http, navigation, chrome
<Router basename={'/' + basename}>
<I18nProvider>
<div>
<EuiPage>
<EuiPage paddingSize='none'>
<EuiPageBody>
<Route
path="/"
Expand Down
Loading