From fcb9950c5ca67fccf441bdac56f52feeee978190 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Tue, 20 Aug 2024 14:31:17 -0400 Subject: [PATCH 01/40] EDSC-4162 Barebones tour code --- package-lock.json | 266 +++++++++++++++++- package.json | 1 + static/src/js/App.jsx | 18 +- .../src/js/components/AppHeader/AppHeader.jsx | 9 +- .../SecondaryToolbar/SecondaryToolbar.jsx | 14 +- static/src/js/components/Tour/SearchTour.jsx | 126 +++++++++ .../SecondaryToolbarContainer.jsx | 7 +- 7 files changed, 430 insertions(+), 11 deletions(-) create mode 100644 static/src/js/components/Tour/SearchTour.jsx diff --git a/package-lock.json b/package-lock.json index 58f2345636..ad520ebe27 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,6 +104,7 @@ "react-helmet": "^6.1.0", "react-icons": "^4.3.1", "react-input-range": "^1.3.0", + "react-joyride": "^2.8.2", "react-leaflet": "^4.2.0", "react-leaflet-custom-control": "^1.3.5", "react-leaflet-draw": "^0.20.4", @@ -10325,6 +10326,12 @@ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" }, + "node_modules/@gilbarbara/deep-equal": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.3.1.tgz", + "integrity": "sha512-I7xWjLs2YSVMc5gGx1Z3ZG1lgFpITPndpi8Ku55GeEIKpACCPQNS/OTqQbxgTCfq0Ncvcc+CrFov96itVh6Qvw==", + "license": "MIT" + }, "node_modules/@hapi/accept": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-6.0.0.tgz", @@ -25275,6 +25282,12 @@ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" }, + "node_modules/is-lite": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-1.2.1.tgz", + "integrity": "sha512-pgF+L5bxC+10hLBgf6R2P4ZZUBOQIIacbdo8YvuCP8/JvsWxG7aZ9p10DYuLtifFci4l3VITphhMlMV4Y+urPw==", + "license": "MIT" + }, "node_modules/is-map": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", @@ -33768,7 +33781,6 @@ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -34654,6 +34666,54 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, + "node_modules/react-floater": { + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/react-floater/-/react-floater-0.7.9.tgz", + "integrity": "sha512-NXqyp9o8FAXOATOEo0ZpyaQ2KPb4cmPMXGWkx377QtJkIXHlHRAGer7ai0r0C1kG5gf+KJ6Gy+gdNIiosvSicg==", + "license": "MIT", + "dependencies": { + "deepmerge": "^4.3.1", + "is-lite": "^0.8.2", + "popper.js": "^1.16.0", + "prop-types": "^15.8.1", + "tree-changes": "^0.9.1" + }, + "peerDependencies": { + "react": "15 - 18", + "react-dom": "15 - 18" + } + }, + "node_modules/react-floater/node_modules/@gilbarbara/deep-equal": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.1.2.tgz", + "integrity": "sha512-jk+qzItoEb0D0xSSmrKDDzf9sheQj/BAPxlgNxgmOaA3mxpUa6ndJLYGZKsJnIVEQSD8zcTbyILz7I0HcnBCRA==", + "license": "MIT" + }, + "node_modules/react-floater/node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-floater/node_modules/is-lite": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.8.2.tgz", + "integrity": "sha512-JZfH47qTsslwaAsqbMI3Q6HNNjUuq6Cmzzww50TdP5Esb6e1y2sK2UAaZZuzfAzpoI2AkxoPQapZdlDuP6Vlsw==", + "license": "MIT" + }, + "node_modules/react-floater/node_modules/tree-changes": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.9.3.tgz", + "integrity": "sha512-vvvS+O6kEeGRzMglTKbc19ltLWNtmNt1cpBoSYLj/iEcPVvpJasemKOlxBrmZaCtDJoF+4bwv3m01UKYi8mukQ==", + "license": "MIT", + "dependencies": { + "@gilbarbara/deep-equal": "^0.1.1", + "is-lite": "^0.8.2" + } + }, "node_modules/react-helmet": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", @@ -34681,6 +34741,16 @@ "react": "*" } }, + "node_modules/react-innertext": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-innertext/-/react-innertext-1.1.5.tgz", + "integrity": "sha512-PWAqdqhxhHIv80dT9znP2KvS+hfkbRovFp4zFYHFFlOoQLRiawIic81gKb3U1wEyJZgMwgs3JoLtwryASRWP3Q==", + "license": "MIT", + "peerDependencies": { + "@types/react": ">=0.0.0 <=99", + "react": ">=0.0.0 <=99" + } + }, "node_modules/react-input-range": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/react-input-range/-/react-input-range-1.3.0.tgz", @@ -34699,6 +34769,62 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "node_modules/react-joyride": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.8.2.tgz", + "integrity": "sha512-2QY8HB1G0I2OT0PKMUz7gg2HAjdkG2Bqi13r0Bb1V16PAwfb9khn4wWBTOJsGsjulbAWiQ3/0YrgNUHGFmuifw==", + "license": "MIT", + "dependencies": { + "@gilbarbara/deep-equal": "^0.3.1", + "deep-diff": "^1.0.2", + "deepmerge": "^4.3.1", + "is-lite": "^1.2.1", + "react-floater": "^0.7.9", + "react-innertext": "^1.1.5", + "react-is": "^16.13.1", + "scroll": "^3.0.1", + "scrollparent": "^2.1.0", + "tree-changes": "^0.11.2", + "type-fest": "^4.18.2" + }, + "peerDependencies": { + "react": "15 - 18", + "react-dom": "15 - 18" + } + }, + "node_modules/react-joyride/node_modules/deep-diff": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz", + "integrity": "sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==", + "license": "MIT" + }, + "node_modules/react-joyride/node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-joyride/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "license": "MIT" + }, + "node_modules/react-joyride/node_modules/type-fest": { + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz", + "integrity": "sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/react-leaflet": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.0.tgz", @@ -36007,6 +36133,18 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/scroll": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scroll/-/scroll-3.0.1.tgz", + "integrity": "sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==", + "license": "MIT" + }, + "node_modules/scrollparent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.1.0.tgz", + "integrity": "sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA==", + "license": "ISC" + }, "node_modules/scss-tokenizer": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz", @@ -38299,6 +38437,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tree-changes": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.11.2.tgz", + "integrity": "sha512-4gXlUthrl+RabZw6lLvcCDl6KfJOCmrC16BC5CRdut1EAH509Omgg0BfKLY+ViRlzrvYOTWR0FMS2SQTwzumrw==", + "license": "MIT", + "dependencies": { + "@gilbarbara/deep-equal": "^0.3.1", + "is-lite": "^1.2.0" + } + }, "node_modules/trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -48252,6 +48400,11 @@ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" }, + "@gilbarbara/deep-equal": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.3.1.tgz", + "integrity": "sha512-I7xWjLs2YSVMc5gGx1Z3ZG1lgFpITPndpi8Ku55GeEIKpACCPQNS/OTqQbxgTCfq0Ncvcc+CrFov96itVh6Qvw==" + }, "@hapi/accept": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-6.0.0.tgz", @@ -59703,6 +59856,11 @@ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" }, + "is-lite": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-1.2.1.tgz", + "integrity": "sha512-pgF+L5bxC+10hLBgf6R2P4ZZUBOQIIacbdo8YvuCP8/JvsWxG7aZ9p10DYuLtifFci4l3VITphhMlMV4Y+urPw==" + }, "is-map": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", @@ -66213,8 +66371,7 @@ "popper.js": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "peer": true + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "postcss": { "version": "8.4.39", @@ -66818,6 +66975,44 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, + "react-floater": { + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/react-floater/-/react-floater-0.7.9.tgz", + "integrity": "sha512-NXqyp9o8FAXOATOEo0ZpyaQ2KPb4cmPMXGWkx377QtJkIXHlHRAGer7ai0r0C1kG5gf+KJ6Gy+gdNIiosvSicg==", + "requires": { + "deepmerge": "^4.3.1", + "is-lite": "^0.8.2", + "popper.js": "^1.16.0", + "prop-types": "^15.8.1", + "tree-changes": "^0.9.1" + }, + "dependencies": { + "@gilbarbara/deep-equal": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.1.2.tgz", + "integrity": "sha512-jk+qzItoEb0D0xSSmrKDDzf9sheQj/BAPxlgNxgmOaA3mxpUa6ndJLYGZKsJnIVEQSD8zcTbyILz7I0HcnBCRA==" + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" + }, + "is-lite": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.8.2.tgz", + "integrity": "sha512-JZfH47qTsslwaAsqbMI3Q6HNNjUuq6Cmzzww50TdP5Esb6e1y2sK2UAaZZuzfAzpoI2AkxoPQapZdlDuP6Vlsw==" + }, + "tree-changes": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.9.3.tgz", + "integrity": "sha512-vvvS+O6kEeGRzMglTKbc19ltLWNtmNt1cpBoSYLj/iEcPVvpJasemKOlxBrmZaCtDJoF+4bwv3m01UKYi8mukQ==", + "requires": { + "@gilbarbara/deep-equal": "^0.1.1", + "is-lite": "^0.8.2" + } + } + } + }, "react-helmet": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", @@ -66842,6 +67037,12 @@ "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==", "requires": {} }, + "react-innertext": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-innertext/-/react-innertext-1.1.5.tgz", + "integrity": "sha512-PWAqdqhxhHIv80dT9znP2KvS+hfkbRovFp4zFYHFFlOoQLRiawIic81gKb3U1wEyJZgMwgs3JoLtwryASRWP3Q==", + "requires": {} + }, "react-input-range": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/react-input-range/-/react-input-range-1.3.0.tgz", @@ -66856,6 +67057,46 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "react-joyride": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.8.2.tgz", + "integrity": "sha512-2QY8HB1G0I2OT0PKMUz7gg2HAjdkG2Bqi13r0Bb1V16PAwfb9khn4wWBTOJsGsjulbAWiQ3/0YrgNUHGFmuifw==", + "requires": { + "@gilbarbara/deep-equal": "^0.3.1", + "deep-diff": "^1.0.2", + "deepmerge": "^4.3.1", + "is-lite": "^1.2.1", + "react-floater": "^0.7.9", + "react-innertext": "^1.1.5", + "react-is": "^16.13.1", + "scroll": "^3.0.1", + "scrollparent": "^2.1.0", + "tree-changes": "^0.11.2", + "type-fest": "^4.18.2" + }, + "dependencies": { + "deep-diff": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz", + "integrity": "sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==" + }, + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "type-fest": { + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz", + "integrity": "sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw==" + } + } + }, "react-leaflet": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.0.tgz", @@ -67797,6 +68038,16 @@ "ajv-keywords": "^3.5.2" } }, + "scroll": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scroll/-/scroll-3.0.1.tgz", + "integrity": "sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==" + }, + "scrollparent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.1.0.tgz", + "integrity": "sha512-bnnvJL28/Rtz/kz2+4wpBjHzWoEzXhVg/TE8BeVGJHUqE8THNIRnDxDWMktwM+qahvlRdvlLdsQfYe+cuqfZeA==" + }, "scss-tokenizer": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz", @@ -69541,6 +69792,15 @@ "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==" }, + "tree-changes": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.11.2.tgz", + "integrity": "sha512-4gXlUthrl+RabZw6lLvcCDl6KfJOCmrC16BC5CRdut1EAH509Omgg0BfKLY+ViRlzrvYOTWR0FMS2SQTwzumrw==", + "requires": { + "@gilbarbara/deep-equal": "^0.3.1", + "is-lite": "^1.2.0" + } + }, "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", diff --git a/package.json b/package.json index f6af659baa..a2846bf4ec 100644 --- a/package.json +++ b/package.json @@ -179,6 +179,7 @@ "react-helmet": "^6.1.0", "react-icons": "^4.3.1", "react-input-range": "^1.3.0", + "react-joyride": "^2.8.2", "react-leaflet": "^4.2.0", "react-leaflet-custom-control": "^1.3.5", "react-leaflet-draw": "^0.20.4", diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index eaca8aae91..cf2ec8e108 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -40,6 +40,7 @@ import KeyboardShortcutsModalContainer from './containers/KeyboardShortcutsModal import MetricsEventsContainer from './containers/MetricsEventsContainer/MetricsEventsContainer' import NotFound from './components/Errors/NotFound' import PortalContainer from './containers/PortalContainer/PortalContainer' +import SearchTour from './components/Tour/SearchTour' import ShapefileDropzoneContainer from './containers/ShapefileDropzoneContainer/ShapefileDropzoneContainer' import ShapefileUploadModalContainer from './containers/ShapefileUploadModalContainer/ShapefileUploadModalContainer' import Spinner from './components/Spinner/Spinner' @@ -72,12 +73,24 @@ const Subscriptions = lazy(() => import('./routes/Subscriptions/Subscriptions')) class App extends Component { constructor(props) { super(props) - this.state = {} + this.state = { + runTour: false, + } this.store = configureStore() const { edscHost } = getEnvironmentConfig() const { env } = getApplicationConfig() this.edscHost = edscHost this.env = env + this.startTour = this.startTour.bind(this) + this.setRunTour = this.setRunTour.bind(this) + } + + startTour() { + this.setState({ runTour: true }) + } + + setRunTour(value) { + this.setState({ runTour: value }) } // Portal paths have been removed, but this needs to stay in order to redirect users using @@ -119,7 +132,7 @@ class App extends Component { - + ( <> + }> diff --git a/static/src/js/components/AppHeader/AppHeader.jsx b/static/src/js/components/AppHeader/AppHeader.jsx index 7ddbe0c163..137ea00e6d 100644 --- a/static/src/js/components/AppHeader/AppHeader.jsx +++ b/static/src/js/components/AppHeader/AppHeader.jsx @@ -1,4 +1,5 @@ import React from 'react' +import PropTypes from 'prop-types' import SecondaryToolbarContainer from '../../containers/SecondaryToolbarContainer/SecondaryToolbarContainer' @@ -6,11 +7,15 @@ import AppLogoContainer from '../../containers/AppLogoContainer/AppLogoContainer import './AppHeader.scss' -const AppHeader = () => ( +const AppHeader = ({ onStartTour }) => (
- +
) +AppHeader.propTypes = { + onStartTour: PropTypes.func.isRequired +} + export default AppHeader diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index fb8e2446ff..b5048ff8de 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -12,9 +12,10 @@ import { parse } from 'qs' import { FaArrowCircleLeft, FaFolder, + FaWalking, FaLock, FaSave, - FaUser + FaUser, } from 'react-icons/fa' import { deployedEnvironment } from '../../../../../sharedUtils/deployedEnvironment' @@ -117,7 +118,8 @@ class SecondaryToolbar extends Component { location, retrieval = {}, secondaryToolbarEnabled, - ursProfile + ursProfile, + onStartTour } = this.props const { first_name: firstName = '' } = ursProfile @@ -320,6 +322,14 @@ class SecondaryToolbar extends Component { onToggle={this.onToggleProjectDropdown} alignRight > + { + const steps = [ + { + target: '.search', + content: 'Welcome to Earthdata Search! This tour will guide you through the main features.', + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: 500, + padding: '20px', + }, + tooltipContent: { + fontSize: '16px', + }, + }, + }, + { + target: '.sidebar__inner', + content: 'This is the search sidebar. It contains the controls and filters for narrowing down your search.', + placement: 'right', + }, + { + target: '.search-form__primary', + content: 'Use Earthdata Search\'s natural language processing-enabled search tool to quickly narrow down to relevant collections. An example search phrase could be "Land Surface Temperature over Texas".', + placement: 'right', + }, + { + target: '.search-form__secondary', + content: 'You can further filter results through the following options:', + placement: 'right', + }, + { + target: '.temporal-selection-dropdown', + content: 'Pick a temporal range from a calendar.', + placement: 'right', + }, + { + target: '.spatial-selection-dropdown', + content: 'Manually set spatial boundaries.', + placement: 'right', + }, + { + target: '.search-form__button--advanced-search', + content: 'Use Advanced Search.', + placement: 'right', + }, + { + target: '.sidebar-filters-list', + content: ( +
+

Refine your search further with available facets, such as:

+
    +
  • Features - has map imagery, is near-real-time, or is subsettable
    • +
  • Keywords - science terms describing collections
    • +
  • Platforms - satellite, aircraft, etc. hosting Instruments
    • +
  • Instruments - devices that make measurements
    • +
  • Organizations - responsible for archiving and/or producing data
    • +
  • Projects - mission or science project
    • +
  • Processing Levels - raw, geophysical variables, grid, or model
    • +
+
+ ), + placement: 'right-start', + styles: { + tooltip: { + width: 450, + }, + options: { + textAlign: 'left !important', + }, + }, + }, + { + target: '.panel-section', + content: 'Search results will be shown in the Matching Collections. Each result will have summary information along with relevant badges to allow you to quickly scan your search results to find the right collection. The panel can be resized by clicking and dragging the bar above.', + placement: 'right', + }, + { + target: '.search-sidebar-header', + content: 'Placeholder.', + placement: 'right', + }, + { + target: '.search-sidebar-header', + content: 'Placeholder.', + placement: 'right', + }, + ]; + + const handleJoyrideCallback = (data) => { + const { action, index, status, type } = data; + console.log('Joyride callback:', { action, index, status, type }); + + if ([STATUS.FINISHED, STATUS.SKIPPED].includes(status)) { + setRunTour(false); + } + }; + + return ( + + ); +}; + +SearchTour.propTypes = { + runTour: PropTypes.bool.isRequired, + setRunTour: PropTypes.func.isRequired, +}; + +export default SearchTour; \ No newline at end of file diff --git a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx index 60a2962087..6f17570a24 100644 --- a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx +++ b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx @@ -44,7 +44,8 @@ export const SecondaryToolbarContainer = (props) => { savedProject, retrieval, ursProfile, - onFetchContactInfo + onFetchContactInfo, + onStartTour } = props useEffect(() => { @@ -66,6 +67,7 @@ export const SecondaryToolbarContainer = (props) => { retrieval={retrieval} secondaryToolbarEnabled={secondaryToolbarEnabled} ursProfile={ursProfile} + onStartTour={onStartTour} /> ) } @@ -82,7 +84,8 @@ SecondaryToolbarContainer.propTypes = { savedProject: PropTypes.shape({}).isRequired, ursProfile: PropTypes.shape({ first_name: PropTypes.string - }).isRequired + }).isRequired, + onStartTour: PropTypes.func.isRequired } export default withRouter( From 6c367293629ea21da4e04a85203e8a567475f607 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 26 Aug 2024 16:00:04 -0400 Subject: [PATCH 02/40] EDSC-4162 tour updates --- .../SecondaryToolbar/SecondaryToolbar.jsx | 2 +- .../SecondaryToolbar/SecondaryToolbar.scss | 3 + static/src/js/components/Tour/SearchTour.jsx | 308 +++++++++++++++--- static/src/js/routes/Search/Search.jsx | 120 +++---- 4 files changed, 328 insertions(+), 105 deletions(-) diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index b5048ff8de..2a15c2e69f 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -323,7 +323,7 @@ class SecondaryToolbar extends Component { alignRight > { + const [stepIndex, setStepIndex] = useState(0) + + useEffect(() => { + if (runTour) { + console.log('Tour started') + setStepIndex(0) + } else { + console.log('Tour stopped') + } + }, [runTour]) + const steps = [ { target: '.search', @@ -11,11 +24,12 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'center', styles: { tooltip: { - width: 500, + width: 700, padding: '20px', }, tooltipContent: { fontSize: '16px', + textAlign: 'center', }, }, }, @@ -23,55 +37,93 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar__inner', content: 'This is the search sidebar. It contains the controls and filters for narrowing down your search.', placement: 'right', + styles: { + tooltip: { + width: '500px' + } + } }, { target: '.search-form__primary', - content: 'Use Earthdata Search\'s natural language processing-enabled search tool to quickly narrow down to relevant collections. An example search phrase could be "Land Surface Temperature over Texas".', + content: 'You can search for specific collections by their Collection Id or by topic such as "Land Surface Temperature".', placement: 'right', }, { target: '.search-form__secondary', - content: 'You can further filter results through the following options:', - placement: 'right', - }, - { - target: '.temporal-selection-dropdown', - content: 'Pick a temporal range from a calendar.', - placement: 'right', - }, - { - target: '.spatial-selection-dropdown', - content: 'Manually set spatial boundaries.', + content: ( +
+

You can further filter results through the following options:

+
    +
  • Temporal Selection: Pick a temporal range from a calendar.
    • +
  • Spatial Selection: Manually set spatial boundaries by drawing on the map or uploading a shapefile.
    • +
  • Advanced Search: Filter search by HUC or River Reach.
    • +
+
+ ), placement: 'right', + styles: { + tooltip: { + width: 800, + }, + }, }, + // { + // target: '.temporal-selection-dropdown', + // content: 'Pick a temporal range from a calendar.', + // placement: 'right', + // }, + // { + // target: '.spatial-selection-dropdown', + // content: 'Manually set spatial boundaries.', + // placement: 'right', + // }, + // { + // target: '.search-form__button--advanced-search', + // content: 'Use Advanced Search.', + // placement: 'right', + // }, { - target: '.search-form__button--advanced-search', - content: 'Use Advanced Search.', + target: '.sidebar-browse-portals', + content: 'Enable a portal in order to refine the data available within Earthdata Search.', placement: 'right', + styles: { + tooltip: { + width: 625, + }, + }, }, { - target: '.sidebar-filters-list', + target: '.sidebar-section-body', content: ( -
-

Refine your search further with available facets, such as:

-
    -
  • Features - has map imagery, is near-real-time, or is subsettable
    • -
  • Keywords - science terms describing collections
    • -
  • Platforms - satellite, aircraft, etc. hosting Instruments
    • -
  • Instruments - devices that make measurements
    • -
  • Organizations - responsible for archiving and/or producing data
    • -
  • Projects - mission or science project
    • -
  • Processing Levels - raw, geophysical variables, grid, or model
    • +
    +

    Refine your search further with available facets, such as:

    +
      +
    • Features - Available only in Earthdata Cloud, Collections that support customization via temportal, spatial variable subsetting, reformatting, etc.
      • +
    • Keywords - Science terms describing collections
      • +
    • Platforms - Satellite, aircraft, hosting instruments etc.
      • +
    • Instruments - Devices that make measurements
      • +
    • Organizations - Responsible for archiving and/or producing data
      • +
    • Projects - Mission or science project
      • +
    • Processing Levels - Raw, geophysical variables, grid, or model
      • +
    • Data Format - Format of the data (ASCII, Binary, CSV, HDF, NetCDF, etc)
      • +
    • Tiling System - CALIPSO, Military Grid Reference System, MISR, etc.
      • +
    • Horizontal Data Resolution - Fidelity of the data resolution
      • +
    • Latency - How quickly data is available after acquisition
    +

    + Additional Filters: +

      +
    • Filter by only collections that contain granules
      • +
    • Filter by only EOSDIS collections
      • +
    +

    ), placement: 'right-start', + isScrollable: true, styles: { tooltip: { - width: 450, - }, - options: { - textAlign: 'left !important', + width: 700, }, }, }, @@ -79,48 +131,212 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panel-section', content: 'Search results will be shown in the Matching Collections. Each result will have summary information along with relevant badges to allow you to quickly scan your search results to find the right collection. The panel can be resized by clicking and dragging the bar above.', placement: 'right', + styles: { + tooltip: { + width: 700, + }, + }, + }, + { + target: '.leaflet-bottom.leaflet-right', + content: ( +
    +

    Map Tools:

    +
      +
    • Projection Switcher - Switch between Equitorial, North, and South Sterographic Views
      • +
    • Draw Section - Draw a shape or select a spatial coordinate
      • +
    • Edit/Delete Layers - Modify currently applied map layers
      • +
    • Control Zoom - Control map zoom
      • +
    • Map Options - Control map details (colors, borders, coastlines)
      • +
    +
    + ), + placement: 'left', + styles: { + tooltip: { + width: 700, + }, + }, }, { - target: '.search-sidebar-header', + target: '.sidebar__inner', content: 'Placeholder.', placement: 'right', + styles: { + tooltip: { + width: 600, + }, + }, }, { - target: '.search-sidebar-header', - content: 'Placeholder.', + target: '.search', + content: ( +
    +

    Want to learn more? Check out this webinar to see these features in action:

    + +

    Or check out one of the following resources:

    +

    + + Learn More + +

    +

    + + Frequently Asked Questions + +

    +
    + ), + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: 600, + padding: '20px', + }, + tooltipContent: { + fontSize: '16px', + }, + }, + }, + { + target: '.secondary-toolbar__begin-tour-button', + content: 'You can replay this tour anytime by clicking here.', placement: 'right', + styles: { + tooltipContent: { + fontSize: '16px', + textAlign: 'center', + }, + }, }, - ]; + ] const handleJoyrideCallback = (data) => { - const { action, index, status, type } = data; - console.log('Joyride callback:', { action, index, status, type }); + const { action, index, status, type } = data + console.log('Joyride callback:', { action, index, status, type }) - if ([STATUS.FINISHED, STATUS.SKIPPED].includes(status)) { - setRunTour(false); + if ([STATUS.FINISHED, STATUS.SKIPPED].includes(status) || action === ACTIONS.CLOSE) { + console.log('Tour ended') + setRunTour(false) + setStepIndex(0) + } else if (type === 'step:after' && action === ACTIONS.NEXT) { + setStepIndex(index + 1) + } else if (type === 'step:after' && action === ACTIONS.PREV) { + setStepIndex(index - 1) } - }; + + // Prevent auto-scrolling within sidebar component when highlighting + if (type === 'step:before') { + const element = document.querySelector('.sidebar-section-body') + if (element) { + element.scrollTop = 0 + } + } + } return ( - ); -}; + ) +} SearchTour.propTypes = { runTour: PropTypes.bool.isRequired, setRunTour: PropTypes.func.isRequired, -}; +} -export default SearchTour; \ No newline at end of file +export default SearchTour \ No newline at end of file diff --git a/static/src/js/routes/Search/Search.jsx b/static/src/js/routes/Search/Search.jsx index 3f2e8bf82a..c61cec38ca 100644 --- a/static/src/js/routes/Search/Search.jsx +++ b/static/src/js/routes/Search/Search.jsx @@ -169,69 +169,73 @@ export const Search = ({ - + Browse Portals + + {/* eslint-disable-next-line max-len */} + Enable a portal in order to refine the data available within Earthdata Search + + ) + } + > + + + +
- - - - - - +
+ + - - - handleCheckboxCheck(event)} - /> - - - handleCheckboxCheck(event)} - /> - - + - - - + + + + + handleCheckboxCheck(event)} + /> + + + handleCheckboxCheck(event)} + /> + + + + + + +
From 7b4bf8a42ac3217b84dfa796d0229aa6f09ad6ee Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 29 Aug 2024 17:10:23 -0400 Subject: [PATCH 03/40] EDSC-4162 Updating tour steps --- static/src/js/components/Tour/SearchTour.jsx | 507 +++++++++++++++--- static/src/js/components/Tour/SearchTour.scss | 115 ++++ 2 files changed, 542 insertions(+), 80 deletions(-) create mode 100644 static/src/js/components/Tour/SearchTour.scss diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index e5120723ae..ffed6ea645 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -1,11 +1,22 @@ import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import Joyride, { STATUS, ACTIONS } from 'react-joyride' -import { FaExternalLinkAlt } from 'react-icons/fa' +import { FaExternalLinkAlt, FaInfoCircle, FaPlus } from 'react-icons/fa' +import Button from '../Button/Button' import EDSCIcon from '../../components/EDSCIcon/EDSCIcon' +import './SearchTour.scss' const SearchTour = ({ runTour, setRunTour }) => { const [stepIndex, setStepIndex] = useState(0) + const [dontShowAgain, setDontShowAgain] = useState(false) + + useEffect(() => { + const dontShowTour = localStorage.getItem('dontShowTour') + if (dontShowTour === 'true') { + setRunTour(false) + } + setDontShowAgain(dontShowTour === 'true') + }, [setRunTour]) useEffect(() => { if (runTour) { @@ -16,79 +27,329 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [runTour]) + const handleDontShowAgainChange = (e) => { + const checked = e.target.checked + setDontShowAgain(checked) + localStorage.setItem('dontShowTour', checked.toString()) + } + + const steps = [ { target: '.search', - content: 'Welcome to Earthdata Search! This tour will guide you through the main features.', + content: ( +
+

Welcome to Earthdata Search!

+

Let’s start with a quick tour...

+

+ Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn how to search for data, use the map, create your first project, and manage your preferences. +

+

+ If you want to skip the tour for now, it is always available by clicking Show Tour at the top of the page. +

+
+ + +
+
+ ), disableBeacon: true, placement: 'center', + }, + { + target: '.sidebar__inner', + content: ( +
+

+ This area contains the filters used when searching for collections (datasets produced by an organization) and their granules (sets of files containing data). +

+

+ Available filters include keyword search, spatial and temporal bounds, and advanced search options. +

+
+ + +
+
+ ), + placement: 'right', styles: { tooltip: { - width: 700, - padding: '20px', + width: '500px', }, tooltipContent: { - fontSize: '16px', - textAlign: 'center', + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', }, - }, + } }, { - target: '.sidebar__inner', - content: 'This is the search sidebar. It contains the controls and filters for narrowing down your search.', + target: '.search-form__primary', + content: ( +
+

+ Search for collections by topic (e.g., "Land Surface Temperature"), by collection name, or by CMR Concept ID. +

+

+ As you type, suggestions for matching topics and keywords will be displayed. When selected, they will be applied as additional search filters. +

+
+

Find more information about the  + Common Metadata Repository (CMR) +

+
+
+ + +
+
+ ), placement: 'right', styles: { tooltip: { - width: '500px' - } + width: '600px', + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', + }, } }, { - target: '.search-form__primary', - content: 'You can search for specific collections by their Collection Id or by topic such as "Land Surface Temperature".', + target: '.temporal-selection-dropdown', + content: ( +
+

+ Use the temporal filters to limit search results to a specific date and time range. +

+

+ A recurring filter can be applied to search a repeating range between specified years. +

+
+ + +
+
+ ), placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', + }, + } }, + { - target: '.search-form__secondary', + target: '.spatial-selection-dropdown', content: (
-

You can further filter results through the following options:

-
    -
  • Temporal Selection: Pick a temporal range from a calendar.
    • -
  • Spatial Selection: Manually set spatial boundaries by drawing on the map or uploading a shapefile.
    • -
  • Advanced Search: Filter search by HUC or River Reach.
    • -
+

+ Use the spatial filters to limit search results to the specified area of interest. +

+

+ To set the spatial area using a polygon, rectangle, point and radius, or circle, select an option from the menu and then draw on the map or manually enter coordinates. +

+

+ Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with a file. +

+
+ + +
), placement: 'right', styles: { tooltip: { - width: 800, + width: '400px', }, - }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', + }, + } + }, + + { + target: '.search-form__button--advanced-search', + content: ( +
+

+ Use Advanced Search parameters to filter results using features like Hydrologic Unit Code (HCU) or SWORD River Reach. +

+
+ + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', + }, + } }, - // { - // target: '.temporal-selection-dropdown', - // content: 'Pick a temporal range from a calendar.', - // placement: 'right', - // }, - // { - // target: '.spatial-selection-dropdown', - // content: 'Manually set spatial boundaries.', - // placement: 'right', - // }, - // { - // target: '.search-form__button--advanced-search', - // content: 'Use Advanced Search.', - // placement: 'right', - // }, { target: '.sidebar-browse-portals', - content: 'Enable a portal in order to refine the data available within Earthdata Search.', + content: ( +
+

+ Choose a portal to refine search results to a particular area of study, project, or organization. +

+
+ + +
+
+ ), placement: 'right', + disableScrolling: true, styles: { tooltip: { - width: 625, + width: '625px', }, }, }, @@ -96,44 +357,147 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar-section-body', content: (
-

Refine your search further with available facets, such as:

-
    -
  • Features - Available only in Earthdata Cloud, Collections that support customization via temportal, spatial variable subsetting, reformatting, etc.
    • +

    Refine your search further with available facets, such as:

    +
      +
    • Features - Available only in Earthdata Cloud, Collections that support customization via temporal, spatial, variable subsetting, reformatting, etc.
    • Keywords - Science terms describing collections
      • -
    • Platforms - Satellite, aircraft, hosting instruments etc.
      • +
    • Platforms - Satellite, aircraft, hosting instruments, etc.
    • Instruments - Devices that make measurements
    • Organizations - Responsible for archiving and/or producing data
    • Projects - Mission or science project
    • Processing Levels - Raw, geophysical variables, grid, or model
      • -
    • Data Format - Format of the data (ASCII, Binary, CSV, HDF, NetCDF, etc)
      • +
    • Data Format - Format of the data (ASCII, Binary, CSV, HDF, NetCDF, etc.)
    • Tiling System - CALIPSO, Military Grid Reference System, MISR, etc.
    • Horizontal Data Resolution - Fidelity of the data resolution
    • Latency - How quickly data is available after acquisition
    -

    - Additional Filters: -

      +

      Additional Filters:

      +
      • Filter by only collections that contain granules
      • Filter by only EOSDIS collections
      -

      +
      + + +
), placement: 'right-start', isScrollable: true, styles: { tooltip: { - width: 700, + width: '700px', }, }, }, { target: '.panel-section', - content: 'Search results will be shown in the Matching Collections. Each result will have summary information along with relevant badges to allow you to quickly scan your search results to find the right collection. The panel can be resized by clicking and dragging the bar above.', + content: ( +
+

+ A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. + To view more information about a collection, click the icon. +

+

+ Add granules to a project and customize options before accessing the data. + To add a collection to your project, click the icon. + To add individual granules to a project, click on a search result to view and add its granules. +

+
+ + +
+
+ ), placement: 'right', styles: { tooltip: { - width: 700, + width: '700px', + }, + }, + }, + { + target: '.panels__handle', + content: ( +
+

+ To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the ] key. +

+
+

+ All keyboard shortcuts can be displayed by pressing the ? key at any time. +

+
+
+ + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '600px', }, }, }, @@ -179,8 +543,8 @@ const SearchTour = ({ runTour, setRunTour }) => { target="_blank" rel="noopener noreferrer" style={{ - display: 'inline-flex', // Changed to inline-flex - alignItems: 'center', // Align items vertically + display: 'inline-flex', + alignItems: 'center', padding: '10px 15px', backgroundColor: '#007bff', color: '#FFFFFF', @@ -237,12 +601,16 @@ const SearchTour = ({ runTour, setRunTour }) => { }, { target: '.secondary-toolbar__begin-tour-button', - content: 'You can replay this tour anytime by clicking here.', + content: ( +
+

You can replay this tour anytime by clicking here.

+
+ ), placement: 'right', styles: { tooltipContent: { fontSize: '16px', - textAlign: 'center', + textAlign: 'left', }, }, }, @@ -277,13 +645,8 @@ const SearchTour = ({ runTour, setRunTour }) => { run={runTour} stepIndex={stepIndex} continuous - showSkipButton - showProgress - disableCloseOnEsc={false} - disableOverlayClose={false} - disableScrolling={true} - scrollToFirstStep={false} - spotlightClicks + callback={handleJoyrideCallback} + hideBackButton={true} styles={{ options: { primaryColor: '#007bff', @@ -300,23 +663,8 @@ const SearchTour = ({ runTour, setRunTour }) => { textAlign: 'left', }, buttonNext: { - backgroundColor: '#007bff', - color: '#fff', - padding: '8px 16px', - fontSize: '14px', - borderRadius: '4px', - }, - buttonBack: { - backgroundColor: '#6c757d', - color: '#fff', - padding: '8px 16px', - fontSize: '14px', - borderRadius: '4px', - marginRight: '10px', - }, - buttonSkip: { - color: '#6c757d', - fontSize: '14px', + // Hide the next button since we use custom buttons + display: 'none' }, }} floaterProps={{ @@ -329,7 +677,6 @@ const SearchTour = ({ runTour, setRunTour }) => { }, }, }} - callback={handleJoyrideCallback} /> ) } diff --git a/static/src/js/components/Tour/SearchTour.scss b/static/src/js/components/Tour/SearchTour.scss new file mode 100644 index 0000000000..683d57ebdb --- /dev/null +++ b/static/src/js/components/Tour/SearchTour.scss @@ -0,0 +1,115 @@ +:root { + --color-blue: #2367e3; + --color-white: #ffffff; + --color-black: #000000; + --color-heading: #0063A6; +} + +.button-tour-start , +.button-tour-skip { + width: 9rem; + height: 3rem; + font-size: 1.2rem; + border-radius: 4px; + display: inline-flex; + justify-content: center; + align-items: center; + border: none; + cursor: pointer; +} + +.button-tour-next, +.button-tour-previous { + width: 9rem; + height: 2.4rem; + font-size: 0.9rem; + border-radius: 4px; + display: inline-flex; + justify-content: center; + align-items: center; + border: none; + cursor: pointer; +} + +.button-tour-start, +.button-tour-next { + background-color: var(--color-blue); + color: var(--color-white); +} + +.button-tour-skip, +.button-tour-previous { + background-color: var(--color-white); + color: var(--color-black); + border: 1px solid var(--color-black); +} + +.tour-heading { + font-size: 14px; + margin-bottom: 10px; + color: var(--color-blue); + text-transform: uppercase; + letter-spacing: 1px; +} + +.tour-subheading { + font-size: 24px; + font-weight: bold; + margin-bottom: 20px; +} + +.tour-content { + font-size: 16px; + margin-bottom: 20px; + text-align: left; +} + +.tour-note { + font-size: 14px; + margin-bottom: 20px; + text-align: left; +} +.tour-intro-buttons { + display: flex; + justify-content: flex-end; + gap: 15px; + position: absolute; + bottom: 20px; + right: 20px; + width: 19rem; +} +.tour-buttons { + display: flex; + justify-content: flex-end; + gap: 15px; + position: absolute; + bottom: 20px; + right: 20px; + width: 9rem; +} + +.tour-info-box { + background-color: #f8f9fa; + padding: 10px; + margin-bottom: 15px; + border-radius: 4px; + font-size: 14px; + text-align: left; +} + +.tour-info-box a { + color: var(--color-black); + text-decoration: underline; + font-weight: bold; +} + +.tour-tooltip { + width: 600px; + padding: 20px; + background-color: var(--color-white); + border-radius: 10px; + font-size: 16px; + text-align: center; + position: relative; + min-height: 200px; +} From 2fdce146d819f0d86ff7ca410b4c1883de0e98da Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 9 Sep 2024 00:36:50 -0400 Subject: [PATCH 04/40] EDSC-4162 Implenting tour changes --- .../assets/images/tour-video-thumbnail.png | Bin 0 -> 163502 bytes .../SecondaryToolbar/SecondaryToolbar.jsx | 18 +- static/src/js/components/Tour/SearchTour.jsx | 374 ++++++++++++------ static/src/js/components/Tour/SearchTour.scss | 45 +-- 4 files changed, 268 insertions(+), 169 deletions(-) create mode 100644 static/src/assets/images/tour-video-thumbnail.png diff --git a/static/src/assets/images/tour-video-thumbnail.png b/static/src/assets/images/tour-video-thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..fc86921a2c46d571ff25085f1da1620e8e9c0727 GIT binary patch literal 163502 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

RTmw4M0ij6zpAf8o4%{@Lg8mnev> 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�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%0A^L4BO#43p7~7P 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 literal 0 HcmV?d00001 diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index 2a15c2e69f..11f7858ad9 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -322,14 +322,16 @@ class SecondaryToolbar extends Component { onToggle={this.onToggleProjectDropdown} alignRight > - + {location.pathname === '/search' && ( + + Start Tour + + )} { + const MAX_STEPS = 14; + const [stepIndex, setStepIndex] = useState(0) const [dontShowAgain, setDontShowAgain] = useState(false) @@ -27,18 +30,33 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [runTour]) + useEffect(() => { + if (stepIndex === 6) { // Scrolling to the top to ensure "Browse Portals" is visible. + const element = document.querySelector('.sidebar__content .simplebar-content-wrapper') + if (element) { + element.scrollTop = 0 + } + } + }, [stepIndex]) + const handleDontShowAgainChange = (e) => { const checked = e.target.checked setDontShowAgain(checked) localStorage.setItem('dontShowTour', checked.toString()) } + const StepCounter = ({ currentStep, totalSteps }) => ( +

+ {currentStep}  OF  {totalSteps} +

+ ) const steps = [ { target: '.search', content: (
+

Welcome to Earthdata Search!

Let’s start with a quick tour...

@@ -52,7 +70,7 @@ const SearchTour = ({ runTour, setRunTour }) => { className="button-tour-start" type="button" bootstrapVariant="primary" - bootstrapSize="sm" + bootstrapSize="lg" onClick={() => { setStepIndex(stepIndex + 1) }} @@ -81,6 +99,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar__inner', content: (

+

This area contains the filters used when searching for collections (datasets produced by an organization) and their granules (sets of files containing data).

@@ -89,7 +108,6 @@ const SearchTour = ({ runTour, setRunTour }) => {

), placement: 'right-start', - isScrollable: true, + disableScrolling: true, styles: { tooltip: { - width: '700px', + width: '400px', }, }, }, @@ -414,6 +409,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panel-section', content: (
+

A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. To view more information about a collection, click the icon. @@ -425,7 +421,6 @@ const SearchTour = ({ runTour, setRunTour }) => {

+ +
+
+ ), + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: '400px', + textAlign: 'left', }, }, }, @@ -505,84 +546,189 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.leaflet-bottom.leaflet-right', content: (
-

Map Tools:

-
    -
  • Projection Switcher - Switch between Equitorial, North, and South Sterographic Views
    • -
  • Draw Section - Draw a shape or select a spatial coordinate
    • -
  • Edit/Delete Layers - Modify currently applied map layers
    • -
  • Control Zoom - Control map zoom
    • -
  • Map Options - Control map details (colors, borders, coastlines)
    • -
+ +

+ Use the map tools to switch map projections, draw, edit, or remove spatial bounds, zoom the map, or select the base map. +

+
+ + +
), placement: 'left', styles: { tooltip: { - width: 700, + width: '400px', + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5', }, }, }, { - target: '.sidebar__inner', - content: 'Placeholder.', + target: '.secondary-toolbar__user-dropdown-toggle', + content: ( +
+ +

+ When logged in, use this menu to set preferences, saved projects, subscriptions, download status and history, or log out. +

+
+ + +
+
+ ), placement: 'right', styles: { tooltip: { - width: 600, + width: '400px', }, }, }, { - target: '.search', + target: '.secondary-toolbar__begin-tour-button', content: ( -
-

Want to learn more? Check out this webinar to see these features in action:

-
- + +

+ You can replay this tour anytime by clicking Show Tour. +

+
+ + +
-

Or check out one of the following resources:

+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + }, + }, + { + target: '.search', + content: ( +
+

+ Want to learn more? +

+

+ Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. +

+ +
+ Webinar Thumbnail +
+
+
+ Discover and Access Earth Science Data Using Earthdata Search +
+

+ Watch the webinar +

+
+ +

+ Find more information here: +

- - Learn More + Earthdata Search wiki

- - Frequently Asked Questions + Earthdata Search FAQs

@@ -591,7 +737,7 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'center', styles: { tooltip: { - width: 600, + width: '600px', padding: '20px', }, tooltipContent: { @@ -599,38 +745,23 @@ const SearchTour = ({ runTour, setRunTour }) => { }, }, }, - { - target: '.secondary-toolbar__begin-tour-button', - content: ( -
-

You can replay this tour anytime by clicking here.

-
- ), - placement: 'right', - styles: { - tooltipContent: { - fontSize: '16px', - textAlign: 'left', - }, - }, - }, ] const handleJoyrideCallback = (data) => { const { action, index, status, type } = data - console.log('Joyride callback:', { action, index, status, type }) - - if ([STATUS.FINISHED, STATUS.SKIPPED].includes(status) || action === ACTIONS.CLOSE) { - console.log('Tour ended') + + // Reset tour state when the tour is finished, skipped, paused, or closed + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) || action === ACTIONS.CLOSE) { setRunTour(false) - setStepIndex(0) + setStepIndex(0); + console.log } else if (type === 'step:after' && action === ACTIONS.NEXT) { setStepIndex(index + 1) } else if (type === 'step:after' && action === ACTIONS.PREV) { setStepIndex(index - 1) } - - // Prevent auto-scrolling within sidebar component when highlighting + + // Prevent auto-scrolling within the sidebar component when highlighting if (type === 'step:before') { const element = document.querySelector('.sidebar-section-body') if (element) { @@ -657,6 +788,7 @@ const SearchTour = ({ runTour, setRunTour }) => { tooltip: { fontSize: '16px', padding: '20px', + paddingTop: '0px', textAlign: 'left', }, tooltipContent: { diff --git a/static/src/js/components/Tour/SearchTour.scss b/static/src/js/components/Tour/SearchTour.scss index 683d57ebdb..92eae8d0c0 100644 --- a/static/src/js/components/Tour/SearchTour.scss +++ b/static/src/js/components/Tour/SearchTour.scss @@ -4,50 +4,15 @@ --color-black: #000000; --color-heading: #0063A6; } - -.button-tour-start , -.button-tour-skip { - width: 9rem; - height: 3rem; - font-size: 1.2rem; - border-radius: 4px; - display: inline-flex; - justify-content: center; - align-items: center; - border: none; - cursor: pointer; -} -.button-tour-next, -.button-tour-previous { - width: 9rem; - height: 2.4rem; - font-size: 0.9rem; - border-radius: 4px; - display: inline-flex; - justify-content: center; - align-items: center; - border: none; - cursor: pointer; -} - -.button-tour-start, -.button-tour-next { - background-color: var(--color-blue); - color: var(--color-white); -} - -.button-tour-skip, -.button-tour-previous { - background-color: var(--color-white); - color: var(--color-black); - border: 1px solid var(--color-black); -} +.button-tour-finish { + min-width: 90px; + } .tour-heading { font-size: 14px; margin-bottom: 10px; - color: var(--color-blue); + color: var(--color-black); text-transform: uppercase; letter-spacing: 1px; } @@ -90,7 +55,7 @@ .tour-info-box { background-color: #f8f9fa; - padding: 10px; + padding: 1rem; margin-bottom: 15px; border-radius: 4px; font-size: 14px; From 7041a6346f2b49035f51477af544626b0a688cb4 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 9 Sep 2024 15:31:50 -0400 Subject: [PATCH 05/40] EDSC-4162 Updating tour steps --- static/src/js/components/Panels/Panels.jsx | 1 + static/src/js/components/Panels/Panels.scss | 12 +++++ static/src/js/components/Tour/SearchTour.jsx | 44 +++++++++---------- static/src/js/components/Tour/SearchTour.scss | 25 ++++++++++- 4 files changed, 59 insertions(+), 23 deletions(-) diff --git a/static/src/js/components/Panels/Panels.jsx b/static/src/js/components/Panels/Panels.jsx index 1a78f9c68a..841241dae8 100644 --- a/static/src/js/components/Panels/Panels.jsx +++ b/static/src/js/components/Panels/Panels.jsx @@ -652,6 +652,7 @@ export class Panels extends PureComponent {
{focusedMeta}
+
) } diff --git a/static/src/js/components/Panels/Panels.scss b/static/src/js/components/Panels/Panels.scss index 2514b3504d..e095a2bb64 100644 --- a/static/src/js/components/Panels/Panels.scss +++ b/static/src/js/components/Panels/Panels.scss @@ -78,3 +78,15 @@ pointer-events: none; } } + +.right-overlay { + position: absolute; + top: 0; + bottom: 0; + right: 0; + z-index: 1000; + background-color: rgba(255, 255, 255, 0); + width: 4000px; + left: calc(100%); + pointer-events: none; +} \ No newline at end of file diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index f0e120dc3d..e005f84275 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -46,17 +46,17 @@ const SearchTour = ({ runTour, setRunTour }) => { } const StepCounter = ({ currentStep, totalSteps }) => ( -

- {currentStep}  OF  {totalSteps} +

+ {currentStep} OF {totalSteps}

) + const steps = [ { target: '.search', content: (
-

Welcome to Earthdata Search!

Let’s start with a quick tour...

@@ -99,7 +99,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar__inner', content: (

- +

This area contains the filters used when searching for collections (datasets produced by an organization) and their granules (sets of files containing data).

@@ -146,7 +146,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.search-form__primary', content: (
- +

Search for collections by topic (e.g., "Land Surface Temperature"), by collection name, or by CMR Concept ID.

@@ -198,7 +198,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.temporal-selection-dropdown', content: (
- +

Use the temporal filters to limit search results to a specific date and time range.

@@ -242,7 +242,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.spatial-selection-dropdown', content: (
- +

Use the spatial filters to limit search results to the specified area of interest.

@@ -289,7 +289,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.search-form__button--advanced-search', content: (
- +

Use Advanced Search parameters to filter results using features like Hydrologic Unit Code (HUC) or SWORD River Reach.

@@ -329,7 +329,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar-browse-portals', content: (
- +

Choose a portal to refine search results to a particular area of study, project, or organization.

@@ -369,7 +369,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar-section-body', content: (
- +

Refine your search further using categories like Features, Keywords, Platforms, Organizations, etc.

@@ -409,14 +409,14 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panel-section', content: (
- +

A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. - To view more information about a collection, click the icon. + To view more information about a collection, click the icon.

Add granules to a project and customize options before accessing the data. - To add a collection to your project, click the icon. + To add a collection to your project, click the icon. To add individual granules to a project, click on a search result to view and add its granules.

@@ -458,7 +458,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panels__handle', content: (
- +

To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the ] key.

@@ -499,10 +499,10 @@ const SearchTour = ({ runTour, setRunTour }) => { }, }, { - target: 'body', + target: '.right-overlay', content: (
- +

Pan the map by clicking and dragging, and zoom by using the scroll wheel or map tools.

@@ -533,8 +533,7 @@ const SearchTour = ({ runTour, setRunTour }) => {
), - disableBeacon: true, - placement: 'center', + placement: 'left', styles: { tooltip: { width: '400px', @@ -546,7 +545,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.leaflet-bottom.leaflet-right', content: (
- +

Use the map tools to switch map projections, draw, edit, or remove spatial bounds, zoom the map, or select the base map.

@@ -590,7 +589,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.secondary-toolbar__user-dropdown-toggle', content: (
- +

When logged in, use this menu to set preferences, saved projects, subscriptions, download status and history, or log out.

@@ -625,7 +624,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.secondary-toolbar__begin-tour-button', content: (
- +

You can replay this tour anytime by clicking Show Tour.

@@ -704,8 +703,9 @@ const SearchTour = ({ runTour, setRunTour }) => { Discover and Access Earth Science Data Using Earthdata Search

- Watch the webinar + Watch the webinar

+

diff --git a/static/src/js/components/Tour/SearchTour.scss b/static/src/js/components/Tour/SearchTour.scss index 92eae8d0c0..d2ff03152a 100644 --- a/static/src/js/components/Tour/SearchTour.scss +++ b/static/src/js/components/Tour/SearchTour.scss @@ -1,5 +1,4 @@ :root { - --color-blue: #2367e3; --color-white: #ffffff; --color-black: #000000; --color-heading: #0063A6; @@ -9,6 +8,23 @@ min-width: 90px; } +.step-counter-text { + font-family: "DM Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + font-size: 12px; + margin-bottom: 15px; + color: #9a989a; + text-align: left; +} + + +.text-icon { + display: inline-block; + vertical-align: center; + margin-top: -2px; + height: 0.85rem; + width: 0.85rem; +} + .tour-heading { font-size: 14px; margin-bottom: 10px; @@ -17,6 +33,13 @@ letter-spacing: 1px; } +kbd { + display: inline-block; + vertical-align: center; + font-size: 0.75em; + padding: 2px 3px; +} + .tour-subheading { font-size: 24px; font-weight: bold; From 0bf61f9248ad674571684d4bed175603aaeb8a93 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Tue, 10 Sep 2024 00:24:15 -0400 Subject: [PATCH 06/40] EDSC-4162 Updating tour based on logged in status --- static/src/js/components/Tour/SearchTour.jsx | 388 +++++++++++-------- 1 file changed, 224 insertions(+), 164 deletions(-) diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index e005f84275..103cdd9b99 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -8,10 +8,11 @@ import EDSCIcon from '../../components/EDSCIcon/EDSCIcon' import './SearchTour.scss' const SearchTour = ({ runTour, setRunTour }) => { - const MAX_STEPS = 14; - const [stepIndex, setStepIndex] = useState(0) const [dontShowAgain, setDontShowAgain] = useState(false) + const [isLoggedIn, setIsLoggedIn] = useState(false) + + const MAX_STEPS = isLoggedIn ? 14 : 12; useEffect(() => { const dontShowTour = localStorage.getItem('dontShowTour') @@ -21,6 +22,22 @@ const SearchTour = ({ runTour, setRunTour }) => { setDontShowAgain(dontShowTour === 'true') }, [setRunTour]) + useEffect(() => { + const handleKeyDown = (event) => { + if (event.key === 'ArrowRight') { + setStepIndex((prevIndex) => Math.min(prevIndex + 1, MAX_STEPS + 1)) + } else if (event.key === 'ArrowLeft') { + setStepIndex((prevIndex) => Math.max(prevIndex - 1, 0)) + } + } + + window.addEventListener('keydown', handleKeyDown) + + return () => { + window.removeEventListener('keydown', handleKeyDown) + } + }, [MAX_STEPS]) + useEffect(() => { if (runTour) { console.log('Tour started') @@ -51,6 +68,210 @@ const SearchTour = ({ runTour, setRunTour }) => {

) + const loggedInSteps = [ + { + target: '.secondary-toolbar__user-dropdown-toggle', + content: ( +
+ +

+ When logged in, use this menu to set preferences, saved projects, subscriptions, download status and history, or log out. +

+
+ + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + }, + }, + { + target: '.secondary-toolbar__project-name-dropdown-toggle', + content: ( +
+ +

+ Click Save Project to create a project using your current search criteria. Once a project is created, any added collections and granules can be viewed by clicking My Project. +

+
+ + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + }, + }, + ] + + const finalSteps = [ + { + target: '.secondary-toolbar__begin-tour-button', + content: ( +
+ +

+ You can replay this tour anytime by clicking Show Tour. +

+
+ + + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + }, + }, + { + target: '.search', + content: ( +
+

+ Want to learn more? +

+

+ Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. +

+ +
+ Webinar Thumbnail +
+
+
+ Discover and Access Earth Science Data Using Earthdata Search +
+

+ Watch the webinar +

+ +
+ +

+ Find more information here: +

+

+ + Earthdata Search wiki + +

+

+ + Earthdata Search FAQs + +

+
+ ), + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: '600px', + padding: '20px', + }, + tooltipContent: { + fontSize: '16px', + }, + }, + }, + ] const steps = [ { @@ -237,7 +458,6 @@ const SearchTour = ({ runTour, setRunTour }) => { }, } }, - { target: '.spatial-selection-dropdown', content: ( @@ -284,7 +504,6 @@ const SearchTour = ({ runTour, setRunTour }) => { }, } }, - { target: '.search-form__button--advanced-search', content: ( @@ -585,166 +804,7 @@ const SearchTour = ({ runTour, setRunTour }) => { }, }, }, - { - target: '.secondary-toolbar__user-dropdown-toggle', - content: ( -
- -

- When logged in, use this menu to set preferences, saved projects, subscriptions, download status and history, or log out. -

-
- - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px', - }, - }, - }, - { - target: '.secondary-toolbar__begin-tour-button', - content: ( -
- -

- You can replay this tour anytime by clicking Show Tour. -

-
- - - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px', - }, - }, - }, - { - target: '.search', - content: ( -
-

- Want to learn more? -

-

- Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. -

- -
- Webinar Thumbnail -
-
-
- Discover and Access Earth Science Data Using Earthdata Search -
-

- Watch the webinar -

- -
- -

- Find more information here: -

-

- - Earthdata Search wiki - -

-

- - Earthdata Search FAQs - -

-
- ), - disableBeacon: true, - placement: 'center', - styles: { - tooltip: { - width: '600px', - padding: '20px', - }, - tooltipContent: { - fontSize: '16px', - }, - }, - }, + ...(isLoggedIn ? [...loggedInSteps, ...finalSteps] : finalSteps), ] const handleJoyrideCallback = (data) => { From f6161597c53cd5f58df8986342d3933edd6e969c Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 11 Sep 2024 11:13:11 -0400 Subject: [PATCH 07/40] EDSC-4162 Updating tour steps --- static/src/js/components/Tour/SearchTour.jsx | 334 +++++++------------ 1 file changed, 126 insertions(+), 208 deletions(-) diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index 103cdd9b99..48309dfa0d 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -10,9 +10,8 @@ import './SearchTour.scss' const SearchTour = ({ runTour, setRunTour }) => { const [stepIndex, setStepIndex] = useState(0) const [dontShowAgain, setDontShowAgain] = useState(false) - const [isLoggedIn, setIsLoggedIn] = useState(false) - const MAX_STEPS = isLoggedIn ? 14 : 12; + const MAX_STEPS = 12 useEffect(() => { const dontShowTour = localStorage.getItem('dontShowTour') @@ -68,211 +67,6 @@ const SearchTour = ({ runTour, setRunTour }) => {

) - const loggedInSteps = [ - { - target: '.secondary-toolbar__user-dropdown-toggle', - content: ( -
- -

- When logged in, use this menu to set preferences, saved projects, subscriptions, download status and history, or log out. -

-
- - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px', - }, - }, - }, - { - target: '.secondary-toolbar__project-name-dropdown-toggle', - content: ( -
- -

- Click Save Project to create a project using your current search criteria. Once a project is created, any added collections and granules can be viewed by clicking My Project. -

-
- - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px', - }, - }, - }, - ] - - const finalSteps = [ - { - target: '.secondary-toolbar__begin-tour-button', - content: ( -
- -

- You can replay this tour anytime by clicking Show Tour. -

-
- - - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px', - }, - }, - }, - { - target: '.search', - content: ( -
-

- Want to learn more? -

-

- Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. -

- -
- Webinar Thumbnail -
-
-
- Discover and Access Earth Science Data Using Earthdata Search -
-

- Watch the webinar -

- -
- -

- Find more information here: -

-

- - Earthdata Search wiki - -

-

- - Earthdata Search FAQs - -

-
- ), - disableBeacon: true, - placement: 'center', - styles: { - tooltip: { - width: '600px', - padding: '20px', - }, - tooltipContent: { - fontSize: '16px', - }, - }, - }, - ] - const steps = [ { target: '.search', @@ -804,7 +598,131 @@ const SearchTour = ({ runTour, setRunTour }) => { }, }, }, - ...(isLoggedIn ? [...loggedInSteps, ...finalSteps] : finalSteps), + { + target: '.secondary-toolbar__begin-tour-button', + content: ( +
+ +

+ You can replay this tour anytime by clicking Show Tour. +

+
+ + + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px', + }, + }, + }, + { + target: '.search', + content: ( +
+

+ Want to learn more? +

+

+ Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. +

+ +
+ Webinar Thumbnail +
+
+
+ Discover and Access Earth Science Data Using Earthdata Search +
+

+ Watch the webinar +

+ +
+ +

+ Find more information here: +

+

+ + Earthdata Search wiki + +

+

+ + Earthdata Search FAQs + +

+
+ ), + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: '600px', + padding: '20px', + }, + tooltipContent: { + fontSize: '16px', + }, + }, + }, ] const handleJoyrideCallback = (data) => { From fccbe18da6375257ad17a41e4b46b19cf6d6b1ee Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 11 Sep 2024 15:30:58 -0400 Subject: [PATCH 08/40] EDSC-4162 Styling changes and auto-start of the tour for new users --- static/src/js/App.jsx | 2 +- static/src/js/components/Tour/SearchTour.jsx | 46 ++++++++------------ 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index cf2ec8e108..53d406a9d3 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -74,7 +74,7 @@ class App extends Component { constructor(props) { super(props) this.state = { - runTour: false, + runTour: localStorage.getItem('dontShowTour') !== 'true', } this.store = configureStore() const { edscHost } = getEnvironmentConfig() diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index 48309dfa0d..6ea53d754d 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -1,15 +1,15 @@ import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import Joyride, { STATUS, ACTIONS } from 'react-joyride' -import { FaExternalLinkAlt, FaInfoCircle, FaPlus } from 'react-icons/fa' +import { FaInfoCircle, FaPlus } from 'react-icons/fa' import Button from '../Button/Button' import TourThumbnail from '../../../assets/images/tour-video-thumbnail.png' import EDSCIcon from '../../components/EDSCIcon/EDSCIcon' +import ExternalLink from '../ExternalLink/ExternalLink' import './SearchTour.scss' const SearchTour = ({ runTour, setRunTour }) => { const [stepIndex, setStepIndex] = useState(0) - const [dontShowAgain, setDontShowAgain] = useState(false) const MAX_STEPS = 12 @@ -18,7 +18,6 @@ const SearchTour = ({ runTour, setRunTour }) => { if (dontShowTour === 'true') { setRunTour(false) } - setDontShowAgain(dontShowTour === 'true') }, [setRunTour]) useEffect(() => { @@ -39,9 +38,11 @@ const SearchTour = ({ runTour, setRunTour }) => { useEffect(() => { if (runTour) { + localStorage.setItem('dontShowTour', 'false') console.log('Tour started') setStepIndex(0) } else { + localStorage.setItem('dontShowTour', 'true') console.log('Tour stopped') } }, [runTour]) @@ -55,12 +56,6 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [stepIndex]) - const handleDontShowAgainChange = (e) => { - const checked = e.target.checked - setDontShowAgain(checked) - localStorage.setItem('dontShowTour', checked.toString()) - } - const StepCounter = ({ currentStep, totalSteps }) => (

{currentStep} OF {totalSteps} @@ -169,8 +164,10 @@ const SearchTour = ({ runTour, setRunTour }) => { As you type, suggestions for matching topics and keywords will be displayed. When selected, they will be applied as additional search filters.

-

Find more information about the  - Common Metadata Repository (CMR) +

Find more information about the {' '} + + Common Metadata Repository (CMR) +

@@ -649,12 +646,8 @@ const SearchTour = ({ runTour, setRunTour }) => {

Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search.

- { textDecoration: 'none', color: '#000', display: 'flex', - alignItems: 'center' + alignItems: 'center', }} >
- Webinar Thumbnail

Find more information here:

Date: Wed, 11 Sep 2024 15:40:20 -0400 Subject: [PATCH 09/40] EDSC-4162 ensuring tour loads after page mounts --- static/src/js/App.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 53d406a9d3..57f71df812 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -74,7 +74,7 @@ class App extends Component { constructor(props) { super(props) this.state = { - runTour: localStorage.getItem('dontShowTour') !== 'true', + runTour: false, } this.store = configureStore() const { edscHost } = getEnvironmentConfig() @@ -85,6 +85,13 @@ class App extends Component { this.setRunTour = this.setRunTour.bind(this) } + componentDidMount() { + const dontShowTour = localStorage.getItem('dontShowTour') !== 'true'; + this.setState({ + runTour: dontShowTour + }); + } + startTour() { this.setState({ runTour: true }) } From f7e16aac01cae0c21bb029df5ed6d35cab4e1a08 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 12 Sep 2024 10:48:09 -0400 Subject: [PATCH 10/40] EDSC-4162 Updating tour and adding tests --- static/src/js/components/Tour/SearchTour.jsx | 319 ++++-------------- .../Tour/__tests__/SearchTour.test.js | 69 ++++ 2 files changed, 126 insertions(+), 262 deletions(-) create mode 100644 static/src/js/components/Tour/__tests__/SearchTour.test.js diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index 6ea53d754d..b4d9bb32e9 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -34,17 +34,14 @@ const SearchTour = ({ runTour, setRunTour }) => { return () => { window.removeEventListener('keydown', handleKeyDown) } - }, [MAX_STEPS]) + }, []) useEffect(() => { if (runTour) { - localStorage.setItem('dontShowTour', 'false') - console.log('Tour started') setStepIndex(0) - } else { - localStorage.setItem('dontShowTour', 'true') - console.log('Tour stopped') } + + localStorage.setItem('dontShowTour', runTour ? 'false' : 'true'); }, [runTour]) useEffect(() => { @@ -56,12 +53,37 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [stepIndex]) - const StepCounter = ({ currentStep, totalSteps }) => ( + const StepCounter = ({ currentStep }) => (

- {currentStep} OF {totalSteps} + {currentStep} OF {MAX_STEPS}

) + const TourButtons = () => ( +
+ + +
+ ) + const steps = [ { target: '.search', @@ -109,35 +131,14 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar__inner', content: (
- +

This area contains the filters used when searching for collections (datasets produced by an organization) and their granules (sets of files containing data).

Available filters include keyword search, spatial and temporal bounds, and advanced search options.

-
- - -
+
), placement: 'right', @@ -156,7 +157,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.search-form__primary', content: (
- +

Search for collections by topic (e.g., "Land Surface Temperature"), by collection name, or by CMR Concept ID.

@@ -170,28 +171,7 @@ const SearchTour = ({ runTour, setRunTour }) => {

-
- - -
+
), placement: 'right', @@ -210,31 +190,14 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.temporal-selection-dropdown', content: (
- +

Use the temporal filters to limit search results to a specific date and time range.

A recurring filter can be applied to search a repeating range between specified years.

-
- - -
+
), placement: 'right', @@ -253,7 +216,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.spatial-selection-dropdown', content: (
- +

Use the spatial filters to limit search results to the specified area of interest.

@@ -263,24 +226,7 @@ const SearchTour = ({ runTour, setRunTour }) => {

Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with a file.

-
- - -
+
), placement: 'right', @@ -299,28 +245,11 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.search-form__button--advanced-search', content: (
- +

Use Advanced Search parameters to filter results using features like Hydrologic Unit Code (HUC) or SWORD River Reach.

-
- - -
+
), placement: 'right', @@ -339,32 +268,11 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar-browse-portals', content: (
- +

Choose a portal to refine search results to a particular area of study, project, or organization.

-
- - -
+
), placement: 'right', @@ -379,32 +287,11 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.sidebar-section-body', content: (
- +

Refine your search further using categories like Features, Keywords, Platforms, Organizations, etc.

-
- - -
+
), placement: 'right-start', @@ -419,7 +306,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panel-section', content: (
- +

A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. To view more information about a collection, click the icon. @@ -429,28 +316,7 @@ const SearchTour = ({ runTour, setRunTour }) => { To add a collection to your project, click the icon. To add individual granules to a project, click on a search result to view and add its granules.

-
- - -
+
), placement: 'right', @@ -468,7 +334,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.panels__handle', content: (
- +

To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the ] key.

@@ -477,28 +343,7 @@ const SearchTour = ({ runTour, setRunTour }) => { All keyboard shortcuts can be displayed by pressing the ? key at any time.

-
- - -
+
), placement: 'right', @@ -512,35 +357,14 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.right-overlay', content: (
- +

Pan the map by clicking and dragging, and zoom by using the scroll wheel or map tools.

When a collection is selected, the granules will be displayed on the map, along with any available GIBS imagery. When a granule is focused on the map, any additional thumbnails will be displayed.

-
- - -
+
), placement: 'left', @@ -555,32 +379,11 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.leaflet-bottom.leaflet-right', content: (
- +

Use the map tools to switch map projections, draw, edit, or remove spatial bounds, zoom the map, or select the base map.

-
- - -
+
), placement: 'left', @@ -599,7 +402,7 @@ const SearchTour = ({ runTour, setRunTour }) => { target: '.secondary-toolbar__begin-tour-button', content: (
- +

You can replay this tour anytime by clicking Show Tour.

@@ -625,7 +428,6 @@ const SearchTour = ({ runTour, setRunTour }) => { > Finish Tour -
), @@ -718,23 +520,16 @@ const SearchTour = ({ runTour, setRunTour }) => { const handleJoyrideCallback = (data) => { const { action, index, status, type } = data - // Reset tour state when the tour is finished, skipped, paused, or closed if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) || action === ACTIONS.CLOSE) { setRunTour(false) - setStepIndex(0); - console.log - } else if (type === 'step:after' && action === ACTIONS.NEXT) { - setStepIndex(index + 1) - } else if (type === 'step:after' && action === ACTIONS.PREV) { - setStepIndex(index - 1) + setStepIndex(0) + } else if (type === 'step:after') { + setStepIndex(action === ACTIONS.NEXT ? index + 1 : index - 1) } - // Prevent auto-scrolling within the sidebar component when highlighting if (type === 'step:before') { const element = document.querySelector('.sidebar-section-body') - if (element) { - element.scrollTop = 0 - } + if (element) element.scrollTop = 0 } } diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js new file mode 100644 index 0000000000..b6590c694d --- /dev/null +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -0,0 +1,69 @@ +import React from 'react' +import { render, screen, fireEvent } from '@testing-library/react' +import '@testing-library/jest-dom/extend-expect' +import SearchTour from './SearchTour' + +describe('SearchTour component', () => { + const mockSetRunTour = jest.fn() + + beforeEach(() => { + mockSetRunTour.mockClear() + localStorage.clear() + }) + + test('renders the SearchTour component', () => { + render() + expect(screen.getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() + }) + + test('displays the step counter', () => { + render() + expect(screen.getByText(/1 OF 12/i)).toBeInTheDocument() + }) + + test('navigates to the next step', () => { + render() + + const nextButton = screen.getByText(/Take the tour/i) + fireEvent.click(nextButton) + + expect(screen.getByText(/2 OF 12/i)).toBeInTheDocument() + }) + + test('skips the tour when "Skip for now" is clicked', () => { + render() + + const skipButton = screen.getByText(/Skip for now/i) + fireEvent.click(skipButton) + + expect(mockSetRunTour).toHaveBeenCalledWith(false) + }) + + test('sets "dontShowTour" in localStorage when tour is started', () => { + render() + + expect(localStorage.getItem('dontShowTour')).toBe('false') + }) + + test('removes tour on finish', () => { + render() + + const nextButton = screen.getByText(/Take the tour/i) + fireEvent.click(nextButton) + fireEvent.click(nextButton) + + const finishButton = screen.getByText(/Finish Tour/i) + fireEvent.click(finishButton) + + expect(mockSetRunTour).toHaveBeenCalledWith(false) + }) + + test('handles arrow key navigation', () => { + render() + + // Simulate pressing the right arrow key + fireEvent.keyDown(window, { key: 'ArrowRight' }) + + expect(screen.getByText(/2 OF 12/i)).toBeInTheDocument() + }) +}) From d8c39c28ff42e4a0947afbec525898b37f8e17ad Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 12 Sep 2024 10:58:29 -0400 Subject: [PATCH 11/40] EDSC-4162 Styling changes --- .../Tour/__tests__/SearchTour.test.js | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index b6590c694d..187ec1bc9e 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,7 +1,11 @@ import React from 'react' -import { render, screen, fireEvent } from '@testing-library/react' +import { + render, + screen, + fireEvent +} from '@testing-library/react' import '@testing-library/jest-dom/extend-expect' -import SearchTour from './SearchTour' +import SearchTour from '../SearchTour' describe('SearchTour component', () => { const mockSetRunTour = jest.fn() @@ -12,17 +16,17 @@ describe('SearchTour component', () => { }) test('renders the SearchTour component', () => { - render() + render() expect(screen.getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() }) test('displays the step counter', () => { - render() + render() expect(screen.getByText(/1 OF 12/i)).toBeInTheDocument() }) test('navigates to the next step', () => { - render() + render() const nextButton = screen.getByText(/Take the tour/i) fireEvent.click(nextButton) @@ -31,7 +35,7 @@ describe('SearchTour component', () => { }) test('skips the tour when "Skip for now" is clicked', () => { - render() + render() const skipButton = screen.getByText(/Skip for now/i) fireEvent.click(skipButton) @@ -40,13 +44,13 @@ describe('SearchTour component', () => { }) test('sets "dontShowTour" in localStorage when tour is started', () => { - render() + render() expect(localStorage.getItem('dontShowTour')).toBe('false') }) test('removes tour on finish', () => { - render() + render() const nextButton = screen.getByText(/Take the tour/i) fireEvent.click(nextButton) @@ -59,7 +63,7 @@ describe('SearchTour component', () => { }) test('handles arrow key navigation', () => { - render() + render() // Simulate pressing the right arrow key fireEvent.keyDown(window, { key: 'ArrowRight' }) From f5921cd99fc9877fe5468a2a4bf4240161b13955 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 12 Sep 2024 16:23:03 -0400 Subject: [PATCH 12/40] EDSC-4162 Syntax fixing --- static/src/js/App.jsx | 15 +- static/src/js/components/Panels/Panels.jsx | 2 +- .../SecondaryToolbar/SecondaryToolbar.jsx | 26 +- static/src/js/components/Tour/SearchTour.jsx | 387 ++++++++++++------ .../Tour/__tests__/SearchTour.test.js | 98 ++--- 5 files changed, 313 insertions(+), 215 deletions(-) diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 57f71df812..460ff8a086 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -74,8 +74,9 @@ class App extends Component { constructor(props) { super(props) this.state = { - runTour: false, + runTour: false } + this.store = configureStore() const { edscHost } = getEnvironmentConfig() const { env } = getApplicationConfig() @@ -86,20 +87,20 @@ class App extends Component { } componentDidMount() { - const dontShowTour = localStorage.getItem('dontShowTour') !== 'true'; + const dontShowTour = localStorage.getItem('dontShowTour') !== 'true' this.setState({ runTour: dontShowTour - }); - } - - startTour() { - this.setState({ runTour: true }) + }) } setRunTour(value) { this.setState({ runTour: value }) } + startTour() { + this.setState({ runTour: true }) + } + // Portal paths have been removed, but this needs to stay in order to redirect users using // a path to the param based portal portalPaths(path) { diff --git a/static/src/js/components/Panels/Panels.jsx b/static/src/js/components/Panels/Panels.jsx index 841241dae8..9a1f26aeb2 100644 --- a/static/src/js/components/Panels/Panels.jsx +++ b/static/src/js/components/Panels/Panels.jsx @@ -652,7 +652,7 @@ export class Panels extends PureComponent {
{focusedMeta}
-
+
) } diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index 641af0fd39..9d33700abd 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -13,10 +13,9 @@ import { parse } from 'qs' import { FaArrowCircleLeft, FaFolder, - FaWalking, FaLock, FaSave, - FaUser, + FaUser } from 'react-icons/fa' import { deployedEnvironment } from '../../../../../sharedUtils/deployedEnvironment' @@ -323,16 +322,18 @@ class SecondaryToolbar extends Component { onToggle={this.onToggleProjectDropdown} alignRight > - {location.pathname === '/search' && ( - - Start Tour - - )} + { + location.pathname === '/search' && ( + + Start Tour + + ) + } { setStepIndex(0) } - localStorage.setItem('dontShowTour', runTour ? 'false' : 'true'); + localStorage.setItem('dontShowTour', runTour ? 'false' : 'true') }, [runTour]) useEffect(() => { - if (stepIndex === 6) { // Scrolling to the top to ensure "Browse Portals" is visible. + if (stepIndex === 6) { // Scrolling to the top to ensure "Browse Portals" is visible. const element = document.querySelector('.sidebar__content .simplebar-content-wrapper') if (element) { element.scrollTop = 0 @@ -55,7 +55,10 @@ const SearchTour = ({ runTour, setRunTour }) => { const StepCounter = ({ currentStep }) => (

- {currentStep} OF {MAX_STEPS} + {currentStep} + {' '} + OF + {MAX_STEPS}

) @@ -65,9 +68,11 @@ const SearchTour = ({ runTour, setRunTour }) => { type="button" bootstrapVariant="secondary" bootstrapSize="sm" - onClick={() => { - setStepIndex(stepIndex - 1) - }} + onClick={ + () => { + setStepIndex(stepIndex - 1) + } + } > Previous @@ -75,9 +80,11 @@ const SearchTour = ({ runTour, setRunTour }) => { type="button" bootstrapVariant="primary" bootstrapSize="sm" - onClick={() => { - setStepIndex(stepIndex + 1) - }} + onClick={ + () => { + setStepIndex(stepIndex + 1) + } + } > Next @@ -95,7 +102,11 @@ const SearchTour = ({ runTour, setRunTour }) => { Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn how to search for data, use the map, create your first project, and manage your preferences.

- If you want to skip the tour for now, it is always available by clicking Show Tour at the top of the page. + If you want to skip the tour for now, it is always available by clicking + {' '} + Show Tour + {' '} + at the top of the page.

@@ -114,10 +127,12 @@ const SearchTour = ({ runTour, setRunTour }) => { type="button" bootstrapVariant="secondary" bootstrapSize="sm" - onClick={() => { - setRunTour(false) - setStepIndex(0) - }} + onClick={ + () => { + setRunTour(false) + setStepIndex(0) + } + } > Skip for now @@ -125,7 +140,7 @@ const SearchTour = ({ runTour, setRunTour }) => {
), disableBeacon: true, - placement: 'center', + placement: 'center' }, { target: '.sidebar__inner', @@ -144,13 +159,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, + lineHeight: '1.5' + } } }, { @@ -165,7 +180,9 @@ const SearchTour = ({ runTour, setRunTour }) => { As you type, suggestions for matching topics and keywords will be displayed. When selected, they will be applied as additional search filters.

-

Find more information about the {' '} +

+ Find more information about the + {' '} Common Metadata Repository (CMR) @@ -177,13 +194,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, + lineHeight: '1.5' + } } }, { @@ -203,13 +220,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, + lineHeight: '1.5' + } } }, { @@ -232,13 +249,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, + lineHeight: '1.5' + } } }, { @@ -255,13 +272,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, + lineHeight: '1.5' + } } }, { @@ -279,9 +296,9 @@ const SearchTour = ({ runTour, setRunTour }) => { disableScrolling: true, styles: { tooltip: { - width: '400px', - }, - }, + width: '400px' + } + } }, { target: '.sidebar-section-body', @@ -298,9 +315,9 @@ const SearchTour = ({ runTour, setRunTour }) => { disableScrolling: true, styles: { tooltip: { - width: '400px', - }, - }, + width: '400px' + } + } }, { target: '.panel-section', @@ -308,12 +325,20 @@ const SearchTour = ({ runTour, setRunTour }) => {

- A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. - To view more information about a collection, click the icon. + A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. + To view more information about a collection, click the + {' '} + + {' '} + icon.

- Add granules to a project and customize options before accessing the data. - To add a collection to your project, click the icon. + Add granules to a project and customize options before accessing the data. + To add a collection to your project, click the + {' '} + + {' '} + icon. To add individual granules to a project, click on a search result to view and add its granules.

@@ -322,13 +347,13 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', - }, + width: '400px' + } }, floaterProps: { disableFlip: true, - offset: 10, - }, + offset: 10 + } }, { target: '.panels__handle', @@ -336,11 +361,19 @@ const SearchTour = ({ runTour, setRunTour }) => {

- To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the ] key. + To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the + {' '} + ] + {' '} + key.

- All keyboard shortcuts can be displayed by pressing the ? key at any time. + All keyboard shortcuts can be displayed by pressing the + {' '} + ? + {' '} + key at any time.

@@ -349,19 +382,31 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', - }, - }, + width: '400px' + } + } }, { target: '.right-overlay', content: (
-

+

Pan the map by clicking and dragging, and zoom by using the scroll wheel or map tools.

-

+

When a collection is selected, the granules will be displayed on the map, along with any available GIBS imagery. When a granule is focused on the map, any additional thumbnails will be displayed.

@@ -371,9 +416,9 @@ const SearchTour = ({ runTour, setRunTour }) => { styles: { tooltip: { width: '400px', - textAlign: 'left', - }, - }, + textAlign: 'left' + } + } }, { target: '.leaflet-bottom.leaflet-right', @@ -389,14 +434,14 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'left', styles: { tooltip: { - width: '400px', + width: '400px' }, tooltipContent: { fontSize: '14px', textAlign: 'left', - lineHeight: '1.5', - }, - }, + lineHeight: '1.5' + } + } }, { target: '.secondary-toolbar__begin-tour-button', @@ -404,16 +449,21 @@ const SearchTour = ({ runTour, setRunTour }) => {

- You can replay this tour anytime by clicking Show Tour. + You can replay this tour anytime by clicking + {' '} + Show Tour + .

@@ -422,9 +472,11 @@ const SearchTour = ({ runTour, setRunTour }) => { type="button" bootstrapVariant="primary" bootstrapSize="sm" - onClick={() => { - setStepIndex(stepIndex + 1) - }} + onClick={ + () => { + setStepIndex(stepIndex + 1) + } + } > Finish Tour @@ -434,51 +486,101 @@ const SearchTour = ({ runTour, setRunTour }) => { placement: 'right', styles: { tooltip: { - width: '400px', - }, - }, + width: '400px' + } + } }, { target: '.search', content: (
-

+

Want to learn more?

-

+

Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search.

-
+
Webinar Thumbnail
-
+
Discover and Access Earth Science Data Using Earthdata Search
-

+

Watch the webinar

-

+

Find more information here:

@@ -486,7 +588,14 @@ const SearchTour = ({ runTour, setRunTour }) => { href="https://www.earthdata.nasa.gov/learn/earthdata-search" target="_blank" rel="noopener noreferrer" - style={{ color: '#5a585a', textDecoration: 'underline', marginBottom: '5px', display: 'block' }} + style={ + { + color: '#5a585a', + textDecoration: 'underline', + marginBottom: '5px', + display: 'block' + } + } > Earthdata Search wiki @@ -496,7 +605,13 @@ const SearchTour = ({ runTour, setRunTour }) => { href="https://www.earthdata.nasa.gov/faq/earthdata-search-faq" target="_blank" rel="noopener noreferrer" - style={{ color: '#5a585a', textDecoration: 'underline', display: 'block' }} + style={ + { + color: '#5a585a', + textDecoration: 'underline', + display: 'block' + } + } > Earthdata Search FAQs @@ -508,25 +623,27 @@ const SearchTour = ({ runTour, setRunTour }) => { styles: { tooltip: { width: '600px', - padding: '20px', + padding: '20px' }, tooltipContent: { - fontSize: '16px', - }, - }, - }, + fontSize: '16px' + } + } + } ] const handleJoyrideCallback = (data) => { - const { action, index, status, type } = data - + const { + action, index, status, type + } = data + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) || action === ACTIONS.CLOSE) { setRunTour(false) setStepIndex(0) } else if (type === 'step:after') { setStepIndex(action === ACTIONS.NEXT ? index + 1 : index - 1) } - + if (type === 'step:before') { const element = document.querySelector('.sidebar-section-body') if (element) element.scrollTop = 0 @@ -540,45 +657,49 @@ const SearchTour = ({ runTour, setRunTour }) => { stepIndex={stepIndex} continuous callback={handleJoyrideCallback} - hideBackButton={true} - styles={{ - options: { - primaryColor: '#007bff', - zIndex: 10000, - textAlign: 'left', - width: '600px', - }, - tooltip: { - fontSize: '16px', - padding: '20px', - paddingTop: '0px', - textAlign: 'left', - }, - tooltipContent: { - textAlign: 'left', - }, - buttonNext: { - // Hide the next button since we use custom buttons - display: 'none' - }, - }} - floaterProps={{ - disableAnimation: true, - styles: { - button: { - borderRadius: '4px', - padding: '8px 16px', - fontSize: '14px', + hideBackButton + styles={ + { + options: { + primaryColor: '#007bff', + zIndex: 10000, + textAlign: 'left', + width: '600px' }, - }, - }} + tooltip: { + fontSize: '16px', + padding: '20px', + paddingTop: '0px', + textAlign: 'left' + }, + tooltipContent: { + textAlign: 'left' + }, + buttonNext: { + // Hide the next button since we use custom buttons + display: 'none' + } + } + } + floaterProps={ + { + disableAnimation: true, + styles: { + button: { + borderRadius: '4px', + padding: '8px 16px', + fontSize: '14px' + } + } + } + } /> ) } SearchTour.propTypes = { runTour: PropTypes.bool.isRequired, - setRunTour: PropTypes.func.isRequired, + setRunTour: PropTypes.func.isRequired } -export default SearchTour \ No newline at end of file +export default SearchTour diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index 187ec1bc9e..eed5adfde9 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,73 +1,47 @@ import React from 'react' -import { - render, - screen, - fireEvent -} from '@testing-library/react' +import { render, screen, act } from '@testing-library/react' +import userEvent from '@testing-library/user-event' import '@testing-library/jest-dom/extend-expect' import SearchTour from '../SearchTour' -describe('SearchTour component', () => { - const mockSetRunTour = jest.fn() - - beforeEach(() => { - mockSetRunTour.mockClear() - localStorage.clear() - }) - - test('renders the SearchTour component', () => { - render() - expect(screen.getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() - }) - - test('displays the step counter', () => { - render() - expect(screen.getByText(/1 OF 12/i)).toBeInTheDocument() +// Mock the react-joyride module +jest.mock('react-joyride', () => { + return jest.fn().mockImplementation(({ callback }) => { + return ( +

callback({ + action: 'close', + status: 'FINISHED', + index: 0, + type: 'step:after' + })} + > + Mocked Joyride +
+ ) }) +}) - test('navigates to the next step', () => { - render() - - const nextButton = screen.getByText(/Take the tour/i) - fireEvent.click(nextButton) - - expect(screen.getByText(/2 OF 12/i)).toBeInTheDocument() - }) - - test('skips the tour when "Skip for now" is clicked', () => { - render() - - const skipButton = screen.getByText(/Skip for now/i) - fireEvent.click(skipButton) - - expect(mockSetRunTour).toHaveBeenCalledWith(false) - }) - - test('sets "dontShowTour" in localStorage when tour is started', () => { - render() - - expect(localStorage.getItem('dontShowTour')).toBe('false') - }) - - test('removes tour on finish', () => { - render() - - const nextButton = screen.getByText(/Take the tour/i) - fireEvent.click(nextButton) - fireEvent.click(nextButton) +// Mock the local storage +const localStorageMock = { + getItem: jest.fn(), + setItem: jest.fn(), + clear: jest.fn() +} +global.localStorage = localStorageMock - const finishButton = screen.getByText(/Finish Tour/i) - fireEvent.click(finishButton) +describe('SearchTour', () => { + const mockSetRunTour = jest.fn() - expect(mockSetRunTour).toHaveBeenCalledWith(false) + beforeEach(() => { + jest.clearAllMocks() }) - test('handles arrow key navigation', () => { - render() - - // Simulate pressing the right arrow key - fireEvent.keyDown(window, { key: 'ArrowRight' }) - - expect(screen.getByText(/2 OF 12/i)).toBeInTheDocument() + describe('when rendered', () => { + it('displays the tour component', () => { + render() + expect(screen.getByTestId('mocked-joyride')).toBeInTheDocument() + }) }) -}) +}) \ No newline at end of file From 87c6497fb62d507770e9427392e8d6a219a17120 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 12 Sep 2024 16:52:58 -0400 Subject: [PATCH 13/40] EDSC-4162 Syntax fixes --- .../Tour/__tests__/SearchTour.test.js | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index eed5adfde9..0ce6eb69c8 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,28 +1,8 @@ import React from 'react' -import { render, screen, act } from '@testing-library/react' -import userEvent from '@testing-library/user-event' +import { render, screen } from '@testing-library/react' import '@testing-library/jest-dom/extend-expect' import SearchTour from '../SearchTour' -// Mock the react-joyride module -jest.mock('react-joyride', () => { - return jest.fn().mockImplementation(({ callback }) => { - return ( -
callback({ - action: 'close', - status: 'FINISHED', - index: 0, - type: 'step:after' - })} - > - Mocked Joyride -
- ) - }) -}) - // Mock the local storage const localStorageMock = { getItem: jest.fn(), @@ -40,8 +20,8 @@ describe('SearchTour', () => { describe('when rendered', () => { it('displays the tour component', () => { - render() + render() expect(screen.getByTestId('mocked-joyride')).toBeInTheDocument() }) }) -}) \ No newline at end of file +}) From 19672aa96b80ec63223947984acc7cdaa9ab357e Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 12 Sep 2024 17:04:57 -0400 Subject: [PATCH 14/40] EDSC-4162 Syntax shuffling --- static/src/js/components/Tour/SearchTour.jsx | 149 +++++++++++-------- 1 file changed, 88 insertions(+), 61 deletions(-) diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index dfe1f6ed7b..e09eae3b99 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -8,9 +8,48 @@ import EDSCIcon from '../EDSCIcon/EDSCIcon' import ExternalLink from '../ExternalLink/ExternalLink' import './SearchTour.scss' +const StepCounter = ({ currentStep, maxSteps }) => ( +

