Skip to content

Commit

Permalink
added bump of java version
Browse files Browse the repository at this point in the history
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
  • Loading branch information
sumukhswamy committed Jul 17, 2024
1 parent 2bb8eb0 commit 89948b7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-e2e-sql-workbench-test.yml
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ import { IHttpResponse } from 'angular';
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 { OPENSEARCH_SQL_INIT_QUERY } from '../../../common/constants';
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 Down Expand Up @@ -296,6 +300,15 @@ export class Main extends React.Component<MainProps, MainState> {
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 @@ -1014,6 +1027,7 @@ export class Main extends React.Component<MainProps, MainState> {
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 `,`
}}
/>
)}
Expand Down

0 comments on commit 89948b7

Please sign in to comment.