Interactive interface for browsing global, full-resolution satellite imagery
Revert "Merge branch 'develop' into main"
christof-wittreich86a3e3ea8dca
diff --git a/e2e/features/animation/animation-test.spec.js b/e2e/features/animation/animation-test.spec.jsindex ea43c1150..1f2d778f6 100644--- a/e2e/features/animation/animation-test.spec.js+++ b/e2e/features/animation/animation-test.spec.js@@ -64,8 +64,8 @@ test('Disable playback when max frames exceeded', async () => {const { playButton, yearStartInput } = selectorsawait page.goto(animationGeostationary)await closeModal(page)- const animateYearDown = page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow').first()- const animateYearUp = page.locator('.wv-date-range-selector > div > div > button > svg.uparrow').first()+ const animateYearDown = page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow').first()+ const animateYearUp = page.locator('.wv-date-range-selector > div > div > div > svg.uparrow').first()await animateYearDown.click()await expect(playButton).toHaveClass(/disabled/)// Playback re-enabled when frames within the maxdiff --git a/e2e/features/compare/compare-mobile-test.spec.js b/e2e/features/compare/compare-mobile-test.spec.jsindex 698bf2ea7..ebd8e92ad 100644--- a/e2e/features/compare/compare-mobile-test.spec.js+++ b/e2e/features/compare/compare-mobile-test.spec.js@@ -23,8 +23,8 @@ test.afterAll(async () => {test('Mobile comparison A|B toggle buttons are visible and only A is selected by default', async () => {await page.goto(swipeAndAIsActive)await closeModal(page)- const aMobileCompareButton = page.locator('#compare-toggle-selected-A')- const bMobileCompareButton = page.locator('#compare-toggle-selected-B')+ const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')await expect(aMobileCompareButton).toHaveClass(/compare-btn-selected/)await expect(bMobileCompareButton).not.toHaveClass(/compare-btn-selected/)})@@ -32,7 +32,7 @@ test('Mobile comparison A|B toggle buttons are visible and only A is selected by// toggle select B change compare mode date to Btest('Toggling to B compare side changes mobile date picker date', async () => {const { mobileDatePickerSelectButton } = selectors- const bMobileCompareButton = page.locator('#compare-toggle-selected-B')+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')// confirm initial A mobile date picker dateawait expect(mobileDatePickerSelectButton).toHaveText('2018 AUG 17')// click B compare toggle button and confirm B mobile date picker date@@ -63,8 +63,8 @@ test('Expand mobile layer list and confirm comparison mode button is present and// B compare button toggle is selected on B permalink load and A is not selectedtest('B compare button toggle is only selected on B permalink load', async () => {await page.goto(spyAndBIsActive)- const aMobileCompareButton = page.locator('#compare-toggle-selected-A')- const bMobileCompareButton = page.locator('#compare-toggle-selected-B')+ const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')await expect(aMobileCompareButton).not.toHaveClass(/compare-btn-selected/)await expect(bMobileCompareButton).toHaveClass(/compare-btn-selected/)})diff --git a/e2e/features/timeline/timeline-test.spec.js b/e2e/features/timeline/timeline-test.spec.jsindex 8647081c9..872ee6cce 100644--- a/e2e/features/timeline/timeline-test.spec.js+++ b/e2e/features/timeline/timeline-test.spec.js@@ -51,7 +51,7 @@ test('Interval defaults to 1 DAY', async () => {})test('Change to month zoom level and axis changes', async () => {- await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()+ await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()const axisGridDay = await page.locator('.axis-grid-text-day').first()const axisGridMonth = await page.locator('.axis-grid-text-month').first()const currentZoom = await page.locator('#current-zoom')@@ -61,8 +61,8 @@ test('Change to month zoom level and axis changes', async () => {})test('Change to year zoom level and axis changes', async () => {- await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()- await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()+ await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()+ await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()const axisGridDay = await page.locator('.axis-grid-text-day').first()const axisGridYear = await page.locator('.axis-grid-text-year').first()const currentZoom = await page.locator('#current-zoom')diff --git a/e2e/test-utils/global-variables/selectors.js b/e2e/test-utils/global-variables/selectors.jsindex 8c56f25ab..659a20c44 100644--- a/e2e/test-utils/global-variables/selectors.js+++ b/e2e/test-utils/global-variables/selectors.js@@ -15,8 +15,8 @@ module.exports = (page) => ({animationButtonCase: page.locator('#timeline-header .animate-button'),animationButton: page.locator('.animate-button'),playButton: page.locator('#play-button'),- animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > button > svg.uparrow'),- animateYearDown: page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow'),+ animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > div > svg.uparrow'),+ animateYearDown: page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow'),yearStartInput: page.locator('#year-animation-widget-start'),monthStartInput: page.locator('#month-animation-widget-start'),dayStartInput: page.locator('#day-animation-widget-start'),@@ -112,12 +112,12 @@ module.exports = (page) => ({dragger: page.locator('.timeline-dragger'),draggerA: page.locator('.timeline-dragger.draggerA'),draggerB: page.locator('.timeline-dragger.draggerB'),- dayDown: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-down'),- dayUp: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-up'),- monthDown: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-down'),- monthUp: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-up'),- yearDown: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-down'),- yearUp: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-up'),+ dayDown: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-down'),+ dayUp: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-up'),+ monthDown: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-down'),+ monthUp: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-up'),+ yearDown: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-down'),+ yearUp: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-up'),datePickerWheel: page.locator('.datepicker-modal .datepicker-wheel'),dateSelectorDayInput: page.locator('#date-selector-main .input-wrapper-day input'),dateSelectorMonthInput: page.locator('#date-selector-main .input-wrapper-month input'),diff --git a/package-lock.json b/package-lock.jsonindex 226b4fc4d..ef7f2d703 100644--- a/package-lock.json+++ b/package-lock.json@@ -11,8 +11,8 @@"license": "NASA-1.3","dependencies": {"@edsc/earthdata-react-icons": "^0.0.2",- "@elastic/react-search-ui": "^1.22.2",- "@elastic/react-search-ui-views": "^1.22.2",+ "@elastic/react-search-ui": "^1.22.0",+ "@elastic/react-search-ui-views": "^1.22.0","@fortawesome/fontawesome-svg-core": "^6.7.2","@fortawesome/free-brands-svg-icons": "^6.7.2","@fortawesome/free-solid-svg-icons": "^6.7.2",@@ -47,7 +47,7 @@"p-queue": "^8.0.1","proj4": "^2.15.0","prop-types": "^15.8.1",- "qs": "^6.14.0",+ "qs": "^6.13.1","react": "^18.3.1","react-beautiful-dnd": "^13.1.1","react-device-detect": "^2.2.3",@@ -73,14 +73,14 @@"simplebar-react": "^3.3.0","stackblur": "^1.0.0","supercluster": "^8.0.1",- "tough-cookie": "^5.1.0",+ "tough-cookie": "^5.0.0","upng-js": "^2.1.0","url-template": "^3.1.1","what-input": "^5.2.12"},"devDependencies": {"@babel/core": "^7.26.0",- "@babel/eslint-parser": "^7.26.5",+ "@babel/eslint-parser": "^7.25.9","@babel/plugin-transform-class-properties": "^7.25.9","@babel/plugin-transform-private-methods": "^7.25.9","@babel/preset-env": "^7.26.0",@@ -103,15 +103,15 @@"eslint-config-standard": "^17.1.0","eslint-import-resolver-webpack": "^0.13.10","eslint-plugin-import": "^2.31.0",- "eslint-plugin-jest": "^28.11.0",+ "eslint-plugin-jest": "^28.10.0","eslint-plugin-jsx-a11y": "^6.10.2","eslint-plugin-n": "^17.15.1","eslint-plugin-no-storage": "^1.0.2","eslint-plugin-node": "^11.1.0","eslint-plugin-promise": "^6.6.0",- "eslint-plugin-react": "^7.37.4",+ "eslint-plugin-react": "^7.37.3","express": "^4.21.0",- "glob": "^11.0.1",+ "glob": "^11.0.0","husky": "^9.1.7","jest": "^29.7.0","jest-canvas-mock": "^2.5.2",@@ -122,13 +122,13 @@"node-ssh": "^13.2.0","npm-run-all": "^4.1.5","patch-package": "^8.0.0",- "postcss": "^8.5.1",+ "postcss": "^8.4.49","postcss-loader": "^8.1.1","react-refresh": "^0.16.0","react-test-renderer": "^18.3.1","redux-mock-store": "^1.5.5","run-script-os": "^1.1.6",- "sass": "^1.83.4",+ "sass": "^1.83.0","sass-loader": "^16.0.4","shelljs": "^0.8.5","showdown": "^2.1.0",@@ -137,7 +137,7 @@"stylelint-high-performance-animation": "^1.10.0","tar": "^7.4.3","terser-webpack-plugin": "^5.3.11",- "uuid": "^11.0.5",+ "uuid": "^11.0.3","webpack": "^5.97.1","webpack-bundle-analyzer": "^4.10.2","webpack-cli": "^5.1.4",@@ -217,9 +217,7 @@}},"node_modules/@babel/eslint-parser": {- "version": "7.26.5",- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.26.5.tgz",- "integrity": "sha512-Kkm8C8uxI842AwQADxl0GbcG1rupELYLShazYEZO/2DYjhyWXJIOUVOE3tBYm6JXzUCNJOZEzqc4rCW/jsEQYQ==",+ "version": "7.25.9","dev": true,"license": "MIT","dependencies": {@@ -1890,13 +1888,13 @@}},"node_modules/@elastic/react-search-ui": {- "version": "1.22.2",- "resolved": "https://registry.npmjs.org/@elastic/react-search-ui/-/react-search-ui-1.22.2.tgz",- "integrity": "sha512-pr/XpxUMbR2Rf7y/QvZIqWK9XgApQIcXLDNQFIDH23ren9ymHj6shgBkvANXnQ0eTdLc2R3rRVJu60wxYvP/0g==",+ "version": "1.22.0",+ "resolved": "https://registry.npmjs.org/@elastic/react-search-ui/-/react-search-ui-1.22.0.tgz",+ "integrity": "sha512-auGjSuOpaWamGSOEQytUUSzZc+z4tY2x2tjELv4v9ugvouMykdUu8ETYK76gasojlKsHGt6tA8dIXFKR5Dug2g==","license": "Apache-2.0","dependencies": {- "@elastic/react-search-ui-views": "1.22.2",- "@elastic/search-ui": "1.22.2"+ "@elastic/react-search-ui-views": "1.22.0",+ "@elastic/search-ui": "1.22.0"},"peerDependencies": {"react": ">= 16.8.0 < 19",@@ -1904,12 +1902,12 @@}},"node_modules/@elastic/react-search-ui-views": {- "version": "1.22.2",- "resolved": "https://registry.npmjs.org/@elastic/react-search-ui-views/-/react-search-ui-views-1.22.2.tgz",- "integrity": "sha512-2Hlgwd9I5bOUakriTBjCaYTDKNTfVMAEnUyZDbue/w4yAhUe0PCmSVY+PJLKmppVSgIoFjYxMci9Sys0tBMnCQ==",+ "version": "1.22.0",+ "resolved": "https://registry.npmjs.org/@elastic/react-search-ui-views/-/react-search-ui-views-1.22.0.tgz",+ "integrity": "sha512-ys/jkOziBlk53eS+OTyiFAjYjey+24+0Cj68X8W6FZfq34wbLjtRvwNzdFPGGAWm4WATZpasWpW6rdlLlrPgEw==","license": "Apache-2.0","dependencies": {- "@elastic/search-ui": "1.22.2",+ "@elastic/search-ui": "1.22.0","downshift": "^3.2.10","rc-pagination": "^4.0.4","react-select": "^5.0.0"@@ -1920,15 +1918,15 @@}},"node_modules/@elastic/search-ui": {- "version": "1.22.2",- "resolved": "https://registry.npmjs.org/@elastic/search-ui/-/search-ui-1.22.2.tgz",- "integrity": "sha512-XlXbclMf+ReH+t7etEfa/99mN2FIDqDEJsS/kcgbQEbo+23WYDyx3n/5ozzkGjPcatVgnx80tlJM3+D4RFmmVw==",+ "version": "1.22.0",+ "resolved": "https://registry.npmjs.org/@elastic/search-ui/-/search-ui-1.22.0.tgz",+ "integrity": "sha512-ce3kOKKYQX+vsjynuRY1aMRnjDaG94CSx12jsWeO+antbVfhdPenZEdtQnjUOc0ta7nXgdOHBfXJCqhwVLgh0g==","license": "Apache-2.0","dependencies": {"date-fns": "^1.30.1","deep-equal": "^1.0.1","history": "^4.9.0",- "qs": "^6.9.7"+ "qs": "^6.7.0"}},"node_modules/@elastic/search-ui/node_modules/history": {@@ -7625,9 +7623,9 @@}},"node_modules/eslint-plugin-jest": {- "version": "28.11.0",- "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.11.0.tgz",- "integrity": "sha512-QAfipLcNCWLVocVbZW8GimKn5p5iiMcgGbRzz8z/P5q7xw+cNEpYqyzFMtIF/ZgF2HLOyy+dYBut+DoYolvqig==",+ "version": "28.10.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.10.0.tgz",+ "integrity": "sha512-hyMWUxkBH99HpXT3p8hc7REbEZK3D+nk8vHXGgpB+XXsi0gO4PxMSP+pjfUzb67GnV9yawV9a53eUmcde1CCZA==","dev": true,"license": "MIT","dependencies": {@@ -7799,9 +7797,9 @@}},"node_modules/eslint-plugin-react": {- "version": "7.37.4",- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",- "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",+ "version": "7.37.3",+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz",+ "integrity": "sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==","dev": true,"license": "MIT","dependencies": {@@ -8934,9 +8932,7 @@}},"node_modules/glob": {- "version": "11.0.1",- "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",- "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==",+ "version": "11.0.0","dev": true,"license": "ISC","dependencies": {@@ -13901,9 +13897,9 @@}},"node_modules/postcss": {- "version": "8.5.1",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",- "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",+ "version": "8.4.49",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",+ "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==","dev": true,"funding": [{@@ -13921,7 +13917,7 @@],"license": "MIT","dependencies": {- "nanoid": "^3.3.8",+ "nanoid": "^3.3.7","picocolors": "^1.1.1","source-map-js": "^1.2.1"},@@ -14629,12 +14625,12 @@"license": "MIT"},"node_modules/qs": {- "version": "6.14.0",- "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",- "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",+ "version": "6.13.1",+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",+ "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==","license": "BSD-3-Clause","dependencies": {- "side-channel": "^1.1.0"+ "side-channel": "^1.0.6"},"engines": {"node": ">=0.6"@@ -15843,9 +15839,9 @@"license": "MIT"},"node_modules/sass": {- "version": "1.83.4",- "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",- "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",+ "version": "1.83.0",+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",+ "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==","dev": true,"license": "MIT","dependencies": {@@ -17536,9 +17532,7 @@}},"node_modules/tough-cookie": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.0.tgz",- "integrity": "sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==",+ "version": "5.0.0","license": "BSD-3-Clause","dependencies": {"tldts": "^6.1.32"@@ -17951,9 +17945,9 @@}},"node_modules/uuid": {- "version": "11.0.5",- "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",- "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",+ "version": "11.0.3",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",+ "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==","dev": true,"funding": ["https://github.com/sponsors/broofa",diff --git a/package.json b/package.jsonindex 2bfa2dca6..c357ddbaa 100644--- a/package.json+++ b/package.json@@ -78,7 +78,7 @@},"devDependencies": {"@babel/core": "^7.26.0",- "@babel/eslint-parser": "^7.26.5",+ "@babel/eslint-parser": "^7.25.9","@babel/plugin-transform-class-properties": "^7.25.9","@babel/plugin-transform-private-methods": "^7.25.9","@babel/preset-env": "^7.26.0",@@ -101,15 +101,15 @@"eslint-config-standard": "^17.1.0","eslint-import-resolver-webpack": "^0.13.10","eslint-plugin-import": "^2.31.0",- "eslint-plugin-jest": "^28.11.0",+ "eslint-plugin-jest": "^28.10.0","eslint-plugin-jsx-a11y": "^6.10.2","eslint-plugin-n": "^17.15.1","eslint-plugin-no-storage": "^1.0.2","eslint-plugin-node": "^11.1.0","eslint-plugin-promise": "^6.6.0",- "eslint-plugin-react": "^7.37.4",+ "eslint-plugin-react": "^7.37.3","express": "^4.21.0",- "glob": "^11.0.1",+ "glob": "^11.0.0","husky": "^9.1.7","jest": "^29.7.0","jest-canvas-mock": "^2.5.2",@@ -120,13 +120,13 @@"node-ssh": "^13.2.0","npm-run-all": "^4.1.5","patch-package": "^8.0.0",- "postcss": "^8.5.1",+ "postcss": "^8.4.49","postcss-loader": "^8.1.1","react-refresh": "^0.16.0","react-test-renderer": "^18.3.1","redux-mock-store": "^1.5.5","run-script-os": "^1.1.6",- "sass": "^1.83.4",+ "sass": "^1.83.0","sass-loader": "^16.0.4","shelljs": "^0.8.5","showdown": "^2.1.0",@@ -135,7 +135,7 @@"stylelint-high-performance-animation": "^1.10.0","tar": "^7.4.3","terser-webpack-plugin": "^5.3.11",- "uuid": "^11.0.5",+ "uuid": "^11.0.3","webpack": "^5.97.1","webpack-bundle-analyzer": "^4.10.2","webpack-cli": "^5.1.4",@@ -147,8 +147,8 @@},"dependencies": {"@edsc/earthdata-react-icons": "^0.0.2",- "@elastic/react-search-ui": "^1.22.2",- "@elastic/react-search-ui-views": "^1.22.2",+ "@elastic/react-search-ui": "^1.22.0",+ "@elastic/react-search-ui-views": "^1.22.0","@fortawesome/fontawesome-svg-core": "^6.7.2","@fortawesome/free-brands-svg-icons": "^6.7.2","@fortawesome/free-solid-svg-icons": "^6.7.2",@@ -183,7 +183,7 @@"p-queue": "^8.0.1","proj4": "^2.15.0","prop-types": "^15.8.1",- "qs": "^6.14.0",+ "qs": "^6.13.1","react": "^18.3.1","react-beautiful-dnd": "^13.1.1","react-device-detect": "^2.2.3",@@ -209,7 +209,7 @@"simplebar-react": "^3.3.0","stackblur": "^1.0.0","supercluster": "^8.0.1",- "tough-cookie": "^5.1.0",+ "tough-cookie": "^5.0.0","upng-js": "^2.1.0","url-template": "^3.1.1","what-input": "^5.2.12"diff --git a/web/.eslintrc b/web/.eslintrcindex 4dff861b7..2b60e1152 100644--- a/web/.eslintrc+++ b/web/.eslintrc@@ -99,7 +99,16 @@// Import rules overrides"import/no-cycle": "warn",// Accesibility rules overrides+ "jsx-a11y/no-noninteractive-tabindex": "off", // 2 errors across 2 files+ "jsx-a11y/no-noninteractive-element-interactions": "off", // 5 errors across 5 files+ "jsx-a11y/anchor-has-content": "off", // 1 error across 1 files+ "jsx-a11y/control-has-associated-label": "off", // 1 error across 1 files+ "jsx-a11y/anchor-is-valid": "off", // 24 errors across 13 files+ "jsx-a11y/label-has-associated-control": "off", // 5 errors across 4 files+ "jsx-a11y/alt-text": "off", // 15 errors across 10 files+ "jsx-a11y/mouse-events-have-key-events": "off", // 7 errors across 4 files"jsx-a11y/no-static-element-interactions": "off", // 71 errors across 39 files+ "jsx-a11y/click-events-have-key-events": "off", // 70 errors across 39 files// React rules overrides"react/jsx-props-no-spreading": "warn", // 6 errors across 2 files"react/jsx-filename-extension": "off", // 206 errors across 206 filesdiff --git a/web/js/components/animation-widget/gif-button.js b/web/js/components/animation-widget/gif-button.jsindex f8aa8d82d..594479615 100644--- a/web/js/components/animation-widget/gif-button.js+++ b/web/js/components/animation-widget/gif-button.js@@ -93,8 +93,7 @@ function GifButton(props) {return (<>- <button- type="button"+ <aid="create-gif-button"aria-label={labelText}className={gifDisabled ? 'wv-icon-case no-drag disabled' : 'wv-icon-case no-drag'}@@ -112,7 +111,7 @@ function GifButton(props) {>{showWarning ? warningMessage : labelText}</UncontrolledTooltip>- </button>+ </a>{isGifActive && <GifContainer onClose={onCloseGif} />}</>);diff --git a/web/js/components/animation-widget/gif-post-creation.js b/web/js/components/animation-widget/gif-post-creation.jsindex a8c22a27c..d6db00523 100644--- a/web/js/components/animation-widget/gif-post-creation.js+++ b/web/js/components/animation-widget/gif-post-creation.js@@ -61,7 +61,7 @@ export default class GifResults extends Component {<ModalHeader close={closeBtn}>GIF Results</ModalHeader><ModalBody><div className="gif-results-dialog-case clearfix">- <img alt="GIF preview" src={blobURL} width={imgElWidth} height={imgElHeight} />+ <img src={blobURL} width={imgElWidth} height={imgElHeight} /><divclassName="gif-results-dialog"style={{ minHeight: 210 }}diff --git a/web/js/components/animation-widget/loop-button.js b/web/js/components/animation-widget/loop-button.jsindex 4a67c08b8..35b3593b7 100644--- a/web/js/components/animation-widget/loop-button.js+++ b/web/js/components/animation-widget/loop-button.js@@ -12,8 +12,7 @@ function LoopButton({ looping, onLoop, isMobile }) {const labelText = looping ? 'Disable animation loop' : 'Enable animation loop';const buttonId = 'loop-button';return (- <button- type="button"+ <aid={buttonId}aria-label={labelText}className={@@ -34,7 +33,7 @@ function LoopButton({ looping, onLoop, isMobile }) {</UncontrolledTooltip>)}<FontAwesomeIcon icon="retweet" className="wv-animation-widget-icon" />- </button>+ </a>);}diff --git a/web/js/components/animation-widget/play-button.js b/web/js/components/animation-widget/play-button.jsindex 3a0d51a2f..c7b218c5b 100644--- a/web/js/components/animation-widget/play-button.js+++ b/web/js/components/animation-widget/play-button.js@@ -18,8 +18,7 @@ function PlayButton({const onClick = isDisabled ? () => {} : playing ? pause : play;return (- <button- type="button"+ <aid={buttonId}aria-label={labelText}className={`wv-anim-play-case wv-icon-case no-drag ${isDisabled ? 'disabled' : ''}`}@@ -37,7 +36,7 @@ function PlayButton({{playing? <FontAwesomeIcon icon="pause" className="wv-animation-widget-icon" />: <FontAwesomeIcon icon="play" className="wv-animation-widget-icon" />}- </button>+ </a>);}diff --git a/web/js/components/compare/alert.js b/web/js/components/compare/alert.jsindex d23f4f179..4c046f071 100644--- a/web/js/components/compare/alert.js+++ b/web/js/components/compare/alert.js@@ -10,7 +10,7 @@ function CompareAlertModalBody() {Select the respective tab (A or B) in order to update the layersand date of that state.</p>- <img alt="A-B tabs" src="images/ab-tabs.png" />+ <img src="images/ab-tabs.png" /></li><li className="compare-dialog-list-item"><p>@@ -18,14 +18,14 @@ function CompareAlertModalBody() {the deactivated time slider to activate that state and change thedate.</p>- <img alt="A-B picks" src="images/ab-picks.png" />+ <img src="images/ab-picks.png" /></li><li className="compare-dialog-list-item"><p>There are three compare modes. You can choose different modesusing the selection at the bottom of the layer list.</p>- <img alt="A-B modes" src="images/ab-modes.png" />+ <img src="images/ab-modes.png" /></li></ul></div>diff --git a/web/js/components/compare/mobile-toggle.js b/web/js/components/compare/mobile-toggle.jsindex c4407eaca..ae2e206c2 100644--- a/web/js/components/compare/mobile-toggle.js+++ b/web/js/components/compare/mobile-toggle.js@@ -10,50 +10,39 @@ function MobileComparisonToggle (props) {toggleActiveCompareState,} = props;- const [isCompareASelected, setCompareASelected] = useState(isCompareA);+ const [isCompareASelected, toggleCompareASelected] = useState(isCompareA);useEffect(() => {if (isCompareASelected !== isCompareA) {- setCompareASelected(isCompareA);+ toggleCompareASelected(isCompareA);}}, [isCompareA]);-- if (isCompareASelected !== isCompareA) {- toggleActiveCompareState();- }+ useEffect(() => {+ if (isCompareASelected !== isCompareA) {+ toggleActiveCompareState();+ }+ }, [isCompareASelected]);if (!active) {return null;}- const handleClick = (evt) => {- if (evt.target.id === 'compare-toggle-selected-A') {- setCompareASelected(true);- } else {- setCompareASelected(false);- }- };-const classA = isCompareASelected ? 'compare-btn-selected' : '';const classB = !isCompareASelected ? 'compare-btn-selected' : '';return (<div className="comparison-mobile-select-toggle">- <button- type="button"- id="compare-toggle-selected-A"+ <divclassName={`compare-toggle-selected-btn ${classA}`}- onClick={handleClick}+ onClick={() => toggleCompareASelected(true)}>A- </button>- <button- type="button"- id="compare-toggle-selected-B"+ </div>+ <divclassName={`compare-toggle-selected-btn ${classB}`}- onClick={handleClick}+ onClick={() => toggleCompareASelected(false)}>B- </button>+ </div></div>);}diff --git a/web/js/components/compare/opacity-slider.js b/web/js/components/compare/opacity-slider.jsindex df1379883..6b370ba3b 100644--- a/web/js/components/compare/opacity-slider.js+++ b/web/js/components/compare/opacity-slider.js@@ -48,12 +48,12 @@ function OpacitySlider ({return (<div id="ab-slider-case" className="ab-slider-case" style={caseStyle}>- <p className="wv-slider-label left" style={labelStyle}>+ <label className="wv-slider-label left" style={labelStyle}><h4 className="left"><span>A</span><MonospaceDate date={dateAText} /></h4>- </p>+ </label><div className="input-range"><div className="range-tooltip">{currentValue}@@ -68,12 +68,12 @@ function OpacitySlider ({style={{ '--value-percent': `${currentValue}%` }}/></div>- <p className="wv-slider-label right" style={labelStyle}>+ <label className="wv-slider-label right" style={labelStyle}><h4 className="right"><span>B</span><MonospaceDate date={dateBText} /></h4>- </p>+ </label></div>);}diff --git a/web/js/components/feature-alert/vector-alert-modal.js b/web/js/components/feature-alert/vector-alert-modal.jsindex caa812c1a..ed005146a 100644--- a/web/js/components/feature-alert/vector-alert-modal.js+++ b/web/js/components/feature-alert/vector-alert-modal.js@@ -50,7 +50,7 @@ function VectorAlertModalBody() {</p></Col><Col>- <img alt="Blue pointer icon" src="images/vector-alert.png" />+ <img src="images/vector-alert.png" /></Col></Row></Container>diff --git a/web/js/components/image-download/lat-long-inputs.js b/web/js/components/image-download/lat-long-inputs.jsindex fcd9daae1..9779675c7 100644--- a/web/js/components/image-download/lat-long-inputs.js+++ b/web/js/components/image-download/lat-long-inputs.js@@ -98,11 +98,7 @@ function LatLongSelect(props) {return (<div className="wv-image-input-case">- <button- type="button"- className="wv-image-input-title"- onClick={() => { setShowCoordinates(!showCoordinates); }}- >+ <div className="wv-image-input-title" onClick={() => { setShowCoordinates(!showCoordinates); }}><span>{coordText}</span><spantitle="Hide coordinates"@@ -110,7 +106,7 @@ function LatLongSelect(props) {><FontAwesomeIcon icon="caret-right" size="lg" rotation={showCoordinates ? 90 : 0} /></span>- </button>+ </div>{showCoordinates && (<><div className="row">diff --git a/web/js/components/layer/info/date-ranges.js b/web/js/components/layer/info/date-ranges.jsindex 90bc08191..d3157c7e4 100644--- a/web/js/components/layer/info/date-ranges.js+++ b/web/js/components/layer/info/date-ranges.js@@ -64,17 +64,12 @@ export default function DateRanges ({ layer }) {<><supclassName="layer-date-ranges-button"+ onClick={() => {+ getDateRanges();+ setShowRanges(!showRanges);+ }}>- <button- type="button"- style={{ background: 'none', border: 'none', color: 'inherit' }}- onClick={() => {- getDateRanges();- setShowRanges(!showRanges);- }}- >- *View Dates- </button>+ *View Dates</sup><divstyle={style}diff --git a/web/js/components/layer/product-picker/browse/category-cell.js b/web/js/components/layer/product-picker/browse/category-cell.jsindex c9946f62f..d87a1863b 100644--- a/web/js/components/layer/product-picker/browse/category-cell.js+++ b/web/js/components/layer/product-picker/browse/category-cell.js@@ -33,15 +33,13 @@ function CategoryCell(props) {<div className="category-background-cover" style={categoryBgImage}><div className="category-background-cover"><h3>- <button- type="button"- style={{ border: 'none', textAlign: 'left' }}+ <aclassName="layer-category-name"alt={category.title}onClick={() => drawMeasurements(category)}>{category.title}- </button>+ </a></h3><ul>{category.measurements@@ -73,13 +71,12 @@ function CategoryCell(props) {/* eslint react/no-array-index-key: 1 */key={category.id + index}>- <button- type="button"+ <aclassName="layer-category-name"onClick={() => drawMeasurements(category)}>...- </button>+ </a></li>) : (<li@@ -89,13 +86,12 @@ function CategoryCell(props) {`layer-category-item-${category.id}-${current.id}`}>- <button- type="button"+ <aclassName="layer-category-name"onClick={() => drawMeasurements(category, current.id, index)}>{current.title}- </button>+ </a>{' '}</li>);diff --git a/web/js/components/layer/product-picker/browse/category-layer-row.js b/web/js/components/layer/product-picker/browse/category-layer-row.jsindex 8bd3a6f71..591e5a2eb 100644--- a/web/js/components/layer/product-picker/browse/category-layer-row.js+++ b/web/js/components/layer/product-picker/browse/category-layer-row.js@@ -210,8 +210,7 @@ class CategoryLayerRow extends React.Component {id={`accordion-${category.id}-${measurement.id}`}key={`${category.id}-${measurement.id}`}>- <button- type="button"+ <divonClick={() => selectMeasurement(id)}className="measurement-row-header">@@ -220,7 +219,7 @@ class CategoryLayerRow extends React.Component {{isSelected? <FontAwesomeIcon icon="chevron-circle-down" className="arrow-icon" />: <FontAwesomeIcon icon="chevron-circle-right" className="arrow-icon" />}- </button>+ </div>{isSelected ? this.renderContent() : ''}</div>);diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.jsindex db88e2491..f26ed8d1b 100644--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js@@ -58,10 +58,8 @@ function MeasurementMetadataDetail (props) {href={`images/layers/previews/${selectedProjection}/${l.id}.jpg`}rel="noopener noreferrer"target="_blank"- aria-label="View layer preview"><img- alt="Layer preview"className="img-fluid layer-preview"src={`images/layers/previews/${selectedProjection}/${l.id}.jpg`}/>@@ -87,15 +85,14 @@ function MeasurementMetadataDetail (props) {{renderMetadataForLayers()}</div>{doesMetaDataNeedExpander && (- <button- type="button"+ <divclassName="metadata-more"onClick={() => setMetadataExpansion(!isMetadataExpanded)}><span className={isMetadataExpanded ? 'ellipsis up' : 'ellipsis'}>{isMetadataExpanded ? '^' : '...'}</span>- </button>+ </div>)}</div>);diff --git a/web/js/components/layer/product-picker/search/filter-chips.js b/web/js/components/layer/product-picker/search/filter-chips.jsindex 06f9f3670..33b716558 100644--- a/web/js/components/layer/product-picker/search/filter-chips.js+++ b/web/js/components/layer/product-picker/search/filter-chips.js@@ -23,8 +23,7 @@ export default function FilterChips(props) {{filterValues.map(({field, displayValue, value,}) => (- <button- type="button"+ <divkey={field + value}className="filter-chip"onClick={() => removeFilter(field, value)}@@ -34,7 +33,7 @@ export default function FilterChips(props) {icon="times"fixedWidth/>- </button>+ </div>))}</div>);diff --git a/web/js/components/layer/product-picker/search/layer-metadata-detail.js b/web/js/components/layer/product-picker/search/layer-metadata-detail.jsindex b0b80eb61..46551eade 100644--- a/web/js/components/layer/product-picker/search/layer-metadata-detail.js+++ b/web/js/components/layer/product-picker/search/layer-metadata-detail.js@@ -64,8 +64,8 @@ class LayerMetadataDetail extends React.Component {{showPreviewImage&& (<div className="text-center">- <a href={previewUrl} rel="noopener noreferrer" target="_blank" aria-label="View layer preview">- <img alt="Layer Preview" className="img-fluid layer-preview" src={previewUrl} />+ <a href={previewUrl} rel="noopener noreferrer" target="_blank">+ <img className="img-fluid layer-preview" src={previewUrl} /></a></div>)}diff --git a/web/js/components/layer/product-picker/search/search-layer-row.js b/web/js/components/layer/product-picker/search/search-layer-row.jsindex 08834e5c9..e3cf77e96 100644--- a/web/js/components/layer/product-picker/search/search-layer-row.js+++ b/web/js/components/layer/product-picker/search/search-layer-row.js@@ -162,7 +162,7 @@ class SearchLayerRow extends React.Component {</UncontrolledTooltip></div>)}- <button type="button" className={headerClassName} onClick={this.onRowClick}>+ <div className={headerClassName} onClick={this.onRowClick}><RenderSplitLayerTitle layer={layer} />{recentLayerMode && showDeleteIcon && (<Button@@ -174,7 +174,7 @@ class SearchLayerRow extends React.Component {<FontAwesomeIcon icon="trash" /></Button>)}- </button>+ </div></div>);}diff --git a/web/js/components/layer/settings/imagery-search.js b/web/js/components/layer/settings/imagery-search.jsindex 54190064f..7d43f71a6 100644--- a/web/js/components/layer/settings/imagery-search.js+++ b/web/js/components/layer/settings/imagery-search.js@@ -119,19 +119,10 @@ export default function ImagerySearch({ layer }) {}, [page]);const renderDates = () => {- const buttonStyle = {- width: '100%',- background: 'none',- color: 'white',- border: 'none',- textAlign: 'left',- };const granuleDates = [...olderGranuleDates, ...newerGranuleDates].sort((a, b) => Date.parse(b) - Date.parse(a));const renderedDates = [...new Set(granuleDates.map((date) => date.toLocaleDateString('en-US', dateOptions)))].map((date, i) => (- <li className="lazyload-list-item" key={date}>- <button type="button" style={buttonStyle} onClick={() => handleSelection(date)}>- {date}- </button>+ <li className="lazyload-list-item" key={date} onClick={() => handleSelection(date)}>+ {date}</li>));return renderedDates;diff --git a/web/js/components/layer/settings/layer-settings.js b/web/js/components/layer/settings/layer-settings.jsindex d8062e4c4..7997da04e 100644--- a/web/js/components/layer/settings/layer-settings.js+++ b/web/js/components/layer/settings/layer-settings.js@@ -10,6 +10,7 @@ import Opacity from './opacity';import Palette from './palette';import BandSelection from './band-selection/band-selection-parent-info-menu';import AssociatedLayers from './associated-layers-toggle';+import VectorStyle from './vector-style';import PaletteThreshold from './palette-threshold';import GranuleLayerDateList from './granule-date-list';import GranuleCountSlider from './granule-count-slider';@@ -267,6 +268,34 @@ class LayerSettings extends React.Component {);}+ /**+ * Render Opacity, threshold, and custom palette options+ */+ renderVectorStyles() {+ const {+ setStyle,+ clearStyle,+ groupName,+ layer,+ vectorStyles,+ } = this.props;+ let customStyle;+ if (layer.custom && layer.custom[0]) {+ [customStyle] = layer.custom;+ }+ return (+ <VectorStyle+ setStyle={setStyle}+ clearStyle={clearStyle}+ activeVectorStyle={customStyle || layer.id}+ layer={layer}+ index={0}+ groupName={groupName}+ vectorStyles={vectorStyles}+ />+ );+ }+/*** Render Granule count slider and granule date list settings (if granule layer)*/diff --git a/web/js/components/layer/settings/palette.js b/web/js/components/layer/settings/palette.jsindex d83a5d6c1..eb6e96fe0 100644--- a/web/js/components/layer/settings/palette.js+++ b/web/js/components/layer/settings/palette.js@@ -60,7 +60,7 @@ function PaletteSelect (props) {onClick={() => onChangePalette(id)}/>{isSelected && (- <span className="dot" />+ <span class="dot" />)}<label htmlFor={`wv-palette-radio-${id}-${index}`}><span@@ -103,10 +103,10 @@ function PaletteSelect (props) {onClick={() => onChangePalette(id)}/>{isSelected && (- <span className="dot" />+ <span class="dot" />)}<label htmlFor={`wv-palette-radio-${id}-${index}`}>- <img alt="Color Palette" src={dataURL} />+ <img src={dataURL} /><span className="wv-palette-label">{legend.name || 'Default'}</span></label></div>diff --git a/web/js/components/layer/settings/vector-style.js b/web/js/components/layer/settings/vector-style.jsnew file mode 100644index 000000000..008e32f10--- /dev/null+++ b/web/js/components/layer/settings/vector-style.js@@ -0,0 +1,187 @@+import React from 'react';+import PropTypes from 'prop-types';+import Scrollbar from '../../util/scrollbar';+import { isConditional } from '../../../modules/vector-styles/util';++class VectorStyleSelect extends React.Component {+ constructor(props) {+ super(props);+ this.state = {+ activeVectorStyle: props.activeVectorStyle,+ };+ }++ /**+ * Pass vector style to model after selection+ * @param {String} id | custom VectorStyle Id+ */+ onChangeVectorStyle(vectorStyleId) {+ const {+ layer, clearStyle, setStyle, groupName,+ } = this.props;+ setTimeout(() => {+ if (vectorStyleId === layer.id) {+ clearStyle(layer, vectorStyleId, groupName);+ } else {+ setStyle(layer, vectorStyleId, groupName);+ }+ }, 0);+ this.setState({ activeVectorStyle: vectorStyleId });+ }++ /**+ * Apply logic to render correct vectorStyle selection+ * @param {String} id | Legend Id+ */+ customLegend(styleLayerObject) {+ const { activeVectorStyle } = this.state;+ const description = styleLayerObject['source-description'] || styleLayerObject.id;+ const isConditionalStyling = styleLayerObject.paint ? isConditional(styleLayerObject.paint['line-color'] || styleLayerObject.paint['circle-color'] || styleLayerObject.paint['fill-color']) : false;++ return isConditionalStyling ? this.renderLegendMultiItem(+ styleLayerObject,+ styleLayerObject.id,+ description,+ )+ : this.renderSelectorItemSingle(+ styleLayerObject,+ styleLayerObject.id,+ description,+ activeVectorStyle === styleLayerObject.id,+ );+ }++ /**+ * Render classification legend when there are conditionals in the vectorstyles+ * @param {Object} vectorStyle | VectorStyle object+ * @param {String} id | colormap Id+ * @param {String} description | Colormap name+ */+ // eslint-disable-next-line class-methods-use-this+ renderLegendMultiItem(vectorStyle, vectorStyleId, description) {+ const caseDefaultClassName = 'wv-palette-selector-row ';+ const array = Array.from(vectorStyle.paint['line-color'] || vectorStyle.paint['circle-color'] || vectorStyle.paint['fill-color']);+ array.shift();+ const organizedArray = [];+ let temp = [];+ const chunk = 2;+ // https://stackoverflow.com/a/8495740/4589331+ for (let i = 0, j = array.length; i < j; i += chunk) {+ temp = array.slice(i, i + chunk);+ if (temp.length === 2) {+ const obj = {};+ if (temp[0].length === 3+ && typeof temp[0][2] === 'string'+ && typeof temp[1] === 'string'+ ) {+ [[,, obj.label], obj.color] = temp;+ organizedArray.push(obj);+ } else {+ console.warn('Irregular conditional');+ }+ } else if (temp.length === 1 && typeof temp[0] === 'string') {+ organizedArray.push({ label: 'Default', color: temp[0] });+ } else {+ console.warn('Irregular conditional');+ }+ }+ return organizedArray.map((obj, i) => (+ /* eslint react/no-array-index-key: 1 */+ <div key={vectorStyleId + i} className={caseDefaultClassName}>+ <label>+ <span+ className="wv-palettes-class"+ style={{ backgroundColor: obj.color }}+ >+ + </span>+ <span className="wv-palette-label">{obj.label}</span>+ </label>+ </div>+ ));+ }++ /**+ * Render classification customs when there is only one+ * Color in colormap+ * @param {Object} vectorStyle | VectorStyle object+ * @param {String} id | colormap Id+ * @param {String} description | Colormap name+ * @param {Boolean} isSelected | is this colormap active+ */+ renderSelectorItemSingle(vectorStyle, vectorStyleId, description, isSelected) {+ const color = vectorStyle.paint+ ? vectorStyle.paint['line-color'] || vectorStyle.paint['circle-color'] || vectorStyle.paint['fill-color']+ : 'rgb(255, 255, 255)';+ const caseDefaultClassName = 'wv-palette-selector-row wv-checkbox wv-checkbox-round gray ';+ const checkedClassName = isSelected ? 'checked' : '';+ return (+ <div key={vectorStyleId} className={caseDefaultClassName + checkedClassName}>+ <input+ id={`wv-palette-radio-${vectorStyleId}`}+ type="radio"+ name="wv-palette-radio"+ onClick={() => this.onChangeVectorStyle(vectorStyleId)}+ />+ {isSelected && (+ <span class="dot" />+ )}+ <label htmlFor={`wv-palette-radio-${vectorStyleId}`}>+ <span+ className="wv-palettes-class"+ style={{ backgroundColor: color }}+ >+ + </span>+ <span className="wv-palette-label">{description}</span>+ </label>+ </div>+ );+ }++ render() {+ const { index, vectorStyles, layer } = this.props;+ const vectorStyleId = layer.vectorStyle.id;+ const vectorStyle = vectorStyles[vectorStyleId];+ const vectorStyleLayers = vectorStyle.layers;++ const uniqueStyleLayers = vectorStyleLayers.filter((a) => {+ if (!this[a.id]) {+ this[a.id] = true;+ return true;+ }+ return false;+ }, Object.create(null));+ return (+ <div+ className="wv-palette-selector settings-component noselect"+ id={`wv-palette-selector${index}`}+ >+ <h2 className="wv-header">Vector Styles</h2>+ <Scrollbar style={{ maxHeight: '200px' }}>+ {+ // eslint-disable-next-line array-callback-return+ uniqueStyleLayers.map((styleLayerObject) => {+ if (styleLayerObject && styleLayerObject) {+ const item = this.customLegend(styleLayerObject);+ return item;+ }+ })+ }+ </Scrollbar>+ </div>+ );+ }+}++VectorStyleSelect.propTypes = {+ activeVectorStyle: PropTypes.string,+ clearStyle: PropTypes.func,+ groupName: PropTypes.string,+ index: PropTypes.number,+ layer: PropTypes.object,+ setStyle: PropTypes.func,+ vectorStyles: PropTypes.object,+};++export default VectorStyleSelect;diff --git a/web/js/components/location-search/coordinates-dialog.js b/web/js/components/location-search/coordinates-dialog.jsindex 2639c2968..7706b5714 100644--- a/web/js/components/location-search/coordinates-dialog.js+++ b/web/js/components/location-search/coordinates-dialog.js@@ -152,8 +152,7 @@ class CoordinatesDialog extends Component {const tooltipVisibilityCondition = !isMobile && !isCopyToClipboardTooltipVisible && showTooltips;return (- <button- type="button"+ <divid={buttonId}className={buttonId}onClick={() => this.copyToClipboard(formattedCoordinates)}@@ -170,7 +169,7 @@ class CoordinatesDialog extends Component {</UncontrolledTooltip>)}<FontAwesomeIcon icon="copy" fixedWidth />- </button>+ </div>);};diff --git a/web/js/components/location-search/location-marker.js b/web/js/components/location-search/location-marker.jsindex 6d809b6a0..1bedc5942 100644--- a/web/js/components/location-search/location-marker.js+++ b/web/js/components/location-search/location-marker.js@@ -33,12 +33,6 @@ export default function LocationMarker ({const coordinates = [latitude, longitude];const title = getDialogTitle(reverseGeocodeResults);const [showDialog, setShowDialog] = useState(dialogVisible);- const buttonStyle = {- background: 'none',- color: 'white',- border: 'none',- textAlign: 'left',- };return (<div className="location-dialog-pin-wrapper ">@@ -52,20 +46,13 @@ export default function LocationMarker ({tooltipId={tooltipId}/>)}- <button- type="button"- style={buttonStyle}- aria-label="Show coordinates dialog"+ <img+ id="marker-pin"+ src="images/map-pin.png"+ height="32"+ width="20"onClick={() => setShowDialog(true)}- >- <img- alt="Map marker"- id="marker-pin"- src="images/map-pin.png"- height="32"- width="20"- />- </button>+ /></div>);}diff --git a/web/js/components/map/__snapshots__/coordinates.test.js.snap b/web/js/components/map/__snapshots__/coordinates.test.js.snapindex b7cb7e732..d33df11cc 100644--- a/web/js/components/map/__snapshots__/coordinates.test.js.snap+++ b/web/js/components/map/__snapshots__/coordinates.test.js.snap@@ -1,7 +1,7 @@// Jest Snapshot v1, https://goo.gl/fbAQLP-exports[`formats coordinate in latlon-dd format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;+exports[`formats coordinate in latlon-dd format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;-exports[`formats coordinate in latlon-dm format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;+exports[`formats coordinate in latlon-dm format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;-exports[`formats coordinate in latlon-dms format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;+exports[`formats coordinate in latlon-dms format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;diff --git a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snapindex 9c1d54cf1..60ad40681 100644--- a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap+++ b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap@@ -2,10 +2,10 @@exports[`clears coordinates when mouse moves off the map 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"></div>"`;-exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;+exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;-exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;+exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;-exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;+exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;-exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;+exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;diff --git a/web/js/components/map/coordinates.js b/web/js/components/map/coordinates.jsindex b33d98232..2c9a37085 100644--- a/web/js/components/map/coordinates.js+++ b/web/js/components/map/coordinates.js@@ -38,8 +38,7 @@ export default class Coordinates extends React.Component {);return (- <button- type="button"+ <divid="coords-panel"className="wv-coords-map wv-coords-map-btn"onClick={this.changeFormat}@@ -55,7 +54,7 @@ export default class Coordinates extends React.Component {<i className="coord-switch" /></div></div>- </button>+ </div>);}}diff --git a/web/js/components/map/rotation.js b/web/js/components/map/rotation.jsindex 55690a5a6..351f232c8 100644--- a/web/js/components/map/rotation.js+++ b/web/js/components/map/rotation.js@@ -63,7 +63,6 @@ function Rotation() {onMouseDown={() => { rotateOnClick(10); }}onMouseUp={clearIntervalRotation}onMouseOut={clearIntervalRotation}- onBlur={clearIntervalRotation}onMouseMove={(e) => { e.stopPropagation(); }}><HoverTooltip@@ -81,7 +80,6 @@ function Rotation() {onMouseDown={resetRotation}onMouseUp={clearIntervalRotation}onMouseOut={clearIntervalRotation}- onBlur={clearIntervalRotation}onMouseMove={(e) => { e.stopPropagation(); }}><HoverTooltip@@ -99,7 +97,6 @@ function Rotation() {onMouseDown={() => { rotateOnClick(-10); }}onMouseUp={clearIntervalRotation}onMouseOut={clearIntervalRotation}- onBlur={clearIntervalRotation}onMouseMove={(e) => { e.stopPropagation(); }}><HoverTooltipdiff --git a/web/js/components/measure-tool/measure-tooltip.js b/web/js/components/measure-tool/measure-tooltip.jsindex 8555c4bd5..d16dadc3f 100644--- a/web/js/components/measure-tool/measure-tooltip.js+++ b/web/js/components/measure-tool/measure-tooltip.js@@ -125,9 +125,9 @@ export default function MeasureTooltip(props) {<div className={`tooltip-measure tooltip-custom-black ${activeStaticClass}`}><span dangerouslySetInnerHTML={{ __html: tooltipValue }} />{!active && (- <button type="button" className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}>+ <span className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}><FontAwesomeIcon icon="times" fixedWidth />- </button>+ </span>)}</div>);diff --git a/web/js/components/sidebar/collapsed-button.js b/web/js/components/sidebar/collapsed-button.jsindex 466327db9..e4d82e5e2 100644--- a/web/js/components/sidebar/collapsed-button.js+++ b/web/js/components/sidebar/collapsed-button.js@@ -18,8 +18,7 @@ class CollapsedButton extends PureComponent {<divclassName={classes}>- <button- type="button"+ <aid={buttonId}aria-label={labelText}onClick={onclick}@@ -41,7 +40,7 @@ class CollapsedButton extends PureComponent {</span>)}{!isMobile && <FontAwesomeIcon className="expand-icon" icon="caret-down" />}- </button>+ </a></div>);}diff --git a/web/js/components/sidebar/event.js b/web/js/components/sidebar/event.jsindex 43f5a1321..c8ff47969 100644--- a/web/js/components/sidebar/event.js+++ b/web/js/components/sidebar/event.js@@ -106,11 +106,6 @@ function Event (props) {* Return date list for selected event*/function renderDateLists() {- const buttonStyle = {- background: 'none',- border: 'none',- color: 'blue',- };if (event.geometry.length > 1) {return (<ul@@ -126,15 +121,12 @@ function Event (props) {<spanclassName="active"onClick={(e) => e.stopPropagation()}- onKeyDown={(e) => e.stopPropagation()}>{formatDisplayDate(date)}</span>): (- <button- type="button"- style={buttonStyle}+ <aclassName="'date item-selected"onClick={(e) => {e.stopPropagation();@@ -142,7 +134,7 @@ function Event (props) {}}>{formatDisplayDate(date)}- </button>+ </a>)}{magnitudeOutput(geometry)}</li>@@ -186,49 +178,37 @@ function Event (props) {});}}- const buttonStyle = {- width: '100%',- background: 'none',- color: 'white',- border: 'none',- textAlign: 'left',- };return (<liid={`sidebar-event-${util.encodeId(event.id)}`}ref={(node) => { elRef.current = node; }}className={itemClass}+ onClick={(e) => {+ e.stopPropagation();+ onEventSelect();+ }}+ onMouseEnter={(e) => {+ onEventHighlight(true);+ }}+ onMouseLeave={(e) => {+ onEventHighlight(false);+ }}>- <button- type="button"- style={buttonStyle}- onClick={(e) => {- e.stopPropagation();- onEventSelect();- }}- onMouseEnter={(e) => {- onEventHighlight(true);- }}- onMouseLeave={(e) => {- onEventHighlight(false);- }}+ <EventIcon id={`${event.id}-list`} category={event.categories[0].title} />+ <h4+ className="title">- <EventIcon id={`${event.id}-list`} category={event.categories[0].title} />- <h4- className="title"- >- {event.title}- {' '}- <br />- {' '}- {!isSelected && (- <MonospaceDate date={dateString} />- )}- </h4>- {isSelected && (<p className="subtitle">{renderReferenceList()}</p>)}- {renderDateLists()}- </button>+ {event.title}+ {' '}+ <br />+ {' '}+ {!isSelected && (+ <MonospaceDate date={dateString} />+ )}+ </h4>+ {isSelected && (<p className="subtitle">{renderReferenceList()}</p>)}+ {renderDateLists()}</li>);}diff --git a/web/js/components/sidebar/nav/nav-case.js b/web/js/components/sidebar/nav/nav-case.jsindex 7df025297..d86df3f41 100644--- a/web/js/components/sidebar/nav/nav-case.js+++ b/web/js/components/sidebar/nav/nav-case.js@@ -98,8 +98,7 @@ function NavCase (props) {{!isEventsTabDisabledEmbed && renderEvents()}{renderDataDownload()}- <button- type="button"+ <divid="toggleIconHolder"className="sidebar-collapse"onClick={toggleSidebar}@@ -114,7 +113,7 @@ function NavCase (props) {<UncontrolledTooltip id="center-align-tooltip" placement="right" target="toggleIconHolder">Hide sidebar</UncontrolledTooltip>- </button>+ </div></Nav>);}diff --git a/web/js/components/smart-handoffs/granule-count.js b/web/js/components/smart-handoffs/granule-count.jsindex 84c233c9a..8cf75b8c4 100644--- a/web/js/components/smart-handoffs/granule-count.js+++ b/web/js/components/smart-handoffs/granule-count.js@@ -121,9 +121,9 @@ export default function GranuleCount (props) {{ granulesExist && (<span className="granule-size fade-in">{`(${sizeText})`}</span>)}- <button type="button" className="help-link" onClick={showGranuleHelpModal}>+ <span className="help-link" onClick={showGranuleHelpModal}><FontAwesomeIcon icon="question-circle" />- </button>+ </span></>);};diff --git a/web/js/components/smart-handoffs/smart-handoff-modal.js b/web/js/components/smart-handoffs/smart-handoff-modal.jsindex b8b69c693..a21a9c75c 100644--- a/web/js/components/smart-handoffs/smart-handoff-modal.js+++ b/web/js/components/smart-handoffs/smart-handoff-modal.js@@ -45,10 +45,10 @@ function SmartHandoffModal({<div><div className="smart-handoff-heading">- <a href="https://search.earthdata.nasa.gov" target="_blank" rel="noopener noreferrer" aria-label="Earthdata Search">- <img alt="NASA logo" src="images/nasa-logo.png" style={{ maxHeight: '38px' }} />+ <a href="https://search.earthdata.nasa.gov" target="_blank" rel="noopener noreferrer">+ <img src="images/nasa-logo.png" style={{ maxHeight: '38px' }} /><span className="smart-handoff-pipe" />- <img alt="Earthdata Search" src="images/earthdata-search.png" />+ <img src="images/earthdata-search.png" /></a></div>@@ -69,7 +69,7 @@ function SmartHandoffModal({viewport region in @NAME@ will be used to derive data granules within Earthdata Search.</p>- <img alt="Earthdata Search preview" className="earth-data-gif" src="images/earth-data-search-preview.gif" />+ <img className="earth-data-gif" src="images/earth-data-search-preview.gif" /><p className="earth-data-caption">Granules that are available to download will be listed in the white pull out menu. Each granule listed can bedownloaded individually or the entire set contained within the bounding box can be downloaded as a zip file.@@ -95,9 +95,9 @@ function SmartHandoffModal({</div>)}- <button type="button" className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}>+ <div className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}><h2><span>{showMoreInfo ? 'Hide Info' : 'Show More Info'}</span></h2>- </button>+ </div><div className="smart-handoff-layer-info">diff --git a/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js b/web/js/components/timeline/custom-interval-selector/custom-interval-selector.jsindex d01699705..4514992d5 100644--- a/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js+++ b/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js@@ -60,6 +60,7 @@ function CustomIntervalSelector(props) {<divonKeyDown={handleKeyPress}className={`custom-interval-widget ${hasSubdailyLayers ? 'subdaily' : ''}`}+ tabIndex={0}ref={(widget) => { customIntervalWidget = widget; }}><h3 className="custom-interval-widget-header">Custom Interval Selector</h3>diff --git a/web/js/components/timeline/custom-interval-selector/interval-select.js b/web/js/components/timeline/custom-interval-selector/interval-select.jsindex e73c25366..965b1a5d7 100644--- a/web/js/components/timeline/custom-interval-selector/interval-select.js+++ b/web/js/components/timeline/custom-interval-selector/interval-select.js@@ -48,30 +48,30 @@ function IntervalSelect(props) {{TIME_SCALE_FROM_NUMBER[interval].toUpperCase()}</DropdownToggle><DropdownMenu>- <DropdownItem onClick={() => handleChangeZoomLevelMobile('year')}>- <span>+ <DropdownItem>+ <span onClick={() => handleChangeZoomLevelMobile('year')}>Year</span></DropdownItem>- <DropdownItem onClick={() => handleChangeZoomLevelMobile('month')}>- <span>+ <DropdownItem>+ <span onClick={() => handleChangeZoomLevelMobile('month')}>Month</span></DropdownItem>- <DropdownItem onClick={() => handleChangeZoomLevelMobile('day')}>- <span>+ <DropdownItem>+ <span onClick={() => handleChangeZoomLevelMobile('day')}>Day</span></DropdownItem>{hasSubdailyLayers ? (<>- <DropdownItem onClick={() => handleChangeZoomLevelMobile('hour')}>- <span>+ <DropdownItem>+ <span onClick={() => handleChangeZoomLevelMobile('hour')}>Hour</span></DropdownItem>- <DropdownItem onClick={() => handleChangeZoomLevelMobile('minute')}>- <span>+ <DropdownItem>+ <span onClick={() => handleChangeZoomLevelMobile('minute')}>Minute</span></DropdownItem>diff --git a/web/js/components/timeline/mobile-date-picker.js b/web/js/components/timeline/mobile-date-picker.jsindex 7f2aaffa1..b7e6127d1 100644--- a/web/js/components/timeline/mobile-date-picker.js+++ b/web/js/components/timeline/mobile-date-picker.js@@ -125,15 +125,14 @@ function MobileDatePicker(props) {return (time && (<>- <button- type="button"+ <divclassName="mobile-date-picker-select-btn"onClick={handleClickDateButton}><div className="mobile-date-picker-select-btn-text"><span>{displayDate}</span></div>- </button>+ </div><DatePickerdateConfig={hasSubdailyLayers ? subDailyDateConfig : defaultDateConfig}showCaptiondiff --git a/web/js/components/timeline/timeline-axis/timeline-axis.js b/web/js/components/timeline/timeline-axis/timeline-axis.jsindex ab3a870d5..18728d473 100644--- a/web/js/components/timeline/timeline-axis/timeline-axis.js+++ b/web/js/components/timeline/timeline-axis/timeline-axis.js@@ -1513,9 +1513,7 @@ class TimelineAxis extends Component {onMouseUp={this.setLineTime}onWheel={this.handleWheelType}onMouseOver={this.showHoverOn}- onFocus={this.showHoverOn}onMouseLeave={showHoverOff}- onBlur={showHoverOff}onTouchStart={this.handleMouseDown}onTouchEnd={this.setLineTimeTouch}>diff --git a/web/js/components/timeline/timeline-controls/animation-button.js b/web/js/components/timeline/timeline-controls/animation-button.jsindex bb8af67c1..a68615064 100644--- a/web/js/components/timeline/timeline-controls/animation-button.js+++ b/web/js/components/timeline/timeline-controls/animation-button.js@@ -41,20 +41,11 @@ function AnimationButton(props) {};const buttonClass = getButtonClassName();- let className = `button-action-group mobile-animate-button animate-button-${buttonClass}`;- if (isKioskModeActive) {- className = 'd-none';- } else if (disabled) {- className = 'wv-disabled-button button-action-group animate-button';- } else if (!isMobile && !isEmbedModeActive) {- className = 'button-action-group animate-button';- }return (- <button- type="button"+ <divonClick={clickAnimationButton}- className={className}+ className={isKioskModeActive ? 'd-none' : disabled ? 'wv-disabled-button button-action-group animate-button' : !isMobile && !isEmbedModeActive ? 'button-action-group animate-button' : `button-action-group mobile-animate-button animate-button-${buttonClass}`}aria-label={labelText}><div id={buttonId}>@@ -70,7 +61,7 @@ function AnimationButton(props) {)}<FontAwesomeIcon icon="video" className="wv-animate" size="2x" /></div>- </button>+ </div>);}diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.jsindex 315d12c10..3d990941a 100644--- a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js@@ -52,7 +52,7 @@ class AxisTimeScaleChangeTooltip extends PureComponent {style={{ display: toolTipHovered ? 'block' : 'none' }}><div id="timeline-zoom" className="timeline-zoom">- <p+ <labelstyle={{textDecoration: 'underline',paddingBottom: '4px',@@ -60,49 +60,44 @@ class AxisTimeScaleChangeTooltip extends PureComponent {}}>TIMESCALE- </p>- <button- type="button"+ </label>+ <spanid="zoom-years"className="zoom-btn zoom-years"onClick={this.changeTimeScaleYear}>YEAR- </button>- <button- type="button"+ </span>+ <spanid="zoom-months"className="zoom-btn zoom-months"onClick={this.changeTimeScaleMonth}>MONTH- </button>- <button- type="button"+ </span>+ <spanid="zoom-days"className="zoom-btn zoom-days"onClick={this.changeTimeScaleDay}>DAY- </button>+ </span>{hasSubdailyLayers ? (<>- <button- type="button"+ <spanid="zoom-hours"className="zoom-btn zoom-hours"onClick={this.changeTimeScaleHour}>HOUR- </button>- <button- type="button"+ </span>+ <spanid="zoom-minutes"className="zoom-btn zoom-minutes"onClick={this.changeTimeScaleMinute}>MINUTE- </button>+ </span></>) : null}</div>diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change.js b/web/js/components/timeline/timeline-controls/axis-timescale-change.jsindex 2f74b47ef..59ae27443 100644--- a/web/js/components/timeline/timeline-controls/axis-timescale-change.js+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change.js@@ -95,7 +95,6 @@ class AxisTimeScaleChange extends PureComponent {{ timeScale? (<div- style={{ display: 'inline-block' }}onMouseEnter={this.toolTipHoverOn}onMouseLeave={this.toolTipHoverOff}>diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.jsindex f67d1833e..722ab7870 100644--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js@@ -94,8 +94,7 @@ class DateChangeArrows extends PureComponent {)}{/* LEFT ARROW */}- <button- type="button"+ <divclassName={`button-action-group${leftArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}id="left-arrow-group"onMouseDown={leftArrowDown}@@ -110,11 +109,10 @@ class DateChangeArrows extends PureComponent {target="left-arrow-group"/><ArrowChevronLeft class="arrow" size="30px" />- </button>+ </div>{/* RIGHT ARROW */}- <button- type="button"+ <divclassName={`button-action-group${rightArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}id="right-arrow-group"onMouseDown={rightArrowDown}@@ -129,11 +127,10 @@ class DateChangeArrows extends PureComponent {target="right-arrow-group"/><ArrowChevronRight class="arrow" size="30px" />- </button>+ </div>{/* NOW BUTTON */}- <button- type="button"+ <divclassName={`button-action-group now-button-group${nowButtonDisabled ? ' button-disabled' : ''} ${isKioskModeActive ? 'd-none' : ''}`}id="now-button-group"onClick={handleSelectNowButton}@@ -151,7 +148,7 @@ class DateChangeArrows extends PureComponent {className="arrow"/></svg>- </button>+ </div></div>);}diff --git a/web/js/components/timeline/timeline-controls/timescale-interval-change.js b/web/js/components/timeline/timeline-controls/timescale-interval-change.jsindex e08dcfec5..f2f2505d6 100644--- a/web/js/components/timeline/timeline-controls/timescale-interval-change.js+++ b/web/js/components/timeline/timeline-controls/timescale-interval-change.js@@ -131,67 +131,60 @@ class TimeScaleIntervalChange extends PureComponent {style={{ display: toolTipHovered ? 'block' : 'none' }}><div id="timeline-interval" className="timeline-interval">- <button- type="button"+ <spanid="interval-years"className="interval-btn interval-years"onClick={() => this.handleClickInterval('year')}>Year- </button>- <button- type="button"+ </span>+ <spanid="interval-months"className="interval-btn interval-months"onClick={() => this.handleClickInterval('month')}>Month- </button>- <button- type="button"+ </span>+ <spanid="interval-days"className="interval-btn interval-days"onClick={() => this.handleClickInterval('day')}>Day- </button>+ </span>{hasSubdailyLayers ? (<>- <button- type="button"+ <spanid="interval-hours"className="interval-btn interval-hours"onClick={() => this.handleClickInterval('hour')}>Hour- </button>- <button- type="button"+ </span>+ <spanid="interval-minutes"className="interval-btn interval-minutes"onClick={() => this.handleClickInterval('minute')}>Minute- </button>+ </span></>) : null}- <button- type="button"+ <spanid="interval-custom"className="interval-btn interval-custom custom-interval-text"style={{ display: customIntervalText === 'Custom' ? 'none' : 'block' }}onClick={() => this.handleClickInterval('custom')}>{customIntervalText}- </button>- <button- type="button"+ </span>+ <spanid="interval-custom-static"className="interval-btn interval-custom custom-interval-text"onClick={() => this.handleClickInterval('custom', true)}>Custom- </button>+ </span></div></div>);@@ -207,25 +200,26 @@ class TimeScaleIntervalChange extends PureComponent {isDisabled,} = this.props;- const className = `no-drag interval-list-btn interval-btn-active${customSelected ? ' custom-interval-text' : ''} ${isDisabled ? ' disabled' : ''}`;+ const className = `no-drag interval-btn interval-btn-active${customSelected ? ' custom-interval-text' : ''} ${isDisabled ? ' disabled' : ''}`;return (- <button- type="button"+ <divid="timeline-interval-btn-container"className="interval-btn-container noselect no-drag"onMouseEnter={() => this.setTooltipState(true)}onMouseLeave={() => this.setTooltipState(false)}onClick={this.onClick}>+<spanid="current-interval"className={className}>{customSelected ? customIntervalText : `${1} ${TIME_SCALE_FROM_NUMBER[interval]}`}</span>+{!isDisabled ? this.renderTooltip() : null}- </button>+ </div>);}}diff --git a/web/js/components/timeline/timeline-coverage/info-modal.js b/web/js/components/timeline/timeline-coverage/info-modal.jsindex cb6891dad..3ca2349aa 100644--- a/web/js/components/timeline/timeline-coverage/info-modal.js+++ b/web/js/components/timeline/timeline-coverage/info-modal.js@@ -13,14 +13,14 @@ function LayerCoverageInfoModal() {</header><div className="layer-coverage-info-item-container"><section className="layer-coverage-info-item-left">- <img alt="Timeline layer coverage axis" src="images/lc-axis.png" />+ <img src="images/lc-axis.png" /></section><section className="layer-coverage-info-item-right"><div><p>Including layers that are hidden may affect the display of the timeline’s solid blue overlapping coverage line as it will take into account the dates of those layers, too.</p>- <img alt="Include Hidden Layers toggle" src="images/lc-toggle.png" />+ <img src="images/lc-toggle.png" /></div><div><p>diff --git a/web/js/components/timeline/timeline-coverage/timeline-coverage.js b/web/js/components/timeline/timeline-coverage/timeline-coverage.jsindex 06b648176..be3450029 100644--- a/web/js/components/timeline/timeline-coverage/timeline-coverage.js+++ b/web/js/components/timeline/timeline-coverage/timeline-coverage.js@@ -309,15 +309,9 @@ class TimelineLayerCoveragePanel extends Component {const { onInfoClick } = this.props;const layerInfoBtnId = 'layer-coverage-info-button';const layerInfoBtnTitle = 'Timeline Layer Coverage Information';- const buttonStyle = {- border: 'none',- background: 'none',- };return (- <button- type="button"- style={buttonStyle}+ <aid={layerInfoBtnId}aria-label={layerInfoBtnTitle}className={layerInfoBtnId}@@ -325,7 +319,7 @@ class TimelineLayerCoveragePanel extends Component {onClick={() => onInfoClick()}><FontAwesomeIcon icon="question-circle" className="layer-coverage-info-button-icon" />- </button>+ </a>);};@@ -410,8 +404,7 @@ class TimelineLayerCoveragePanel extends Component {return (<>{/* Timeline Layer Coverage Panel open/close handle */}- <button- type="button"+ <divid="timeline-layer-coverage-panel-handle"aria-label={panelToggleLabelText}onClick={this.togglePanelOpenClose}@@ -421,7 +414,7 @@ class TimelineLayerCoveragePanel extends Component {{panelToggleLabelText}</UncontrolledTooltip><div className={`timeline-layer-coverage-panel-handle-chevron ${panelChevronClassName}`} />- </button>+ </div><divclassName={`timeline-layer-coverage-container ${isPanelOpenClassName}`}style={panelContainerStyle}diff --git a/web/js/components/tooltip/tooltip.js b/web/js/components/tooltip/tooltip.jsnew file mode 100644index 000000000..4457e0ff6--- /dev/null+++ b/web/js/components/tooltip/tooltip.js@@ -0,0 +1,68 @@++import React from 'react';+import PropTypes from 'prop-types';++class Tooltip extends React.Component {+ constructor(props) {+ super(props);+ this.state = {+ hovered: false,+ };+ }++ mouseOver() {+ this.setState({+ hovered: true,+ });+ }++ mouseOut() {+ this.setState({+ hovered: false,+ });+ }++ onClick(str) {+ const { onClick } = this.props;+ onClick(str);+ }++ render() {+ const { text, dataArray } = this.props;+ const { hovered } = this.state;+ return (+ <div+ onMouseEnter={this.mouseOver.bind(this)}+ onMouseLeave={this.mouseOut.bind(this)}+ className="wv-tooltip-case"+ >+ <span>{text}</span>+ <div+ className="wv-tooltip"+ style={hovered ? { visibility: 'visible' } : {}}+ >+ <ul>+ {dataArray.map((dataEl, i) => (+ <li+ /* eslint react/no-array-index-key: 1 */+ key={`tooltip-${dataEl}-${i}`}+ id={dataEl}+ onClick={this.onClick.bind(this, dataEl)}+ >+ {dataEl}+ </li>+ ))}+ </ul>+ </div>+ </div>+ );+ }+}++Tooltip.propTypes = {+ dataArray: PropTypes.array.isRequired,+ text: PropTypes.string.isRequired,+ onClick: PropTypes.func,+};++export default Tooltip;diff --git a/web/js/components/tour/content-intro.js b/web/js/components/tour/content-intro.jsindex 2d5293e99..6bf1536e3 100644--- a/web/js/components/tour/content-intro.js+++ b/web/js/components/tour/content-intro.js@@ -13,17 +13,10 @@ function TourIntro(props) {<a href="https://earthdata.nasa.gov/" target="_blank" rel="noreferrer">NASA Earthdata</a>), the satellite imagery we provide and events occurring around the world.{' '}- <button- type="button"- style={{ border: 'none', background: 'none', padding: '0' }}- href="#"- title="Start using @NAME@"- onClick={props.toggleModalStart}- className="start-link"- >+ <a href="#" title="Start using @NAME@" onClick={props.toggleModalStart} className="start-link">Start using @NAME@<ArrowLineRightCircleFill class="intro-arrow" size="16px" />- </button>+ </a></p></div>);diff --git a/web/js/components/tour/tour-box.js b/web/js/components/tour/tour-box.jsindex d639bf5a1..c5ff9b865 100644--- a/web/js/components/tour/tour-box.js+++ b/web/js/components/tour/tour-box.js@@ -17,8 +17,6 @@ class TourBox extends React.Component {if (backgroundImage) {this.setState({styles: {- border: 'none',- padding: '0',backgroundImage: `url(config/metadata/stories/${storyId}/${backgroundImage})`,},});@@ -31,8 +29,6 @@ class TourBox extends React.Component {if (backgroundImageHover) {this.setState({styles: {- border: 'none',- padding: '0',backgroundImage: `url(config/metadata/stories/${storyId}/${backgroundImageHover})`,},});@@ -45,8 +41,6 @@ class TourBox extends React.Component {if (backgroundImage) {this.setState({styles: {- border: 'none',- padding: '0',backgroundImage: `url(config/metadata/stories/${storyId}/${backgroundImage})`,},});@@ -64,13 +58,11 @@ class TourBox extends React.Component {floatBox = ' tour-box-float';}return (- <button- type="button"+ <a+ href="#"style={styles}onMouseOver={(e) => this.onMouseOver(e)}- onFocus={this.onMouseOver}onMouseOut={(e) => this.onMouseOut(e)}- onBlur={this.onMouseOut}className={className + floatBox}onClick={(e) => selectTour(e, story, index, storyId)}>@@ -84,7 +76,7 @@ class TourBox extends React.Component {<p>{description}</p></div></div>- </button>+ </a>);}}diff --git a/web/js/components/tour/widget-steps.js b/web/js/components/tour/widget-steps.jsindex d96878236..0dd736177 100644--- a/web/js/components/tour/widget-steps.js+++ b/web/js/components/tour/widget-steps.js@@ -30,23 +30,15 @@ function Steps(props) {};}, []);- const buttonStyle = {- border: 'none',- background: 'none',- padding: '0',- };-return (<div className="step-container">- <button- type="button"- style={buttonStyle}+ <aclassName={isKioskModeActive ? 'd-none' : 'step-previous'}aria-label="Previous"onClick={decreaseStep}><FontAwesomeIcon icon="arrow-circle-left" />- </button>+ </a><div className="step-counter"><p>Step@@ -56,9 +48,7 @@ function Steps(props) {<span className="step-total">{totalSteps}</span></p></div>- <button- type="button"- style={buttonStyle}+ <aclassName={isKioskModeActive ? 'd-none' : 'step-next'}aria-label="Next"onClick={incrementStep}@@ -66,7 +56,7 @@ function Steps(props) {{currentStep === totalSteps? <FontAwesomeIcon icon="check-circle" />: <FontAwesomeIcon icon="arrow-circle-right" />}- </button>+ </a></div>);}diff --git a/web/js/components/util/alert.js b/web/js/components/util/alert.jsindex 2ee3197da..a27345f85 100644--- a/web/js/components/util/alert.js+++ b/web/js/components/util/alert.js@@ -60,8 +60,7 @@ export default class AlertUtil extends React.Component {className="wv-alert"isOpen={isOpen}>- <button- type="button"+ <divclassName="alert-content"title={title}onClick={onClick}@@ -80,16 +79,15 @@ export default class AlertUtil extends React.Component {<b>{message}</b></em></div>- </button>+ </div>{onDismiss && (- <button- type="button"+ <divid={`${id}-close`}className="close-alert"onClick={() => this.closeAlert()}><FontAwesomeIcon icon="times" className="exit" size="1x" />- </button>+ </div>)}</Alert>);diff --git a/web/js/components/util/arrow.js b/web/js/components/util/arrow.jsindex 350f3cae3..ede6bac07 100644--- a/web/js/components/util/arrow.js+++ b/web/js/components/util/arrow.js@@ -12,14 +12,13 @@ function Arrow({const arrowClassName = `${direction}arrow`;return (- <button- type="button"+ <divonClick={onClick}className={isKioskModeActive ? 'd-none' : containerClassName}data-interval={type}><ArrowFilledUp className={arrowClassName} size={arrowSize} />- </button>+ </div>);}diff --git a/web/js/components/util/image-crop.js b/web/js/components/util/image-crop.jsindex 9d1514753..9e26d02ac 100644--- a/web/js/components/util/image-crop.js+++ b/web/js/components/util/image-crop.js@@ -114,7 +114,7 @@ function Crop(props) {onComplete={onFinishDrag}onChange={onDrag}>- <img alt="" src={TRANSPARENT_GIF} style={{ width: maxWidth, height: maxHeight }} />+ <img src={TRANSPARENT_GIF} style={{ width: maxWidth, height: maxHeight }} /></ReactCrop></>,document.getElementById('wv-content'),diff --git a/web/js/components/util/switch.js b/web/js/components/util/switch.jsindex 2f2af21c7..316d3968e 100644--- a/web/js/components/util/switch.js+++ b/web/js/components/util/switch.js@@ -1,6 +1,3 @@-/* eslint-disable jsx-a11y/no-noninteractive-tabindex */-/* eslint-disable jsx-a11y/label-has-associated-control */-/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */import React, { useState, useEffect } from 'react';import PropTypes from 'prop-types';import { Tooltip } from 'reactstrap';@@ -67,7 +64,6 @@ function Switch(props) {<spanclassName="switch-label-text"onClick={toggleSwitch}- onKeyDown={onKeyDown}>{label}</span>diff --git a/web/js/containers/alertDropdown.js b/web/js/containers/alertDropdown.jsindex 1afef2e66..1afce2c51 100644--- a/web/js/containers/alertDropdown.js+++ b/web/js/containers/alertDropdown.js@@ -15,7 +15,7 @@ export default function AlertDropdown(isTourActive) {return (<div className="wv-alert-dropdown" hidden={isDistractionFreeModeActive || tourActive || isMobile}>- <button type="button" className="multiple-alerts-btn" hidden={notifications <= 1} onClick={toggle}>+ <button type="button" hidden={notifications <= 1} onClick={toggle}><FontAwesomeIconicon="exclamation-triangle"className="wv-alert-icon"diff --git a/web/js/containers/animation-widget/mobile-animation-widget.js b/web/js/containers/animation-widget/mobile-animation-widget.jsindex eea89631d..337ef896d 100644--- a/web/js/containers/animation-widget/mobile-animation-widget.js+++ b/web/js/containers/animation-widget/mobile-animation-widget.js@@ -81,23 +81,16 @@ function MobileAnimationWidget (props) {onUpdateEndDate(dateObj);};- const buttonStyle = {- background: 'none',- border: 'none',- };-return (<div className="wv-animation-widget-wrapper-mobile" id={`mobile-animation-widget-${mobileID}`}><div className="mobile-animation-header" style={{ justifyContent: isEmbedModeActive ? 'flex-start' : 'flex-end' }}>- <button- type="button"- style={buttonStyle}+ <spanaria-label="Close"onClick={toggleCollapse}id="mobile-animation-close"><FontAwesomeIcon icon="times" className="collapse-icon" style={collapseIconMobile} />- </button>+ </span></div><div className="mobile-animation-warning-message-container"><span id={playDisabled ? 'mobile-animation-warning-message' : ''}>Too many animation frames. Reduce time range or increase increment size.</span>diff --git a/web/js/containers/embed.js b/web/js/containers/embed.jsindex 5caa14789..220a42468 100644--- a/web/js/containers/embed.js+++ b/web/js/containers/embed.js@@ -56,7 +56,7 @@ function Embed ({ isEmbedModeActive, selectedDate, isMobile }) {>{showClickToInteractMessage && (<>- <button type="button" onClick={handleOverlayClick} className="embed-overlay-bg" aria-label="click to interact" />+ <div onClick={handleOverlayClick} className="embed-overlay-bg" /><div className="embed-overlay-btn"><FontAwesomeIcon icon="hand-pointer" size="2x" fixedWidth /><p>Click anywhere to interact</p>diff --git a/web/js/containers/share.js b/web/js/containers/share.jsindex f88d1036f..8f88a57f7 100644--- a/web/js/containers/share.js+++ b/web/js/containers/share.js@@ -293,14 +293,7 @@ class ShareLinkContainer extends Component {<p>Please{' '}- <button- type="button"- style={{ border: 'none', background: 'none', padding: '0' }}- onClick={this.openFeedback}- id="feedback-url"- >- contact us- </button>+ <a onClick={this.openFeedback} id="feedback-url">contact us</a>{' '}to enable Worldview embedding on your website.</p>diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.jsindex 7946412d6..8852189ea 100644--- a/web/js/containers/sidebar/layer-row.js+++ b/web/js/containers/sidebar/layer-row.js@@ -352,8 +352,7 @@ function LayerRow (props) {<>{showDropdownBtn || isMobile ? renderDropdownMenu() : null}{!isChartingActive && (- <button- type="button"+ <aid={removeLayerBtnId}aria-label={removeLayerBtnTitle}className={isMobile ? 'hidden wv-layers-options' : 'button wv-layers-close'}@@ -363,10 +362,9 @@ function LayerRow (props) {{removeLayerBtnTitle}</UncontrolledTooltip><FontAwesomeIcon icon="times" fixedWidth />- </button>+ </a>)}- <button- type="button"+ <aid={layerOptionsBtnId}aria-label={layerOptionsBtnTitle}className={isMobile ? 'hidden wv-layers-options' : 'button wv-layers-options'}@@ -377,9 +375,8 @@ function LayerRow (props) {{layerOptionsBtnTitle}</UncontrolledTooltip><FontAwesomeIcon icon="sliders-h" className="wv-layers-options-icon" />- </button>- <button- type="button"+ </a>+ <aid={layerInfoBtnId}aria-label={layerInfoBtnTitle}className={isMobile ? 'hidden wv-layers-info' : 'button wv-layers-info'}@@ -390,7 +387,7 @@ function LayerRow (props) {{layerInfoBtnTitle}</UncontrolledTooltip><FontAwesomeIcon icon="fa-solid fa-info" className="wv-layers-info-icon" />- </button>+ </a></>);@@ -403,8 +400,7 @@ function LayerRow (props) {: 'Zoom in further to click features.';const layerVectorBtnId = `layer-vector-hand-btn-${encodedLayerId}`;return (- <button- type="button"+ <divid={layerVectorBtnId}aria-label={title}className={runningDataObj ? `${classNames} running` : classNames}@@ -415,7 +411,7 @@ function LayerRow (props) {{title}</UncontrolledTooltip><FontAwesomeIcon icon="hand-pointer" fixedWidth />- </button>+ </div>);};@@ -481,8 +477,7 @@ function LayerRow (props) {const renderLayerRow = () => (<>{(!isEmbedModeActive && !isChartingActive) && (- <button- type="button"+ <aid={`hide${encodedLayerId}`}className={getVisibilityToggleClass()}aria-label={visibilityTitle}@@ -498,13 +493,12 @@ function LayerRow (props) {</UncontrolledTooltip>)}<FontAwesomeIcon icon={visibilityIconClass} className="layer-eye-icon" />- </button>+ </a>)}{isChartingActive && (<><div />- <button- type="button"+ <aid={`activate-${encodedLayerId}`}className={layer.id === activeChartingLayer ? 'layer-visible visibility active-chart' : 'layer-visible visibility'}onClick={() => makeActiveForCharting(layer.id)}@@ -527,7 +521,7 @@ function LayerRow (props) {className="charting-indicator"/>)}- </button>+ </a></>)}<Zot zot={activeZot || zot} layer={layer.id} isMobile={isMobile} />@@ -608,9 +602,7 @@ function LayerRow (props) {style={getItemStyle(snapshot.isDragging, provided.draggableProps.style)}ref={provided.innerRef}onMouseOver={mouseOver}- onFocus={mouseOver}onMouseLeave={mouseLeave}- onBlur={mouseLeave}{...provided.draggableProps}{...provided.dragHandleProps}>diff --git a/web/js/containers/sidebar/layers-container.js b/web/js/containers/sidebar/layers-container.jsindex 842218a37..de27bc1e1 100644--- a/web/js/containers/sidebar/layers-container.js+++ b/web/js/containers/sidebar/layers-container.js@@ -128,22 +128,23 @@ function LayersContainer (props) {const shouldHideForEmbedNoOverlays = isEmbedModeActive && overlays.length === 0;const shouldHideForEmbedNoBaseLayers = isEmbedModeActive && baselayers.length === 0;return isActive && (- <div id="layers-scroll-container" style={scrollContainerStyles}>- <div className="layer-container sidebar-panel">+ <>+ <div id="layers-scroll-container" style={scrollContainerStyles}>+ <div className="layer-container sidebar-panel">- {groupOverlays ? renderOverlayGroups() : !shouldHideForEmbedNoOverlays && (- <LayerList- title="Overlays"- groupId="overlays"- compareState={compareState}- collapsed={overlaysCollapsed}- toggleCollapse={() => toggleOverlaysCollapsed(!overlaysCollapsed)}- layers={overlays}- layerSplit={overlays.length}- />- )}+ {groupOverlays ? renderOverlayGroups() : !shouldHideForEmbedNoOverlays && (+ <LayerList+ title="Overlays"+ groupId="overlays"+ compareState={compareState}+ collapsed={overlaysCollapsed}+ toggleCollapse={() => toggleOverlaysCollapsed(!overlaysCollapsed)}+ layers={overlays}+ layerSplit={overlays.length}+ />+ )}- {!shouldHideForEmbedNoBaseLayers && (+ {!shouldHideForEmbedNoBaseLayers && (<div className="layer-group-baselayers"><LayerListtitle="Base Layers"@@ -155,9 +156,10 @@ function LayersContainer (props) {layerSplit={overlays.length}/></div>- )}+ )}+ </div></div>- </div>+ </>);}diff --git a/web/js/containers/sidebar/smart-handoff.js b/web/js/containers/sidebar/smart-handoff.jsindex d449a1539..8c364ead0 100644--- a/web/js/containers/sidebar/smart-handoff.js+++ b/web/js/containers/sidebar/smart-handoff.js@@ -513,14 +513,9 @@ class SmartHandoff extends Component {</h1><hr /><h2>- <button- type="button"- style={{ border: 'none', background: 'none', padding: '0' }}- className="help-link"- onClick={showNotAvailableModal}- >+ <a className="help-link" onClick={showNotAvailableModal}>Why are my layers not available?- </button>+ </a></h2></>)}@@ -590,14 +585,9 @@ class SmartHandoff extends Component {application.</div><h2>- <button- type="button"- style={{ border: 'none', background: 'none', padding: '0' }}- className="help-link"- onClick={showNotAvailableModal}- >+ <a className="help-link" onClick={showNotAvailableModal}>Why are some layers not available?- </button>+ </a></h2><hr />{this.renderLayerChoices()}diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 43c9699b0..19769b82a 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -1254,13 +1254,13 @@ class Timeline extends React.Component {/></div><div id="zoom-buttons-group" className={isKioskModeActive ? 'd-none' : ''}>- <div style={{ width: '90px', display: 'block' }}>- <TimeScaleIntervalChange- timeScaleChangeUnit={timeScaleChangeUnit}- hasSubdailyLayers={hasSubdailyLayers}- modalType={customModalType.TIMELINE}- />- </div>++ <TimeScaleIntervalChange+ timeScaleChangeUnit={timeScaleChangeUnit}+ hasSubdailyLayers={hasSubdailyLayers}+ modalType={customModalType.TIMELINE}+ />+{this.renderDateChangeArrows()}</div><AnimationButton@@ -1445,8 +1445,7 @@ class Timeline extends React.Component {/>{/* Open/Close Chevron */}- <button- type="button"+ <divid="timeline-hide"aria-label={isTimelineHidden ? 'Show timeline' : 'Hide timeline'}onClick={this.toggleHideTimeline}@@ -1457,7 +1456,7 @@ class Timeline extends React.Component {<divclassName={`wv-timeline-hide wv-timeline-hide-double-chevron-${chevronDirection}`}/>- </button>+ </div></section>)}</ErrorBoundary>diff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scssindex 3197d8bc0..adce34fcd 100644--- a/web/scss/components/alert.scss+++ b/web/scss/components/alert.scss@@ -8,27 +8,11 @@width: 450px;background: #282828;- .multiple-alerts-btn {- width: 100%;- display: flex;- justify-content: space-between;- align-items: center;- position: relative;- color: #fff;- background: #282828;- border: #282828;- border-radius: 0;- min-height: 40px;- padding: 0;- z-index: 100;- padding-left: 1rem;- padding-right: 1rem;- }button {width: 100%;display: flex;- justify-content: flex-start;+ justify-content: space-between;align-items: center;position: relative;color: #fff;@@ -36,15 +20,13 @@border: #282828;border-radius: 0;min-height: 40px;+ cursor: pointer;padding: 0;z-index: 100;+ margin-bottom: 5px;padding-left: 1rem;padding-right: 1rem;}-- .close-alert {- width: unset;- }}.wv-alert-container {@@ -65,7 +47,7 @@cursor: pointer;padding: 0;z-index: 100;- margin-bottom: 0;+ margin-bottom: 5px;}.alert-content {@@ -95,7 +77,7 @@text-align: center;}-.wv-alert button:hover {+.wv-alert div:hover {background-color: #ddd;color: #333;}diff --git a/web/scss/components/dateselector.scss b/web/scss/components/dateselector.scssindex ae2db0bd2..26386def8 100644--- a/web/scss/components/dateselector.scss+++ b/web/scss/components/dateselector.scss@@ -113,9 +113,6 @@.date-arrows {display: block;height: 10px;- background: none;- border: none;- width: 100%;}.zoom-level-change-arrows .date-arrows {@@ -123,9 +120,6 @@margin-top: -5px;padding-bottom: 20px;margin-bottom: 5px;- background: none;- border: none;- width: 100%;}.wv-date-selector-widget .date-arrows svg,diff --git a/web/scss/components/facets.scss b/web/scss/components/facets.scssindex 80a0b2fe2..3ec486ef4 100644--- a/web/scss/components/facets.scss+++ b/web/scss/components/facets.scss@@ -20,7 +20,6 @@position: relative;display: inline-block;cursor: pointer;- border: none;span {font-weight: 500;diff --git a/web/scss/components/image.scss b/web/scss/components/image.scssindex 22119ab9d..3d4cb3b1c 100644--- a/web/scss/components/image.scss+++ b/web/scss/components/image.scss@@ -120,11 +120,6 @@padding: 5px 0;font-weight: 600;cursor: pointer;- width: 100%;- background: none;- border: none;- color: white;- text-align: left;&:hover {font-weight: 900;diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scssindex 42d74c327..bd95119c4 100644--- a/web/scss/components/tooltip.scss+++ b/web/scss/components/tooltip.scss@@ -158,13 +158,6 @@bottom: 0;height: 20px;width: 23px;- background: none;- border: none;- padding: 0;-- & svg {- height: 13px;- }}}@@ -183,13 +176,9 @@.close-tooltip,.minimize-tooltip {- padding: 0 0 0 6px;+ padding-left: 6px;margin-left: 8px;border-left: 1px solid #777;- border-top: none;- border-right: none;- border-bottom: none;- background: none;&.close-coordinates-tooltip,&.minimize-coordinates-tooltip {diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scssindex d49732a7c..8b4c3075a 100644--- a/web/scss/features/anim-widget.scss+++ b/web/scss/features/anim-widget.scss@@ -145,9 +145,6 @@& .interval-btn.interval-btn-active {color: #ce4c21;display: inline;- background: none;- border: none;- padding: 0;&.disabled {color: #fff;@@ -165,7 +162,6 @@}& > a,- & > button,& > div {display: inline-block;margin: 7px 0 0 10px;@@ -183,8 +179,6 @@background: variables.$wv-dark-blue;position: relative;border-radius: 5px;- padding: 0;- border: none;&.disabled {cursor: not-allowed;@@ -266,7 +260,7 @@}}-button .wv-animation-widget-icon {+a .wv-animation-widget-icon {font-size: 23px;color: #fff;position: absolute;diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scssindex 458c2187f..ab272f8e7 100644--- a/web/scss/features/compare.scss+++ b/web/scss/features/compare.scss@@ -208,7 +208,6 @@padding: 13.5px;color: #fff;border: thin solid transparent;- background-color: transparent;&:first-child {border-bottom-left-radius: 5px;diff --git a/web/scss/features/layer-categories.scss b/web/scss/features/layer-categories.scssindex ba6be169f..d306d8ac1 100644--- a/web/scss/features/layer-categories.scss+++ b/web/scss/features/layer-categories.scss@@ -170,9 +170,6 @@overflow: hidden;box-sizing: border-box;text-decoration: none;- background: none;- text-align: left;- border: none;}& .layer-category-name:hover {@@ -226,10 +223,6 @@position: relative;cursor: pointer;min-height: 44px;- width: 100%;- border: none;- background: none;- text-align: start;& .arrow-icon {color: #d54e21;@@ -342,7 +335,6 @@background: #333;border-top: 2px solid #d54e21;box-shadow: 0 -2px 16px rgb(0 0 0 / 35%);- width: 100%;}.layers-all .metadata-more:hover,diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scssindex 51fa243dc..a55112e1e 100644--- a/web/scss/features/layers.scss+++ b/web/scss/features/layers.scss@@ -279,10 +279,6 @@.layers-all-header {padding: 0 0 0 40px;- width: 100%;- background: none;- border: none;- text-align: left;&.notice {padding: 0 0 0 70px;diff --git a/web/scss/features/map.scss b/web/scss/features/map.scssindex 3134883e0..c6e2647c7 100644--- a/web/scss/features/map.scss+++ b/web/scss/features/map.scss@@ -200,7 +200,6 @@cursor: pointer;height: 35px;padding: 0 0 0 5px;- width: 100%;}.wv-coords-map:hover {diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scssindex 7fce6dba8..fca20a369 100644--- a/web/scss/features/sidebar-panel.scss+++ b/web/scss/features/sidebar-panel.scss@@ -3,7 +3,7 @@.sidebar-expand {position: relative;- > button {+ > a {float: left;left: 10px;position: absolute;@@ -82,7 +82,6 @@display: flex;align-items: center;justify-content: center;- background: none;svg.collapse-icon {height: 22px;@@ -258,7 +257,7 @@ li.item.productsitem.inmotion,border-color: #fff;}-.productsitem button.visibility {+.productsitem a.visibility {width: 30px;background-color: #ccc;position: absolute;@@ -266,11 +265,6 @@ li.item.productsitem.inmotion,bottom: 0;cursor: pointer;border-right: 1px solid #333;- border-top: none;- border-bottom: none;- border-left: none;- text-align: left;- padding: 0;&.layer-enabled:hover {background: #fff;@@ -328,9 +322,6 @@ li.item.productsitem.inmotion,position: absolute;right: 4px;bottom: 7px;- background: none;- border: none;- padding: 0;}.productsitem .layer-pointer-icon svg.svg-inline--fa {@@ -396,15 +387,12 @@ li.item.productsitem.inmotion,* End -- Granule active footprint toggle *************************************/-.productsitem button.wv-layers-info,-.productsitem button.wv-layers-options {+.productsitem a.wv-layers-info,+.productsitem a.wv-layers-options {position: relative;width: 20px;height: 20px;float: right;- border: none;- background:none;- padding: 0;}.productsitem.inmotion {@@ -412,9 +400,9 @@ li.item.productsitem.inmotion,list-style: none;}-.productsitem button.wv-layers-close:hover,-.productsitem button.wv-layers-info:hover,-.productsitem button.wv-layers-options:hover {+.productsitem a.wv-layers-close:hover,+.productsitem a.wv-layers-info:hover,+.productsitem a.wv-layers-options:hover {background: #fff;}@@ -425,6 +413,7 @@ li.item.productsitem.inmotion,text-align: center;border-radius: 50%;padding: 1px;+ margin-top: 3px;}.layer-info svg.svg-inline--fa.wv-layers-options-icon {@@ -437,11 +426,11 @@ li.item.productsitem.inmotion,margin-left: -6px;}-.productsitem.layer-hidden button.wv-layers-options svg.svg-inline--fa.wv-layers-options-icon {+.productsitem.layer-hidden a.wv-layers-options svg.svg-inline--fa.wv-layers-options-icon {background-position: -21px -69px;}-.productsitem.layer-hidden button.wv-layers-options:hover svg.svg-inline--fa.wv-layers-options-icon {+.productsitem.layer-hidden a.wv-layers-options:hover svg.svg-inline--fa.wv-layers-options-icon {background-position: 0 -69px;}@@ -525,17 +514,15 @@ li.item.productsitem.inmotion,}}-.productsitem button.wv-layers-close {+.productsitem a.button.wv-layers-close {display: block;float: right;width: 20px;height: 20px;position: relative;- background: none;- border: none;}-.productsitem button.wv-layers-close svg.svg-inline--fa {+.productsitem a.button.wv-layers-close svg.svg-inline--fa {width: 12px;pointer-events: none;position: absolute;@@ -617,7 +604,7 @@ li.item.productsitem.inmotion,height: 42px;}-.productsitem.layer-hidden button.visibility {+.productsitem.layer-hidden a.visibility {background: #666;}@@ -626,12 +613,12 @@ li.item.productsitem.inmotion,cursor: default;}-.disabled.layer-hidden button.visibility:hover {+.disabled.layer-hidden a.visibility:hover {background: rgb(255 255 255 / 20%);cursor: default;}-.productsitem.disabled.layer-hidden button.visibility:hover svg.svg-inline--fa {+.productsitem.disabled.layer-hidden a.visibility:hover svg.svg-inline--fa {color: #c5c5c8;}@@ -707,7 +694,7 @@ li.item.productsitem.inmotion,margin-top: -13px;}- button.visibility {+ a.visibility {width: 45px;}}diff --git a/web/scss/features/sidebar.scss b/web/scss/features/sidebar.scssindex 096b05efe..0e15394ce 100644--- a/web/scss/features/sidebar.scss+++ b/web/scss/features/sidebar.scss@@ -711,41 +711,41 @@ p.recharts-tooltip-label {}/* Layers Info */-.sidebar-panel li.item button.wv-layers-info {+.sidebar-panel li.item a.wv-layers-info {color: #333;text-align: center;}-.sidebar-panel li.item button.wv-layers-info .wv-layers-info-icon {+.sidebar-panel li.item a.wv-layers-info .wv-layers-info-icon {border-color: #333;}-.sidebar-panel li.item button.wv-layers-info.disabled {+.sidebar-panel li.item a.wv-layers-info.disabled {color: #aaa;}-.sidebar-panel li.item button.wv-layers-info.disabled .wv-layers-info-icon {+.sidebar-panel li.item a.wv-layers-info.disabled .wv-layers-info-icon {border-color: #aaa;}-.sidebar-panel li.item button.wv-layers-info.disabled:hover {+.sidebar-panel li.item a.wv-layers-info.disabled:hover {cursor: no-drop;background-color: transparent;}-.sidebar-panel li.layer-hidden button.wv-layers-info {+.sidebar-panel li.layer-hidden a.wv-layers-info {color: #999;}-.sidebar-panel li.layer-hidden button.wv-layers-info .wv-layers-info-icon {+.sidebar-panel li.layer-hidden a.wv-layers-info .wv-layers-info-icon {border-color: #999;}-.sidebar-panel li.layer-hidden button.wv-layers-info.disabled {+.sidebar-panel li.layer-hidden a.wv-layers-info.disabled {color: #666;}-.sidebar-panel li.layer-hidden button.wv-layers-info.disabled .wv-layers-info-icon {+.sidebar-panel li.layer-hidden a.wv-layers-info.disabled .wv-layers-info-icon {border-color: #666;}diff --git a/web/scss/features/smart-handoff.scss b/web/scss/features/smart-handoff.scssindex b94a19bdf..8bc4fa168 100644--- a/web/scss/features/smart-handoff.scss+++ b/web/scss/features/smart-handoff.scss@@ -174,25 +174,6 @@ a.help-link {vertical-align: bottom;}}-- button {- color: #fff;- font-size: 16px;- font-weight: 900;- margin: 14px 5px 5px;- display: inline-block;- text-align: center;- background: none;- border: none;- padding: 0;- height: auto;- width: auto;-- &.help-link {- text-align: left;- display: inline;- }- }}.loading-granule-count {@@ -350,9 +331,6 @@ a.help-link {color: #7bf;font-size: 17px;text-align: center;- width: 100%;- background: none;- border: none;}.toggle-more-info:hover {diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scssindex 54b1c9bbe..978b0ee3a 100644--- a/web/scss/features/timeline.scss+++ b/web/scss/features/timeline.scss@@ -228,9 +228,6 @@ button:focus {width: 35px;margin: auto;text-align: center;- background: none;- border: none;- padding: 0;}& .date-arrows svg {@@ -291,8 +288,6 @@ button:focus {width: 34px;height: 34px;margin-top: -1.5px;- padding: 0;- vertical-align: top;svg {left: 15px;@@ -329,7 +324,6 @@ button:focus {top: 16px;right: 4px;background-color: transparent;- border: none;& svg {top: 5px;@@ -378,8 +372,6 @@ button:focus {width: 40px;vertical-align: middle;position: relative;- background: none;- border: none;}.date-arrow-wrapper {@@ -471,10 +463,10 @@ button:focus {.zoom-level-change-arrows {user-select: none;background: transparent;+ border: thin solid transparent;vertical-align: middle;box-sizing: border-box;width: 55px;- border: none;}/* Interval selector */@@ -569,18 +561,14 @@ button:focus {width: 100%;margin-left: auto;margin-right: auto;- padding: 0;+ padding: 4px;background-color: variables.$wv-transparent-black;border-radius: 3px;}#timeline-header #timeline-interval-btn-container,#zoom-btn-container-axis {- color: white;display: block;- background: none;- border: none;- width: inherit;}.timeline-container .wv-tooltip {@@ -613,12 +601,13 @@ button:focus {.zoom-btn-active,.interval-btn-active {- width: inherit;+ width: 90px;color: #ccc;font-size: 12px;line-height: 14px;display: block;clear: both;+ cursor: pointer;text-transform: uppercase;text-align: center;font-family: variables.$wv-monospace-font;@@ -649,21 +638,6 @@ button:focus {line-height: 16px;color: #ccc;padding: 2px 0;- background: none;- border: none;- width: 100%;-}--.interval-list-btn {- display: block;- clear: both;- text-transform: uppercase;- text-align: center;- font-family: variables.$wv-monospace-font;- font-size: 14px;- line-height: 16px;- color: inherit;- padding: 2px 0;}.zoom-btn:hover,@@ -678,14 +652,10 @@ button:focus {right: 0;height: 64px;width: 20px;+ cursor: pointer;border-left: variables.$wv-dark-menu-border;border-top-right-radius: variables.$wv-menu-border-radius;border-bottom-right-radius: variables.$wv-menu-border-radius;- border-right: none;- background: none;- padding: 0;- border-top: none;- border-bottom: none;}#timeline-hide:hover,