Interactive interface for browsing global, full-resolution satellite imagery
Revert "WV-2912 notification count (#4733)" (#4740)
Tom Cariello4d2ec80b75f9
diff --git a/e2e/features/notifications/notify-test.spec.js b/e2e/features/notifications/notify-test.spec.jsindex b0c7ff699..205950d9c 100644--- a/e2e/features/notifications/notify-test.spec.js+++ b/e2e/features/notifications/notify-test.spec.js@@ -20,7 +20,7 @@ test.beforeAll(async ({ browser }) => {selectors = createSelectors(page)infoButtonIcon = page.locator('#wv-info-button svg.svg-inline--fa')infoMenu = page.locator('#toolbar_info')- notificationsListItem = page.locator('#notifications_info_item')+ notificationsListItem = page.locator('#notifications_info_item .fa-circle-exclamation')tooltipSelector = page.locator('.tooltip-inner div')})@@ -39,21 +39,30 @@ test('No visible notifications with mockAlert parameter set to no_types', asyncawait expect(boltListItem).not.toBeVisible()})-test('Verify that layer notices don\'t show up in the notification list or contribute to the count', async () => {+test('Outage takes precedence when all three notifications are present', async () => {const { modalCloseButton } = selectorsconst url = `${layerNoticesQuery}&mockAlerts=all_types`+ const statusOutage = await page.locator('#wv-info-button.wv-status-outage')await page.goto(url)await modalCloseButton.click()+ await expect(statusOutage).toBeVisible()await infoButtonIcon.click()+ await expect(infoMenu).toContainText('Notifications')+ await expect(notificationsListItem).toBeVisible()+})++test('Verify that layer notices don\'t show up in the notification list or contribute to the count', async () => {const badge = await page.locator('span.badge')await expect(badge).toBeVisible()await expect(badge).toContainText('2')})-test('Alert and message content is highlighted and found in modal', async () => {+test('Alert, outage, and message content is highlighted and found in modal', async () => {+ const outageContentHighlighted = await page.locator('#notification_list_modal .outage-notification-item span')const alertContentHighlighted = await page.locator('#notification_list_modal .alert-notification-item p')const messageContentHighlighted = await page.locator('#notification_list_modal .message-notification-item p')await notificationsListItem.click()+ await expect(outageContentHighlighted).toContainText('Posted 20 May 2018')await expect(alertContentHighlighted).toContainText('learn how to visualize global satellite imagery')await expect(messageContentHighlighted).toContainText('This is a message test')})diff --git a/package-lock.json b/package-lock.jsonindex c080427f7..baee05e91 100644--- a/package-lock.json+++ b/package-lock.json@@ -53,7 +53,7 @@"react-draggable": "^4.4.6","react-image-crop": "^10.1.8","react-infinite-scroller": "^1.2.6",- "react-joyride": "^2.6.1",+ "react-joyride": "^2.5.4","react-mobile-datepicker": "^4.0.2","react-redux": "^8.1.3","react-resizable": "^3.0.5",@@ -77,12 +77,12 @@"what-input": "^5.2.12"},"devDependencies": {- "@babel/core": "^7.23.2",+ "@babel/core": "^7.23.0","@babel/eslint-parser": "^7.22.15","@babel/plugin-transform-class-properties": "^7.18.6",- "@babel/preset-env": "^7.23.2",+ "@babel/preset-env": "^7.22.20","@babel/preset-react": "^7.22.15",- "@playwright/test": "^1.39.0",+ "@playwright/test": "^1.38.1","@pmmmwh/react-refresh-webpack-plugin": "^0.5.11","@webpack-cli/serve": "^2.0.5","ajv": "^8.12.0",@@ -95,14 +95,14 @@"css-minimizer-webpack-plugin": "^5.0.1","css-url-relative-plugin": "^1.1.0","cssnano": "^6.0.1",- "eslint": "^8.51.0",+ "eslint": "^8.50.0","eslint-config-airbnb": "^19.0.4","eslint-config-standard": "^17.1.0","eslint-import-resolver-webpack": "^0.13.7","eslint-plugin-import": "^2.28.1","eslint-plugin-jest": "^27.4.2","eslint-plugin-jsx-a11y": "^6.7.1",- "eslint-plugin-n": "^16.2.0",+ "eslint-plugin-n": "^16.1.0","eslint-plugin-no-storage": "^1.0.2","eslint-plugin-node": "^11.1.0","eslint-plugin-promise": "^6.1.1",@@ -126,7 +126,7 @@"react-test-renderer": "^18.0.0","redux-mock-store": "^1.5.4","run-script-os": "^1.1.6",- "sass": "^1.69.3",+ "sass": "^1.69.0","sass-loader": "^13.3.2","shelljs": "^0.8.5","showdown": "^2.1.0",@@ -182,18 +182,18 @@}},"node_modules/@babel/compat-data": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",- "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",+ "version": "7.22.20",+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",+ "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==","dev": true,"engines": {"node": ">=6.9.0"}},"node_modules/@babel/core": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",- "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",+ "version": "7.23.0",+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",+ "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==","dev": true,"dependencies": {"@ampproject/remapping": "^2.2.0",@@ -201,10 +201,10 @@"@babel/generator": "^7.23.0","@babel/helper-compilation-targets": "^7.22.15","@babel/helper-module-transforms": "^7.23.0",- "@babel/helpers": "^7.23.2",+ "@babel/helpers": "^7.23.0","@babel/parser": "^7.23.0","@babel/template": "^7.22.15",- "@babel/traverse": "^7.23.2",+ "@babel/traverse": "^7.23.0","@babel/types": "^7.23.0","convert-source-map": "^2.0.0","debug": "^4.1.0",@@ -220,6 +220,15 @@"url": "https://opencollective.com/babel"}},+ "node_modules/@babel/core/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/eslint-parser": {"version": "7.22.15","resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.15.tgz",@@ -238,6 +247,15 @@"eslint": "^7.5.0 || ^8.0.0"}},+ "node_modules/@babel/eslint-parser/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/generator": {"version": "7.23.0","resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",@@ -316,6 +334,15 @@"yallist": "^3.0.2"}},+ "node_modules/@babel/helper-compilation-targets/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/helper-compilation-targets/node_modules/yallist": {"version": "3.1.1","resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",@@ -345,6 +372,15 @@"@babel/core": "^7.0.0"}},+ "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/helper-create-regexp-features-plugin": {"version": "7.22.15","resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",@@ -362,10 +398,19 @@"@babel/core": "^7.0.0"}},+ "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/helper-define-polyfill-provider": {- "version": "0.4.3",- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",- "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",+ "version": "0.4.2",+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",+ "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==","dev": true,"dependencies": {"@babel/helper-compilation-targets": "^7.22.6",@@ -585,13 +630,13 @@}},"node_modules/@babel/helpers": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",- "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",+ "version": "7.23.1",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",+ "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==","dev": true,"dependencies": {"@babel/template": "^7.22.15",- "@babel/traverse": "^7.23.2",+ "@babel/traverse": "^7.23.0","@babel/types": "^7.23.0"},"engines": {@@ -949,14 +994,14 @@}},"node_modules/@babel/plugin-transform-async-generator-functions": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",- "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",+ "version": "7.22.15",+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",+ "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==","dev": true,"dependencies": {- "@babel/helper-environment-visitor": "^7.22.20",+ "@babel/helper-environment-visitor": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5",- "@babel/helper-remap-async-to-generator": "^7.22.20",+ "@babel/helper-remap-async-to-generator": "^7.22.9","@babel/plugin-syntax-async-generators": "^7.8.4"},"engines": {@@ -1771,12 +1816,12 @@}},"node_modules/@babel/preset-env": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",- "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",+ "version": "7.22.20",+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",+ "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==","dev": true,"dependencies": {- "@babel/compat-data": "^7.23.2",+ "@babel/compat-data": "^7.22.20","@babel/helper-compilation-targets": "^7.22.15","@babel/helper-plugin-utils": "^7.22.5","@babel/helper-validator-option": "^7.22.15",@@ -1802,15 +1847,15 @@"@babel/plugin-syntax-top-level-await": "^7.14.5","@babel/plugin-syntax-unicode-sets-regex": "^7.18.6","@babel/plugin-transform-arrow-functions": "^7.22.5",- "@babel/plugin-transform-async-generator-functions": "^7.23.2",+ "@babel/plugin-transform-async-generator-functions": "^7.22.15","@babel/plugin-transform-async-to-generator": "^7.22.5","@babel/plugin-transform-block-scoped-functions": "^7.22.5",- "@babel/plugin-transform-block-scoping": "^7.23.0",+ "@babel/plugin-transform-block-scoping": "^7.22.15","@babel/plugin-transform-class-properties": "^7.22.5","@babel/plugin-transform-class-static-block": "^7.22.11","@babel/plugin-transform-classes": "^7.22.15","@babel/plugin-transform-computed-properties": "^7.22.5",- "@babel/plugin-transform-destructuring": "^7.23.0",+ "@babel/plugin-transform-destructuring": "^7.22.15","@babel/plugin-transform-dotall-regex": "^7.22.5","@babel/plugin-transform-duplicate-keys": "^7.22.5","@babel/plugin-transform-dynamic-import": "^7.22.11",@@ -1822,9 +1867,9 @@"@babel/plugin-transform-literals": "^7.22.5","@babel/plugin-transform-logical-assignment-operators": "^7.22.11","@babel/plugin-transform-member-expression-literals": "^7.22.5",- "@babel/plugin-transform-modules-amd": "^7.23.0",- "@babel/plugin-transform-modules-commonjs": "^7.23.0",- "@babel/plugin-transform-modules-systemjs": "^7.23.0",+ "@babel/plugin-transform-modules-amd": "^7.22.5",+ "@babel/plugin-transform-modules-commonjs": "^7.22.15",+ "@babel/plugin-transform-modules-systemjs": "^7.22.11","@babel/plugin-transform-modules-umd": "^7.22.5","@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5","@babel/plugin-transform-new-target": "^7.22.5",@@ -1833,7 +1878,7 @@"@babel/plugin-transform-object-rest-spread": "^7.22.15","@babel/plugin-transform-object-super": "^7.22.5","@babel/plugin-transform-optional-catch-binding": "^7.22.11",- "@babel/plugin-transform-optional-chaining": "^7.23.0",+ "@babel/plugin-transform-optional-chaining": "^7.22.15","@babel/plugin-transform-parameters": "^7.22.15","@babel/plugin-transform-private-methods": "^7.22.5","@babel/plugin-transform-private-property-in-object": "^7.22.11",@@ -1850,10 +1895,10 @@"@babel/plugin-transform-unicode-regex": "^7.22.5","@babel/plugin-transform-unicode-sets-regex": "^7.22.5","@babel/preset-modules": "0.1.6-no-external-plugins",- "@babel/types": "^7.23.0",- "babel-plugin-polyfill-corejs2": "^0.4.6",- "babel-plugin-polyfill-corejs3": "^0.8.5",- "babel-plugin-polyfill-regenerator": "^0.5.3",+ "@babel/types": "^7.22.19",+ "babel-plugin-polyfill-corejs2": "^0.4.5",+ "babel-plugin-polyfill-corejs3": "^0.8.3",+ "babel-plugin-polyfill-regenerator": "^0.5.2","core-js-compat": "^3.31.0","semver": "^6.3.1"},@@ -1864,6 +1909,15 @@"@babel/core": "^7.0.0-0"}},+ "node_modules/@babel/preset-env/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/@babel/preset-modules": {"version": "0.1.6-no-external-plugins","resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",@@ -1934,9 +1988,9 @@}},"node_modules/@babel/traverse": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",- "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",+ "version": "7.23.0",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",+ "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==","dev": true,"dependencies": {"@babel/code-frame": "^7.22.13",@@ -2343,9 +2397,9 @@}},"node_modules/@eslint/js": {- "version": "8.51.0",- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",- "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",+ "version": "8.50.0",+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",+ "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==","engines": {"node": "^12.22.0 || ^14.17.0 || >=16.0.0"}@@ -2432,34 +2486,6 @@"version": "0.1.2","license": "MIT"},- "node_modules/@gilbarbara/helpers": {- "version": "0.8.7",- "resolved": "https://registry.npmjs.org/@gilbarbara/helpers/-/helpers-0.8.7.tgz",- "integrity": "sha512-DL3btZpWnS3ZMkGdQ9sVQgVj/WlabUFbRoP6sg2iOjEFImq+QDqFgEDZn4Uf8LF3thGuNgj9EtsWlNCbvJYTqg==",- "dependencies": {- "@gilbarbara/types": "^0.2.2",- "is-lite": "^0.9.3"- }- },- "node_modules/@gilbarbara/types": {- "version": "0.2.2",- "resolved": "https://registry.npmjs.org/@gilbarbara/types/-/types-0.2.2.tgz",- "integrity": "sha512-QuQDBRRcm1Q8AbSac2W1YElurOhprj3Iko/o+P1fJxUWS4rOGKMVli98OXS7uo4z+cKAif6a+L9bcZFSyauQpQ==",- "dependencies": {- "type-fest": "^4.1.0"- }- },- "node_modules/@gilbarbara/types/node_modules/type-fest": {- "version": "4.4.0",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.4.0.tgz",- "integrity": "sha512-HT3RRs7sTfY22KuPQJkD/XjbTbxgP2Je5HPt6H6JEGvcjHd5Lqru75EbrP3tb4FYjNJ+DjLp+MNQTFQU0mhXNw==",- "engines": {- "node": ">=16"- },- "funding": {- "url": "https://github.com/sponsors/sindresorhus"- }- },"node_modules/@humanwhocodes/config-array": {"version": "0.11.11","resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",@@ -3456,12 +3482,12 @@}},"node_modules/@playwright/test": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",- "integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",+ "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==","dev": true,"dependencies": {- "playwright": "1.39.0"+ "playwright": "1.38.1"},"bin": {"playwright": "cli.js"@@ -5098,26 +5124,35 @@}},"node_modules/babel-plugin-polyfill-corejs2": {- "version": "0.4.6",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",- "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",+ "version": "0.4.5",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",+ "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==","dev": true,"dependencies": {"@babel/compat-data": "^7.22.6",- "@babel/helper-define-polyfill-provider": "^0.4.3",+ "@babel/helper-define-polyfill-provider": "^0.4.2","semver": "^6.3.1"},"peerDependencies": {"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"}},+ "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/babel-plugin-polyfill-corejs3": {- "version": "0.8.5",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",- "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",+ "version": "0.8.4",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz",+ "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==","dev": true,"dependencies": {- "@babel/helper-define-polyfill-provider": "^0.4.3",+ "@babel/helper-define-polyfill-provider": "^0.4.2","core-js-compat": "^3.32.2"},"peerDependencies": {@@ -5125,12 +5160,12 @@}},"node_modules/babel-plugin-polyfill-regenerator": {- "version": "0.5.3",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",- "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",+ "version": "0.5.2",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",+ "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==","dev": true,"dependencies": {- "@babel/helper-define-polyfill-provider": "^0.4.3"+ "@babel/helper-define-polyfill-provider": "^0.4.2"},"peerDependencies": {"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"@@ -6905,11 +6940,6 @@}}},- "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=="- },"node_modules/deep-equal": {"version": "1.1.1","resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",@@ -7508,14 +7538,14 @@}},"node_modules/eslint": {- "version": "8.51.0",- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",- "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",+ "version": "8.50.0",+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",+ "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==","dependencies": {"@eslint-community/eslint-utils": "^4.2.0","@eslint-community/regexpp": "^4.6.1","@eslint/eslintrc": "^2.1.2",- "@eslint/js": "8.51.0",+ "@eslint/js": "8.50.0","@humanwhocodes/config-array": "^0.11.11","@humanwhocodes/module-importer": "^1.0.1","@nodelib/fs.walk": "^1.2.8",@@ -7818,6 +7848,15 @@"node": ">=0.10.0"}},+ "node_modules/eslint-plugin-import/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/eslint-plugin-jest": {"version": "27.4.2","resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.4.2.tgz",@@ -7873,9 +7912,9 @@}},"node_modules/eslint-plugin-n": {- "version": "16.2.0",- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz",- "integrity": "sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==",+ "version": "16.1.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",+ "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==","dev": true,"dependencies": {"@eslint-community/eslint-utils": "^4.4.0",@@ -8018,6 +8057,15 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/eslint-plugin-react/node_modules/semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true,+ "bin": {+ "semver": "bin/semver.js"+ }+ },"node_modules/eslint-scope": {"version": "5.1.1","license": "BSD-2-Clause",@@ -9818,9 +9866,8 @@}},"node_modules/is-lite": {- "version": "0.9.3",- "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.9.3.tgz",- "integrity": "sha512-lbyynwsRRUMh1fHEinXkde/thdjj8OpW/okyGAVgmW4r/FkCEP966oSEg0B8ON5+mm73MJjFXB4ZViuaAldw4g=="+ "version": "0.9.2",+ "license": "MIT"},"node_modules/is-map": {"version": "2.0.2",@@ -13856,12 +13903,12 @@}},"node_modules/playwright": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",- "integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",+ "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==","dev": true,"dependencies": {- "playwright-core": "1.39.0"+ "playwright-core": "1.38.1"},"bin": {"playwright": "cli.js"@@ -13874,9 +13921,9 @@}},"node_modules/playwright-core": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",- "integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",+ "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==","dev": true,"bin": {"playwright-core": "cli.js"@@ -14886,60 +14933,30 @@"react": "^0.14.9 || ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"}},- "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==",- "peerDependencies": {- "@types/react": ">=0.0.0 <=99",- "react": ">=0.0.0 <=99"- }- },"node_modules/react-is": {"version": "16.13.1","license": "MIT"},"node_modules/react-joyride": {- "version": "2.6.1",- "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.6.1.tgz",- "integrity": "sha512-JgGxWcg3fhQx3DrSTfC7nBmexH1N1UTy8hKi+U5QAObo+ZqACi3/X62RWbauZDxloshCNX2c6Zpui14+6NYeow==",+ "version": "2.5.5",+ "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.5.5.tgz",+ "integrity": "sha512-/esW9IcsuQJr4NcRZJUH8UYYTvB/yzVC0IyElopbjMFYPw3aylSny91QO3mQRRKPQJUqYa6wREOtQpsaLbu9fw==","dependencies": {- "@gilbarbara/deep-equal": "^0.2.0",- "@gilbarbara/helpers": "^0.8.6",- "deep-diff": "^1.0.2","deepmerge": "^4.3.1",- "is-lite": "^0.9.3",+ "exenv": "^1.2.2",+ "is-lite": "^0.9.2",+ "prop-types": "^15.8.1","react-floater": "^0.7.6",- "react-innertext": "^1.1.5","react-is": "^16.13.1","scroll": "^3.0.1","scrollparent": "^2.1.0",- "tree-changes": "^0.10.0"+ "tree-changes": "^0.9.2"},"peerDependencies": {"react": "15 - 18","react-dom": "15 - 18"}},- "node_modules/react-joyride/node_modules/@gilbarbara/deep-equal": {- "version": "0.2.0",- "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.2.0.tgz",- "integrity": "sha512-dkjEAjjsoPUthQHYENjmgd453IBWLNGqFPolcmbbyKrHrGWj3AayQz7CYGN45OljDOTaFSmyb0sWgDtzpaxWjw=="- },- "node_modules/react-joyride/node_modules/tree-changes": {- "version": "0.10.0",- "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.10.0.tgz",- "integrity": "sha512-Hu1ElozbPrc8/zvDfazlnbOQxepXVpy0IRrNrZkUB1aDyyJ+yColKKzGmvO8KE5AH8xvW6z9aChFQfDJGlDdKA==",- "dependencies": {- "@gilbarbara/deep-equal": "^0.1.1",- "is-lite": "^0.9.2"- }- },- "node_modules/react-joyride/node_modules/tree-changes/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=="- },"node_modules/react-lifecycles-compat": {"version": "3.0.4","resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",@@ -15995,10 +16012,9 @@}},"node_modules/semver": {- "version": "6.3.1",- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "version": "6.3.0","dev": true,+ "license": "ISC","bin": {"semver": "bin/semver.js"}@@ -18783,15 +18799,15 @@}},"@babel/compat-data": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",- "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",+ "version": "7.22.20",+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",+ "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==","dev": true},"@babel/core": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",- "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",+ "version": "7.23.0",+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",+ "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==","dev": true,"requires": {"@ampproject/remapping": "^2.2.0",@@ -18799,16 +18815,24 @@"@babel/generator": "^7.23.0","@babel/helper-compilation-targets": "^7.22.15","@babel/helper-module-transforms": "^7.23.0",- "@babel/helpers": "^7.23.2",+ "@babel/helpers": "^7.23.0","@babel/parser": "^7.23.0","@babel/template": "^7.22.15",- "@babel/traverse": "^7.23.2",+ "@babel/traverse": "^7.23.0","@babel/types": "^7.23.0","convert-source-map": "^2.0.0","debug": "^4.1.0","gensync": "^1.0.0-beta.2","json5": "^2.2.3","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"@babel/eslint-parser": {@@ -18820,6 +18844,14 @@"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1","eslint-visitor-keys": "^2.1.0","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"@babel/generator": {@@ -18887,6 +18919,12 @@"yallist": "^3.0.2"}},+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ },"yallist": {"version": "3.1.1","resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",@@ -18910,6 +18948,14 @@"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5","@babel/helper-split-export-declaration": "^7.22.6","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"@babel/helper-create-regexp-features-plugin": {@@ -18921,12 +18967,20 @@"@babel/helper-annotate-as-pure": "^7.22.5","regexpu-core": "^5.3.1","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"@babel/helper-define-polyfill-provider": {- "version": "0.4.3",- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",- "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",+ "version": "0.4.2",+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",+ "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==","dev": true,"requires": {"@babel/helper-compilation-targets": "^7.22.6",@@ -19083,13 +19137,13 @@}},"@babel/helpers": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",- "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",+ "version": "7.23.1",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",+ "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==","dev": true,"requires": {"@babel/template": "^7.22.15",- "@babel/traverse": "^7.23.2",+ "@babel/traverse": "^7.23.0","@babel/types": "^7.23.0"}},@@ -19314,14 +19368,14 @@}},"@babel/plugin-transform-async-generator-functions": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",- "integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",+ "version": "7.22.15",+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",+ "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==","dev": true,"requires": {- "@babel/helper-environment-visitor": "^7.22.20",+ "@babel/helper-environment-visitor": "^7.22.5","@babel/helper-plugin-utils": "^7.22.5",- "@babel/helper-remap-async-to-generator": "^7.22.20",+ "@babel/helper-remap-async-to-generator": "^7.22.9","@babel/plugin-syntax-async-generators": "^7.8.4"}},@@ -19830,12 +19884,12 @@}},"@babel/preset-env": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",- "integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",+ "version": "7.22.20",+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",+ "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==","dev": true,"requires": {- "@babel/compat-data": "^7.23.2",+ "@babel/compat-data": "^7.22.20","@babel/helper-compilation-targets": "^7.22.15","@babel/helper-plugin-utils": "^7.22.5","@babel/helper-validator-option": "^7.22.15",@@ -19861,15 +19915,15 @@"@babel/plugin-syntax-top-level-await": "^7.14.5","@babel/plugin-syntax-unicode-sets-regex": "^7.18.6","@babel/plugin-transform-arrow-functions": "^7.22.5",- "@babel/plugin-transform-async-generator-functions": "^7.23.2",+ "@babel/plugin-transform-async-generator-functions": "^7.22.15","@babel/plugin-transform-async-to-generator": "^7.22.5","@babel/plugin-transform-block-scoped-functions": "^7.22.5",- "@babel/plugin-transform-block-scoping": "^7.23.0",+ "@babel/plugin-transform-block-scoping": "^7.22.15","@babel/plugin-transform-class-properties": "^7.22.5","@babel/plugin-transform-class-static-block": "^7.22.11","@babel/plugin-transform-classes": "^7.22.15","@babel/plugin-transform-computed-properties": "^7.22.5",- "@babel/plugin-transform-destructuring": "^7.23.0",+ "@babel/plugin-transform-destructuring": "^7.22.15","@babel/plugin-transform-dotall-regex": "^7.22.5","@babel/plugin-transform-duplicate-keys": "^7.22.5","@babel/plugin-transform-dynamic-import": "^7.22.11",@@ -19881,9 +19935,9 @@"@babel/plugin-transform-literals": "^7.22.5","@babel/plugin-transform-logical-assignment-operators": "^7.22.11","@babel/plugin-transform-member-expression-literals": "^7.22.5",- "@babel/plugin-transform-modules-amd": "^7.23.0",- "@babel/plugin-transform-modules-commonjs": "^7.23.0",- "@babel/plugin-transform-modules-systemjs": "^7.23.0",+ "@babel/plugin-transform-modules-amd": "^7.22.5",+ "@babel/plugin-transform-modules-commonjs": "^7.22.15",+ "@babel/plugin-transform-modules-systemjs": "^7.22.11","@babel/plugin-transform-modules-umd": "^7.22.5","@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5","@babel/plugin-transform-new-target": "^7.22.5",@@ -19892,7 +19946,7 @@"@babel/plugin-transform-object-rest-spread": "^7.22.15","@babel/plugin-transform-object-super": "^7.22.5","@babel/plugin-transform-optional-catch-binding": "^7.22.11",- "@babel/plugin-transform-optional-chaining": "^7.23.0",+ "@babel/plugin-transform-optional-chaining": "^7.22.15","@babel/plugin-transform-parameters": "^7.22.15","@babel/plugin-transform-private-methods": "^7.22.5","@babel/plugin-transform-private-property-in-object": "^7.22.11",@@ -19909,12 +19963,20 @@"@babel/plugin-transform-unicode-regex": "^7.22.5","@babel/plugin-transform-unicode-sets-regex": "^7.22.5","@babel/preset-modules": "0.1.6-no-external-plugins",- "@babel/types": "^7.23.0",- "babel-plugin-polyfill-corejs2": "^0.4.6",- "babel-plugin-polyfill-corejs3": "^0.8.5",- "babel-plugin-polyfill-regenerator": "^0.5.3",+ "@babel/types": "^7.22.19",+ "babel-plugin-polyfill-corejs2": "^0.4.5",+ "babel-plugin-polyfill-corejs3": "^0.8.3",+ "babel-plugin-polyfill-regenerator": "^0.5.2","core-js-compat": "^3.31.0","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"@babel/preset-modules": {@@ -19973,9 +20035,9 @@}},"@babel/traverse": {- "version": "7.23.2",- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",- "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",+ "version": "7.23.0",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",+ "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==","dev": true,"requires": {"@babel/code-frame": "^7.22.13",@@ -20259,9 +20321,9 @@}},"@eslint/js": {- "version": "8.51.0",- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",- "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg=="+ "version": "8.50.0",+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",+ "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ=="},"@floating-ui/core": {"version": "1.5.0",@@ -20323,30 +20385,6 @@"@gilbarbara/deep-equal": {"version": "0.1.2"},- "@gilbarbara/helpers": {- "version": "0.8.7",- "resolved": "https://registry.npmjs.org/@gilbarbara/helpers/-/helpers-0.8.7.tgz",- "integrity": "sha512-DL3btZpWnS3ZMkGdQ9sVQgVj/WlabUFbRoP6sg2iOjEFImq+QDqFgEDZn4Uf8LF3thGuNgj9EtsWlNCbvJYTqg==",- "requires": {- "@gilbarbara/types": "^0.2.2",- "is-lite": "^0.9.3"- }- },- "@gilbarbara/types": {- "version": "0.2.2",- "resolved": "https://registry.npmjs.org/@gilbarbara/types/-/types-0.2.2.tgz",- "integrity": "sha512-QuQDBRRcm1Q8AbSac2W1YElurOhprj3Iko/o+P1fJxUWS4rOGKMVli98OXS7uo4z+cKAif6a+L9bcZFSyauQpQ==",- "requires": {- "type-fest": "^4.1.0"- },- "dependencies": {- "type-fest": {- "version": "4.4.0",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.4.0.tgz",- "integrity": "sha512-HT3RRs7sTfY22KuPQJkD/XjbTbxgP2Je5HPt6H6JEGvcjHd5Lqru75EbrP3tb4FYjNJ+DjLp+MNQTFQU0mhXNw=="- }- }- },"@humanwhocodes/config-array": {"version": "0.11.11","resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",@@ -21078,12 +21116,12 @@"optional": true},"@playwright/test": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",- "integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",+ "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==","dev": true,"requires": {- "playwright": "1.39.0"+ "playwright": "1.38.1"}},"@pmmmwh/react-refresh-webpack-plugin": {@@ -22300,33 +22338,41 @@}},"babel-plugin-polyfill-corejs2": {- "version": "0.4.6",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",- "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",+ "version": "0.4.5",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",+ "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==","dev": true,"requires": {"@babel/compat-data": "^7.22.6",- "@babel/helper-define-polyfill-provider": "^0.4.3",+ "@babel/helper-define-polyfill-provider": "^0.4.2","semver": "^6.3.1"+ },+ "dependencies": {+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true+ }}},"babel-plugin-polyfill-corejs3": {- "version": "0.8.5",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",- "integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",+ "version": "0.8.4",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz",+ "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==","dev": true,"requires": {- "@babel/helper-define-polyfill-provider": "^0.4.3",+ "@babel/helper-define-polyfill-provider": "^0.4.2","core-js-compat": "^3.32.2"}},"babel-plugin-polyfill-regenerator": {- "version": "0.5.3",- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",- "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",+ "version": "0.5.2",+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",+ "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==","dev": true,"requires": {- "@babel/helper-define-polyfill-provider": "^0.4.3"+ "@babel/helper-define-polyfill-provider": "^0.4.2"}},"babel-preset-current-node-syntax": {@@ -23514,11 +23560,6 @@"dev": true,"requires": {}},- "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=="- },"deep-equal": {"version": "1.1.1","resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",@@ -23936,14 +23977,14 @@}},"eslint": {- "version": "8.51.0",- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",- "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",+ "version": "8.50.0",+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",+ "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==","requires": {"@eslint-community/eslint-utils": "^4.2.0","@eslint-community/regexpp": "^4.6.1","@eslint/eslintrc": "^2.1.2",- "@eslint/js": "8.51.0",+ "@eslint/js": "8.50.0","@humanwhocodes/config-array": "^0.11.11","@humanwhocodes/module-importer": "^1.0.1","@nodelib/fs.walk": "^1.2.8",@@ -24221,6 +24262,12 @@"requires": {"esutils": "^2.0.2"}+ },+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true}}},@@ -24256,9 +24303,9 @@}},"eslint-plugin-n": {- "version": "16.2.0",- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz",- "integrity": "sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==",+ "version": "16.1.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",+ "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==","dev": true,"requires": {"@eslint-community/eslint-utils": "^4.4.0",@@ -24343,6 +24390,12 @@"path-parse": "^1.0.7","supports-preserve-symlinks-flag": "^1.0.0"}+ },+ "semver": {+ "version": "6.3.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "dev": true}}},@@ -25381,9 +25434,7 @@}},"is-lite": {- "version": "0.9.3",- "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.9.3.tgz",- "integrity": "sha512-lbyynwsRRUMh1fHEinXkde/thdjj8OpW/okyGAVgmW4r/FkCEP966oSEg0B8ON5+mm73MJjFXB4ZViuaAldw4g=="+ "version": "0.9.2"},"is-map": {"version": "2.0.2",@@ -28149,13 +28200,13 @@}},"playwright": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",- "integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",+ "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==","dev": true,"requires": {"fsevents": "2.3.2",- "playwright-core": "1.39.0"+ "playwright-core": "1.38.1"},"dependencies": {"fsevents": {@@ -28168,9 +28219,9 @@}},"playwright-core": {- "version": "1.39.0",- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",- "integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",+ "version": "1.38.1",+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",+ "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==","dev": true},"popper.js": {@@ -28783,54 +28834,23 @@"prop-types": "^15.5.8"}},- "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-is": {"version": "16.13.1"},"react-joyride": {- "version": "2.6.1",- "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.6.1.tgz",- "integrity": "sha512-JgGxWcg3fhQx3DrSTfC7nBmexH1N1UTy8hKi+U5QAObo+ZqACi3/X62RWbauZDxloshCNX2c6Zpui14+6NYeow==",+ "version": "2.5.5",+ "resolved": "https://registry.npmjs.org/react-joyride/-/react-joyride-2.5.5.tgz",+ "integrity": "sha512-/esW9IcsuQJr4NcRZJUH8UYYTvB/yzVC0IyElopbjMFYPw3aylSny91QO3mQRRKPQJUqYa6wREOtQpsaLbu9fw==","requires": {- "@gilbarbara/deep-equal": "^0.2.0",- "@gilbarbara/helpers": "^0.8.6",- "deep-diff": "^1.0.2","deepmerge": "^4.3.1",- "is-lite": "^0.9.3",+ "exenv": "^1.2.2",+ "is-lite": "^0.9.2",+ "prop-types": "^15.8.1","react-floater": "^0.7.6",- "react-innertext": "^1.1.5","react-is": "^16.13.1","scroll": "^3.0.1","scrollparent": "^2.1.0",- "tree-changes": "^0.10.0"- },- "dependencies": {- "@gilbarbara/deep-equal": {- "version": "0.2.0",- "resolved": "https://registry.npmjs.org/@gilbarbara/deep-equal/-/deep-equal-0.2.0.tgz",- "integrity": "sha512-dkjEAjjsoPUthQHYENjmgd453IBWLNGqFPolcmbbyKrHrGWj3AayQz7CYGN45OljDOTaFSmyb0sWgDtzpaxWjw=="- },- "tree-changes": {- "version": "0.10.0",- "resolved": "https://registry.npmjs.org/tree-changes/-/tree-changes-0.10.0.tgz",- "integrity": "sha512-Hu1ElozbPrc8/zvDfazlnbOQxepXVpy0IRrNrZkUB1aDyyJ+yColKKzGmvO8KE5AH8xvW6z9aChFQfDJGlDdKA==",- "requires": {- "@gilbarbara/deep-equal": "^0.1.1",- "is-lite": "^0.9.2"- },- "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=="- }- }- }+ "tree-changes": "^0.9.2"}},"react-lifecycles-compat": {@@ -29564,9 +29584,7 @@}},"semver": {- "version": "6.3.1",- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",+ "version": "6.3.0","dev": true},"send": {diff --git a/package.json b/package.jsonindex cb6c2b851..3a942806c 100644--- a/package.json+++ b/package.json@@ -77,12 +77,12 @@"upload": "node tasks/util/upload.js"},"devDependencies": {- "@babel/core": "^7.23.2",+ "@babel/core": "^7.23.0","@babel/eslint-parser": "^7.22.15","@babel/plugin-transform-class-properties": "^7.18.6",- "@babel/preset-env": "^7.23.2",+ "@babel/preset-env": "^7.22.20","@babel/preset-react": "^7.22.15",- "@playwright/test": "^1.39.0",+ "@playwright/test": "^1.38.1","@pmmmwh/react-refresh-webpack-plugin": "^0.5.11","@webpack-cli/serve": "^2.0.5","ajv": "^8.12.0",@@ -95,14 +95,14 @@"css-minimizer-webpack-plugin": "^5.0.1","css-url-relative-plugin": "^1.1.0","cssnano": "^6.0.1",- "eslint": "^8.51.0",+ "eslint": "^8.50.0","eslint-config-airbnb": "^19.0.4","eslint-config-standard": "^17.1.0","eslint-import-resolver-webpack": "^0.13.7","eslint-plugin-import": "^2.28.1","eslint-plugin-jest": "^27.4.2","eslint-plugin-jsx-a11y": "^6.7.1",- "eslint-plugin-n": "^16.2.0",+ "eslint-plugin-n": "^16.1.0","eslint-plugin-no-storage": "^1.0.2","eslint-plugin-node": "^11.1.0","eslint-plugin-promise": "^6.1.1",@@ -126,7 +126,7 @@"react-test-renderer": "^18.0.0","redux-mock-store": "^1.5.4","run-script-os": "^1.1.6",- "sass": "^1.69.3",+ "sass": "^1.69.0","sass-loader": "^13.3.2","shelljs": "^0.8.5","showdown": "^2.1.0",@@ -189,7 +189,7 @@"react-draggable": "^4.4.6","react-image-crop": "^10.1.8","react-infinite-scroller": "^1.2.6",- "react-joyride": "^2.6.1",+ "react-joyride": "^2.5.4","react-mobile-datepicker": "^4.0.2","react-redux": "^8.1.3","react-resizable": "^3.0.5",diff --git a/web/js/app.js b/web/js/app.jsindex e09a17cea..d598eda37 100644--- a/web/js/app.js+++ b/web/js/app.js@@ -36,7 +36,6 @@ import Debug from './components/util/debug';import keyPress from './modules/key-press/actions';import setScreenInfo from './modules/screen-size/actions';// Notifications-import { addToLocalStorage } from './modules/notifications/util';import Notifications from './containers/notifications';import { outageNotificationsSeenAction } from './modules/notifications/actions';// Dependency CSS@@ -68,12 +67,10 @@ class App extends React.Component {componentDidUpdate(prevProps) {// Check if the numberUnseen prop has changed- const {- kioskModeEnabled, notifications, numberOutagesUnseen,- } = this.props;+ const { kioskModeEnabled, numberOutagesUnseen, object } = this.props;if (numberOutagesUnseen !== prevProps.numberOutagesUnseen) {if (numberOutagesUnseen > 0 && !kioskModeEnabled) {- this.openNotification(notifications, numberOutagesUnseen);+ this.openNotification(object.outages, numberOutagesUnseen);}}}@@ -201,7 +198,6 @@ function mapStateToProps(state) {isEmbedModeActive: state.embed.isEmbedModeActive,isMobile: state.screenSize.isMobileDevice,isTourActive: state.tour.active,- notifications,numberOutagesUnseen,numberUnseen,object,@@ -221,14 +217,6 @@ const mapDispatchToProps = (dispatch) => ({dispatch(setScreenInfo());},notificationClick: (obj, numberOutagesUnseen) => {- // Used to update local storage to reflect OUTAGES have been seen- const notificationsSeenObj = {- alerts: [],- layerNotices: [],- messages: [],- outages: obj.object.outages,- };-dispatch(openCustomContent('NOTIFICATION_LIST_MODAL', {headerText: 'Notifications',@@ -237,7 +225,6 @@ const mapDispatchToProps = (dispatch) => ({onClose: () => {if (numberOutagesUnseen > 0) {dispatch(outageNotificationsSeenAction());- addToLocalStorage(notificationsSeenObj);}},}),@@ -260,7 +247,6 @@ App.propTypes = {locationKey: PropTypes.string,modalId: PropTypes.string,notificationClick: PropTypes.func,- notifications: PropTypes.object,numberOutagesUnseen: PropTypes.number,parameters: PropTypes.object,setScreenInfoAction: PropTypes.func,diff --git a/web/js/containers/info.js b/web/js/containers/info.jsindex 1ff243a9d..c31a39fab 100644--- a/web/js/containers/info.js+++ b/web/js/containers/info.js@@ -50,7 +50,7 @@ function InfoList (props) {? 'exclamation-circle': ['fas', 'bolt'],id: 'notifications_info_item',- badge: type ? numberUnseen : 0,+ badge: numberUnseen,className: type ? `${type}-notification` : '',onClick: () => {notificationClick(object, numberUnseen);diff --git a/web/js/containers/toolbar.js b/web/js/containers/toolbar.jsindex 1e7d6be77..3468f1674 100644--- a/web/js/containers/toolbar.js+++ b/web/js/containers/toolbar.js@@ -102,9 +102,7 @@ class toolbarContainer extends Component {}componentDidUpdate(prevProps, prevState) {- const {- isAboutOpen, openAboutModal, modalIsOpen,- } = this.props;+ const { isAboutOpen, openAboutModal, modalIsOpen } = this.props;if (modalIsOpen !== prevProps.modalIsOpen) {if (isAboutOpen) {openAboutModal();@@ -350,7 +348,6 @@ class toolbarContainer extends Component {isDistractionFreeModeActive,isMobile,} = this.props;-const notificationClass = notificationType? ` wv-status-${notificationType}`: ' wv-status-hide';@@ -442,7 +439,7 @@ const mapStateToProps = (state) => {ui,} = state;const { isDistractionFreeModeActive, isKioskModeActive } = ui;- const { numberUnseen, type } = notifications;+ const { number, type } = notifications;const { activeString } = compare;const activeLayersForProj = getAllActiveLayers(state);const isMobile = screenSize.isMobileDevice;@@ -482,7 +479,7 @@ const mapStateToProps = (state) => {),modalIsOpen,notificationType: type,- notificationContentNumber: numberUnseen,+ notificationContentNumber: number,proj,rotation: map.rotation,shouldBeCollapsed,diff --git a/web/js/modules/notifications/reducers.js b/web/js/modules/notifications/reducers.jsindex db0e4a8fc..7db66dd14 100644--- a/web/js/modules/notifications/reducers.js+++ b/web/js/modules/notifications/reducers.js@@ -32,7 +32,7 @@ export function notificationsReducer(state = notificationReducerState, action) {return {...state,number: getCount(notificationsByType),- numberUnseen: getCount(notificationsByType),+ numberUnseen: getCount(notificationsByType, true),numberOutagesUnseen,type: getPriority(notificationsByType),isActive: true,@@ -48,25 +48,11 @@ export function notificationsReducer(state = notificationReducerState, action) {type: '',isActive: true,};- case OUTAGE_NOTIFICATIONS_SEEN: {- const notificationObj = {- alerts: state.object.alerts,- messages: state.object.messages,- layerNotices: state.object.layerNotices,- outages: [],- };+ case OUTAGE_NOTIFICATIONS_SEEN:return {...state,- numberUnseen: state.number - state.numberOutagesUnseen >= 0- ? state.number - state.numberOutagesUnseen- : 0,- number: state.number - state.numberOutagesUnseen >= 0- ? state.number - state.numberOutagesUnseen- : 0,numberOutagesUnseen: 0,- type: getPriority(notificationObj),};- }default:return state;}diff --git a/web/js/modules/notifications/reducers.test.js b/web/js/modules/notifications/reducers.test.jsindex 5603c8705..b612f5c82 100644--- a/web/js/modules/notifications/reducers.test.js+++ b/web/js/modules/notifications/reducers.test.js@@ -54,7 +54,7 @@ describe('notificationsReducer', () => {).toEqual({number: 1,numberOutagesUnseen: 1,- numberUnseen: 1,+ numberUnseen: 0,type: 'outage',isActive: true,object: constants.MOCK_SORTED_NOTIFICATIONS,diff --git a/web/js/modules/notifications/util.js b/web/js/modules/notifications/util.jsindex 14cef647c..67e08da74 100644--- a/web/js/modules/notifications/util.js+++ b/web/js/modules/notifications/util.js@@ -153,6 +153,13 @@ export function getCount(notifications, unseenOnly) {messages, outages, alerts,} = notifications;+ if (unseenOnly) {+ const messageCount = getNumberOfTypeNotSeen(NOTIFICATION_MSG, notifications.layerNotices.filter((obj) => obj.notification_type === 'message'));+ const alertCount = getNumberOfTypeNotSeen(NOTIFICATION_ALERT, notifications.layerNotices.filter((obj) => obj.notification_type === 'alert'));+ const outageCount = getNumberOfTypeNotSeen(NOTIFICATION_OUTAGE, notifications.layerNotices.filter((obj) => obj.notification_type === 'outage'));++ return messageCount + outageCount + alertCount;+ }return messages.length + alerts.length + outages.length;}