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

Bump version to 2.0.0 #311

Merged
merged 6 commits into from
Mar 24, 2022
Merged

Bump version to 2.0.0 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0efb09c
Bump version to 2.0
eugenesk24 Mar 21, 2022
248dfa2
Revert jest config for build failure
eugenesk24 Mar 21, 2022
b5063b3
Use dashboards 1.3 for build
eugenesk24 Mar 21, 2022
6707fac
Bump node version
eugenesk24 Mar 23, 2022
c3233cb
resolve package conflict versions
davidcui1225 Mar 23, 2022
100cba9
update main test to use done() instead of both done() and async/await
davidcui1225 Mar 23, 2022
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
6 changes: 3 additions & 3 deletions .github/workflows/dashboards-reports-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions dashboards-reports/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 5 additions & 5 deletions dashboards-reports/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions dashboards-reports/public/components/main/__tests__/main.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function setBreadcrumbs(array: []) {

describe('<Main /> panel', () => {
configure({ adapter: new Adapter() });
test('render component', async (done) => {
test('render component', (done) => {
window = Object.create(window);
Object.defineProperty(window, 'location', {
configurable: true,
Expand All @@ -27,7 +27,7 @@ describe('<Main /> panel', () => {
},
});

const { container } = await render(
const { container } = render(
<Main httpClient={httpClientMock} setBreadcrumbs={setBreadcrumbs} />
);

Expand Down
1 change: 1 addition & 0 deletions dashboards-reports/test/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ module.exports = {
'\\.(css|less|sass|scss)$': '<rootDir>/test/__mocks__/styleMock.js',
'\\.(gif|ttf|eot|svg)$': '<rootDir>/test/__mocks__/fileMock.js',
},
testEnvironment: 'jsdom',
Copy link
Member

Choose a reason for hiding this comment

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

what's this for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@joshuali925 This was added in sql so I added just in case but I am not sure if it is needed in reporting. opensearch-project/dashboards-visualizations#56 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

Does removing this testEnvironment config help unblock the front-end CI workflow?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately it did not

};