+ {currentStep} + {' '} + OF + {maxSteps} +

+) + +StepCounter.propTypes = { + currentStep: PropTypes.number.isRequired, + maxSteps: PropTypes.number.isRequired +} + +const TourButtons = ({ stepIndex, setStepIndex }) => ( +
+ + +
+) + +TourButtons.propTypes = { + stepIndex: PropTypes.number.isRequired, + setStepIndex: PropTypes.func.isRequired +} + const SearchTour = ({ runTour, setRunTour }) => { const [stepIndex, setStepIndex] = useState(0) - const MAX_STEPS = 12 useEffect(() => { @@ -53,44 +92,6 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [stepIndex]) - const StepCounter = ({ currentStep }) => ( -

- {currentStep} - {' '} - OF - {MAX_STEPS} -

- ) - - const TourButtons = () => ( -
- - -
- ) - const steps = [ { target: '.search', @@ -99,7 +100,9 @@ const SearchTour = ({ runTour, setRunTour }) => {

Welcome to Earthdata Search!

Let’s start with a quick tour...

- Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn how to search for data, use the map, create your first project, and manage your preferences. + Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn + how to search for data, use the map, create your first project, and manage your + preferences.

If you want to skip the tour for now, it is always available by clicking @@ -148,10 +151,13 @@ const SearchTour = ({ runTour, setRunTour }) => {

- This area contains the filters used when searching for collections (datasets produced by an organization) and their granules (sets of files containing data). + This area contains the filters used when searching for collections + (datasets produced by an organization) + and their granules (sets of files containing data).

- Available filters include keyword search, spatial and temporal bounds, and advanced search options. + Available filters include keyword search, spatial and temporal bounds, + and advanced search options.

@@ -174,10 +180,12 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Search for collections by topic (e.g., "Land Surface Temperature"), by collection name, or by CMR Concept ID. + Search for collections by topic (e.g., "Land Surface Temperature"), + by collection name, or by CMR Concept ID.

- As you type, suggestions for matching topics and keywords will be displayed. When selected, they will be applied as additional search filters. + As you type, suggestions for matching topics and keywords will be + displayed. When selected, they will be applied as additional search filters.

@@ -209,10 +217,12 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Use the temporal filters to limit search results to a specific date and time range. + Use the temporal filters to limit search results to a specific date + and time range.

- A recurring filter can be applied to search a repeating range between specified years. + A recurring filter can be applied to search a repeating range between + specified years.

@@ -235,13 +245,17 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Use the spatial filters to limit search results to the specified area of interest. + Use the spatial filters to limit search results to the specified + area of interest.

- To set the spatial area using a polygon, rectangle, point and radius, or circle, select an option from the menu and then draw on the map or manually enter coordinates. + To set the spatial area using a polygon, rectangle, point and radius, + or circle, select an option from the menu and then draw on the map + or manually enter coordinates.

- Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with a file. + Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with + a file.

@@ -264,7 +278,8 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Use Advanced Search parameters to filter results using features like Hydrologic Unit Code (HUC) or SWORD River Reach. + Use Advanced Search parameters to filter results using features like + Hydrologic Unit Code (HUC) or SWORD River Reach.

@@ -287,7 +302,8 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Choose a portal to refine search results to a particular area of study, project, or organization. + Choose a portal to refine search results to a particular area of study, + project, or organization.

@@ -306,7 +322,8 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Refine your search further using categories like Features, Keywords, Platforms, Organizations, etc. + Refine your search further using categories like Features, Keywords, + Platforms, Organizations, etc.

@@ -325,8 +342,9 @@ const SearchTour = ({ runTour, setRunTour }) => {

- A high-level description is displayed for each search result to help you find the right data, including a summary, temporal range, and information about capabilities. - To view more information about a collection, click the + A high-level description is displayed for each search result to help you find + the right data, including a summary, temporal range, and information about + capabilities. To view more information about a collection, click the {' '} {' '} @@ -339,7 +357,8 @@ const SearchTour = ({ runTour, setRunTour }) => { {' '} icon. - To add individual granules to a project, click on a search result to view and add its granules. + To add individual granules to a project, click on a search result to view and + add its granules.

@@ -361,7 +380,9 @@ const SearchTour = ({ runTour, setRunTour }) => {

- To make more room to view the map, the search results can be resized by clicking or dragging the bar above. The panel can be hidden or shown by clicking the handle or using the + To make more room to view the map, the search results can be resized by clicking + or dragging the bar above. The panel can be hidden or shown by clicking the + handle or using the {' '} ] {' '} @@ -398,7 +419,8 @@ const SearchTour = ({ runTour, setRunTour }) => { } } > - Pan the map by clicking and dragging, and zoom by using the scroll wheel or map tools. + Pan the map by clicking and dragging, and zoom by using the scroll wheel or + map tools.

{ } } > - When a collection is selected, the granules will be displayed on the map, along with any available GIBS imagery. When a granule is focused on the map, any additional thumbnails will be displayed. + When a collection is selected, the granules will be displayed on the map, + along with any available GIBS imagery. When a granule is focused on the + map, any additional thumbnails will be displayed.

@@ -426,7 +450,8 @@ const SearchTour = ({ runTour, setRunTour }) => {

- Use the map tools to switch map projections, draw, edit, or remove spatial bounds, zoom the map, or select the base map. + Use the map tools to switch map projections, draw, edit, or remove spatial + bounds, zoom the map, or select the base map.

@@ -513,7 +538,8 @@ const SearchTour = ({ runTour, setRunTour }) => { } } > - Check out our latest webinar where you will see a hands-on example of how to search for data in Earthdata Search. + Check out our latest webinar where you will see a hands-on example of + how to search for data in Earthdata Search.

{ action, index, status, type } = data - if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) || action === ACTIONS.CLOSE) { + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) + || action === ACTIONS.CLOSE) { setRunTour(false) setStepIndex(0) } else if (type === 'step:after') { From 8944a340fc6442823ed1ee563e531ea4c4d76186 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 2 Oct 2024 16:16:01 -0400 Subject: [PATCH 15/40] EDSC-4162 Adding Playwright test --- static/src/js/App.jsx | 4 +- static/src/js/components/Tour/SearchTour.jsx | 34 +++++++------ .../Tour/__tests__/SearchTour.test.js | 27 ----------- tests/e2e/tour/tour.spec.js | 48 +++++++++++++++++++ 4 files changed, 69 insertions(+), 44 deletions(-) delete mode 100644 static/src/js/components/Tour/__tests__/SearchTour.test.js create mode 100644 tests/e2e/tour/tour.spec.js diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 460ff8a086..6294d380ea 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -87,9 +87,9 @@ class App extends Component { } componentDidMount() { - const dontShowTour = localStorage.getItem('dontShowTour') !== 'true' + const shouldShowTour = localStorage.getItem('dontShowTour') !== 'true' && window.location.hostname !== 'localhost' this.setState({ - runTour: dontShowTour + runTour: shouldShowTour }) } diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index e09eae3b99..9f9ca804f6 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -8,18 +8,20 @@ import EDSCIcon from '../EDSCIcon/EDSCIcon' import ExternalLink from '../ExternalLink/ExternalLink' import './SearchTour.scss' -const StepCounter = ({ currentStep, maxSteps }) => ( +const TOTAL_STEPS = 12 + +const StepCounter = ({ currentStep }) => (

{currentStep} {' '} OF - {maxSteps} + {' '} + {TOTAL_STEPS}

) StepCounter.propTypes = { - currentStep: PropTypes.number.isRequired, - maxSteps: PropTypes.number.isRequired + currentStep: PropTypes.number.isRequired } const TourButtons = ({ stepIndex, setStepIndex }) => ( @@ -28,6 +30,7 @@ const TourButtons = ({ stepIndex, setStepIndex }) => ( type="button" bootstrapVariant="secondary" bootstrapSize="sm" + data-testid="tour-previous-button" onClick={() => setStepIndex(stepIndex - 1)} > Previous @@ -36,6 +39,7 @@ const TourButtons = ({ stepIndex, setStepIndex }) => ( type="button" bootstrapVariant="primary" bootstrapSize="sm" + data-testid="tour-next-button" onClick={() => setStepIndex(stepIndex + 1)} > Next @@ -159,7 +163,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Available filters include keyword search, spatial and temporal bounds, and advanced search options.

- +
), placement: 'right', @@ -196,7 +200,7 @@ const SearchTour = ({ runTour, setRunTour }) => {

- +
), placement: 'right', @@ -224,7 +228,7 @@ const SearchTour = ({ runTour, setRunTour }) => { A recurring filter can be applied to search a repeating range between specified years.

- +
), placement: 'right', @@ -257,7 +261,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with a file.

- +
), placement: 'right', @@ -281,7 +285,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Use Advanced Search parameters to filter results using features like Hydrologic Unit Code (HUC) or SWORD River Reach.

- +
), placement: 'right', @@ -305,7 +309,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Choose a portal to refine search results to a particular area of study, project, or organization.

- +
), placement: 'right', @@ -325,7 +329,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Refine your search further using categories like Features, Keywords, Platforms, Organizations, etc.

- +
), placement: 'right-start', @@ -360,7 +364,7 @@ const SearchTour = ({ runTour, setRunTour }) => { To add individual granules to a project, click on a search result to view and add its granules.

- +
), placement: 'right', @@ -397,7 +401,7 @@ const SearchTour = ({ runTour, setRunTour }) => { key at any time.

- +
), placement: 'right', @@ -433,7 +437,7 @@ const SearchTour = ({ runTour, setRunTour }) => { along with any available GIBS imagery. When a granule is focused on the map, any additional thumbnails will be displayed.

- +
), placement: 'left', @@ -453,7 +457,7 @@ const SearchTour = ({ runTour, setRunTour }) => { Use the map tools to switch map projections, draw, edit, or remove spatial bounds, zoom the map, or select the base map.

- +
), placement: 'left', diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js deleted file mode 100644 index 0ce6eb69c8..0000000000 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react' -import { render, screen } from '@testing-library/react' -import '@testing-library/jest-dom/extend-expect' -import SearchTour from '../SearchTour' - -// Mock the local storage -const localStorageMock = { - getItem: jest.fn(), - setItem: jest.fn(), - clear: jest.fn() -} -global.localStorage = localStorageMock - -describe('SearchTour', () => { - const mockSetRunTour = jest.fn() - - beforeEach(() => { - jest.clearAllMocks() - }) - - describe('when rendered', () => { - it('displays the tour component', () => { - render() - expect(screen.getByTestId('mocked-joyride')).toBeInTheDocument() - }) - }) -}) diff --git a/tests/e2e/tour/tour.spec.js b/tests/e2e/tour/tour.spec.js new file mode 100644 index 0000000000..f023cbe84c --- /dev/null +++ b/tests/e2e/tour/tour.spec.js @@ -0,0 +1,48 @@ +import { test, expect } from 'playwright-test-coverage' + +import { login } from '../../support/login' + +test.describe('Joyride Tour Navigation', () => { + test.beforeEach(async ({ page, context }) => { + await login(context) + await page.goto('/search') + }) + + test('should navigate through the Joyride tour', async ({ page }) => { + // Start the tour by clicking the "Start Tour" button + await page.click('button:has-text("Start Tour")') + + // Expect the first step to show the "Take the tour" button + await expect(page.locator('.tour-heading')).toHaveText('Welcome to Earthdata Search!') + + // Click the "Take the tour" button to proceed + await page.click('button:has-text("Take the tour")') + + await page.waitForTimeout(500) + + // Wait for the second step to load and ensure the text is visible + await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') + + await page.waitForTimeout(500) + await page.locator('.tour-buttons button:has-text("Next")').click() + + await page.waitForTimeout(500) + + // Wait for the next step and verify its content + await expect(page.locator('.tour-content').first()).toContainText('Search for collections by topic (e.g., "Land Surface Temperature")') + + // Click the "Next" button again within the ".tour-buttons" container + await page.locator('.tour-buttons button:has-text("Next")').click() + + // Continue through the remaining intermediary steps + for (let i = 0; i < 9; i += 1) { + // eslint-disable-next-line no-await-in-loop + await page.locator('.tour-buttons button:has-text("Next")').click() + } + + await page.locator('.tour-buttons button:has-text("Finish Tour")').click() + + // Expect the final step to show the "Want to learn more?" heading + await expect(page.locator('.tour-heading')).toContainText('Want to learn more?') + }) +}) From 0f3402adbbb129af4cedea9fcf27f0208f093c97 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 2 Oct 2024 16:21:52 -0400 Subject: [PATCH 16/40] EDSC-4162 Destructuring --- static/src/js/App.jsx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 6294d380ea..5ef081dcf9 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -229,15 +229,20 @@ class App extends Component { ( - <> - - - }> - - - - ) + () => { + const { runTour } = this.state + const { setRunTour } = this + + return ( + <> + + + }> + + + + ) + } } /> Date: Thu, 3 Oct 2024 10:00:42 -0400 Subject: [PATCH 17/40] EDSC-4162 Fixing failing test --- .../src/js/components/AppHeader/__tests__/AppHeader.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/static/src/js/components/AppHeader/__tests__/AppHeader.test.js b/static/src/js/components/AppHeader/__tests__/AppHeader.test.js index 5053ebf23d..a8d6cfd1f7 100644 --- a/static/src/js/components/AppHeader/__tests__/AppHeader.test.js +++ b/static/src/js/components/AppHeader/__tests__/AppHeader.test.js @@ -6,7 +6,9 @@ import AppHeader from '../AppHeader' Enzyme.configure({ adapter: new Adapter() }) function setup() { - const props = {} + const props = { + onStartTour: jest.fn() + } const enzymeWrapper = shallow() return { From 8a96ff3192075483188c595c3b8d468de5d0fc53 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 3 Oct 2024 10:12:20 -0400 Subject: [PATCH 18/40] EDSC-4162 Fixing tests --- static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx | 2 +- .../SecondaryToolbar/__tests__/SecondaryToolbar.test.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index 9d33700abd..ac24085a1d 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -402,7 +402,7 @@ SecondaryToolbar.propTypes = { earthdataEnvironment: PropTypes.string.isRequired, location: locationPropType.isRequired, onLogout: PropTypes.func.isRequired, - onStartTour: PropTypes.bool.isRequired, + onStartTour: PropTypes.func.isRequired, onUpdateProjectName: PropTypes.func.isRequired, projectCollectionIds: PropTypes.arrayOf(PropTypes.string).isRequired, retrieval: PropTypes.shape({}).isRequired, diff --git a/static/src/js/components/SecondaryToolbar/__tests__/SecondaryToolbar.test.js b/static/src/js/components/SecondaryToolbar/__tests__/SecondaryToolbar.test.js index e38536c9f5..5c853e8581 100644 --- a/static/src/js/components/SecondaryToolbar/__tests__/SecondaryToolbar.test.js +++ b/static/src/js/components/SecondaryToolbar/__tests__/SecondaryToolbar.test.js @@ -29,6 +29,7 @@ function setup(state, overrideProps) { first_name: 'First' }, secondaryToolbarEnabled: true, + onStartTour: jest.fn(), ...overrideProps } From f1787e2ad005ae15df9423f9812f8d56c0ba2d2a Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 3 Oct 2024 10:18:51 -0400 Subject: [PATCH 19/40] EDSC-4162 Updating failing test --- .../__tests__/SecondaryToolbarContainer.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/src/js/containers/SecondaryToolbarContainer/__tests__/SecondaryToolbarContainer.test.js b/static/src/js/containers/SecondaryToolbarContainer/__tests__/SecondaryToolbarContainer.test.js index 95d0463171..abf7046293 100644 --- a/static/src/js/containers/SecondaryToolbarContainer/__tests__/SecondaryToolbarContainer.test.js +++ b/static/src/js/containers/SecondaryToolbarContainer/__tests__/SecondaryToolbarContainer.test.js @@ -32,6 +32,7 @@ function setup(overrideProps) { onUpdateProjectName: jest.fn(), onFetchContactInfo: jest.fn(), ursProfile: {}, + onStartTour: jest.fn(), ...overrideProps } From d6fb55bb3d0b3b577b4f9716ac900b03e80679af Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 3 Oct 2024 17:05:21 -0400 Subject: [PATCH 20/40] EDSC-4162 Refactoring some files and adding feature toggle for tour --- static.config.json | 3 +- static/src/js/App.jsx | 7 +- static/src/js/__tests__/App.test.js | 2 +- static/src/js/components/Tour/SearchTour.jsx | 621 +------------------ static/src/js/components/Tour/TourSteps.jsx | 619 ++++++++++++++++++ 5 files changed, 631 insertions(+), 621 deletions(-) create mode 100644 static/src/js/components/Tour/TourSteps.jsx diff --git a/static.config.json b/static.config.json index fb34630e0b..79f68b8b45 100644 --- a/static.config.json +++ b/static.config.json @@ -51,7 +51,8 @@ "disableSwodlr": "false", "macOSEddDownloadSize":130, "windowsEddDownloadSize":100, - "linuxEddDownloadSize":90 + "linuxEddDownloadSize":90, + "disableSiteTour": "false" }, "environment": { "test": { diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 5ef081dcf9..57df8d5b0f 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -87,7 +87,12 @@ class App extends Component { } componentDidMount() { - const shouldShowTour = localStorage.getItem('dontShowTour') !== 'true' && window.location.hostname !== 'localhost' + const { disableSiteTour } = getApplicationConfig() + const isSiteTourEnabled = disableSiteTour === 'false' + const hasUserDisabledTour = localStorage.getItem('dontShowTour') === 'true' + const isLocalhost = window.location.hostname === 'localhost' + const shouldShowTour = isSiteTourEnabled && !hasUserDisabledTour && !isLocalhost + this.setState({ runTour: shouldShowTour }) diff --git a/static/src/js/__tests__/App.test.js b/static/src/js/__tests__/App.test.js index cabeb34331..54ddd1d539 100644 --- a/static/src/js/__tests__/App.test.js +++ b/static/src/js/__tests__/App.test.js @@ -312,7 +312,7 @@ describe('App component', () => { test('renders loaded lazy components', async () => { setup() - waitFor(() => { + await waitFor(() => { expect(screen.getByTestId('mocked-map-container')).toBeInTheDocument() }) }) diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index 9f9ca804f6..8de7bf53bb 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -1,60 +1,11 @@ import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import Joyride, { STATUS, ACTIONS } from 'react-joyride' -import { FaInfoCircle, FaPlus } from 'react-icons/fa' -import Button from '../Button/Button' -import TourThumbnail from '../../../assets/images/tour-video-thumbnail.png' -import EDSCIcon from '../EDSCIcon/EDSCIcon' -import ExternalLink from '../ExternalLink/ExternalLink' +import TourSteps, { TOTAL_STEPS } from './TourSteps' import './SearchTour.scss' -const TOTAL_STEPS = 12 - -const StepCounter = ({ currentStep }) => ( -

- {currentStep} - {' '} - OF - {' '} - {TOTAL_STEPS} -

-) - -StepCounter.propTypes = { - currentStep: PropTypes.number.isRequired -} - -const TourButtons = ({ stepIndex, setStepIndex }) => ( -
- - -
-) - -TourButtons.propTypes = { - stepIndex: PropTypes.number.isRequired, - setStepIndex: PropTypes.func.isRequired -} - const SearchTour = ({ runTour, setRunTour }) => { const [stepIndex, setStepIndex] = useState(0) - const MAX_STEPS = 12 useEffect(() => { const dontShowTour = localStorage.getItem('dontShowTour') @@ -66,7 +17,7 @@ const SearchTour = ({ runTour, setRunTour }) => { useEffect(() => { const handleKeyDown = (event) => { if (event.key === 'ArrowRight') { - setStepIndex((prevIndex) => Math.min(prevIndex + 1, MAX_STEPS + 1)) + setStepIndex((prevIndex) => Math.min(prevIndex + 1, TOTAL_STEPS + 1)) } else if (event.key === 'ArrowLeft') { setStepIndex((prevIndex) => Math.max(prevIndex - 1, 0)) } @@ -96,572 +47,6 @@ const SearchTour = ({ runTour, setRunTour }) => { } }, [stepIndex]) - const steps = [ - { - target: '.search', - content: ( -
-

Welcome to Earthdata Search!

-

Let’s start with a quick tour...

-

- Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn - how to search for data, use the map, create your first project, and manage your - preferences. -

-

- If you want to skip the tour for now, it is always available by clicking - {' '} - Show Tour - {' '} - at the top of the page. -

-
- - -
-
- ), - disableBeacon: true, - placement: 'center' - }, - { - target: '.sidebar__inner', - content: ( -
- -

- This area contains the filters used when searching for collections - (datasets produced by an organization) - and their granules (sets of files containing data). -

-

- Available filters include keyword search, spatial and temporal bounds, - and advanced search options. -

- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.search-form__primary', - content: ( -
- -

- Search for collections by topic (e.g., "Land Surface Temperature"), - by collection name, or by CMR Concept ID. -

-

- As you type, suggestions for matching topics and keywords will be - displayed. When selected, they will be applied as additional search filters. -

-
-

- Find more information about the - {' '} - - Common Metadata Repository (CMR) - -

-
- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.temporal-selection-dropdown', - content: ( -
- -

- Use the temporal filters to limit search results to a specific date - and time range. -

-

- A recurring filter can be applied to search a repeating range between - specified years. -

- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.spatial-selection-dropdown', - content: ( -
- -

- Use the spatial filters to limit search results to the specified - area of interest. -

-

- To set the spatial area using a polygon, rectangle, point and radius, - or circle, select an option from the menu and then draw on the map - or manually enter coordinates. -

-

- Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with - a file. -

- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.search-form__button--advanced-search', - content: ( -
- -

- Use Advanced Search parameters to filter results using features like - Hydrologic Unit Code (HUC) or SWORD River Reach. -

- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.sidebar-browse-portals', - content: ( -
- -

- Choose a portal to refine search results to a particular area of study, - project, or organization. -

- -
- ), - placement: 'right', - disableScrolling: true, - styles: { - tooltip: { - width: '400px' - } - } - }, - { - target: '.sidebar-section-body', - content: ( -
- -

- Refine your search further using categories like Features, Keywords, - Platforms, Organizations, etc. -

- -
- ), - placement: 'right-start', - disableScrolling: true, - styles: { - tooltip: { - width: '400px' - } - } - }, - { - target: '.panel-section', - content: ( -
- -

- A high-level description is displayed for each search result to help you find - the right data, including a summary, temporal range, and information about - capabilities. To view more information about a collection, click the - {' '} - - {' '} - icon. -

-

- Add granules to a project and customize options before accessing the data. - To add a collection to your project, click the - {' '} - - {' '} - icon. - To add individual granules to a project, click on a search result to view and - add its granules. -

- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - } - }, - floaterProps: { - disableFlip: true, - offset: 10 - } - }, - { - target: '.panels__handle', - content: ( -
- -

- To make more room to view the map, the search results can be resized by clicking - or dragging the bar above. The panel can be hidden or shown by clicking the - handle or using the - {' '} - ] - {' '} - key. -

-
-

- All keyboard shortcuts can be displayed by pressing the - {' '} - ? - {' '} - key at any time. -

-
- -
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - } - } - }, - { - target: '.right-overlay', - content: ( -
- -

- Pan the map by clicking and dragging, and zoom by using the scroll wheel or - map tools. -

-

- When a collection is selected, the granules will be displayed on the map, - along with any available GIBS imagery. When a granule is focused on the - map, any additional thumbnails will be displayed. -

- -
- ), - placement: 'left', - styles: { - tooltip: { - width: '400px', - textAlign: 'left' - } - } - }, - { - target: '.leaflet-bottom.leaflet-right', - content: ( -
- -

- Use the map tools to switch map projections, draw, edit, or remove spatial - bounds, zoom the map, or select the base map. -

- -
- ), - placement: 'left', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } - }, - { - target: '.secondary-toolbar__begin-tour-button', - content: ( -
- -

- You can replay this tour anytime by clicking - {' '} - Show Tour - . -

-
- - -
-
- ), - placement: 'right', - styles: { - tooltip: { - width: '400px' - } - } - }, - { - target: '.search', - content: ( -
-

- Want to learn more? -

-

- Check out our latest webinar where you will see a hands-on example of - how to search for data in Earthdata Search. -

-
-
- Webinar Thumbnail -
-
-
- Discover and Access Earth Science Data Using Earthdata Search -
-

- - Watch the webinar - -

-
-
-

- Find more information here: -

-

- - Earthdata Search wiki - -

-

- - Earthdata Search FAQs - -

-
- ), - disableBeacon: true, - placement: 'center', - styles: { - tooltip: { - width: '600px', - padding: '20px' - }, - tooltipContent: { - fontSize: '16px' - } - } - } - ] - const handleJoyrideCallback = (data) => { const { action, index, status, type @@ -683,7 +68,7 @@ const SearchTour = ({ runTour, setRunTour }) => { return ( ( +
+ + +
+) + +TourButtons.propTypes = { + stepIndex: PropTypes.number.isRequired, + setStepIndex: PropTypes.func.isRequired +} + +const StepCounter = ({ currentStep }) => ( +

+ {currentStep} + {' '} + OF + {' '} + {TOTAL_STEPS} +

+) + +StepCounter.propTypes = { + currentStep: PropTypes.number.isRequired +} + +const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ + { + target: '.search', + content: ( +
+

Welcome to Earthdata Search!

+

Let’s start with a quick tour...

+

+ Get acquainted with Earthdata Search by taking our guided tour, where you’ll learn + how to search for data, use the map, create your first project, and manage your + preferences. +

+

+ If you want to skip the tour for now, it is always available by clicking + {' '} + Show Tour + {' '} + at the top of the page. +

+
+ + +
+
+ ), + disableBeacon: true, + placement: 'center' + }, + { + target: '.sidebar__inner', + content: ( +
+ +

+ This area contains the filters used when searching for collections + (datasets produced by an organization) + and their granules (sets of files containing data). +

+

+ Available filters include keyword search, spatial and temporal bounds, + and advanced search options. +

+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.search-form__primary', + content: ( +
+ +

+ Search for collections by topic (e.g., "Land Surface Temperature"), + by collection name, or by CMR Concept ID. +

+

+ As you type, suggestions for matching topics and keywords will be + displayed. When selected, they will be applied as additional search filters. +

+
+

+ Find more information about the + {' '} + + Common Metadata Repository (CMR) + +

+
+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.temporal-selection-dropdown', + content: ( +
+ +

+ Use the temporal filters to limit search results to a specific date + and time range. +

+

+ A recurring filter can be applied to search a repeating range between + specified years. +

+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.spatial-selection-dropdown', + content: ( +
+ +

+ Use the spatial filters to limit search results to the specified + area of interest. +

+

+ To set the spatial area using a polygon, rectangle, point and radius, + or circle, select an option from the menu and then draw on the map + or manually enter coordinates. +

+

+ Upload a shapefile (KML, KMZ, ESRI, etc.) to set the spatial area with + a file. +

+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.search-form__button--advanced-search', + content: ( +
+ +

+ Use Advanced Search parameters to filter results using features like + Hydrologic Unit Code (HUC) or SWORD River Reach. +

+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.sidebar-browse-portals', + content: ( +
+ +

+ Choose a portal to refine search results to a particular area of study, + project, or organization. +

+ +
+ ), + placement: 'right', + disableScrolling: true, + styles: { + tooltip: { + width: '400px' + } + } + }, + { + target: '.sidebar-section-body', + content: ( +
+ +

+ Refine your search further using categories like Features, Keywords, + Platforms, Organizations, etc. +

+ +
+ ), + placement: 'right-start', + disableScrolling: true, + styles: { + tooltip: { + width: '400px' + } + } + }, + { + target: '.panel-section', + content: ( +
+ +

+ A high-level description is displayed for each search result to help you find + the right data, including a summary, temporal range, and information about + capabilities. To view more information about a collection, click the + {' '} + + {' '} + icon. +

+

+ Add granules to a project and customize options before accessing the data. + To add a collection to your project, click the + {' '} + + {' '} + icon. + To add individual granules to a project, click on a search result to view and + add its granules. +

+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + } + }, + floaterProps: { + disableFlip: true, + offset: 10 + } + }, + { + target: '.panels__handle', + content: ( +
+ +

+ To make more room to view the map, the search results can be resized by clicking + or dragging the bar above. The panel can be hidden or shown by clicking the + handle or using the + {' '} + ] + {' '} + key. +

+
+

+ All keyboard shortcuts can be displayed by pressing the + {' '} + ? + {' '} + key at any time. +

+
+ +
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + } + } + }, + { + target: '.right-overlay', + content: ( +
+ +

+ Pan the map by clicking and dragging, and zoom by using the scroll wheel or + map tools. +

+

+ When a collection is selected, the granules will be displayed on the map, + along with any available GIBS imagery. When a granule is focused on the + map, any additional thumbnails will be displayed. +

+ +
+ ), + placement: 'left', + styles: { + tooltip: { + width: '400px', + textAlign: 'left' + } + } + }, + { + target: '.leaflet-bottom.leaflet-right', + content: ( +
+ +

+ Use the map tools to switch map projections, draw, edit, or remove spatial + bounds, zoom the map, or select the base map. +

+ +
+ ), + placement: 'left', + styles: { + tooltip: { + width: '400px' + }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } + } + }, + { + target: '.secondary-toolbar__begin-tour-button', + content: ( +
+ +

+ You can replay this tour anytime by clicking + {' '} + Show Tour + . +

+
+ + +
+
+ ), + placement: 'right', + styles: { + tooltip: { + width: '400px' + } + } + }, + { + target: '.search', + content: ( +
+

+ Want to learn more? +

+

+ Check out our latest webinar where you will see a hands-on example of + how to search for data in Earthdata Search. +

+
+
+ Webinar Thumbnail +
+
+
+ Discover and Access Earth Science Data Using Earthdata Search +
+

+ + Watch the webinar + +

+
+
+

+ Find more information here: +

+

+ + Earthdata Search wiki + +

+

+ + Earthdata Search FAQs + +

+
+ ), + disableBeacon: true, + placement: 'center', + styles: { + tooltip: { + width: '600px', + padding: '20px' + }, + tooltipContent: { + fontSize: '16px' + } + } + } +] + +export default TourSteps From c609b3e4f5d6398dd2d2d4927b9f42ae0d783975 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Fri, 4 Oct 2024 14:38:58 -0400 Subject: [PATCH 21/40] EDSC-4162 Adding test coverage --- .../Tour/__tests__/SearchTour.test.js | 79 +++++++++++++++++++ .../Tour/__tests__/TourSteps.test.js | 44 +++++++++++ 2 files changed, 123 insertions(+) create mode 100644 static/src/js/components/Tour/__tests__/SearchTour.test.js create mode 100644 static/src/js/components/Tour/__tests__/TourSteps.test.js diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js new file mode 100644 index 0000000000..b16cf0dac4 --- /dev/null +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -0,0 +1,79 @@ +import React from 'react' +import { + render, + fireEvent, + waitFor +} from '@testing-library/react' +import { STATUS, ACTIONS } from 'react-joyride' +import SearchTour from '../SearchTour' +import '@testing-library/jest-dom/extend-expect' + +describe('SearchTour Keyboard Navigation', () => { + test('increments stepIndex when ArrowRight key is pressed', async () => { + const setRunTour = jest.fn() + + // Mock the target elements for the tour steps + const { getByText, container } = render( +
+
Search Element
+ {' '} +
Sidebar Content
+ {' '} + +
+ ) + + // Assert the first step renders correctly + expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() + + // Simulate ArrowRight key press to move to the next step + fireEvent.keyDown(window, { key: 'ArrowRight' }) + + // Wait for the next step to render (using waitFor for async behavior) + await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) + }) +}) + +describe('SearchTour Joyride Callback', () => { + test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { + const setRunTour = jest.fn() + const setStepIndex = jest.fn() + + // Mock the Joyride callback handler within the component + const handleJoyrideCallback = jest.fn((data) => { + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) + || data.action === ACTIONS.CLOSE) { + setRunTour(false) + setStepIndex(0) + } + }) + + // Render the component with mock functions + const { getByText } = render( +
+
Search Element
+ {' '} + {/* Mock target for the first step */} + +
+ ) + + // Assert the first step renders correctly + await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) + + // Simulate the Joyride callback for tour finish + const joyrideCallbackData = { + status: STATUS.FINISHED, + action: ACTIONS.CLOSE, + index: 0, + type: 'step:after' + } + + // Manually invoke the callback + handleJoyrideCallback(joyrideCallbackData) + + // Assertions for setRunTour(false) and setStepIndex(0) + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) + }) +}) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js new file mode 100644 index 0000000000..1335af7235 --- /dev/null +++ b/static/src/js/components/Tour/__tests__/TourSteps.test.js @@ -0,0 +1,44 @@ +import { render, fireEvent } from '@testing-library/react' +import TourSteps from '../TourSteps' +import '@testing-library/jest-dom/extend-expect' + +describe('TourSteps Navigation', () => { + test('calls setStepIndex(stepIndex - 1) when Previous button is clicked', () => { + const setStepIndex = jest.fn() + const setRunTour = jest.fn() + const stepIndex = 2 + + // Get the tour steps array + const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + + // Render the second step (index [1]) + const { getByText } = render(steps[1].content) + + // Simulate clicking the Previous button + const previousButton = getByText('Previous') + fireEvent.click(previousButton) + + // Assert that setStepIndex was called with stepIndex - 1 + expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) + }) + + test('calls setRunTour(false) and setStepIndex(0) when "Skip for now" button is clicked', () => { + const setStepIndex = jest.fn() + const setRunTour = jest.fn() + const stepIndex = 0 + + // Get the tour steps array + const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + + // Render the first step (index [0]) + const { getByText } = render(steps[0].content) + + // Simulate clicking the "Skip for now" button + const skipButton = getByText('Skip for now') + fireEvent.click(skipButton) + + // Assert that setRunTour was called with false and setStepIndex was called with 0 + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) + }) +}) From 9fe1d8db8ad01a7adc301de9c6656a2dc40a76ff Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Fri, 4 Oct 2024 15:37:49 -0400 Subject: [PATCH 22/40] EDSC-4162 Updating tests --- .../Tour/__tests__/SearchTour.test.js | 137 +++++++++++------- .../Tour/__tests__/TourSteps.test.js | 19 ++- .../js/routes/Search/__tests__/Search.test.js | 20 ++- 3 files changed, 107 insertions(+), 69 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index b16cf0dac4..91f08007cf 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,67 +1,25 @@ -import React from 'react' -import { - render, - fireEvent, - waitFor -} from '@testing-library/react' import { STATUS, ACTIONS } from 'react-joyride' -import SearchTour from '../SearchTour' import '@testing-library/jest-dom/extend-expect' -describe('SearchTour Keyboard Navigation', () => { - test('increments stepIndex when ArrowRight key is pressed', async () => { - const setRunTour = jest.fn() - - // Mock the target elements for the tour steps - const { getByText, container } = render( -
-
Search Element
- {' '} -
Sidebar Content
- {' '} - -
- ) - - // Assert the first step renders correctly - expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() - - // Simulate ArrowRight key press to move to the next step - fireEvent.keyDown(window, { key: 'ArrowRight' }) - - // Wait for the next step to render (using waitFor for async behavior) - await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) +describe('SearchTour Joyride Callback', () => { + let setRunTour + let setStepIndex + + beforeEach(() => { + setRunTour = jest.fn() + setStepIndex = jest.fn() }) -}) -describe('SearchTour Joyride Callback', () => { test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { - const setRunTour = jest.fn() - const setStepIndex = jest.fn() - - // Mock the Joyride callback handler within the component - const handleJoyrideCallback = jest.fn((data) => { + const handleJoyrideCallback = (data) => { if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { + || data.action === ACTIONS.CLOSE) { setRunTour(false) setStepIndex(0) } - }) - - // Render the component with mock functions - const { getByText } = render( -
-
Search Element
- {' '} - {/* Mock target for the first step */} - -
- ) - - // Assert the first step renders correctly - await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) - - // Simulate the Joyride callback for tour finish + } + + // Simulate the callback when the tour is finished const joyrideCallbackData = { status: STATUS.FINISHED, action: ACTIONS.CLOSE, @@ -69,10 +27,77 @@ describe('SearchTour Joyride Callback', () => { type: 'step:after' } - // Manually invoke the callback handleJoyrideCallback(joyrideCallbackData) - // Assertions for setRunTour(false) and setStepIndex(0) + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) + }) + + test('calls setRunTour(false) and setStepIndex(0) when tour is skipped', () => { + const handleJoyrideCallback = (data) => { + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) + || data.action === ACTIONS.CLOSE) { + setRunTour(false) + setStepIndex(0) + } + } + + // Simulate the callback when the tour is skipped + const joyrideCallbackData = { + status: STATUS.SKIPPED, + action: ACTIONS.CLOSE, + index: 0, + type: 'step:after' + } + + handleJoyrideCallback(joyrideCallbackData) + + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) + }) + + test('calls setRunTour(false) and setStepIndex(0) when tour is paused', () => { + const handleJoyrideCallback = (data) => { + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) + || data.action === ACTIONS.CLOSE) { + setRunTour(false) + setStepIndex(0) + } + } + + // Simulate the callback when the tour is paused + const joyrideCallbackData = { + status: STATUS.PAUSED, + action: ACTIONS.CLOSE, + index: 0, + type: 'step:after' + } + + handleJoyrideCallback(joyrideCallbackData) + + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) + }) + + test('calls setRunTour(false) and setStepIndex(0) when tour is closed', () => { + const handleJoyrideCallback = (data) => { + if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) + || data.action === ACTIONS.CLOSE) { + setRunTour(false) + setStepIndex(0) + } + } + + // Simulate the callback when the tour is closed + const joyrideCallbackData = { + status: STATUS.RUNNING, + action: ACTIONS.CLOSE, + index: 0, + type: 'step:after' + } + + handleJoyrideCallback(joyrideCallbackData) + expect(setRunTour).toHaveBeenCalledWith(false) expect(setStepIndex).toHaveBeenCalledWith(0) }) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js index 1335af7235..cda2ba87d5 100644 --- a/static/src/js/components/Tour/__tests__/TourSteps.test.js +++ b/static/src/js/components/Tour/__tests__/TourSteps.test.js @@ -1,3 +1,4 @@ +import React from 'react' import { render, fireEvent } from '@testing-library/react' import TourSteps from '../TourSteps' import '@testing-library/jest-dom/extend-expect' @@ -8,11 +9,14 @@ describe('TourSteps Navigation', () => { const setRunTour = jest.fn() const stepIndex = 2 - // Get the tour steps array const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the second step (index [1]) - const { getByText } = render(steps[1].content) + // Render the second step (index [1]) including buttons + const { getByText } = render( +
+ {steps[1].content} +
+ ) // Simulate clicking the Previous button const previousButton = getByText('Previous') @@ -27,11 +31,14 @@ describe('TourSteps Navigation', () => { const setRunTour = jest.fn() const stepIndex = 0 - // Get the tour steps array const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the first step (index [0]) - const { getByText } = render(steps[0].content) + // Render the first step (index [0]) including buttons + const { getByText } = render( +
+ {steps[0].content} +
+ ) // Simulate clicking the "Skip for now" button const skipButton = getByText('Skip for now') diff --git a/static/src/js/routes/Search/__tests__/Search.test.js b/static/src/js/routes/Search/__tests__/Search.test.js index 6e8e992888..8a2e6076f6 100644 --- a/static/src/js/routes/Search/__tests__/Search.test.js +++ b/static/src/js/routes/Search/__tests__/Search.test.js @@ -9,7 +9,6 @@ import { } from '../Search' import PortalFeatureContainer from '../../../containers/PortalFeatureContainer/PortalFeatureContainer' import AdvancedSearchModalContainer from '../../../containers/AdvancedSearchModalContainer/AdvancedSearchModalContainer' - import actions from '../../../actions' // Mock react-leaflet because it causes errors @@ -104,11 +103,20 @@ describe('Search component', () => { expect(portalFeatureContainer.props().advancedSearch).toBeTruthy() }) + test('calls onTogglePortalBrowserModal(true) when "Browse Portals" button is clicked', () => { + const { enzymeWrapper, props } = setup() + + const browsePortalsButton = enzymeWrapper.find('Button').filterWhere((button) => button.text().includes('Browse Portals')) + + browsePortalsButton.simulate('click') + + expect(props.onTogglePortalBrowserModal).toHaveBeenCalledWith(true) + }) + test('renders the Additional Filters under PortalFeatureContainer', () => { const { enzymeWrapper } = setup() - const filters = enzymeWrapper - .find('#input__only-granules') + const filters = enzymeWrapper.find('#input__only-granules') const portalFeatureContainer = filters .parents(PortalFeatureContainer) // #input__only-granules PortalFeatureContainer .first() @@ -121,8 +129,7 @@ describe('Search component', () => { test('renders the "Include collections without granules" checkbox under PortalFeatureContainer', () => { const { enzymeWrapper } = setup() - const filters = enzymeWrapper - .find('#input__only-granules') + const filters = enzymeWrapper.find('#input__only-granules') const portalFeatureContainer = filters.parents(PortalFeatureContainer).first() expect(portalFeatureContainer.props().onlyGranulesCheckbox).toBeTruthy() @@ -131,8 +138,7 @@ describe('Search component', () => { test('renders the "Include only EOSDIS collections" checkbox under PortalFeatureContainer', () => { const { enzymeWrapper } = setup() - const filters = enzymeWrapper - .find('#input__non-eosdis') + const filters = enzymeWrapper.find('#input__non-eosdis') const portalFeatureContainer = filters.parents(PortalFeatureContainer).first() expect(portalFeatureContainer.props().nonEosdisCheckbox).toBeTruthy() From 27ee1814e550ae46d9686ad99499663e213844d7 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Fri, 4 Oct 2024 16:02:06 -0400 Subject: [PATCH 23/40] EDSC-4162 Test coverage patch --- .../Tour/__tests__/SearchTour.test.js | 137 +++++++----------- 1 file changed, 56 insertions(+), 81 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index 91f08007cf..b16cf0dac4 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,103 +1,78 @@ +import React from 'react' +import { + render, + fireEvent, + waitFor +} from '@testing-library/react' import { STATUS, ACTIONS } from 'react-joyride' +import SearchTour from '../SearchTour' import '@testing-library/jest-dom/extend-expect' -describe('SearchTour Joyride Callback', () => { - let setRunTour - let setStepIndex - - beforeEach(() => { - setRunTour = jest.fn() - setStepIndex = jest.fn() +describe('SearchTour Keyboard Navigation', () => { + test('increments stepIndex when ArrowRight key is pressed', async () => { + const setRunTour = jest.fn() + + // Mock the target elements for the tour steps + const { getByText, container } = render( +
+
Search Element
+ {' '} +
Sidebar Content
+ {' '} + +
+ ) + + // Assert the first step renders correctly + expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() + + // Simulate ArrowRight key press to move to the next step + fireEvent.keyDown(window, { key: 'ArrowRight' }) + + // Wait for the next step to render (using waitFor for async behavior) + await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) }) +}) +describe('SearchTour Joyride Callback', () => { test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { - const handleJoyrideCallback = (data) => { - if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { - setRunTour(false) - setStepIndex(0) - } - } - - // Simulate the callback when the tour is finished - const joyrideCallbackData = { - status: STATUS.FINISHED, - action: ACTIONS.CLOSE, - index: 0, - type: 'step:after' - } + const setRunTour = jest.fn() + const setStepIndex = jest.fn() - handleJoyrideCallback(joyrideCallbackData) - - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) - }) - - test('calls setRunTour(false) and setStepIndex(0) when tour is skipped', () => { - const handleJoyrideCallback = (data) => { + // Mock the Joyride callback handler within the component + const handleJoyrideCallback = jest.fn((data) => { if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { + || data.action === ACTIONS.CLOSE) { setRunTour(false) setStepIndex(0) } - } - - // Simulate the callback when the tour is skipped + }) + + // Render the component with mock functions + const { getByText } = render( +
+
Search Element
+ {' '} + {/* Mock target for the first step */} + +
+ ) + + // Assert the first step renders correctly + await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) + + // Simulate the Joyride callback for tour finish const joyrideCallbackData = { - status: STATUS.SKIPPED, - action: ACTIONS.CLOSE, - index: 0, - type: 'step:after' - } - - handleJoyrideCallback(joyrideCallbackData) - - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) - }) - - test('calls setRunTour(false) and setStepIndex(0) when tour is paused', () => { - const handleJoyrideCallback = (data) => { - if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { - setRunTour(false) - setStepIndex(0) - } - } - - // Simulate the callback when the tour is paused - const joyrideCallbackData = { - status: STATUS.PAUSED, - action: ACTIONS.CLOSE, - index: 0, - type: 'step:after' - } - - handleJoyrideCallback(joyrideCallbackData) - - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) - }) - - test('calls setRunTour(false) and setStepIndex(0) when tour is closed', () => { - const handleJoyrideCallback = (data) => { - if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { - setRunTour(false) - setStepIndex(0) - } - } - - // Simulate the callback when the tour is closed - const joyrideCallbackData = { - status: STATUS.RUNNING, + status: STATUS.FINISHED, action: ACTIONS.CLOSE, index: 0, type: 'step:after' } + // Manually invoke the callback handleJoyrideCallback(joyrideCallbackData) + // Assertions for setRunTour(false) and setStepIndex(0) expect(setRunTour).toHaveBeenCalledWith(false) expect(setStepIndex).toHaveBeenCalledWith(0) }) From e21245f26bebc6be7bde7935056ba44cf35805a2 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Fri, 4 Oct 2024 16:19:16 -0400 Subject: [PATCH 24/40] EDSC-4162 Test coverage --- .../Tour/__tests__/TourSteps.test.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js index cda2ba87d5..1335af7235 100644 --- a/static/src/js/components/Tour/__tests__/TourSteps.test.js +++ b/static/src/js/components/Tour/__tests__/TourSteps.test.js @@ -1,4 +1,3 @@ -import React from 'react' import { render, fireEvent } from '@testing-library/react' import TourSteps from '../TourSteps' import '@testing-library/jest-dom/extend-expect' @@ -9,14 +8,11 @@ describe('TourSteps Navigation', () => { const setRunTour = jest.fn() const stepIndex = 2 + // Get the tour steps array const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the second step (index [1]) including buttons - const { getByText } = render( -
- {steps[1].content} -
- ) + // Render the second step (index [1]) + const { getByText } = render(steps[1].content) // Simulate clicking the Previous button const previousButton = getByText('Previous') @@ -31,14 +27,11 @@ describe('TourSteps Navigation', () => { const setRunTour = jest.fn() const stepIndex = 0 + // Get the tour steps array const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the first step (index [0]) including buttons - const { getByText } = render( -
- {steps[0].content} -
- ) + // Render the first step (index [0]) + const { getByText } = render(steps[0].content) // Simulate clicking the "Skip for now" button const skipButton = getByText('Skip for now') From e95c29b7404a72acb838b036f413ca16e74191f2 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 09:02:05 -0400 Subject: [PATCH 25/40] EDSC-4162 Sanity check --- .../Tour/__tests__/SearchTour.test.js | 128 +++++++++--------- .../Tour/__tests__/TourSteps.test.js | 58 ++++---- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index b16cf0dac4..88522ccba9 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,79 +1,79 @@ -import React from 'react' -import { - render, - fireEvent, - waitFor -} from '@testing-library/react' -import { STATUS, ACTIONS } from 'react-joyride' -import SearchTour from '../SearchTour' +// Import React from 'react' +// import { +// render, +// fireEvent, +// waitFor +// } from '@testing-library/react' +// import { STATUS, ACTIONS } from 'react-joyride' +// import SearchTour from '../SearchTour' import '@testing-library/jest-dom/extend-expect' describe('SearchTour Keyboard Navigation', () => { - test('increments stepIndex when ArrowRight key is pressed', async () => { - const setRunTour = jest.fn() +// Test('increments stepIndex when ArrowRight key is pressed', async () => { +// const setRunTour = jest.fn() - // Mock the target elements for the tour steps - const { getByText, container } = render( -
-
Search Element
- {' '} -
Sidebar Content
- {' '} - -
- ) + // // Mock the target elements for the tour steps + // const { getByText, container } = render( + //
+ //
Search Element
+ // {' '} + //
Sidebar Content
+ // {' '} + // + //
+ // ) - // Assert the first step renders correctly - expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() + // // Assert the first step renders correctly + // expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() - // Simulate ArrowRight key press to move to the next step - fireEvent.keyDown(window, { key: 'ArrowRight' }) + // // Simulate ArrowRight key press to move to the next step + // fireEvent.keyDown(window, { key: 'ArrowRight' }) - // Wait for the next step to render (using waitFor for async behavior) - await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) - }) -}) + // // Wait for the next step to render (using waitFor for async behavior) + // await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) + // }) + // }) -describe('SearchTour Joyride Callback', () => { - test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { - const setRunTour = jest.fn() - const setStepIndex = jest.fn() + // describe('SearchTour Joyride Callback', () => { + // test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { + // const setRunTour = jest.fn() + // const setStepIndex = jest.fn() - // Mock the Joyride callback handler within the component - const handleJoyrideCallback = jest.fn((data) => { - if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - || data.action === ACTIONS.CLOSE) { - setRunTour(false) - setStepIndex(0) - } - }) + // // Mock the Joyride callback handler within the component + // const handleJoyrideCallback = jest.fn((data) => { + // if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) + // || data.action === ACTIONS.CLOSE) { + // setRunTour(false) + // setStepIndex(0) + // } + // }) - // Render the component with mock functions - const { getByText } = render( -
-
Search Element
- {' '} - {/* Mock target for the first step */} - -
- ) + // // Render the component with mock functions + // const { getByText } = render( + //
+ //
Search Element
+ // {' '} + // {/* Mock target for the first step */} + // + //
+ // ) - // Assert the first step renders correctly - await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) + // // Assert the first step renders correctly + // await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) - // Simulate the Joyride callback for tour finish - const joyrideCallbackData = { - status: STATUS.FINISHED, - action: ACTIONS.CLOSE, - index: 0, - type: 'step:after' - } + // // Simulate the Joyride callback for tour finish + // const joyrideCallbackData = { + // status: STATUS.FINISHED, + // action: ACTIONS.CLOSE, + // index: 0, + // type: 'step:after' + // } - // Manually invoke the callback - handleJoyrideCallback(joyrideCallbackData) + // // Manually invoke the callback + // handleJoyrideCallback(joyrideCallbackData) - // Assertions for setRunTour(false) and setStepIndex(0) - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) - }) +// // Assertions for setRunTour(false) and setStepIndex(0) +// expect(setRunTour).toHaveBeenCalledWith(false) +// expect(setStepIndex).toHaveBeenCalledWith(0) +// }) }) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js index 1335af7235..3adc51bac7 100644 --- a/static/src/js/components/Tour/__tests__/TourSteps.test.js +++ b/static/src/js/components/Tour/__tests__/TourSteps.test.js @@ -1,44 +1,44 @@ -import { render, fireEvent } from '@testing-library/react' -import TourSteps from '../TourSteps' +// Import { render, fireEvent } from '@testing-library/react' +// import TourSteps from '../TourSteps' import '@testing-library/jest-dom/extend-expect' describe('TourSteps Navigation', () => { test('calls setStepIndex(stepIndex - 1) when Previous button is clicked', () => { - const setStepIndex = jest.fn() - const setRunTour = jest.fn() - const stepIndex = 2 + // Const setStepIndex = jest.fn() + // const setRunTour = jest.fn() + // const stepIndex = 2 - // Get the tour steps array - const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + // // Get the tour steps array + // const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the second step (index [1]) - const { getByText } = render(steps[1].content) + // // Render the second step (index [1]) + // const { getByText } = render(steps[1].content) - // Simulate clicking the Previous button - const previousButton = getByText('Previous') - fireEvent.click(previousButton) + // // Simulate clicking the Previous button + // const previousButton = getByText('Previous') + // fireEvent.click(previousButton) - // Assert that setStepIndex was called with stepIndex - 1 - expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) - }) + // // Assert that setStepIndex was called with stepIndex - 1 + // expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) + // }) - test('calls setRunTour(false) and setStepIndex(0) when "Skip for now" button is clicked', () => { - const setStepIndex = jest.fn() - const setRunTour = jest.fn() - const stepIndex = 0 + // test('calls setRunTour(false) and setStepIndex(0) when "Skip for now" button is clicked', () => { + // const setStepIndex = jest.fn() + // const setRunTour = jest.fn() + // const stepIndex = 0 - // Get the tour steps array - const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + // // Get the tour steps array + // const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // Render the first step (index [0]) - const { getByText } = render(steps[0].content) + // // Render the first step (index [0]) + // const { getByText } = render(steps[0].content) - // Simulate clicking the "Skip for now" button - const skipButton = getByText('Skip for now') - fireEvent.click(skipButton) + // // Simulate clicking the "Skip for now" button + // const skipButton = getByText('Skip for now') + // fireEvent.click(skipButton) - // Assert that setRunTour was called with false and setStepIndex was called with 0 - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) + // // Assert that setRunTour was called with false and setStepIndex was called with 0 + // expect(setRunTour).toHaveBeenCalledWith(false) + // expect(setStepIndex).toHaveBeenCalledWith(0) }) }) From cb98ea3822580f83bb99379430ae91f67ba3b4fe Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 10:24:43 -0400 Subject: [PATCH 26/40] EDSC-4162 Test coverage --- .../Tour/__tests__/SearchTour.test.js | 9 +-- .../Tour/__tests__/TourSteps.test.js | 63 ++++++++++--------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index 88522ccba9..43c2652627 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -72,8 +72,9 @@ describe('SearchTour Keyboard Navigation', () => { // // Manually invoke the callback // handleJoyrideCallback(joyrideCallbackData) -// // Assertions for setRunTour(false) and setStepIndex(0) -// expect(setRunTour).toHaveBeenCalledWith(false) -// expect(setStepIndex).toHaveBeenCalledWith(0) -// }) + // // Assertions for setRunTour(false) and setStepIndex(0) + // expect(setRunTour).toHaveBeenCalledWith(false) + // expect(setStepIndex).toHaveBeenCalledWith(0) + // }) + expect(1 !== 0) }) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js index 3adc51bac7..9a024b6228 100644 --- a/static/src/js/components/Tour/__tests__/TourSteps.test.js +++ b/static/src/js/components/Tour/__tests__/TourSteps.test.js @@ -1,44 +1,47 @@ -// Import { render, fireEvent } from '@testing-library/react' -// import TourSteps from '../TourSteps' +import { render, fireEvent } from '@testing-library/react' +import TourSteps from '../TourSteps' import '@testing-library/jest-dom/extend-expect' describe('TourSteps Navigation', () => { - test('calls setStepIndex(stepIndex - 1) when Previous button is clicked', () => { - // Const setStepIndex = jest.fn() - // const setRunTour = jest.fn() - // const stepIndex = 2 + test('should navigate to the previous step when the "Previous" button is clicked', () => { + const setStepIndex = jest.fn() + const stepIndex = 2 + const steps = TourSteps(stepIndex, setStepIndex, jest.fn()) - // // Get the tour steps array - // const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + const { content } = steps[stepIndex] - // // Render the second step (index [1]) - // const { getByText } = render(steps[1].content) + const { getByText } = render(content) - // // Simulate clicking the Previous button - // const previousButton = getByText('Previous') - // fireEvent.click(previousButton) + fireEvent.click(getByText('Previous')) - // // Assert that setStepIndex was called with stepIndex - 1 - // expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) - // }) + expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) + }) + + test('should navigate to the next step when the "Next" button is clicked', () => { + const setStepIndex = jest.fn() + const stepIndex = 2 + const steps = TourSteps(stepIndex, setStepIndex, jest.fn()) + + const { content } = steps[stepIndex] + const { getByText } = render(content) - // test('calls setRunTour(false) and setStepIndex(0) when "Skip for now" button is clicked', () => { - // const setStepIndex = jest.fn() - // const setRunTour = jest.fn() - // const stepIndex = 0 + fireEvent.click(getByText('Next')) + + expect(setStepIndex).toHaveBeenCalledWith(stepIndex + 1) + }) - // // Get the tour steps array - // const steps = TourSteps(stepIndex, setStepIndex, setRunTour) + test('should skip the tour and reset step index when the "Skip for now" button is clicked', () => { + const setStepIndex = jest.fn() + const setRunTour = jest.fn() + const stepIndex = 0 + const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - // // Render the first step (index [0]) - // const { getByText } = render(steps[0].content) + const { content } = steps[stepIndex] + const { getByText } = render(content) - // // Simulate clicking the "Skip for now" button - // const skipButton = getByText('Skip for now') - // fireEvent.click(skipButton) + fireEvent.click(getByText('Skip for now')) - // // Assert that setRunTour was called with false and setStepIndex was called with 0 - // expect(setRunTour).toHaveBeenCalledWith(false) - // expect(setStepIndex).toHaveBeenCalledWith(0) + expect(setRunTour).toHaveBeenCalledWith(false) + expect(setStepIndex).toHaveBeenCalledWith(0) }) }) From e980751568c9b295cfbac549dc37167bedf1bb82 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 10:31:48 -0400 Subject: [PATCH 27/40] EDSC-4162 Reverting test file --- .../Tour/__tests__/SearchTour.test.js | 79 +------------------ .../Tour/__tests__/TourSteps.test.js | 47 ----------- 2 files changed, 3 insertions(+), 123 deletions(-) delete mode 100644 static/src/js/components/Tour/__tests__/TourSteps.test.js diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index 43c2652627..8aa6624277 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,80 +1,7 @@ -// Import React from 'react' -// import { -// render, -// fireEvent, -// waitFor -// } from '@testing-library/react' -// import { STATUS, ACTIONS } from 'react-joyride' -// import SearchTour from '../SearchTour' import '@testing-library/jest-dom/extend-expect' describe('SearchTour Keyboard Navigation', () => { -// Test('increments stepIndex when ArrowRight key is pressed', async () => { -// const setRunTour = jest.fn() - - // // Mock the target elements for the tour steps - // const { getByText, container } = render( - //
- //
Search Element
- // {' '} - //
Sidebar Content
- // {' '} - // - //
- // ) - - // // Assert the first step renders correctly - // expect(getByText(/Welcome to Earthdata Search!/i)).toBeInTheDocument() - - // // Simulate ArrowRight key press to move to the next step - // fireEvent.keyDown(window, { key: 'ArrowRight' }) - - // // Wait for the next step to render (using waitFor for async behavior) - // await waitFor(() => expect(container.querySelector('.sidebar__inner')).toBeInTheDocument()) - // }) - // }) - - // describe('SearchTour Joyride Callback', () => { - // test('calls setRunTour(false) and setStepIndex(0) when tour is finished', async () => { - // const setRunTour = jest.fn() - // const setStepIndex = jest.fn() - - // // Mock the Joyride callback handler within the component - // const handleJoyrideCallback = jest.fn((data) => { - // if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(data.status) - // || data.action === ACTIONS.CLOSE) { - // setRunTour(false) - // setStepIndex(0) - // } - // }) - - // // Render the component with mock functions - // const { getByText } = render( - //
- //
Search Element
- // {' '} - // {/* Mock target for the first step */} - // - //
- // ) - - // // Assert the first step renders correctly - // await waitFor(() => getByText(/Welcome to Earthdata Search!/i)) - - // // Simulate the Joyride callback for tour finish - // const joyrideCallbackData = { - // status: STATUS.FINISHED, - // action: ACTIONS.CLOSE, - // index: 0, - // type: 'step:after' - // } - - // // Manually invoke the callback - // handleJoyrideCallback(joyrideCallbackData) - - // // Assertions for setRunTour(false) and setStepIndex(0) - // expect(setRunTour).toHaveBeenCalledWith(false) - // expect(setStepIndex).toHaveBeenCalledWith(0) - // }) - expect(1 !== 0) + test('increments stepIndex when ArrowRight key is pressed', async () => { + expect(1 !== 0) + }) }) diff --git a/static/src/js/components/Tour/__tests__/TourSteps.test.js b/static/src/js/components/Tour/__tests__/TourSteps.test.js deleted file mode 100644 index 9a024b6228..0000000000 --- a/static/src/js/components/Tour/__tests__/TourSteps.test.js +++ /dev/null @@ -1,47 +0,0 @@ -import { render, fireEvent } from '@testing-library/react' -import TourSteps from '../TourSteps' -import '@testing-library/jest-dom/extend-expect' - -describe('TourSteps Navigation', () => { - test('should navigate to the previous step when the "Previous" button is clicked', () => { - const setStepIndex = jest.fn() - const stepIndex = 2 - const steps = TourSteps(stepIndex, setStepIndex, jest.fn()) - - const { content } = steps[stepIndex] - - const { getByText } = render(content) - - fireEvent.click(getByText('Previous')) - - expect(setStepIndex).toHaveBeenCalledWith(stepIndex - 1) - }) - - test('should navigate to the next step when the "Next" button is clicked', () => { - const setStepIndex = jest.fn() - const stepIndex = 2 - const steps = TourSteps(stepIndex, setStepIndex, jest.fn()) - - const { content } = steps[stepIndex] - const { getByText } = render(content) - - fireEvent.click(getByText('Next')) - - expect(setStepIndex).toHaveBeenCalledWith(stepIndex + 1) - }) - - test('should skip the tour and reset step index when the "Skip for now" button is clicked', () => { - const setStepIndex = jest.fn() - const setRunTour = jest.fn() - const stepIndex = 0 - const steps = TourSteps(stepIndex, setStepIndex, setRunTour) - - const { content } = steps[stepIndex] - const { getByText } = render(content) - - fireEvent.click(getByText('Skip for now')) - - expect(setRunTour).toHaveBeenCalledWith(false) - expect(setStepIndex).toHaveBeenCalledWith(0) - }) -}) From 19fd52f1593a6f6f3fadcd398db5845cc27729bf Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 14:05:04 -0400 Subject: [PATCH 28/40] EDSC-4162 Moving jest testing --- .../Tour/__tests__/SearchTour.test.js | 26 ++++++++++++ tests/e2e/tour/tour.spec.js | 42 ++++++++++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js index 8aa6624277..8c5c7e86f3 100644 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ b/static/src/js/components/Tour/__tests__/SearchTour.test.js @@ -1,7 +1,33 @@ +import React from 'react' +import { render } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import SearchTour from '../SearchTour' + import '@testing-library/jest-dom/extend-expect' +const setup = () => { + const props = { + runTour: true, + setRunTour: jest.fn() + } + + const user = userEvent.setup() + + const { onFetchRetrieval, onChangePath } = props + render( + + ) + + return { + onChangePath, + onFetchRetrieval, + user + } +} + describe('SearchTour Keyboard Navigation', () => { test('increments stepIndex when ArrowRight key is pressed', async () => { + setup() expect(1 !== 0) }) }) diff --git a/tests/e2e/tour/tour.spec.js b/tests/e2e/tour/tour.spec.js index f023cbe84c..55989ae4be 100644 --- a/tests/e2e/tour/tour.spec.js +++ b/tests/e2e/tour/tour.spec.js @@ -23,19 +23,27 @@ test.describe('Joyride Tour Navigation', () => { // Wait for the second step to load and ensure the text is visible await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') - await page.waitForTimeout(500) - await page.locator('.tour-buttons button:has-text("Next")').click() + // Move forward using the right arrow key + await page.keyboard.press('ArrowRight') await page.waitForTimeout(500) - // Wait for the next step and verify its content + // Verify we're on the next step await expect(page.locator('.tour-content').first()).toContainText('Search for collections by topic (e.g., "Land Surface Temperature")') - // Click the "Next" button again within the ".tour-buttons" container + // Now go back to the previous step using the left arrow key + await page.keyboard.press('ArrowLeft') + + await page.waitForTimeout(500) + + // Ensure the content is back to the previous step + await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') + + // Proceed to the next steps as before await page.locator('.tour-buttons button:has-text("Next")').click() // Continue through the remaining intermediary steps - for (let i = 0; i < 9; i += 1) { + for (let i = 0; i < 10; i += 1) { // eslint-disable-next-line no-await-in-loop await page.locator('.tour-buttons button:has-text("Next")').click() } @@ -45,4 +53,28 @@ test.describe('Joyride Tour Navigation', () => { // Expect the final step to show the "Want to learn more?" heading await expect(page.locator('.tour-heading')).toContainText('Want to learn more?') }) + + test('should close the tour when clicking outside the tour window', async ({ page }) => { + // Start the tour by clicking the "Start Tour" button + await page.click('button:has-text("Start Tour")') + + // Expect the first step to show the "Take the tour" button + await expect(page.locator('.tour-heading')).toHaveText('Welcome to Earthdata Search!') + + // Click the "Take the tour" button to proceed + await page.click('button:has-text("Take the tour")') + + await page.waitForTimeout(500) + + // Ensure we're on the second step + await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') + + // Simulate a click outside the tour window by clicking an area outside the overlay + await page.mouse.click(10, 10) // Adjust this based on your layout, clicking near the top-left of the screen + + await page.waitForTimeout(500) + + // Ensure the tour is closed by checking the absence of the tour container + await expect(page.locator('.tour-container')).toBeHidden() + }) }) From 72c0dd79870898a83cd3687c8bafe5b520aeb25b Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 14:26:09 -0400 Subject: [PATCH 29/40] EDSC-4162 Addressing PR feedback --- static/src/js/components/Panels/Panels.scss | 2 +- tests/e2e/tour/tour.spec.js | 36 ++++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/static/src/js/components/Panels/Panels.scss b/static/src/js/components/Panels/Panels.scss index e095a2bb64..ee94e6ab1b 100644 --- a/static/src/js/components/Panels/Panels.scss +++ b/static/src/js/components/Panels/Panels.scss @@ -89,4 +89,4 @@ width: 4000px; left: calc(100%); pointer-events: none; -} \ No newline at end of file +} diff --git a/tests/e2e/tour/tour.spec.js b/tests/e2e/tour/tour.spec.js index 55989ae4be..f763833acc 100644 --- a/tests/e2e/tour/tour.spec.js +++ b/tests/e2e/tour/tour.spec.js @@ -39,7 +39,22 @@ test.describe('Joyride Tour Navigation', () => { // Ensure the content is back to the previous step await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') - // Proceed to the next steps as before + // Move forward to the next step again using the "Next" button + await page.locator('.tour-buttons button:has-text("Next")').click() + + await page.waitForTimeout(500) + + // Ensure we're back on the step with "Search for collections by topic" + await expect(page.locator('.tour-content').first()).toContainText('Search for collections by topic (e.g., "Land Surface Temperature")') + + // Now go back one step using the "Previous" button + await page.locator('.tour-buttons button:has-text("Previous")').click() + + await page.waitForTimeout(500) + + // Ensure the content is back to the previous step again + await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') + await page.locator('.tour-buttons button:has-text("Next")').click() // Continue through the remaining intermediary steps @@ -50,31 +65,20 @@ test.describe('Joyride Tour Navigation', () => { await page.locator('.tour-buttons button:has-text("Finish Tour")').click() - // Expect the final step to show the "Want to learn more?" heading await expect(page.locator('.tour-heading')).toContainText('Want to learn more?') }) - test('should close the tour when clicking outside the tour window', async ({ page }) => { + test('should close the tour when clicking "Skip for now"', async ({ page }) => { // Start the tour by clicking the "Start Tour" button await page.click('button:has-text("Start Tour")') // Expect the first step to show the "Take the tour" button await expect(page.locator('.tour-heading')).toHaveText('Welcome to Earthdata Search!') - // Click the "Take the tour" button to proceed - await page.click('button:has-text("Take the tour")') - - await page.waitForTimeout(500) - - // Ensure we're on the second step - await expect(page.locator('.tour-content').first()).toContainText('This area contains the filters used when searching for collections') - - // Simulate a click outside the tour window by clicking an area outside the overlay - await page.mouse.click(10, 10) // Adjust this based on your layout, clicking near the top-left of the screen - - await page.waitForTimeout(500) + // Click the "Skip for now" button to close the tour + await page.click('button:has-text("Skip for now")') - // Ensure the tour is closed by checking the absence of the tour container + // Ensure the tour is closed by checking that the tour container is no longer visible await expect(page.locator('.tour-container')).toBeHidden() }) }) From c9ba1113606f1b77b9edf9a47742b4a1feee9a14 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 14:40:25 -0400 Subject: [PATCH 30/40] EDSC-4162 Updating playwright test --- tests/e2e/tour/tour.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/e2e/tour/tour.spec.js b/tests/e2e/tour/tour.spec.js index f763833acc..b80228370b 100644 --- a/tests/e2e/tour/tour.spec.js +++ b/tests/e2e/tour/tour.spec.js @@ -63,6 +63,10 @@ test.describe('Joyride Tour Navigation', () => { await page.locator('.tour-buttons button:has-text("Next")').click() } + // Testing the unique Previous button for the semi-final step + await page.locator('.tour-buttons button:has-text("Previous")').click() + await page.locator('.tour-buttons button:has-text("Next")').click() + await page.locator('.tour-buttons button:has-text("Finish Tour")').click() await expect(page.locator('.tour-heading')).toContainText('Want to learn more?') From 700a0c75baa42e6856e70fecb77a2cd83150abf9 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Mon, 7 Oct 2024 15:36:10 -0400 Subject: [PATCH 31/40] EDSC-4162 Consolidating css --- static/src/js/components/Tour/TourSteps.jsx | 112 ++++---------------- 1 file changed, 21 insertions(+), 91 deletions(-) diff --git a/static/src/js/components/Tour/TourSteps.jsx b/static/src/js/components/Tour/TourSteps.jsx index 016fe9cd96..8d45cfc53c 100644 --- a/static/src/js/components/Tour/TourSteps.jsx +++ b/static/src/js/components/Tour/TourSteps.jsx @@ -50,6 +50,15 @@ StepCounter.propTypes = { currentStep: PropTypes.number.isRequired } +const commonStyles = { + tooltip: { width: '400px' }, + tooltipContent: { + fontSize: '14px', + textAlign: 'left', + lineHeight: '1.5' + } +} + const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ { target: '.search', @@ -121,16 +130,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.search-form__primary', @@ -158,16 +158,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.temporal-selection-dropdown', @@ -186,16 +177,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.spatial-selection-dropdown', @@ -219,16 +201,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.search-form__button--advanced-search', @@ -243,16 +216,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.sidebar-browse-portals', @@ -268,11 +232,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ ), placement: 'right', disableScrolling: true, - styles: { - tooltip: { - width: '400px' - } - } + styles: commonStyles }, { target: '.sidebar-section-body', @@ -288,11 +248,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ ), placement: 'right-start', disableScrolling: true, - styles: { - tooltip: { - width: '400px' - } - } + styles: commonStyles }, { target: '.panel-section', @@ -322,11 +278,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - } - }, + styles: commonStyles, floaterProps: { disableFlip: true, offset: 10 @@ -359,11 +311,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - } - } + styles: commonStyles }, { target: '.right-overlay', @@ -395,12 +343,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'left', - styles: { - tooltip: { - width: '400px', - textAlign: 'left' - } - } + styles: commonStyles }, { target: '.leaflet-bottom.leaflet-right', @@ -415,16 +358,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'left', - styles: { - tooltip: { - width: '400px' - }, - tooltipContent: { - fontSize: '14px', - textAlign: 'left', - lineHeight: '1.5' - } - } + styles: commonStyles }, { target: '.secondary-toolbar__begin-tour-button', @@ -467,11 +401,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
), placement: 'right', - styles: { - tooltip: { - width: '400px' - } - } + styles: commonStyles }, { target: '.search', From ddc810eae634116a587017c95b05715e688cf821 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Tue, 8 Oct 2024 09:51:00 -0400 Subject: [PATCH 32/40] EDSC-4162 Code cleanup --- static/src/js/components/Tour/TourSteps.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/static/src/js/components/Tour/TourSteps.jsx b/static/src/js/components/Tour/TourSteps.jsx index 8d45cfc53c..3f8c798108 100644 --- a/static/src/js/components/Tour/TourSteps.jsx +++ b/static/src/js/components/Tour/TourSteps.jsx @@ -14,7 +14,6 @@ const TourButtons = ({ stepIndex, setStepIndex }) => ( type="button" bootstrapVariant="secondary" bootstrapSize="sm" - data-testid="tour-previous-button" onClick={() => setStepIndex(stepIndex - 1)} > Previous @@ -23,7 +22,6 @@ const TourButtons = ({ stepIndex, setStepIndex }) => ( type="button" bootstrapVariant="primary" bootstrapSize="sm" - data-testid="tour-next-button" onClick={() => setStepIndex(stepIndex + 1)} > Next From 783c43fa96ba3d054f7dc5eaec0bbc8f430576d8 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Tue, 8 Oct 2024 09:51:47 -0400 Subject: [PATCH 33/40] EDSC-4162 Removing unused file --- .../Tour/__tests__/SearchTour.test.js | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 static/src/js/components/Tour/__tests__/SearchTour.test.js diff --git a/static/src/js/components/Tour/__tests__/SearchTour.test.js b/static/src/js/components/Tour/__tests__/SearchTour.test.js deleted file mode 100644 index 8c5c7e86f3..0000000000 --- a/static/src/js/components/Tour/__tests__/SearchTour.test.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react' -import { render } from '@testing-library/react' -import userEvent from '@testing-library/user-event' -import SearchTour from '../SearchTour' - -import '@testing-library/jest-dom/extend-expect' - -const setup = () => { - const props = { - runTour: true, - setRunTour: jest.fn() - } - - const user = userEvent.setup() - - const { onFetchRetrieval, onChangePath } = props - render( - - ) - - return { - onChangePath, - onFetchRetrieval, - user - } -} - -describe('SearchTour Keyboard Navigation', () => { - test('increments stepIndex when ArrowRight key is pressed', async () => { - setup() - expect(1 !== 0) - }) -}) From 263335e19db93f659c05c50a9873e4f6a8bba266 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Tue, 8 Oct 2024 15:59:10 -0400 Subject: [PATCH 34/40] EDSC-4162 style adjustments --- static/src/js/components/Tour/SearchTour.scss | 6 +++++- static/src/js/components/Tour/TourSteps.jsx | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/static/src/js/components/Tour/SearchTour.scss b/static/src/js/components/Tour/SearchTour.scss index d2ff03152a..d339af490c 100644 --- a/static/src/js/components/Tour/SearchTour.scss +++ b/static/src/js/components/Tour/SearchTour.scss @@ -16,6 +16,10 @@ text-align: left; } +.tour-heading { + font-family: "DM Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + color: var(--color-heading) !important; +} .text-icon { display: inline-block; @@ -78,7 +82,7 @@ kbd { .tour-info-box { background-color: #f8f9fa; - padding: 1rem; + padding: 1rem 1rem 0.1rem 1rem; margin-bottom: 15px; border-radius: 4px; font-size: 14px; diff --git a/static/src/js/components/Tour/TourSteps.jsx b/static/src/js/components/Tour/TourSteps.jsx index 3f8c798108..fab8729dd0 100644 --- a/static/src/js/components/Tour/TourSteps.jsx +++ b/static/src/js/components/Tour/TourSteps.jsx @@ -5,6 +5,7 @@ import ExternalLink from '../ExternalLink/ExternalLink' import EDSCIcon from '../EDSCIcon/EDSCIcon' import Button from '../Button/Button' import TourThumbnail from '../../../assets/images/tour-video-thumbnail.png' +import './SearchTour.scss' export const TOTAL_STEPS = 12 @@ -72,7 +73,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [

If you want to skip the tour for now, it is always available by clicking {' '} - Show Tour + Start Tour {' '} at the top of the page.

@@ -94,7 +95,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ className="button-tour-skip" type="button" bootstrapVariant="secondary" - bootstrapSize="sm" + bootstrapSize="lg" onClick={ () => { setRunTour(false) @@ -505,7 +506,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ color: '#5a585a', textDecoration: 'underline', marginBottom: '5px', - display: 'block' + display: 'inline' } } > @@ -521,7 +522,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ { color: '#5a585a', textDecoration: 'underline', - display: 'block' + display: 'inline' } } > From 147972dffcee7d45393854d61f9935f9fff62155 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 9 Oct 2024 14:13:50 -0400 Subject: [PATCH 35/40] EDSC-4162 addressing feedback --- .../SecondaryToolbar/SecondaryToolbar.jsx | 2 +- .../SecondaryToolbar/SecondaryToolbar.scss | 8 +-- static/src/js/components/Tour/SearchTour.jsx | 25 +++++---- static/src/js/components/Tour/TourSteps.jsx | 54 ++++++++++--------- 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index ac24085a1d..ce5aa66baa 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -325,7 +325,7 @@ class SecondaryToolbar extends Component { { location.pathname === '/search' && ( { }, [runTour]) useEffect(() => { - if (stepIndex === 6) { // Scrolling to the top to ensure "Browse Portals" is visible. + // Scrolling to the top to ensure "Browse Portals" is visible. + // If users are scrolled to the bottom of the Filters panel, the "Browse Portals" + // box will be out of view, but the tour will still highlight it even through the + // user cannot see it. + if (stepIndex === 6) { const element = document.querySelector('.sidebar__content .simplebar-content-wrapper') if (element) { element.scrollTop = 0 @@ -49,7 +53,10 @@ const SearchTour = ({ runTour, setRunTour }) => { const handleJoyrideCallback = (data) => { const { - action, index, status, type + action, + index, + status, + type } = data if ([STATUS.FINISHED, STATUS.SKIPPED, STATUS.PAUSED].includes(status) @@ -80,12 +87,12 @@ const SearchTour = ({ runTour, setRunTour }) => { primaryColor: '#007bff', zIndex: 10000, textAlign: 'left', - width: '600px' + width: '37.5rem' }, tooltip: { - fontSize: '16px', - padding: '20px', - paddingTop: '0px', + fontSize: '1rem', + padding: '1.25rem', + paddingTop: '0rem', textAlign: 'left' }, tooltipContent: { @@ -102,9 +109,9 @@ const SearchTour = ({ runTour, setRunTour }) => { disableAnimation: true, styles: { button: { - borderRadius: '4px', - padding: '8px 16px', - fontSize: '14px' + borderRadius: '0.25rem', + padding: '0.5rem 1rem', + fontSize: '0.875rem' } } } diff --git a/static/src/js/components/Tour/TourSteps.jsx b/static/src/js/components/Tour/TourSteps.jsx index fab8729dd0..df7b353cf8 100644 --- a/static/src/js/components/Tour/TourSteps.jsx +++ b/static/src/js/components/Tour/TourSteps.jsx @@ -50,9 +50,11 @@ StepCounter.propTypes = { } const commonStyles = { - tooltip: { width: '400px' }, + tooltip: { + width: '25rem' + }, tooltipContent: { - fontSize: '14px', + fontSize: '0.875rem', textAlign: 'left', lineHeight: '1.5' } @@ -280,7 +282,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ styles: commonStyles, floaterProps: { disableFlip: true, - offset: 10 + offset: '0.625rem' } }, { @@ -319,7 +321,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [

[

[ styles: commonStyles }, { - target: '.secondary-toolbar__begin-tour-button', + target: '.secondary-toolbar__start-tour-button', content: (

@@ -410,9 +412,9 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ className="tour-heading" style={ { - fontSize: '22px', + fontSize: '1.375rem', fontWeight: 'bold', - marginBottom: '15px' + marginBottom: '0.9375rem' } } > @@ -420,8 +422,8 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [

@@ -432,9 +434,9 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ style={ { backgroundColor: '#f5f5f5', - padding: '10px', - marginBottom: '20px', - borderRadius: '6px', + padding: '0.625rem', + marginBottom: '1.25rem', + borderRadius: '0.375rem', textDecoration: 'none', color: '#000', display: 'flex', @@ -444,8 +446,8 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ >

@@ -463,8 +465,8 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [
[

@@ -488,9 +490,9 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [

@@ -505,7 +507,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ { color: '#5a585a', textDecoration: 'underline', - marginBottom: '5px', + marginBottom: '0.3125rem', display: 'inline' } } @@ -535,11 +537,11 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ placement: 'center', styles: { tooltip: { - width: '600px', - padding: '20px' + width: '37.5rem', + padding: '1.25rem' }, tooltipContent: { - fontSize: '16px' + fontSize: '1rem' } } } From 8b63ccae4450697482e1fac9b8b54b43352dc125 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 9 Oct 2024 17:28:57 -0400 Subject: [PATCH 36/40] EDSC-4162 Adding ContextProviders --- static/src/js/App.jsx | 53 +++++-------------- .../src/js/components/AppHeader/AppHeader.jsx | 9 +--- .../SecondaryToolbar/SecondaryToolbar.jsx | 37 ++++++++----- static/src/js/components/Tour/SearchTour.jsx | 28 ++++------ static/src/js/components/Tour/TourTooltip.jsx | 53 +++++++++++++++++++ .../SecondaryToolbarContainer.jsx | 3 +- static/src/js/contexts/TourContext.js | 5 ++ .../src/js/providers/Providers/Providers.jsx | 38 +++++++++++++ .../TourContextProvider.jsx | 45 ++++++++++++++++ .../providers/WithProviders/WithProviders.jsx | 14 +++++ 10 files changed, 204 insertions(+), 81 deletions(-) create mode 100644 static/src/js/components/Tour/TourTooltip.jsx create mode 100644 static/src/js/contexts/TourContext.js create mode 100644 static/src/js/providers/Providers/Providers.jsx create mode 100644 static/src/js/providers/TourContextProvider/TourContextProvider.jsx create mode 100644 static/src/js/providers/WithProviders/WithProviders.jsx diff --git a/static/src/js/App.jsx b/static/src/js/App.jsx index 57df8d5b0f..cdd018f76b 100644 --- a/static/src/js/App.jsx +++ b/static/src/js/App.jsx @@ -17,6 +17,7 @@ import ogImage from '../assets/images/earthdata-search-og-image.jpg' import configureStore from './store/configureStore' import history from './util/history' import { getApplicationConfig, getEnvironmentConfig } from '../../../sharedUtils/config' +import WithProviders from './providers/WithProviders/WithProviders' // Routes import Project from './routes/Project/Project' @@ -73,37 +74,12 @@ const Subscriptions = lazy(() => import('./routes/Subscriptions/Subscriptions')) class App extends Component { constructor(props) { super(props) - this.state = { - runTour: false - } this.store = configureStore() const { edscHost } = getEnvironmentConfig() const { env } = getApplicationConfig() this.edscHost = edscHost this.env = env - this.startTour = this.startTour.bind(this) - this.setRunTour = this.setRunTour.bind(this) - } - - componentDidMount() { - const { disableSiteTour } = getApplicationConfig() - const isSiteTourEnabled = disableSiteTour === 'false' - const hasUserDisabledTour = localStorage.getItem('dontShowTour') === 'true' - const isLocalhost = window.location.hostname === 'localhost' - const shouldShowTour = isSiteTourEnabled && !hasUserDisabledTour && !isLocalhost - - this.setState({ - runTour: shouldShowTour - }) - } - - setRunTour(value) { - this.setState({ runTour: value }) - } - - startTour() { - this.setState({ runTour: true }) } // Portal paths have been removed, but this needs to stay in order to redirect users using @@ -145,7 +121,7 @@ class App extends Component { - + { - const { runTour } = this.state - const { setRunTour } = this - - return ( - <> - - - }> - - - - ) - } + () => ( + <> + + + }> + + + + ) } /> ( +const AppHeader = () => (

- +
) -AppHeader.propTypes = { - onStartTour: PropTypes.func.isRequired -} - export default AppHeader diff --git a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx index ce5aa66baa..2feda4f1b4 100644 --- a/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx +++ b/static/src/js/components/SecondaryToolbar/SecondaryToolbar.jsx @@ -9,7 +9,6 @@ import { } from 'react-bootstrap' import { LinkContainer } from 'react-router-bootstrap' import { parse } from 'qs' - import { FaArrowCircleLeft, FaFolder, @@ -17,9 +16,10 @@ import { FaSave, FaUser } from 'react-icons/fa' +import TourContext from '../../contexts/TourContext' +import { getApplicationConfig, getEnvironmentConfig } from '../../../../../sharedUtils/config' import { deployedEnvironment } from '../../../../../sharedUtils/deployedEnvironment' -import { getEnvironmentConfig } from '../../../../../sharedUtils/config' import { isDownloadPathWithId } from '../../util/isDownloadPathWithId' import { isPath } from '../../util/isPath' import { locationPropType } from '../../util/propTypes/location' @@ -34,6 +34,9 @@ import EDSCIcon from '../EDSCIcon/EDSCIcon' import './SecondaryToolbar.scss' class SecondaryToolbar extends Component { + // eslint-disable-next-line react/static-property-placement + static contextType = TourContext + constructor(props) { super(props) @@ -118,10 +121,11 @@ class SecondaryToolbar extends Component { location, retrieval = {}, secondaryToolbarEnabled, - ursProfile, - onStartTour + ursProfile } = this.props + const { disableSiteTour } = getApplicationConfig() + const { first_name: firstName = '' } = ursProfile const loggedIn = authToken !== '' @@ -323,15 +327,21 @@ class SecondaryToolbar extends Component { alignRight > { - location.pathname === '/search' && ( - - Start Tour - + location.pathname === '/search' && (disableSiteTour !== 'true') && ( + + { + ({ setRunTour }) => ( + + Start Tour + + ) + } + ) } { - const [stepIndex, setStepIndex] = useState(0) +const SearchTour = () => { + const { runTour, setRunTour } = useContext(TourContext) - useEffect(() => { - const dontShowTour = localStorage.getItem('dontShowTour') - if (dontShowTour === 'true') { - setRunTour(false) - } - }, [setRunTour]) + const [stepIndex, setStepIndex] = useState(0) useEffect(() => { const handleKeyDown = (event) => { @@ -33,9 +32,8 @@ const SearchTour = ({ runTour, setRunTour }) => { useEffect(() => { if (runTour) { setStepIndex(0) + localStorage.setItem('dontShowTour', 'false') } - - localStorage.setItem('dontShowTour', runTour ? 'false' : 'true') }, [runTour]) useEffect(() => { @@ -63,6 +61,7 @@ const SearchTour = ({ runTour, setRunTour }) => { || action === ACTIONS.CLOSE) { setRunTour(false) setStepIndex(0) + localStorage.setItem('dontShowTour', 'true') } else if (type === 'step:after') { setStepIndex(action === ACTIONS.NEXT ? index + 1 : index - 1) } @@ -120,9 +119,4 @@ const SearchTour = ({ runTour, setRunTour }) => { ) } -SearchTour.propTypes = { - runTour: PropTypes.bool.isRequired, - setRunTour: PropTypes.func.isRequired -} - export default SearchTour diff --git a/static/src/js/components/Tour/TourTooltip.jsx b/static/src/js/components/Tour/TourTooltip.jsx new file mode 100644 index 0000000000..c46536da81 --- /dev/null +++ b/static/src/js/components/Tour/TourTooltip.jsx @@ -0,0 +1,53 @@ +import React from 'react' +import PropTypes from 'prop-types' +import { TooltipRenderProps } from 'react-joyride' + +const TourTooltip = (props) => { + const { + backProps, closeProps, continuous, index, primaryProps, skipProps, step, tooltipProps + } = props + + return ( +
+ + {step.title &&

{step.title}

} +
{step.content}
+
+ +
+ { + index > 0 && ( + + ) + } + { + continuous && ( + + ) + } +
+
+
+ ) +} + +TourTooltip.propTypes = { + backProps: PropTypes.object.isRequired, + closeProps: PropTypes.object.isRequired, + continuous: PropTypes.bool.isRequired, + index: PropTypes.number.isRequired, + primaryProps: PropTypes.object.isRequired, + skipProps: PropTypes.object.isRequired, + step: PropTypes.object.isRequired, + tooltipProps: PropTypes.object.isRequired +} + +export default TourTooltip diff --git a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx index 6f17570a24..5510517bb1 100644 --- a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx +++ b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx @@ -84,8 +84,7 @@ SecondaryToolbarContainer.propTypes = { savedProject: PropTypes.shape({}).isRequired, ursProfile: PropTypes.shape({ first_name: PropTypes.string - }).isRequired, - onStartTour: PropTypes.func.isRequired + }).isRequired } export default withRouter( diff --git a/static/src/js/contexts/TourContext.js b/static/src/js/contexts/TourContext.js new file mode 100644 index 0000000000..2edfc8cbbc --- /dev/null +++ b/static/src/js/contexts/TourContext.js @@ -0,0 +1,5 @@ +import { createContext } from 'react' + +const TourContext = createContext() + +export default TourContext diff --git a/static/src/js/providers/Providers/Providers.jsx b/static/src/js/providers/Providers/Providers.jsx new file mode 100644 index 0000000000..eca84059b8 --- /dev/null +++ b/static/src/js/providers/Providers/Providers.jsx @@ -0,0 +1,38 @@ +import React from 'react' +import PropTypes from 'prop-types' + +import TourContextProvider from '../TourContextProvider/TourContextProvider' + +/** + * @typedef {Object} ProvidersProps + * @property {ReactNode} children The children to be rendered. + +/** + * Renders any children wrapped with the application wide Providers + * @param {ProvidersProps} props + * + * @example Renders children wrapped with context providers. + * + * return ( + * + * {children} + * + * ) + */ +const Providers = ({ children }) => { + const providers = [ + + ] + + // Combine the Providers into a single Provider component + return providers.reduceRight( + (providerChildren, parent) => React.cloneElement(parent, { children: providerChildren }), + children + ) +} + +Providers.propTypes = { + children: PropTypes.node.isRequired +} + +export default Providers diff --git a/static/src/js/providers/TourContextProvider/TourContextProvider.jsx b/static/src/js/providers/TourContextProvider/TourContextProvider.jsx new file mode 100644 index 0000000000..20bbcddd0e --- /dev/null +++ b/static/src/js/providers/TourContextProvider/TourContextProvider.jsx @@ -0,0 +1,45 @@ +import React, { + useState, + useMemo, + useEffect +} from 'react' +import PropTypes from 'prop-types' +import TourContext from '../../contexts/TourContext' +import { getApplicationConfig } from '../../../../../sharedUtils/config' + +const { disableSiteTour } = getApplicationConfig() +const isSiteTourEnabled = disableSiteTour === 'false' + +const TourContextProvider = ({ children }) => { + const [runTour, setRunTour] = useState(false) + useEffect(() => { + const isLocalhost = window.location.hostname === 'localhosttt' + const hasUserDisabledTour = localStorage.getItem('dontShowTour') === 'true' + const shouldShowTour = isSiteTourEnabled && !hasUserDisabledTour && !isLocalhost + setRunTour(shouldShowTour) + }, []) + + const providerValue = useMemo( + () => ({ + runTour, + setRunTour + }), + [runTour] + ) + + return ( + + {children} + + ) +} + +TourContextProvider.defaultProps = { + children: null +} + +TourContextProvider.propTypes = { + children: PropTypes.node +} + +export default TourContextProvider diff --git a/static/src/js/providers/WithProviders/WithProviders.jsx b/static/src/js/providers/WithProviders/WithProviders.jsx new file mode 100644 index 0000000000..18379c7bd3 --- /dev/null +++ b/static/src/js/providers/WithProviders/WithProviders.jsx @@ -0,0 +1,14 @@ +import React from 'react' +import Providers from '../Providers/Providers' + +const withProviders = (WrappedComponent) => { + const WithProviders = (props) => ( + + + + ) + + return WithProviders +} + +export default withProviders From eb975a74614df5fd0879b4410c78bc86293e3919 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 9 Oct 2024 17:34:27 -0400 Subject: [PATCH 37/40] EDSC-4162 Uncommitting in progress file --- static/src/js/components/Tour/TourTooltip.jsx | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/static/src/js/components/Tour/TourTooltip.jsx b/static/src/js/components/Tour/TourTooltip.jsx index c46536da81..e69de29bb2 100644 --- a/static/src/js/components/Tour/TourTooltip.jsx +++ b/static/src/js/components/Tour/TourTooltip.jsx @@ -1,53 +0,0 @@ -import React from 'react' -import PropTypes from 'prop-types' -import { TooltipRenderProps } from 'react-joyride' - -const TourTooltip = (props) => { - const { - backProps, closeProps, continuous, index, primaryProps, skipProps, step, tooltipProps - } = props - - return ( -
- - {step.title &&

{step.title}

} -
{step.content}
-
- -
- { - index > 0 && ( - - ) - } - { - continuous && ( - - ) - } -
-
-
- ) -} - -TourTooltip.propTypes = { - backProps: PropTypes.object.isRequired, - closeProps: PropTypes.object.isRequired, - continuous: PropTypes.bool.isRequired, - index: PropTypes.number.isRequired, - primaryProps: PropTypes.object.isRequired, - skipProps: PropTypes.object.isRequired, - step: PropTypes.object.isRequired, - tooltipProps: PropTypes.object.isRequired -} - -export default TourTooltip From 405a378de2b090a6e2b3a7052513f42354bbd22a Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Wed, 9 Oct 2024 17:35:16 -0400 Subject: [PATCH 38/40] EDSC-4162 Removing tour breadcrubs --- .../SecondaryToolbarContainer/SecondaryToolbarContainer.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx index 5510517bb1..60a2962087 100644 --- a/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx +++ b/static/src/js/containers/SecondaryToolbarContainer/SecondaryToolbarContainer.jsx @@ -44,8 +44,7 @@ export const SecondaryToolbarContainer = (props) => { savedProject, retrieval, ursProfile, - onFetchContactInfo, - onStartTour + onFetchContactInfo } = props useEffect(() => { @@ -67,7 +66,6 @@ export const SecondaryToolbarContainer = (props) => { retrieval={retrieval} secondaryToolbarEnabled={secondaryToolbarEnabled} ursProfile={ursProfile} - onStartTour={onStartTour} /> ) } From 26fe840efe8d6a266f4b26f89e3f8404e8fd2c91 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 10 Oct 2024 09:12:49 -0400 Subject: [PATCH 39/40] EDSC-4162 localhost change --- .../js/providers/TourContextProvider/TourContextProvider.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/src/js/providers/TourContextProvider/TourContextProvider.jsx b/static/src/js/providers/TourContextProvider/TourContextProvider.jsx index 20bbcddd0e..dbdb956525 100644 --- a/static/src/js/providers/TourContextProvider/TourContextProvider.jsx +++ b/static/src/js/providers/TourContextProvider/TourContextProvider.jsx @@ -13,7 +13,7 @@ const isSiteTourEnabled = disableSiteTour === 'false' const TourContextProvider = ({ children }) => { const [runTour, setRunTour] = useState(false) useEffect(() => { - const isLocalhost = window.location.hostname === 'localhosttt' + const isLocalhost = window.location.hostname === 'localhost' const hasUserDisabledTour = localStorage.getItem('dontShowTour') === 'true' const shouldShowTour = isSiteTourEnabled && !hasUserDisabledTour && !isLocalhost setRunTour(shouldShowTour) From 529358457501d1217da11f421535b75223350bd5 Mon Sep 17 00:00:00 2001 From: Drew Pesall Date: Thu, 10 Oct 2024 17:28:18 -0400 Subject: [PATCH 40/40] EDSC-4162 Updating styling --- static/src/js/components/Tour/SearchTour.jsx | 13 -- static/src/js/components/Tour/SearchTour.scss | 218 +++++++++++------- static/src/js/components/Tour/TourSteps.jsx | 114 ++------- 3 files changed, 148 insertions(+), 197 deletions(-) diff --git a/static/src/js/components/Tour/SearchTour.jsx b/static/src/js/components/Tour/SearchTour.jsx index f8fb520fbd..33410b2b57 100644 --- a/static/src/js/components/Tour/SearchTour.jsx +++ b/static/src/js/components/Tour/SearchTour.jsx @@ -5,7 +5,6 @@ import React, { } from 'react' import Joyride, { STATUS, ACTIONS } from 'react-joyride' import TourSteps, { TOTAL_STEPS } from './TourSteps' -import './SearchTour.scss' import TourContext from '../../contexts/TourContext' const SearchTour = () => { @@ -103,18 +102,6 @@ const SearchTour = () => { } } } - floaterProps={ - { - disableAnimation: true, - styles: { - button: { - borderRadius: '0.25rem', - padding: '0.5rem 1rem', - fontSize: '0.875rem' - } - } - } - } /> ) } diff --git a/static/src/js/components/Tour/SearchTour.scss b/static/src/js/components/Tour/SearchTour.scss index d339af490c..f648b2f454 100644 --- a/static/src/js/components/Tour/SearchTour.scss +++ b/static/src/js/components/Tour/SearchTour.scss @@ -1,107 +1,157 @@ :root { - --color-white: #ffffff; - --color-black: #000000; - --color-heading: #0063A6; + --color-white: #ffffff; + --color-black: #000000; + --color-heading: #0063A6; + --color-gray: #9a989a; + --color-light-gray: #f5f5f5; + --font-mono: "DM Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } -.button-tour-finish { - min-width: 90px; - } - -.step-counter-text { - font-family: "DM Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - font-size: 12px; - margin-bottom: 15px; - color: #9a989a; - text-align: left; -} - -.tour-heading { - font-family: "DM Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - color: var(--color-heading) !important; -} - -.text-icon { - display: inline-block; - vertical-align: center; - margin-top: -2px; - height: 0.85rem; - width: 0.85rem; -} - -.tour-heading { - font-size: 14px; - margin-bottom: 10px; - color: var(--color-black); +.tour { + &-heading { + font-family: var(--font-mono); + color: var(--color-heading); + font-size: 1.5rem; + font-weight: bold; + margin-bottom: 0.9375rem; text-transform: uppercase; - letter-spacing: 1px; -} - -kbd { - display: inline-block; - vertical-align: center; - font-size: 0.75em; - padding: 2px 3px; -} + letter-spacing: 0.0625rem; + } -.tour-subheading { - font-size: 24px; + &-subheading { + font-size: 1.5rem; font-weight: bold; - margin-bottom: 20px; -} + margin-bottom: 1.25rem; + } -.tour-content { - font-size: 16px; - margin-bottom: 20px; + &-content, &-webinar-description { + font-size: 1rem; + margin-bottom: 1.25rem; text-align: left; -} + } -.tour-note { - font-size: 14px; - margin-bottom: 20px; + &-note { + font-size: 0.875rem; + margin-bottom: 1.25rem; text-align: left; -} -.tour-intro-buttons { - display: flex; - justify-content: flex-end; - gap: 15px; - position: absolute; - bottom: 20px; - right: 20px; - width: 19rem; -} -.tour-buttons { + } + + &-buttons { display: flex; justify-content: flex-end; - gap: 15px; + gap: 0.9375rem; position: absolute; - bottom: 20px; - right: 20px; - width: 9rem; -} + bottom: 1.25rem; + right: 1.25rem; + + &.intro { + width: 19rem; + } -.tour-info-box { + &:not(.intro) { + width: 9rem; + } + } + + &-info-box { background-color: #f8f9fa; - padding: 1rem 1rem 0.1rem 1rem; - margin-bottom: 15px; - border-radius: 4px; - font-size: 14px; + padding: 1rem 1rem 0.0625rem; + margin-bottom: 0.9375rem; + border-radius: 0.25rem; + font-size: 0.875rem; text-align: left; -} -.tour-info-box a { - color: var(--color-black); - text-decoration: underline; + a { + color: var(--color-black); + text-decoration: underline; + font-weight: bold; + } + } + + &-webinar { + &-box { + background-color: var(--color-light-gray); + padding: 0.625rem; + margin-bottom: 1.25rem; + border-radius: 0.375rem; + text-decoration: none; + color: var(--color-black); + display: flex; + align-items: center; + } + + &-text { + flex: 0 0 13.75rem; + margin-right: 0.9375rem; + } + + &-thumbnail { + width: 100%; + height: auto; + } + + &-link { + font-size: 1rem; + font-weight: bold; + margin-top: 0.625rem; + margin-left: 0.625rem; + } + } + + &-discover-more { + padding: 0.625rem; + font-size: 1rem; + font-weight: 500; + } + + &-more-info { + font-size: 1rem; font-weight: bold; -} + margin-bottom: 0.3125rem; + } -.tour-tooltip { - width: 600px; - padding: 20px; + &-earthdata-link { + color: #5a585a; + text-decoration: underline; + margin-bottom: 0.3125rem; + display: inline; + } + + &-tooltip { + width: 25rem; + padding: 1.25rem; background-color: var(--color-white); - border-radius: 10px; - font-size: 16px; + border-radius: 0.625rem; + font-size: 1rem; text-align: center; position: relative; - min-height: 200px; + min-height: 12.5rem; + } +} + +.step-counter-text { + font-family: var(--font-mono); + font-size: 0.75rem; + margin-bottom: 0.9375rem; + color: var(--color-gray); + text-align: left; +} + +.text-icon { + display: inline-block; + vertical-align: center; + margin-top: -0.125rem; + height: 0.85rem; + width: 0.85rem; +} + +kbd { + display: inline-block; + vertical-align: center; + font-size: 0.75em; + padding: 0.125rem 0.1875rem; +} + +.button-tour-finish { + min-width: 5.625rem; } diff --git a/static/src/js/components/Tour/TourSteps.jsx b/static/src/js/components/Tour/TourSteps.jsx index df7b353cf8..f8b62d8ffd 100644 --- a/static/src/js/components/Tour/TourSteps.jsx +++ b/static/src/js/components/Tour/TourSteps.jsx @@ -79,7 +79,7 @@ const TourSteps = (stepIndex, setStepIndex, setRunTour) => [ {' '} at the top of the page.

-
+