+
- [Welcome!](#welcome)
- [Project Resources](#project-resources)
diff --git a/TESTING.md b/TESTING.md
index 2cf5e6d96c7f..5f5e54735c4f 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -6,21 +6,23 @@ Overview
- [Unit tests](#unit-tests)
- [Integration tests](#integration-tests)
- [Functional tests](#functional-tests)
+ - [Backwards Compatibility tests](#backwards-compatibility-tests)
- [Continuous Integration](#continuous-integration)
- [Environment misc](#environment-misc)
- [Misc](#misc)
# General information
-OpenSearch Dashboards uses [Jest](https://jestjs.io/) for unit and integration tests and [Selenium](https://www.selenium.dev/) for functional tests.
+OpenSearch Dashboards uses [Jest](https://jestjs.io/) for unit and integration tests, [Selenium](https://www.selenium.dev/) for functional tests, and [Cypress](https://www.cypress.io/) for backwards compatibility tests.
-In general, we recommend three tiers of tests:
+In general, we recommend four tiers of tests:
* Unit tests: Unit tests: small and modular tests that utilize mocks for external dependencies.
* Integration tests: higher-level tests that verify interactions between systems (eg. HTTP APIs, OpenSearch API calls, calling other plugin).
* End-to-end tests (e2e): functional tests that verify behavior in a web browser.
+* Backwards Compatibility tests: cypress tests that verify any changes are backwards compatible with previous versions.
# Requirements
* Install the latest NodeJS, [NPM](https://www.npmjs.com/get-npm) and [Yarn](https://classic.yarnpkg.com/en/docs/install/#mac-stable)
- * `nvm install v10.24.1`
+ * `nvm install v14.18.2`
* `npm install -g yarn`
# Running tests
@@ -48,7 +50,26 @@ To debug functional tests:
Say that you would want to debug a test in CI group 1, you can run the following command in your environment:
`node --debug-brk --inspect scripts/functional_tests.js --config test/functional/config.js --include ciGroup1 --debug`
-This will print of an address, to which you could open your chrome browser on your instance and navigate to `chrome://inspect/#devices` and inspect the functional test runner `scripts/functional_tests.js`.
+This will print off an address, to which you could open your chrome browser on your instance and navigate to `chrome://inspect/#devices` and inspect the functional test runner `scripts/functional_tests.js`.
+
+### Backwards Compatibility tests
+To run all the backwards compatibility tests on vanilla OpenSearch Dashboards:
+
+`yarn test:bwc -o [test path to opensearch.tar.gz] -d [test path to opensearch-dashboards.tar.gz]`
+
+To run all the backwards compatibility tests on bundled dashboards, pass the bundle parameter to the test:
+
+`yarn test:bwc -o [test path to opensearch.tar.gz] -d [test path to opensearch-dashboards.tar.gz] -b true`
+
+To run specific versions' backwards compatibility tests, pass the versions to the test:
+
+`yarn test:bwc -o [test path to opensearch.tar.gz] -d [test path to opensearch-dashboards.tar.gz] -v "[test versions]"`
+
+### Additional checks
+Make sure you run lint checker before submitting a pull request. To run lint checker:
+`node scripts/precommit_hook.js --fix`
+
+Please ensure that you don't introduce any broken links accidently. For any intentional broken link (e.g. dummy url in unit test), you can add it to [lycheeexclude](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/.lycheeexclude) allow list specifically.
# Continuous Integration
Automated testing is provided with Jenkins for Continuous Integration. Jenkins enables developers to build, deploy, and automate projects and provides us to run groups of tests quickly. CI groups are ran from the [Jenkinsfile](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/Jenkinsfile).
@@ -64,5 +85,4 @@ By default the version of OpenSearch Dashboards will pull the snapshot of the sa
Although Jest is the standard for this project, there are a few Mocha tests that still exist. You can run these tests by running:
`yarn test:mocha`
-However, these tests will eventually be migrated. Please avoid writing new Mocha tests. For further questions or to check the status please see this [issue](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/215).
-
+However, these tests will eventually be migrated. Please avoid writing new Mocha tests. For further questions or to check the status please see this [issue](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/215).
\ No newline at end of file
diff --git a/config/opensearch_dashboards.yml b/config/opensearch_dashboards.yml
index 143dac3c175e..26c11904fa9a 100644
--- a/config/opensearch_dashboards.yml
+++ b/config/opensearch_dashboards.yml
@@ -160,4 +160,8 @@
# defaultUrl: ""
# darkModeUrl: ""
# faviconUrl: ""
- # applicationTitle: ""
\ No newline at end of file
+ # applicationTitle: ""
+
+# Set the value of this setting to true to capture region blocked warnings and errors
+# for your map rendering services.
+# map.showRegionBlockedWarning: false
\ No newline at end of file
diff --git a/cypress/integration/osd-bundle/check_advanced_settings.js b/cypress/integration/osd-bundle/check_advanced_settings.js
new file mode 100644
index 000000000000..12d4e56b1768
--- /dev/null
+++ b/cypress/integration/osd-bundle/check_advanced_settings.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import {
+ MiscUtils,
+ LoginPage,
+} from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const loginPage = new LoginPage(cy);
+
+describe('verify the advanced settings are saved', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/management/opensearch-dashboards/settings');
+ loginPage.enterUserName('admin');
+ loginPage.enterPassword('admin');
+ loginPage.submit();
+ });
+
+ it('the dark mode is on', () => {
+ cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]')
+ .invoke('attr', 'aria-checked')
+ .should('eq', 'true');
+ });
+
+ it('the Timeline default columns field is set to 4', () => {
+ cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').should(
+ 'have.value',
+ 4
+ );
+ });
+
+ it('the Timeline Maximum buckets field is set to 4', () => {
+ cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').should(
+ 'have.value',
+ 4
+ );
+ });
+});
diff --git a/cypress/integration/osd-bundle/check_default_page.js b/cypress/integration/osd-bundle/check_default_page.js
new file mode 100644
index 000000000000..469b80014bda
--- /dev/null
+++ b/cypress/integration/osd-bundle/check_default_page.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import {
+ MiscUtils,
+ LoginPage,
+} from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const loginPage = new LoginPage(cy);
+
+describe('verify default landing page work for bwc', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('');
+ loginPage.enterUserName('admin');
+ loginPage.enterPassword('admin');
+ loginPage.submit();
+ });
+
+ it('the overview page is set as the default landing page', () => {
+ cy.url().should('include', '/app/opensearch_dashboards_overview#/');
+ });
+});
diff --git a/cypress/integration/osd-bundle/check_filter_and_query.js b/cypress/integration/osd-bundle/check_filter_and_query.js
new file mode 100644
index 000000000000..04b415a5aeb1
--- /dev/null
+++ b/cypress/integration/osd-bundle/check_filter_and_query.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import {
+ MiscUtils,
+ CommonUI,
+ LoginPage,
+} from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const commonUI = new CommonUI(cy);
+const loginPage = new LoginPage(cy);
+
+describe('check dashboards filter and query', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/dashboards#');
+ loginPage.enterUserName('admin');
+ loginPage.enterPassword('admin');
+ loginPage.submit();
+ });
+
+ afterEach(() => {
+ cy.clearCookies();
+ });
+
+ it('tenant-switch-modal page should show and be clicked', () => {
+ cy.get('[data-test-subj="tenant-switch-modal"]');
+ cy.get('[data-test-subj="confirm"]').click();
+ });
+
+ describe('osx filter and query should work in [Logs] Web Traffic dashboards', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="dashboardListingTitleLink-[Logs]-Web-Traffic"]').click();
+ cy.get('[data-test-subj="breadcrumb last"]')
+ .invoke('attr', 'title')
+ .should('eq', '[Logs] Web Traffic');
+ });
+
+ it('osx filter and query should exist and be named correctly', () => {
+ cy.get('[data-test-subj="saved-query-management-popover-button"]').click();
+ cy.get('[data-test-subj="saved-query-management-popover"]')
+ .find('[class="osdSavedQueryListItem__labelText"]')
+ .should('have.text', 'test-query')
+ .click();
+ cy.get('[data-test-subj="queryInput"]').should('have.text', 'resp=200');
+ cy.get(
+ '[data-test-subj="filter filter-enabled filter-key-machine.os filter-value-osx filter-unpinned "]'
+ )
+ .should('have.text', 'osx filter')
+ .click();
+ cy.get('[data-test-subj="editFilter"]').click();
+ cy.get('[data-test-subj="filterFieldSuggestionList"]')
+ .find('[data-test-subj="comboBoxInput"]')
+ .should('have.text', 'machine.os');
+ cy.get('[data-test-subj="filterOperatorList"]')
+ .find('[data-test-subj="comboBoxInput"]')
+ .should('have.text', 'is');
+ cy.get('[data-test-subj="filterParams"]').find('input').should('have.value', 'osx');
+ });
+
+ it('osx filter and query should function correctly', () => {
+ cy.get('[data-test-subj="saved-query-management-popover-button"]').click();
+ cy.get('[data-test-subj="saved-query-management-popover"]')
+ .find('[class="osdSavedQueryListItem__labelText"]')
+ .should('have.text', 'test-query')
+ .click();
+ commonUI.setDateRange('Dec 1, 2021 @ 00:00:00.000', 'Jan 1, 2021 @ 00:00:00.000');
+
+ //[Logs] vistor chart should show osx 100%
+ cy.get('[data-title="[Logs] Visitors by OS"]')
+ .find('[class="label"]')
+ .should('have.text', 'osx (100%)');
+
+ //[Logs] Response chart should show 200 label
+ cy.get('[data-title="[Logs] Response Codes Over Time + Annotations"]')
+ .find('[title="200"]')
+ .should('have.text', '200');
+ });
+ });
+});
diff --git a/cypress/integration/osd-bundle/check_loaded_data.js b/cypress/integration/osd-bundle/check_loaded_data.js
new file mode 100644
index 000000000000..34f0ac545688
--- /dev/null
+++ b/cypress/integration/osd-bundle/check_loaded_data.js
@@ -0,0 +1,90 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import { MiscUtils, CommonUI, LoginPage } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const commonUI = new CommonUI(cy);
+const loginPage = new LoginPage(cy);
+
+describe('check previously loaded data', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/dashboards#');
+ loginPage.enterUserName('admin');
+ loginPage.enterPassword('admin');
+ loginPage.submit();
+ });
+
+ afterEach(() => {
+ cy.clearCookies();
+ });
+
+ it('previous loaded data should exist in dashboards', () => {
+ let items = cy.get('[data-test-subj="itemsInMemTable"]');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[Flights]-Global-Flight-Dashboard"]')
+ .should('have.text', '[Flights] Global Flight Dashboard');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[Logs]-Web-Traffic"]')
+ .should('have.text', '[Logs] Web Traffic');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[eCommerce]-Revenue-Dashboard"]')
+ .should('have.text', '[eCommerce] Revenue Dashboard');
+ });
+
+ describe('Check Global Flight Dashboard', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="itemsInMemTable"]')
+ .get('[data-test-subj="dashboardListingTitleLink-[Flights]-Global-Flight-Dashboard"]')
+ .click();
+ commonUI.removeAllFilters();
+ commonUI.setDateRange('Dec 1, 2021 @ 00:00:00.000', 'Nov 1, 2021 @ 00:00:00.000')
+ });
+
+ it('Global Flight Dashboard is loaded and funtions correctly', () => {
+ cy.get('[data-test-subj="breadcrumb last"]').should('have.text', '[Flights] Global Flight Dashboard');
+ cy.get('[data-title="[Flights] Total Flights"]').should('exist');
+ cy.get('[data-title="[Flights] Average Ticket Price"]').should('exist');
+
+ commonUI.addFilterRetrySelection('FlightDelayType', 'is not', 'No Delay');
+ let types = cy.get('[data-title="[Flights] Delay Type"]')
+ types.find('[data-label="Weather Delay"]').should('exist');
+ types.find('[data-label="No Delay"]').should('not.exist'); ;
+ commonUI.removeFilter('FlightDelayType');
+
+ commonUI.addFilterRetrySelection('Carrier', 'is', 'Logstash Airways');
+ cy.get('[data-title="[Flights] Airline Carrier"]')
+ .find('[class="label-text"]')
+ .should('have.text', 'Logstash Airways (100%)');
+ });
+ });
+
+ describe('Check eCommerce Revenue Dashboard', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="itemsInMemTable"]')
+ .get('[data-test-subj="dashboardListingTitleLink-[eCommerce]-Revenue-Dashboard"]')
+ .click();
+ commonUI.removeAllFilters();
+ commonUI.setDateRange('Nov 1, 2021 @ 00:00:00.000', 'Nov 1, 2016 @ 00:00:00.000')
+ });
+
+ it('eCommerce Revenue Dashboard is loaded and functions correctly', () => {
+ cy.get('[data-test-subj="breadcrumb last"]').should('have.text', '[eCommerce] Revenue Dashboard');
+ cy.get('[data-title="[eCommerce] Average Sales Price"]').should('exist');
+ cy.get('[data-title="[eCommerce] Average Sold Quantity"]').should('exist');
+
+ commonUI.addFilterRetrySelection('customer_gender', 'is', 'FEMALE');
+ cy.get('[data-title="[eCommerce] Sales by Gender"]')
+ .find('[class="label-text"]')
+ .should('have.text', 'FEMALE (100%)');
+
+ commonUI.addFilterRetrySelection('category', 'is not', "Women's Clothing");
+ let category = cy.get('[data-title="[eCommerce] Sales by Category"]')
+ category.find('[data-label="Men\'s Clothing"]').should('exist');
+ category.find('[data-label="Women\'s Clothing"]').should('not.exist');
+ });
+ });
+});
\ No newline at end of file
diff --git a/cypress/integration/osd-bundle/check_timeline.js b/cypress/integration/osd-bundle/check_timeline.js
new file mode 100644
index 000000000000..e0639d3b917a
--- /dev/null
+++ b/cypress/integration/osd-bundle/check_timeline.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import { MiscUtils, LoginPage } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const loginPage = new LoginPage(cy);
+
+describe('check timeline visualization', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/visualize#');
+ loginPage.enterUserName('admin');
+ loginPage.enterPassword('admin');
+ loginPage.submit();
+ });
+
+ afterEach(() => {
+ cy.clearCookies();
+ });
+
+ it('tenant-switch-modal page should show and be clicked', () => {
+ cy.get('[data-test-subj="tenant-switch-modal"]');
+ cy.get('[data-test-subj="confirm"]').click();
+ });
+
+ it('timeline visualizations should be saved and named correctly', () => {
+ cy.get('[data-test-subj="visualizationLandingPage"]')
+ .find('[class="euiFormControlLayout__childrenWrapper"]')
+ .type('timeline');
+ cy.get('[data-test-subj="visListingTitleLink-test-timeline"]').should('have.text', 'test-timeline').click();
+ cy.get('[class="view-line"]').contains('.es(*)');
+ });
+
+ describe('timeline visualizations should work properly', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="visualizationLandingPage"]')
+ .find('[data-test-subj="newItemButton"]')
+ .click();
+ cy.get('[data-test-subj="visType-timelion"]').click();
+ });
+
+ it('.es(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.es(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.es(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.elasticsearch(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.elasticsearch(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.elasticsearch(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.opensearch(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.opensearch(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.opensearch(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+ });
+});
\ No newline at end of file
diff --git a/cypress/integration/osd/check_advanced_settings.js b/cypress/integration/osd/check_advanced_settings.js
index 1c281ca83712..7a7d5f535ac8 100644
--- a/cypress/integration/osd/check_advanced_settings.js
+++ b/cypress/integration/osd/check_advanced_settings.js
@@ -1,32 +1,8 @@
/*
+ * Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
*/
-/*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-/* es-lint-disable for missing definitions */
/* eslint-disable */
import { MiscUtils } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
diff --git a/cypress/integration/osd/check_default_page.js b/cypress/integration/osd/check_default_page.js
index 27b566eb831d..20af7440b027 100644
--- a/cypress/integration/osd/check_default_page.js
+++ b/cypress/integration/osd/check_default_page.js
@@ -1,32 +1,8 @@
/*
+ * Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
*/
-/*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-/* es-lint-disable for missing definitions */
/* eslint-disable */
import { MiscUtils } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
@@ -37,8 +13,7 @@ describe('verify default landing page work for bwc', () => {
miscUtils.visitPage('');
});
- it('the overview page is set as the default landing pag', () => {
+ it('the overview page is set as the default landing page', () => {
cy.url().should('include', '/app/opensearch_dashboards_overview#/');
- cy.contains('Display a different page on log in');
});
});
\ No newline at end of file
diff --git a/cypress/integration/osd/check_filter_and_query.js b/cypress/integration/osd/check_filter_and_query.js
index 21459f098049..8847192b2863 100644
--- a/cypress/integration/osd/check_filter_and_query.js
+++ b/cypress/integration/osd/check_filter_and_query.js
@@ -1,50 +1,23 @@
/*
+ * Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
*/
-/*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-/* es-lint-disable for missing definitions */
/* eslint-disable */
-import {
- MiscUtils,
- CommonUI
-} from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
-
-const commonUI = new CommonUI(cy);
+import { MiscUtils, CommonUI } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
const miscUtils = new MiscUtils(cy);
-
-describe('verify dashboards filter and query work properly for bwc', () => {
+const commonUI = new CommonUI(cy);
+
+describe('check dashboards filter and query', () => {
beforeEach(() => {
miscUtils.visitPage('app/dashboards#');
});
-
+
afterEach(() => {
cy.clearCookies();
});
-
+
describe('osx filter and query should work in [Logs] Web Traffic dashboards', () => {
beforeEach(() => {
cy.get('[data-test-subj="dashboardListingTitleLink-[Logs]-Web-Traffic"]').click();
@@ -52,7 +25,7 @@ describe('verify dashboards filter and query work properly for bwc', () => {
.invoke('attr', 'title')
.should('eq', '[Logs] Web Traffic');
});
-
+
it('osx filter and query should exist and be named correctly', () => {
cy.get('[data-test-subj="saved-query-management-popover-button"]').click();
cy.get('[data-test-subj="saved-query-management-popover"]')
@@ -74,45 +47,24 @@ describe('verify dashboards filter and query work properly for bwc', () => {
.should('have.text', 'is');
cy.get('[data-test-subj="filterParams"]').find('input').should('have.value', 'osx');
});
-
+
it('osx filter and query should function correctly', () => {
- commonUI.setDateRange('Oct 10, 2021 @ 00:00:00.000', 'Oct 4, 2021 @ 00:00:00.000');
cy.get('[data-test-subj="saved-query-management-popover-button"]').click();
cy.get('[data-test-subj="saved-query-management-popover"]')
.find('[class="osdSavedQueryListItem__labelText"]')
.should('have.text', 'test-query')
.click();
- cy.get('[data-test-subj="dashboardPanel"]').each((item) => {
- const vsLoader = item.get('[data-test-subj="visualizationLoader"]');
- //[Logs] unique visitors should be 211
- if (
- vsLoader &&
- vsLoader
- .get('[data-test-subj="visualizationLoader"]')
- .find('[class="chart-title"]')
- .should('have.text', 'Unique Visitors')
- ) {
- vsLoader.should('have.class', 'chart-label').should('have.text', '211');
- }
- //[Logs] vistor chart should show osx 100%
- if (
- vsLoader &&
- vsLoader.get('[data-test-subj="visualizationLoader"]').invoke('css', 'data-title') ===
- '[Logs] Visitors by OS'
- ) {
- vsLoader.should('have.class', 'label').should('have.text', 'osx (100%)');
- }
- //[Logs] Response chart should show 200 label
- if (
- vsLoader &&
- vsLoader.get('[data-test-subj="visualizationLoader"]').invoke('css', 'data-title') ===
- '[Logs] Response Codes Over Time + Annotations'
- ) {
- vsLoader
- .should('have.class', 'echLegendItem__label echLegendItem__label--clickable')
- .should('have.text', '200');
- }
- });
+ commonUI.setDateRange('Dec 1, 2021 @ 00:00:00.000', 'Jan 1, 2021 @ 00:00:00.000');
+
+ //[Logs] vistor chart should show osx 100%
+ cy.get('[data-title="[Logs] Visitors by OS"]')
+ .find('[class="label"]')
+ .should('have.text', 'osx (100%)');
+
+ //[Logs] Response chart should show 200 label
+ cy.get('[data-title="[Logs] Response Codes Over Time + Annotations"]')
+ .find('[title="200"]')
+ .should('have.text', '200');
});
});
});
\ No newline at end of file
diff --git a/cypress/integration/osd/check_loaded_data.js b/cypress/integration/osd/check_loaded_data.js
new file mode 100644
index 000000000000..9439affa702b
--- /dev/null
+++ b/cypress/integration/osd/check_loaded_data.js
@@ -0,0 +1,89 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import { MiscUtils, CommonUI } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+const commonUI = new CommonUI(cy);
+
+describe('check previously loaded data', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/dashboards#');
+ });
+
+ it('previous loaded data should exist in dashboards', () => {
+ let items = cy.get('[data-test-subj="itemsInMemTable"]');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[Flights]-Global-Flight-Dashboard"]')
+ .should('have.text', '[Flights] Global Flight Dashboard');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[Logs]-Web-Traffic"]')
+ .should('have.text', '[Logs] Web Traffic');
+
+ items.get('[data-test-subj="dashboardListingTitleLink-[eCommerce]-Revenue-Dashboard"]')
+ .should('have.text', '[eCommerce] Revenue Dashboard');
+ });
+
+ describe('Global Flight Dashboard should function properly', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="itemsInMemTable"]')
+ .get('[data-test-subj="dashboardListingTitleLink-[Flights]-Global-Flight-Dashboard"]')
+ .click();
+ commonUI.removeAllFilters();
+ commonUI.setDateRange('Dec 1, 2021 @ 00:00:00.000', 'Nov 1, 2021 @ 00:00:00.000');
+ });
+
+ it('Global Flight Dashboard is loaded when clicked', () => {
+ cy.get('[data-test-subj="breadcrumb last"]').should('have.text', '[Flights] Global Flight Dashboard');
+ cy.get('[data-title="[Flights] Total Flights"]').should('exist');
+ cy.get('[data-title="[Flights] Average Ticket Price"]').should('exist');
+ });
+
+ it('If set filter for carrier, [Flights] Airline Carrier should show correct carrier', () => {
+ commonUI.addFilterRetrySelection('Carrier', 'is', 'Logstash Airways');
+ cy.get('[data-title="[Flights] Airline Carrier"]')
+ .find('[class="label-text"]')
+ .should('have.text', 'Logstash Airways (100%)');
+ });
+
+ it('If set filter for FlightDelayType, [Flights] Delay Type should filter out selected type', () => {
+ commonUI.addFilterRetrySelection('FlightDelayType', 'is not', 'No Delay');
+ let types = cy.get('[data-title="[Flights] Delay Type"]')
+ types.find('[data-label="Weather Delay"]').should('exist');
+ types.find('[data-label="No Delay"]').should('not.exist'); ;
+ });
+ });
+
+ describe('eCommerce Revenue Dashboard should function properly', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="itemsInMemTable"]')
+ .get('[data-test-subj="dashboardListingTitleLink-[eCommerce]-Revenue-Dashboard"]')
+ .click();
+ commonUI.removeAllFilters();
+ commonUI.setDateRange('Nov 1, 2021 @ 00:00:00.000', 'Nov 1, 2016 @ 00:00:00.000');
+ });
+
+ it('eCommerce Revenue Dashboard is loaded when clicked', () => {
+ cy.get('[data-test-subj="breadcrumb last"]').should('have.text', '[eCommerce] Revenue Dashboard');
+ cy.get('[data-title="[eCommerce] Average Sales Price"]').should('exist');
+ cy.get('[data-title="[eCommerce] Average Sold Quantity"]').should('exist');
+ });
+
+ it('If set filter for gender, [eCommerce] Sales by Gender should show one gender', () => {
+ commonUI.addFilterRetrySelection('customer_gender', 'is', 'FEMALE');
+ cy.get('[data-title="[eCommerce] Sales by Gender"]')
+ .find('[class="label-text"]')
+ .should('have.text', 'FEMALE (100%)');
+ })
+
+ it('If filter out Women\'s Clothing, [eCommerce] Sales by Category should not show this category', () => {
+ commonUI.addFilterRetrySelection('category', 'is not', "Women's Clothing");
+ let category = cy.get('[data-title="[eCommerce] Sales by Category"]')
+ category.find('[data-label="Men\'s Clothing"]').should('exist');
+ category.find('[data-label="Women\'s Clothing"]').should('not.exist');
+ });
+ });
+});
\ No newline at end of file
diff --git a/cypress/integration/osd/check_timeline.js b/cypress/integration/osd/check_timeline.js
new file mode 100644
index 000000000000..dd7ca2d3f495
--- /dev/null
+++ b/cypress/integration/osd/check_timeline.js
@@ -0,0 +1,86 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable */
+import { MiscUtils } from '@opensearch-dashboards-test/opensearch-dashboards-test-library';
+
+const miscUtils = new MiscUtils(cy);
+
+describe('check timeline visualization', () => {
+ beforeEach(() => {
+ miscUtils.visitPage('app/visualize#');
+ });
+
+ it('timeline visualizations should be saved and named correctly', () => {
+ cy.get('[data-test-subj="visualizationLandingPage"]')
+ .find('[class="euiFormControlLayout__childrenWrapper"]')
+ .type('timeline');
+ cy.get('[data-test-subj="visListingTitleLink-test-timeline"]').should('have.text', 'test-timeline').click();
+ cy.get('[class="view-line"]').contains('.es(*)');
+ });
+
+ describe('timeline visualizations should work properly', () => {
+ beforeEach(() => {
+ cy.get('[data-test-subj="visualizationLandingPage"]')
+ .find('[data-test-subj="newItemButton"]')
+ .click();
+ cy.get('[data-test-subj="visType-timelion"]').click();
+ });
+
+ it('.es(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.es(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.es(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.elasticsearch(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.elasticsearch(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.elasticsearch(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}elasticsearch(*, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.opensearch(*, kibana1=true) should report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, kibana1=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').contains('Timeline request error: undefined Error: Unknown argument to es: kibana1')
+ });
+
+ it('.opensearch(*, kibana=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, kibana=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+
+ it('.opensearch(*, opensearchDashboards=true) should not report search error', () => {
+ cy.get('[class="view-line"]').type('{selectall}{backspace}{backspace}{backspace}{backspace}{backspace}opensearch(*, opensearchDashboards=true)');
+ cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
+ cy.get('[data-test-subj="globalToastList"]').find('[data-test-subj="errorToastMessage"]').should('not.exist')
+ });
+ });
+});
\ No newline at end of file
diff --git a/cypress/test-data/osd-bundle/odfe-0.10.0.tar.gz b/cypress/test-data/osd-bundle/odfe-0.10.0.tar.gz
new file mode 100644
index 000000000000..efd1092b3786
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-0.10.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.0.2.tar.gz b/cypress/test-data/osd-bundle/odfe-1.0.2.tar.gz
new file mode 100644
index 000000000000..b3ddd6a64c5d
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.0.2.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.1.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.1.0.tar.gz
new file mode 100644
index 000000000000..378f5a1824a4
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.1.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.11.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.11.0.tar.gz
new file mode 100644
index 000000000000..ea676ef49cf7
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.11.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.13.2.tar.gz b/cypress/test-data/osd-bundle/odfe-1.13.2.tar.gz
new file mode 100644
index 000000000000..5bab78444404
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.13.2.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.2.1.tar.gz b/cypress/test-data/osd-bundle/odfe-1.2.1.tar.gz
new file mode 100644
index 000000000000..dffefe62c71a
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.2.1.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.3.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.3.0.tar.gz
new file mode 100644
index 000000000000..6b0a8c3e1c97
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.3.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.4.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.4.0.tar.gz
new file mode 100644
index 000000000000..f999e5d7dc74
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.4.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.7.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.7.0.tar.gz
new file mode 100644
index 000000000000..da3a9fb56c1e
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.7.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.8.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.8.0.tar.gz
new file mode 100644
index 000000000000..3c0a9ee82467
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.8.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/odfe-1.9.0.tar.gz b/cypress/test-data/osd-bundle/odfe-1.9.0.tar.gz
new file mode 100644
index 000000000000..7b6c729593dd
Binary files /dev/null and b/cypress/test-data/osd-bundle/odfe-1.9.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/osd-1.0.0.tar.gz b/cypress/test-data/osd-bundle/osd-1.0.0.tar.gz
new file mode 100644
index 000000000000..677657e5b2cb
Binary files /dev/null and b/cypress/test-data/osd-bundle/osd-1.0.0.tar.gz differ
diff --git a/cypress/test-data/osd-bundle/osd-1.1.0.tar.gz b/cypress/test-data/osd-bundle/osd-1.1.0.tar.gz
new file mode 100644
index 000000000000..0136b202b592
Binary files /dev/null and b/cypress/test-data/osd-bundle/osd-1.1.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-0.10.0.tar.gz b/cypress/test-data/osd/odfe-0.10.0.tar.gz
new file mode 100644
index 000000000000..e3234e1b5966
Binary files /dev/null and b/cypress/test-data/osd/odfe-0.10.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.0.2.tar.gz b/cypress/test-data/osd/odfe-1.0.2.tar.gz
new file mode 100644
index 000000000000..193c8b283060
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.0.2.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.1.0.tar.gz b/cypress/test-data/osd/odfe-1.1.0.tar.gz
new file mode 100644
index 000000000000..c6f6221162de
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.1.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.11.0.tar.gz b/cypress/test-data/osd/odfe-1.11.0.tar.gz
new file mode 100644
index 000000000000..b8f42a50b52a
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.11.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.13.2.tar.gz b/cypress/test-data/osd/odfe-1.13.2.tar.gz
new file mode 100644
index 000000000000..e775f58ebcea
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.13.2.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.2.1.tar.gz b/cypress/test-data/osd/odfe-1.2.1.tar.gz
new file mode 100644
index 000000000000..193f48f99349
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.2.1.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.3.0.tar.gz b/cypress/test-data/osd/odfe-1.3.0.tar.gz
new file mode 100644
index 000000000000..49e96194e53d
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.3.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.4.0.tar.gz b/cypress/test-data/osd/odfe-1.4.0.tar.gz
new file mode 100644
index 000000000000..2fd7c085895f
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.4.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.7.0.tar.gz b/cypress/test-data/osd/odfe-1.7.0.tar.gz
new file mode 100644
index 000000000000..5269d283ea75
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.7.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.8.0.tar.gz b/cypress/test-data/osd/odfe-1.8.0.tar.gz
new file mode 100644
index 000000000000..7e47882df3b1
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.8.0.tar.gz differ
diff --git a/cypress/test-data/osd/odfe-1.9.0.tar.gz b/cypress/test-data/osd/odfe-1.9.0.tar.gz
new file mode 100644
index 000000000000..0eea7a9d3e26
Binary files /dev/null and b/cypress/test-data/osd/odfe-1.9.0.tar.gz differ
diff --git a/cypress/test-data/osd/osd-1.0.0.tar.gz b/cypress/test-data/osd/osd-1.0.0.tar.gz
new file mode 100644
index 000000000000..1614230b81c3
Binary files /dev/null and b/cypress/test-data/osd/osd-1.0.0.tar.gz differ
diff --git a/cypress/test-data/osd/osd-1.1.0.tar.gz b/cypress/test-data/osd/osd-1.1.0.tar.gz
new file mode 100644
index 000000000000..01470f4b1462
Binary files /dev/null and b/cypress/test-data/osd/osd-1.1.0.tar.gz differ
diff --git a/package.json b/package.json
index 010accdd5e29..a91a624344be 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"dashboarding"
],
"private": true,
- "version": "1.2.0",
+ "version": "2.0.0",
"branch": "main",
"types": "./opensearch_dashboards.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
@@ -19,7 +19,7 @@
"number": 8467,
"sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9"
},
- "homepage": "https://www.opensearch.org",
+ "homepage": "https://opensearch.org",
"bugs": {
"url": "http://github.com/opensearch-project/OpenSearch-Dashboards/issues"
},
@@ -41,6 +41,7 @@
"osd": "node scripts/osd",
"opensearch": "node scripts/opensearch",
"test": "grunt test",
+ "test:bwc": "./scripts/bwctest-osd.sh",
"test:jest": "node scripts/jest",
"test:jest_integration": "node scripts/jest_integration",
"test:mocha": "node scripts/mocha",
@@ -61,28 +62,24 @@
"makelogs": "node scripts/makelogs",
"uiFramework:start": "cd packages/osd-ui-framework && yarn docSiteStart",
"uiFramework:build": "cd packages/osd-ui-framework && yarn docSiteBuild",
- "uiFramework:createComponent": "cd packages/osd-ui-framework && yarn createComponent",
- "uiFramework:documentComponent": "cd packages/osd-ui-framework && yarn documentComponent",
"osd:watch": "node scripts/opensearch_dashboards --dev --logging.json=false",
"build:types": "rm -rf ./target/types && tsc --p tsconfig.types.json",
"docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
"osd:bootstrap": "node scripts/build_ts_refs && node scripts/register_git_hook",
- "spec_to_console": "node scripts/spec_to_console",
- "storybook": "node scripts/storybook"
+ "spec_to_console": "node scripts/spec_to_console"
},
"repository": {
"type": "git",
"url": "https://github.com/opensearch-project/opensearch-dashboards.git"
},
"resolutions": {
- "**/@types/node": ">=10.17.17 <10.20.0",
- "**/axios": "^0.21.4",
+ "**/@types/node": "^14.17.32",
+ "**/@types/react": "^16.14.23",
"**/ejs": "^3.1.6",
"**/front-matter": "^4.0.2",
"**/glob-parent": "^6.0.0",
"**/hoist-non-react-statics": "^3.3.2",
"**/immer": "^9.0.6",
- "**/istanbul-instrumenter-loader/schema-utils": "^1.0.0",
"**/kind-of": ">=6.0.3",
"**/lodash": "^4.17.21",
"**/merge": "^2.1.1",
@@ -92,7 +89,6 @@
"**/prismjs": "^1.23.0",
"**/react-syntax-highlighter": "^15.3.1",
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
- "**/request": "^2.88.2",
"**/ssri": "^6.0.2",
"**/tar": "^6.1.11",
"**/trim": "^0.0.3",
@@ -120,12 +116,22 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "7.10.0-rc.1",
"@elastic/eui": "29.3.2",
- "@elastic/good": "8.1.1-kibana2",
+ "@elastic/good": "^9.0.1-kibana3",
"@elastic/numeral": "^2.5.0",
"@elastic/request-crypto": "1.1.4",
"@elastic/safer-lodash-set": "0.0.0",
- "@hapi/good-squeeze": "5.2.1",
- "@hapi/wreck": "^15.0.2",
+ "@hapi/accept": "^5.0.2",
+ "@hapi/boom": "^9.1.4",
+ "@hapi/cookie": "^11.0.2",
+ "@hapi/good-squeeze": "^6.0.0",
+ "@hapi/h2o2": "^9.1.0",
+ "@hapi/hapi": "^20.2.1",
+ "@hapi/hoek": "^9.2.1",
+ "@hapi/inert": "^6.0.4",
+ "@hapi/podium": "^4.1.3",
+ "@hapi/vision": "^6.1.0",
+ "@hapi/wreck": "^17.1.0",
+ "@osd/ace": "1.0.0",
"@osd/analytics": "1.0.0",
"@osd/apm-config-loader": "1.0.0",
"@osd/config": "1.0.0",
@@ -133,21 +139,18 @@
"@osd/i18n": "1.0.0",
"@osd/interpreter": "1.0.0",
"@osd/logging": "1.0.0",
+ "@osd/monaco": "1.0.0",
"@osd/std": "1.0.0",
"@osd/ui-framework": "1.0.0",
- "@osd/ace": "1.0.0",
- "@osd/monaco": "1.0.0",
"@osd/ui-shared-deps": "1.0.0",
"@reduxjs/toolkit": "^1.6.2",
"@types/yauzl": "^2.9.1",
"JSONStream": "1.3.5",
"abortcontroller-polyfill": "^1.4.0",
- "accept": "3.0.2",
"angular": "^1.8.0",
"angular-elastic": "^2.5.1",
"angular-sanitize": "^1.8.0",
"bluebird": "3.5.5",
- "boom": "^7.2.0",
"chalk": "^4.1.0",
"chokidar": "^3.4.2",
"color": "1.0.3",
@@ -166,15 +169,10 @@
"glob": "^7.1.7",
"glob-all": "^3.2.1",
"globby": "^8.0.1",
- "h2o2": "^8.1.2",
"handlebars": "4.7.7",
- "hapi": "^17.5.3",
- "hapi-auth-cookie": "^9.0.0",
"hjson": "3.2.1",
- "hoek": "^5.0.4",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^5.0.0",
- "inert": "^5.1.0",
"inline-style": "^2.0.0",
"ip-cidr": "^2.1.0",
"joi": "^13.5.2",
@@ -187,22 +185,20 @@
"moment": "^2.24.0",
"moment-timezone": "^0.5.27",
"mustache": "^2.3.2",
- "node-fetch": "^2.6.1",
+ "node-fetch": "^2.6.7",
"node-forge": "^0.10.0",
"p-map": "^4.0.0",
"pegjs": "0.10.0",
"proxy-from-env": "1.0.0",
"query-string": "^6.13.2",
"re2": "^1.15.4",
- "react": "^16.12.0",
- "react-color": "^2.13.8",
+ "react": "^16.14.0",
"react-dom": "^16.12.0",
"react-input-range": "^1.3.0",
- "react-router": "^5.2.0",
+ "react-router": "^5.2.1",
"react-use": "^13.27.0",
"redux-thunk": "^2.3.0",
"regenerator-runtime": "^0.13.3",
- "request": "^2.88.0",
"require-in-the-middle": "^5.0.2",
"rison-node": "1.0.2",
"rxjs": "^6.5.5",
@@ -215,15 +211,14 @@
"tslib": "^2.0.0",
"type-detect": "^4.0.8",
"uuid": "3.3.2",
- "vision": "^5.3.3",
"whatwg-fetch": "^3.0.0",
"yauzl": "^2.10.0"
},
"devDependencies": {
- "@babel/core": "^7.11.6",
- "@babel/parser": "^7.11.2",
- "@babel/register": "^7.10.5",
- "@babel/types": "^7.11.0",
+ "@babel/core": "^7.16.5",
+ "@babel/parser": "^7.16.6",
+ "@babel/register": "^7.16.5",
+ "@babel/types": "^7.16.0",
"@elastic/apm-rum": "^5.6.1",
"@elastic/charts": "23.2.2",
"@elastic/ems-client": "7.10.0",
@@ -232,13 +227,15 @@
"@elastic/filesaver": "1.1.2",
"@elastic/github-checks-reporter": "0.0.20b3",
"@elastic/makelogs": "^6.0.0",
+ "@microsoft/api-documenter": "^7.13.78",
+ "@microsoft/api-extractor": "^7.19.3",
"@osd/babel-preset": "1.0.0",
"@osd/dev-utils": "1.0.0",
- "@osd/opensearch": "1.0.0",
- "@osd/opensearch-archiver": "1.0.0",
"@osd/eslint-import-resolver-opensearch-dashboards": "2.0.0",
"@osd/eslint-plugin-eslint": "1.0.0",
"@osd/expect": "1.0.0",
+ "@osd/opensearch": "1.0.0",
+ "@osd/opensearch-archiver": "1.0.0",
"@osd/optimizer": "1.0.0",
"@osd/plugin-generator": "1.0.0",
"@osd/pm": "1.0.0",
@@ -247,20 +244,17 @@
"@osd/test": "1.0.0",
"@osd/test-subj-selector": "0.2.1",
"@osd/utility-types": "1.0.0",
- "@microsoft/api-documenter": "7.7.2",
- "@microsoft/api-extractor": "7.7.0",
- "@percy/agent": "^0.28.6",
+ "@percy/cli": "^1.0.0-beta.74",
+ "@percy/sdk-utils": "^1.0.0-beta.74",
"@testing-library/dom": "^7.24.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.0.4",
"@testing-library/react-hooks": "^3.4.1",
- "@types/accept": "3.1.1",
"@types/angular": "^1.6.56",
"@types/angular-mocks": "^1.7.0",
"@types/archiver": "^3.1.0",
- "@types/babel__core": "^7.1.10",
+ "@types/babel__core": "^7.1.17",
"@types/bluebird": "^3.1.1",
- "@types/boom": "^7.2.0",
"@types/chance": "^1.0.0",
"@types/cheerio": "^0.22.10",
"@types/chromedriver": "^81.0.0",
@@ -280,14 +274,13 @@
"@types/glob": "^7.1.3",
"@types/globby": "^8.0.0",
"@types/graphql": "^0.13.2",
- "@types/h2o2": "^8.1.1",
- "@types/hapi": "^17.0.18",
- "@types/hapi-auth-cookie": "^9.1.0",
+ "@types/hapi__cookie": "^10.1.4",
+ "@types/hapi__h2o2": "^8.3.3",
+ "@types/hapi__hapi": "^20.0.10",
+ "@types/hapi__inert": "^5.2.3",
"@types/has-ansi": "^3.0.0",
"@types/history": "^4.7.3",
"@types/hjson": "^2.4.2",
- "@types/hoek": "^4.1.3",
- "@types/inert": "^5.1.2",
"@types/jest": "^26.0.14",
"@types/joi": "^13.4.2",
"@types/jquery": "^3.3.31",
@@ -304,41 +297,40 @@
"@types/mock-fs": "^4.10.0",
"@types/moment-timezone": "^0.5.12",
"@types/mustache": "^0.8.31",
- "@types/node": ">=10.17.17 <10.20.0",
+ "@types/node": "^14.17.32",
"@types/node-forge": "^0.9.5",
"@types/normalize-path": "^3.0.0",
"@types/pegjs": "^0.10.1",
"@types/pngjs": "^3.4.0",
- "@types/podium": "^1.0.0",
"@types/prop-types": "^15.7.3",
"@types/reach__router": "^1.2.6",
- "@types/react": "^16.9.36",
+ "@types/react": "^16.14.23",
"@types/react-dom": "^16.9.8",
"@types/react-grid-layout": "^0.16.7",
"@types/react-redux": "^7.1.9",
"@types/react-resize-detector": "^4.0.1",
- "@types/react-router": "^5.1.7",
- "@types/react-router-dom": "^5.1.5",
+ "@types/react-router": "^5.1.17",
+ "@types/react-router-dom": "^5.3.2",
"@types/react-virtualized": "^9.18.7",
"@types/recompose": "^0.30.6",
- "@types/request": "^2.48.2",
"@types/selenium-webdriver": "^4.0.9",
"@types/semver": "^5.5.0",
"@types/sinon": "^7.0.13",
"@types/strip-ansi": "^5.2.1",
- "@types/styled-components": "^5.1.0",
+ "@types/styled-components": "^5.1.19",
"@types/supertest": "^2.0.5",
"@types/supertest-as-promised": "^2.0.38",
"@types/tapable": "^1.0.6",
"@types/tar": "^4.0.3",
"@types/testing-library__jest-dom": "^5.9.3",
"@types/testing-library__react-hooks": "^3.4.0",
+ "@types/tough-cookie": "^4.0.1",
"@types/type-detect": "^4.0.1",
"@types/uuid": "^3.4.4",
"@types/vinyl": "^2.0.4",
"@types/vinyl-fs": "^2.4.11",
- "@types/webpack": "^4.41.3",
- "@types/webpack-env": "^1.15.2",
+ "@types/webpack": "^4.41.31",
+ "@types/webpack-env": "^1.16.3",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "^3.10.0",
"@typescript-eslint/parser": "^3.10.0",
@@ -369,7 +361,7 @@
"enzyme-to-json": "^3.4.4",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.11.0",
- "eslint-plugin-babel": "^5.3.0",
+ "eslint-plugin-babel": "^5.3.1",
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-cypress": "^2.8.1",
"eslint-plugin-eslint-comments": "^3.2.0",
@@ -414,12 +406,12 @@
"leaflet-responsive-popup": "0.6.4",
"leaflet-vega": "^0.8.6",
"leaflet.heat": "0.2.0",
- "less": "npm:@elastic/less@2.7.3-kibana",
+ "less": "^4.1.2",
"license-checker": "^16.0.0",
"listr": "^0.14.1",
"load-grunt-config": "^3.0.1",
"load-json-file": "^6.2.0",
- "markdown-it": "^10.0.0",
+ "markdown-it": "^12.3.2",
"mocha": "^7.2.0",
"mock-fs": "^4.12.0",
"monaco-editor": "~0.17.0",
@@ -432,16 +424,18 @@
"nyc": "^14.1.1",
"pixelmatch": "^5.1.0",
"pngjs": "^3.4.0",
- "postcss": "^8.2.10",
+ "postcss": "^8.4.5",
"prettier": "^2.1.1",
"prop-types": "^15.7.2",
+ "react": "^16.14.0",
"react-grid-layout": "^0.16.2",
"react-markdown": "^4.3.1",
"react-monaco-editor": "~0.27.0",
"react-redux": "^7.2.0",
"react-resize-detector": "^4.2.0",
- "react-router-dom": "^5.2.0",
+ "react-router-dom": "^5.3.0",
"react-sizeme": "^2.3.6",
+ "react-test-renderer": "^16.12.0",
"reactcss": "1.2.3",
"redux": "^4.0.5",
"regenerate": "^1.4.0",
@@ -456,6 +450,7 @@
"supertest-as-promised": "^4.0.2",
"tape": "^5.0.1",
"topojson-client": "3.0.0",
+ "tough-cookie": "^4.0.0",
"tree-kill": "^1.2.2",
"typescript": "4.0.2",
"ui-select": "0.19.8",
@@ -469,7 +464,7 @@
"zlib": "^1.0.5"
},
"engines": {
- "node": "10.24.1",
+ "node": "14.18.2",
"yarn": "^1.21.1"
}
}
diff --git a/packages/opensearch-eslint-config-opensearch-dashboards/package.json b/packages/opensearch-eslint-config-opensearch-dashboards/package.json
index 415d2fb640d7..685c85b5df78 100644
--- a/packages/opensearch-eslint-config-opensearch-dashboards/package.json
+++ b/packages/opensearch-eslint-config-opensearch-dashboards/package.json
@@ -22,7 +22,7 @@
"@typescript-eslint/parser": "^3.10.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.8.0",
- "eslint-plugin-babel": "^5.3.0",
+ "eslint-plugin-babel": "^5.3.1",
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-eslint-comments": "^3.2.0",
diff --git a/packages/osd-ace/package.json b/packages/osd-ace/package.json
index 4de5dd58cedb..5a2f3141ddd5 100644
--- a/packages/osd-ace/package.json
+++ b/packages/osd-ace/package.json
@@ -14,7 +14,8 @@
"devDependencies": {
"@osd/dev-utils": "1.0.0",
"@osd/babel-preset": "1.0.0",
- "raw-loader": "^3.1.0",
- "typescript": "4.0.2"
+ "raw-loader": "^4.0.2",
+ "typescript": "4.0.2",
+ "webpack": "^4.41.5"
}
}
diff --git a/packages/osd-ace/src/ace/modes/lexer_rules/opensearch_sql_highlight_rules.ts b/packages/osd-ace/src/ace/modes/lexer_rules/opensearch_sql_highlight_rules.ts
index b662c1eaf7a8..64f288df877c 100644
--- a/packages/osd-ace/src/ace/modes/lexer_rules/opensearch_sql_highlight_rules.ts
+++ b/packages/osd-ace/src/ace/modes/lexer_rules/opensearch_sql_highlight_rules.ts
@@ -35,14 +35,14 @@ const { TextHighlightRules } = ace.acequire('ace/mode/text_highlight_rules');
const oop = ace.acequire('ace/lib/oop');
export const OpenSearchSqlHighlightRules = function (this: any) {
- // See https://www.opensearch.org/guide/en/elasticsearch/reference/current/sql-commands.html
+ // See https://opensearch.org/docs/latest/search-plugins/sql/index/
const keywords =
'describe|between|in|like|not|and|or|desc|select|from|where|having|group|by|order' +
'asc|desc|pivot|for|in|as|show|columns|include|frozen|tables|escape|limit|rlike|all|distinct|is';
const builtinConstants = 'true|false';
- // See https://www.opensearch.org/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html
+ // See https://opensearch.org/docs/latest/search-plugins/sql/functions/
const builtinFunctions =
'avg|count|first|first_value|last|last_value|max|min|sum|kurtosis|mad|percentile|percentile_rank|skewness' +
'|stddev_pop|sum_of_squares|var_pop|histogram|case|coalesce|greatest|ifnull|iif|isnull|least|nullif|nvl' +
@@ -56,7 +56,7 @@ export const OpenSearchSqlHighlightRules = function (this: any) {
'|ltrim|octet_length|position|repeat|replace|right|rtrim|space|substring|ucase|cast|convert|database|user|st_astext|st_aswkt' +
'|st_distance|st_geometrytype|st_geomfromtext|st_wkttosql|st_x|st_y|st_z|score';
- // See https://www.opensearch.org/guide/en/elasticsearch/reference/current/sql-data-types.html
+ // See https://opensearch.org/docs/latest/search-plugins/sql/datatypes/
const dataTypes =
'null|boolean|byte|short|integer|long|double|float|half_float|scaled_float|keyword|text|binary|date|ip|object|nested|time' +
'|interval_year|interval_month|interval_day|interval_hour|interval_minute|interval_second|interval_year_to_month' +
diff --git a/packages/osd-analytics/package.json b/packages/osd-analytics/package.json
index 63967fd9867f..d460ab335a2d 100644
--- a/packages/osd-analytics/package.json
+++ b/packages/osd-analytics/package.json
@@ -14,7 +14,7 @@
"osd:watch": "node scripts/build --source-maps --watch"
},
"devDependencies": {
- "@babel/cli": "^7.14.5",
+ "@babel/cli": "^7.16.0",
"@osd/dev-utils": "1.0.0",
"@osd/babel-preset": "1.0.0",
"typescript": "4.0.2"
diff --git a/packages/osd-babel-preset/README.md b/packages/osd-babel-preset/README.md
index 34b8685b9c99..bb09db6c57b1 100644
--- a/packages/osd-babel-preset/README.md
+++ b/packages/osd-babel-preset/README.md
@@ -1,6 +1,6 @@
# @osd/babel-preset
-This package contains the shared bits of babel config that we use for transpiling our source code to code compatible with Node.JS and the various [browsers we support](https://www.opensearch.org/support/matrix#matrix_browsers).
+This package contains the shared bits of babel config that we use for transpiling our source code to code compatible with Node.JS and the various [browsers we support](https://opensearch.org/docs/latest/dashboards/browser-compatibility/).
## usage
diff --git a/packages/osd-babel-preset/package.json b/packages/osd-babel-preset/package.json
index 85b13bf35bdf..67ef872075e9 100644
--- a/packages/osd-babel-preset/package.json
+++ b/packages/osd-babel-preset/package.json
@@ -7,18 +7,18 @@
"devOnly": true
},
"dependencies": {
- "@babel/plugin-proposal-class-properties": "^7.10.4",
- "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
- "@babel/plugin-proposal-optional-chaining": "^7.11.0",
- "@babel/plugin-proposal-private-methods": "^7.10.4",
- "@babel/preset-env": "^7.11.0",
- "@babel/preset-react": "^7.10.4",
- "@babel/preset-typescript": "^7.10.4",
+ "@babel/plugin-proposal-class-properties": "^7.16.5",
+ "@babel/plugin-proposal-export-namespace-from": "^7.16.5",
+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
+ "@babel/plugin-proposal-optional-chaining": "^7.16.5",
+ "@babel/plugin-proposal-private-methods": "^7.16.5",
+ "@babel/preset-env": "^7.16.5",
+ "@babel/preset-react": "^7.16.5",
+ "@babel/preset-typescript": "^7.16.5",
"babel-plugin-add-module-exports": "^1.0.4",
- "babel-plugin-styled-components": "^1.10.7",
+ "babel-plugin-styled-components": "^2.0.2",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"react-is": "^16.8.0",
- "styled-components": "^5.1.0"
+ "styled-components": "^5.3.3"
}
}
diff --git a/packages/osd-config-schema/src/errors/__snapshots__/schema_error.test.ts.snap b/packages/osd-config-schema/src/errors/__snapshots__/schema_error.test.ts.snap
index 6bcb14760ee5..2ef38e1b3224 100644
--- a/packages/osd-config-schema/src/errors/__snapshots__/schema_error.test.ts.snap
+++ b/packages/osd-config-schema/src/errors/__snapshots__/schema_error.test.ts.snap
@@ -2,6 +2,6 @@
exports[`includes stack 1`] = `
"Error: test
- at Object.= Readonly< { [K in keyof OptionalProperties
]?: TypeOf ]: TypeOf ]: TypeOf = Omit = ObjectType<
ExtendedProps