diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
index 599adc1c..400db797 100644
--- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml
+++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -5,8 +5,8 @@ on: [pull_request, push]
env:
PLUGIN_NAME: reportsDashboards
ARTIFACT_NAME: reports-dashboards
- OPENSEARCH_VERSION: '1.x'
- OPENSEARCH_PLUGIN_VERSION: 1.3.0.0
+ OPENSEARCH_VERSION: 'main'
+ OPENSEARCH_PLUGIN_VERSION: 2.0.0.0
jobs:
build:
@@ -25,7 +25,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v1
with:
- node-version: "10.24.1"
+ node-version: "14.18.2"
- name: Move Dashboards Reports to Plugins Dir
run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
index 0d7f1eb6..2162586c 100644
--- a/.github/workflows/draft-release-notes-workflow.yml
+++ b/.github/workflows/draft-release-notes-workflow.yml
@@ -16,6 +16,6 @@ jobs:
with:
config-name: draft-release-notes-config.yml
tag: (None)
- version: 1.3.0.0
+ version: 2.0.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json
index 31ac6c14..d43fcffa 100644
--- a/dashboards-reports/opensearch_dashboards.json
+++ b/dashboards-reports/opensearch_dashboards.json
@@ -1,7 +1,7 @@
{
"id": "reportsDashboards",
- "version": "1.3.0.0",
- "opensearchDashboardsVersion": "1.3.0",
+ "version": "2.0.0.0",
+ "opensearchDashboardsVersion": "2.0.0",
"requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
"optionalPlugins": ["share"],
"server": true,
diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json
index 8f1226db..d39342db 100644
--- a/dashboards-reports/package.json
+++ b/dashboards-reports/package.json
@@ -1,6 +1,6 @@
{
"name": "reports-dashboards",
- "version": "1.3.0.0",
+ "version": "2.0.0.0",
"description": "OpenSearch Dashboards Reports Plugin",
"license": "Apache-2.0",
"main": "index.ts",
@@ -38,7 +38,7 @@
"react-native-base64": "^0.0.2",
"react-native-i18n": "^2.0.15",
"react-navigation": "^4.3.9",
- "react-router-dom": "^5.2.0",
+ "react-router-dom": "^5.3.0",
"react-toast-notifications": "^2.4.0",
"set-interval-async": "1.0.33",
"showdown": "^1.9.1"
@@ -49,16 +49,16 @@
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jsdom": "^16.2.3",
"@types/puppeteer-core": "^2.0.0",
- "@types/react": "^16.9.36",
+ "@types/react": "^16.14.23",
"@types/react-addons-test-utils": "^0.14.25",
"@types/react-dom": "^16.9.8",
"@types/react-test-renderer": "^16.9.1",
"@types/set-interval-async": "^1.0.0",
"@types/showdown": "^1.9.3",
- "babel-jest": "^26.3.0",
+ "babel-jest": "^27.5.1",
"cypress": "^5.0.0",
"elastic-builder": "^2.7.1",
- "eslint-plugin-babel": "^5.3.0",
+ "eslint-plugin-babel": "^5.3.1",
"eslint-plugin-no-unsanitized": "^3.0.2",
"eslint-plugin-prefer-object-spread": "^1.2.1",
"identity-obj-proxy": "^3.0.0",
diff --git a/dashboards-reports/public/components/main/__tests__/main.test.tsx b/dashboards-reports/public/components/main/__tests__/main.test.tsx
index 8445d31d..3142326e 100644
--- a/dashboards-reports/public/components/main/__tests__/main.test.tsx
+++ b/dashboards-reports/public/components/main/__tests__/main.test.tsx
@@ -17,7 +17,7 @@ function setBreadcrumbs(array: []) {
describe(' panel', () => {
configure({ adapter: new Adapter() });
- test('render component', async (done) => {
+ test('render component', (done) => {
window = Object.create(window);
Object.defineProperty(window, 'location', {
configurable: true,
@@ -27,7 +27,7 @@ describe(' panel', () => {
},
});
- const { container } = await render(
+ const { container } = render(
);
diff --git a/dashboards-reports/test/jest.config.js b/dashboards-reports/test/jest.config.js
index cfbfff71..ec861b87 100644
--- a/dashboards-reports/test/jest.config.js
+++ b/dashboards-reports/test/jest.config.js
@@ -19,4 +19,5 @@ module.exports = {
'\\.(css|less|sass|scss)$': '/test/__mocks__/styleMock.js',
'\\.(gif|ttf|eot|svg)$': '/test/__mocks__/fileMock.js',
},
+ testEnvironment: 'jsdom',
};