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 bump of java version #351

Closed
wants to merge 1 commit into from
Closed

added bump of java version #351

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
2 changes: 1 addition & 1 deletion .github/workflows/cypress-e2e-sql-workbench-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
jdk: [ 11 ]
jdk: [ 21 ]
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ftr-e2e-sql-workbench-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
jdk: [ 11 ]
jdk: [ 21 ]
runs-on: ${{ matrix.os }}

steps:
Expand Down
14 changes: 14 additions & 0 deletions public/components/Main/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@
import { createBrowserHistory } from 'history';
import _ from 'lodash';
import React from 'react';
import semver from "semver";

Check failure on line 25 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `"semver"` with `'semver'`
import {
ChromeBreadcrumb,
CoreStart,
MountPoint,
NotificationsStart,
SavedObject,
SavedObjectsStart,
} from '../../../../../src/core/public';
import { DataSourceAttributes } from "../../../../../src/plugins/data_source/common/data_sources";

Check failure on line 34 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `"../../../../../src/plugins/data_source/common/data_sources"` with `'../../../../../src/plugins/data_source/common/data_sources'`
import {
DataSourceManagementPluginSetup,
DataSourceSelectableConfig,
Expand All @@ -38,6 +41,7 @@
import { AsyncApiResponse, AsyncQueryStatus } from '../../../common/types';
import { executeAsyncQuery } from '../../../common/utils/async_query_helpers';
import { fetchDataSources } from '../../../common/utils/fetch_datasources';
import * as pluginManifest from "../../../opensearch_dashboards.json";

Check failure on line 44 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `"../../../opensearch_dashboards.json"` with `'../../../opensearch_dashboards.json'`
import { MESSAGE_TAB_LABEL } from '../../utils/constants';
import {
Tree,
Expand All @@ -57,8 +61,8 @@

interface ResponseData {
ok: boolean;
resp: any;

Check warning on line 64 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
body: any;

Check warning on line 65 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
}

export interface ResponseDetail<T> {
Expand All @@ -68,11 +72,11 @@
}

export interface TranslateResult {
[key: string]: any;

Check warning on line 75 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
}

export interface QueryMessage {
text: any;

Check warning on line 79 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
className: string;
}

Expand All @@ -92,13 +96,13 @@
[key: string]: {
nodes: Tree;
expandedRow?: {};
selectedNodes?: { [key: string]: any };

Check warning on line 99 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
};
}

export interface DataRow {
rowId: number;
data: { [key: string]: any };

Check warning on line 105 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
}

interface MainProps {
Expand Down Expand Up @@ -146,7 +150,7 @@
}

const SUCCESS_MESSAGE = 'Success';
const errorQueryResponse = (queryResultResponseDetail: any) => {

Check warning on line 153 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
const errorMessage =
queryResultResponseDetail.errorMessage +
', this query is not runnable. \n \n' +
Expand Down Expand Up @@ -174,7 +178,7 @@
const dataRows: DataRow[] = [];

const schema: object[] = _.get(responseObj, 'schema');
const datarows: any[][] = _.get(responseObj, 'datarows');

Check warning on line 181 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
let queryType = 'default';

for (const column of schema.values()) {
Expand All @@ -199,7 +203,7 @@
}

for (const [id, field] of datarows.entries()) {
const row: { [key: string]: any } = {};

Check warning on line 206 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
row.TABLE_NAME = field[index];
const dataRow: DataRow = {
rowId: id,
Expand All @@ -212,7 +216,7 @@
case 'describe':
case 'default':
for (const [id, field] of schema.entries()) {
let alias: any = null;

Check warning on line 219 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
try {
alias = _.get(field, 'alias');
} catch (e) {
Expand Down Expand Up @@ -288,7 +292,7 @@
dataSourceOptions: [],
selectedMDSDataConnectionId: '',
mdsClusterName: '',
flintDataConnections: false

Check failure on line 295 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Insert `,`
};
this.httpClient = this.props.httpClient;
this.updateSQLQueries = _.debounce(this.updateSQLQueries, 250).bind(this);
Expand All @@ -296,6 +300,15 @@
this.setIsResultFullScreen = this.setIsResultFullScreen.bind(this);
}

dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
const engineVersion = dataSource?.attributes?.dataSourceVersion || "";

Check failure on line 304 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `""` with `''`
const availablePlugins = dataSource?.attributes?.installedPlugins || [];
return (
semver.satisfies(engineVersion, pluginManifest.supportedOSDataSourceVersions) &&
pluginManifest.requiredOSDataSourcePlugins.every((plugin) => availablePlugins.includes(plugin))

Check failure on line 308 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `·availablePlugins.includes(plugin)` with `⏎········availablePlugins.includes(plugin)⏎······`
);
};

componentDidMount() {
this.props.setBreadcrumbs([
{
Expand Down Expand Up @@ -900,7 +913,7 @@
mdsClusterName: clusterName,
cluster: 'Indexes',
selectedDatasource: [{ label: 'OpenSearch', key: '' }],
isAccelerationFlyoutOpened: false

Check failure on line 916 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Insert `,`
});
this.fetchFlintDataSources();
};
Expand Down Expand Up @@ -1014,11 +1027,12 @@
notifications: this.props.notifications,
fullWidth: true,
onSelectedDataSources: this.onSelectedDataSource,
dataSourceFilter: this.dataSourceFilterFn

Check failure on line 1030 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Insert `,`
}}
/>
)}
<EuiPage paddingSize="none">
<EuiPanel grow={true} style={{marginRight: '10px'}}>

Check failure on line 1035 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `marginRight:·'10px'` with `·marginRight:·'10px'·`
<EuiPageSideBar
style={{
maxWidth: '400px',
Expand All @@ -1026,7 +1040,7 @@
height: 'calc(100vh - 254px)',
}}
>
<EuiTitle size='xs'>

Check failure on line 1043 in public/components/Main/main.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Replace `'xs'` with `"xs"`
<p><b>{this.state.mdsClusterName}</b></p>
</EuiTitle>
<EuiSpacer size='s'/>
Expand Down
Loading