Interactive interface for browsing global, full-resolution satellite imagery
WV-2996 Implement Notification Wireframes (#4988)
Patrick Mouldenfbc155b64570
diff --git a/e2e/features/image-download/crosses-dateline-test.spec.js b/e2e/features/image-download/crosses-dateline-test.spec.jsindex 73dba1434..c468a3088 100644--- a/e2e/features/image-download/crosses-dateline-test.spec.js+++ b/e2e/features/image-download/crosses-dateline-test.spec.js@@ -10,11 +10,11 @@ const crossesNextDayURLParams = 'http://localhost:3000/?v=-198.76946733086245,-5test.describe.configure({ mode: 'serial' })-test.beforeAll(async ({ browser }) => {+test.beforeEach(async ({ browser }) => {page = await browser.newPage()})-test.afterAll(async () => {+test.afterEach(async () => {await page.close()})diff --git a/e2e/features/layers/layers-vector-test.spec.js b/e2e/features/layers/layers-vector-test.spec.jsindex 073eaa84b..a26de63ba 100644--- a/e2e/features/layers/layers-vector-test.spec.js+++ b/e2e/features/layers/layers-vector-test.spec.js@@ -38,6 +38,7 @@ test('Vectors show alert when not clickable', async ({ browserName }) => {const pointerIcon = await page.locator('#active-GRanD_Dams .fa-hand-pointer')await expect(pointerIcon).toBeVisible()await geographicMap.click()+ await geographicMap.click()await expect(notifyMessage).toBeVisible()await expect(notifyMessage).toContainText('Vector features may not be clickable at all zoom levels.')})diff --git a/e2e/features/ui/distraction-free-mode-test.spec.js b/e2e/features/ui/distraction-free-mode-test.spec.jsindex be87d9716..0984f5e1f 100644--- a/e2e/features/ui/distraction-free-mode-test.spec.js+++ b/e2e/features/ui/distraction-free-mode-test.spec.js@@ -79,7 +79,6 @@ test('Enabling distraction free mode with shortcut key hides UI elements', asyncawait locationSearchMinimizeButton.click()await infoToolbarButton.click()await page.locator('#distraction_free_info_item').click()- await page.locator('#distraction-free-mode-active-alert-close').click()await distractionFreeModeValidElsRemoved('arctic', true)})diff --git a/web/js/app.js b/web/js/app.jsindex e09a17cea..209dbf07d 100644--- a/web/js/app.js+++ b/web/js/app.js@@ -22,13 +22,12 @@ import LocationSearch from './components/location-search/location-search';import Brand from './brand';import Embed from './containers/embed';import MeasureButton from './components/measure-tool/measure-button';-import FeatureAlert from './components/feature-alert/alert';-import Alerts from './containers/alerts';+import AlertDropdown from './containers/alertDropdown';import LoadingSpinner from './components/map/loading-spinner';import './font-awesome-library';+import Tour from './containers/tour';// actions-import Tour from './containers/tour';import Timeline from './containers/timeline/timeline';import AnimationWidget from './containers/animation-widget/animation-widget';import ErrorBoundary from './containers/error-boundary';@@ -163,9 +162,8 @@ class App extends React.Component {<LoadingSpinner /><Toolbar /><MapInteractions />- <div id="wv-alert-container" className="wv-alert-container">- <FeatureAlert />- <Alerts />+ <AlertDropdown isTourActive={isTourActive} />+ <div>{isTourActive && numberOutagesUnseen === 0 && (!isMobile || isEmbedModeActive) ? <Tour /> : null}</div><Sidebar />diff --git a/web/js/components/util/alert.js b/web/js/components/util/alert.jsindex 889a130e1..a27345f85 100644--- a/web/js/components/util/alert.js+++ b/web/js/components/util/alert.js@@ -47,6 +47,7 @@ export default class AlertUtil extends React.Component {id,title,message,+ messageTitle,icon,onDismiss,onClick,@@ -70,8 +71,13 @@ export default class AlertUtil extends React.Component {className="wv-alert-icon"size="1x"/>- <div className="wv-alert-message">- {message}+ <div className="alert-text">+ <p className="wv-alert-title">+ {messageTitle}+ </p>+ <em className="wv-alert-message">+ <b>{message}</b>+ </em></div></div>{onDismiss && (@@ -106,6 +112,7 @@ AlertUtil.propTypes = {id: PropTypes.string,isOpen: PropTypes.bool,message: PropTypes.string,+ messageTitle: PropTypes.string,noPortal: PropTypes.bool,onClick: PropTypes.func,onDismiss: PropTypes.func,diff --git a/web/js/containers/alertDropdown.js b/web/js/containers/alertDropdown.jsnew file mode 100644index 000000000..1afce2c51--- /dev/null+++ b/web/js/containers/alertDropdown.js@@ -0,0 +1,36 @@+import React, { useState, useRef } from 'react';+import { useSelector } from 'react-redux';+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';+import FeatureAlert from '../components/feature-alert/alert';+import Alerts from './alerts';++export default function AlertDropdown(isTourActive) {+ const [dropdownOpen, setDropdownOpen] = useState(false);+ const containerRef = useRef(null);+ const notifications = containerRef?.current?.children.length;+ const toggle = () => setDropdownOpen((prevState) => !prevState);+ const { isTourActive: tourActive } = isTourActive;+ const isDistractionFreeModeActive = useSelector((state) => state.ui.isDistractionFreeModeActive);+ const isMobile = useSelector((state) => state.screenSize.isMobileDevice);++ return (+ <div className="wv-alert-dropdown" hidden={isDistractionFreeModeActive || tourActive || isMobile}>+ <button type="button" hidden={notifications <= 1} onClick={toggle}>+ <FontAwesomeIcon+ icon="exclamation-triangle"+ className="wv-alert-icon"+ size="1x"+ />+ Multiple Layer Alerts+ {dropdownOpen ? <FontAwesomeIcon icon="fa-solid fa-caret-down" /> : <FontAwesomeIcon icon="fa-solid fa-caret-up" />}+ </button>+ <div ref={containerRef} hidden={!(dropdownOpen || notifications === 1)} id="wv-alert-container" className="wv-alert-container">+ <FeatureAlert />+ <Alerts />+ </div>+ <div className="wv-alert-footer" hidden={!dropdownOpen || notifications <= 1}>+ <em>Select an issue above for details</em>+ </div>+ </div>+ );+}diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.jsindex 982e7905c..48d43bb81 100644--- a/web/js/containers/sidebar/layer-row.js+++ b/web/js/containers/sidebar/layer-row.js@@ -508,7 +508,8 @@ function LayerRow (props) {id="zoom-alert"isOpentitle="Zoom in to see imagery for this layer"- message={`Imagery for ${layer.title} is not available at this zoom level.`}+ messageTitle={layer.title}+ message="Imagery is not available at this zoom level."onDismiss={() => setHideZoomAlert(true)}onClick={openZoomAlertModal}/>@@ -518,7 +519,8 @@ function LayerRow (props) {id="granule-alert"isOpentitle="Try moving the map or select a different date in the layer's settings."- message={`Imagery for ${layer.title} is not available at this location or date.`}+ messageTitle={layer.title}+ message="Imagery is not available at this location or date."onDismiss={() => setHideGranuleAlert(true)}onClick={openGranuleAlertModal}/>diff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scssindex 22fa9db59..20d2969bd 100644--- a/web/scss/components/alert.scss+++ b/web/scss/components/alert.scss@@ -1,8 +1,35 @@-.wv-alert-container {+.wv-alert-dropdown {position: absolute;top: 60px;- right: 10px;+ right: 50px;left: auto;+ width: 450px;+ background: #282828;+++ button {+ width: 100%;+ display: flex;+ justify-content: space-between;+ align-items: center;+ position: relative;+ color: #fff;+ background: #282828;+ border: #282828;+ border-radius: 0;+ min-height: 40px;+ cursor: pointer;+ padding: 0;+ z-index: 100;+ margin-bottom: 5px;+ padding-left: 1rem;+ padding-right: 1rem;+ }+}++.wv-alert-container {+ max-height: 300px;+ overflow-y: scroll;}.wv-alert {@@ -14,7 +41,7 @@display: flex;align-items: center;justify-content: space-between;- min-height: 40px;+ min-height: 50px;cursor: pointer;padding: 0;z-index: 100;@@ -25,7 +52,22 @@padding-right: 3px;display: flex;align-items: center;+ min-height: 50px;+ width: 100%;+}++.alert-text {+ display: flex;+ flex-direction: column;+}++.wv-alert-footer {+ display: flex;+ align-items: center;+ justify-content: space-around;+ width: 100%;height: 40px;+ color: #fff;}.wv-alert .close-alert {