From e36552839b068241ba45969b8aa2fae4ef092640 Mon Sep 17 00:00:00 2001 From: Junqiu Lei Date: Mon, 26 Feb 2024 11:52:40 -0800 Subject: [PATCH] Update data layer source name (#588) * Update data layer source name Signed-off-by: Junqiu Lei (cherry picked from commit 0647a71e7aefe710d0cdec380bd906c4e2bd9561) --- .github/workflows/cypress-workflow.yml | 2 +- .github/workflows/unit-tests-workflow.yml | 4 +-- CHANGELOG.md | 1 + DEVELOPER_GUIDE.md | 2 +- cypress/e2e/documentsLayer.cy.js | 4 +-- package.json | 2 +- .../document_layer_source.tsx | 4 +-- yarn.lock | 36 ++++++++----------- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index da505fd2..d8e503eb 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -106,7 +106,7 @@ jobs: - name: Bootstrap plugin run: | cd OpenSearch-Dashboards/plugins/dashboards-maps - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run OpenSearch Dashboards server run: | diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 72c56dbe..307e8389 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -51,7 +51,7 @@ jobs: cd ./OpenSearch-Dashboards/ su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && cd ./plugins/dashboards-maps && - whoami && yarn osd bootstrap && yarn run test:jest --coverage" + whoami && yarn osd bootstrap --single-version=loose && yarn run test:jest --coverage" - name: Uploads coverage uses: codecov/codecov-action@v1 @@ -104,7 +104,7 @@ jobs: - name: Bootstrap plugin run: | cd OpenSearch-Dashboards/plugins/dashboards-maps - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run tests with coverage run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 77328e43..98436282 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,5 +18,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Bug Fixes ### Infrastructure ### Documentation +* Update data layer source name [#588](https://github.com/opensearch-project/dashboards-maps/pull/588) ### Maintenance ### Refactoring diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index f17686db..d1d39606 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -44,7 +44,7 @@ Ultimately, your directory structure should look like this: From OpenSearch-Dashboards repo (root folder), the following commands start OpenSearch Dashboards and includes this plugin. ``` -yarn osd bootstrap +yarn osd bootstrap --single-version=loose yarn start --no-base-path ``` diff --git a/cypress/e2e/documentsLayer.cy.js b/cypress/e2e/documentsLayer.cy.js index cda25b6f..c3d1e0a2 100644 --- a/cypress/e2e/documentsLayer.cy.js +++ b/cypress/e2e/documentsLayer.cy.js @@ -24,9 +24,9 @@ describe('Documents layer', () => { cy.contains('Create map').click(); cy.get("button[data-test-subj='addLayerButton']").click(); cy.contains('Documents').click(); - cy.contains('Select data source', { timeout: 60000 }).click({ force: true }); + cy.wait(5000).contains('Select index pattern', { timeout: 60000 }).click({ force: true }); cy.contains('opensearch_dashboards_sample_data_flights').click(); - cy.contains('Select data field', { timeout: 60000 }).click({ force: true }); + cy.wait(5000).contains('Select data field', { timeout: 60000 }).click({ force: true }); cy.contains('DestLocation').click(); cy.get('[data-test-subj="indexPatternSelect"]').should( 'contain', diff --git a/package.json b/package.json index 847f04b1..e54ef38e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "dependencies": { "@cypress/skip-test": "^2.6.1", "@mapbox/mapbox-gl-draw": "^1.4.0", - "@opensearch-dashboards-test/opensearch-dashboards-test-library": "git+https://github.com/opensearch-project/opensearch-dashboards-test-library.git#main", + "@opensearch-dashboards-test/opensearch-dashboards-test-library": "https://github.com/opensearch-project/opensearch-dashboards-test-library/archive/refs/tags/1.0.6.tar.gz", "@types/mapbox__mapbox-gl-draw": "^1.3.3", "@types/wellknown": "^0.5.4", "cypress-file-upload": "^5.0.8", diff --git a/public/components/layer_config/documents_config/document_layer_source.tsx b/public/components/layer_config/documents_config/document_layer_source.tsx index 260def0f..69f9ab46 100644 --- a/public/components/layer_config/documents_config/document_layer_source.tsx +++ b/public/components/layer_config/documents_config/document_layer_source.tsx @@ -264,7 +264,7 @@ export const DocumentLayerSource = ({ { diff --git a/yarn.lock b/yarn.lock index 48a03fd6..f2c5d089 100644 --- a/yarn.lock +++ b/yarn.lock @@ -137,9 +137,9 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@opensearch-dashboards-test/opensearch-dashboards-test-library@git+https://github.com/opensearch-project/opensearch-dashboards-test-library.git#main": - version "1.0.5" - resolved "git+https://github.com/opensearch-project/opensearch-dashboards-test-library.git#96bb1d8ef0f17e4ae319c10badb194b981e89e5d" +"@opensearch-dashboards-test/opensearch-dashboards-test-library@https://github.com/opensearch-project/opensearch-dashboards-test-library/archive/refs/tags/1.0.6.tar.gz": + version "1.0.6" + resolved "https://github.com/opensearch-project/opensearch-dashboards-test-library/archive/refs/tags/1.0.6.tar.gz#f2f489832a75191e243c6d2b42d49047265d9ce3" "@types/geojson@*", "@types/geojson@^7946.0.10": version "7946.0.10" @@ -180,11 +180,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.7.tgz#4b8ecac87fbefbc92f431d09c30e176fc0a7c377" integrity sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA== -"@types/node@^16.18.39": - version "16.18.46" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.46.tgz#9f2102d0ba74a318fcbe170cbff5463f119eab59" - integrity sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg== - "@types/pbf@*", "@types/pbf@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.2.tgz#8d291ad68b4b8c533e96c174a2e3e6399a59ed61" @@ -195,10 +190,10 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-test-renderer@^18.0.0": - version "18.0.0" - resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-18.0.0.tgz#7b7f69ca98821ea5501b21ba24ea7b6139da2243" - integrity sha512-C7/5FBJ3g3sqUahguGi03O79b8afNeSD6T8/GU50oQrJCU0bVCCGQHaGKUbg2Ce8VQEEqTw8/HiS6lXHHdgkdQ== +"@types/react-test-renderer@^18.0.7": + version "18.0.7" + resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-18.0.7.tgz#2cfe657adb3688cdf543995eceb2e062b5a68728" + integrity sha512-1+ANPOWc6rB3IkSnElhjv6VLlKg2dSv/OWClUyZimbLsQyBn8Js9Vtdsi3UICJ2rIQ3k2la06dkB+C92QfhKmg== dependencies: "@types/react" "*" @@ -357,7 +352,7 @@ buffer-crc32@~0.2.3: resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== -buffer@^5.6.0: +buffer@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -520,20 +515,19 @@ cypress-multi-reporters@^1.5.0: debug "^4.3.4" lodash "^4.17.21" -cypress@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.1.0.tgz#18f268e66662cd91b1766db18bd1f63a66592205" - integrity sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ== +cypress@^13.6.3: + version "13.6.6" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.6.6.tgz#5133f231ed1c6e57dc8dcbf60aade220bcd6884b" + integrity sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A== dependencies: "@cypress/request" "^3.0.0" "@cypress/xvfb" "^1.2.4" - "@types/node" "^16.18.39" "@types/sinonjs__fake-timers" "8.1.1" "@types/sizzle" "^2.3.2" arch "^2.2.0" blob-util "^2.0.2" bluebird "^3.7.2" - buffer "^5.6.0" + buffer "^5.7.1" cachedir "^2.3.0" chalk "^4.1.0" check-more-types "^2.24.0" @@ -551,7 +545,7 @@ cypress@^13.1.0: figures "^3.2.0" fs-extra "^9.1.0" getos "^3.2.1" - is-ci "^3.0.0" + is-ci "^3.0.1" is-installed-globally "~0.4.0" lazy-ass "^1.6.0" listr2 "^3.8.3" @@ -907,7 +901,7 @@ install@^0.13.0: resolved "https://registry.yarnpkg.com/install/-/install-0.13.0.tgz#6af6e9da9dd0987de2ab420f78e60d9c17260776" integrity sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA== -is-ci@^3.0.0: +is-ci@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==