Merge branch 'develop' into update-node-CI

ral-facilities · Nov 3, 2023 · 8590cbd · 8590cbd
2 parents a87925c + 7f47a97
commit 8590cbd
Show file tree

Hide file tree

Showing 55 changed files with 773 additions and 407 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@babel-code-frame-npm-7.22.13-2782581d20-22e342c807.zip b/.yarn/cache/@babel-code-frame-npm-7.22.13-2782581d20-22e342c807.zip
diff --git a/.yarn/cache/@babel-generator-npm-7.23.0-08841c5369-8efe24adad.zip b/.yarn/cache/@babel-generator-npm-7.23.0-08841c5369-8efe24adad.zip
diff --git a/.yarn/cache/@babel-helper-environment-visitor-npm-7.22.20-260909e014-d80ee98ff6.zip b/.yarn/cache/@babel-helper-environment-visitor-npm-7.22.20-260909e014-d80ee98ff6.zip
diff --git a/.yarn/cache/@babel-helper-function-name-npm-7.23.0-ce38271242-e44542257b.zip b/.yarn/cache/@babel-helper-function-name-npm-7.23.0-ce38271242-e44542257b.zip
diff --git a/.yarn/cache/@babel-helper-hoist-variables-npm-7.22.5-6db3192347-394ca191b4.zip b/.yarn/cache/@babel-helper-hoist-variables-npm-7.22.5-6db3192347-394ca191b4.zip
diff --git a/.yarn/cache/@babel-helper-split-export-declaration-npm-7.22.6-e723505aef-e141cace58.zip b/.yarn/cache/@babel-helper-split-export-declaration-npm-7.22.6-e723505aef-e141cace58.zip
diff --git a/.yarn/cache/@babel-helper-string-parser-npm-7.22.5-448ff0e489-836851ca5e.zip b/.yarn/cache/@babel-helper-string-parser-npm-7.22.5-448ff0e489-836851ca5e.zip
diff --git a/.yarn/cache/@babel-helper-validator-identifier-npm-7.22.20-18305bb306-136412784d.zip b/.yarn/cache/@babel-helper-validator-identifier-npm-7.22.20-18305bb306-136412784d.zip
diff --git a/.yarn/cache/@babel-highlight-npm-7.22.20-5de7aba88d-84bd034dca.zip b/.yarn/cache/@babel-highlight-npm-7.22.20-5de7aba88d-84bd034dca.zip
diff --git a/.yarn/cache/@babel-parser-npm-7.23.0-8a7b151672-453fdf8b9e.zip b/.yarn/cache/@babel-parser-npm-7.23.0-8a7b151672-453fdf8b9e.zip
diff --git a/.yarn/cache/@babel-template-npm-7.22.15-0b464facb4-1f3e7dcd6c.zip b/.yarn/cache/@babel-template-npm-7.22.15-0b464facb4-1f3e7dcd6c.zip
diff --git a/.yarn/cache/@babel-traverse-npm-7.21.5-1ca322a4d6-b403733fa7.zip b/.yarn/cache/@babel-traverse-npm-7.21.5-1ca322a4d6-b403733fa7.zip
diff --git a/.yarn/cache/@babel-traverse-npm-7.23.2-4758feee42-26a1eea0dd.zip b/.yarn/cache/@babel-traverse-npm-7.23.2-4758feee42-26a1eea0dd.zip
diff --git a/.yarn/cache/@babel-types-npm-7.23.0-332fd21daf-215fe04bd7.zip b/.yarn/cache/@babel-types-npm-7.23.0-332fd21daf-215fe04bd7.zip
diff --git a/.yarn/cache/@date-io-core-npm-2.16.0-9d85ca73c3-336d0dd90f.zip b/.yarn/cache/@date-io-core-npm-2.16.0-9d85ca73c3-336d0dd90f.zip
diff --git a/.yarn/cache/@date-io-core-npm-2.17.0-964e4da5c1-008dfc79eb.zip b/.yarn/cache/@date-io-core-npm-2.17.0-964e4da5c1-008dfc79eb.zip
diff --git a/.yarn/cache/@date-io-date-fns-npm-2.16.0-01bd3f9bac-aedb23c07d.zip b/.yarn/cache/@date-io-date-fns-npm-2.16.0-01bd3f9bac-aedb23c07d.zip
diff --git a/.yarn/cache/@date-io-date-fns-npm-2.17.0-86569c50a5-bfab634c98.zip b/.yarn/cache/@date-io-date-fns-npm-2.17.0-86569c50a5-bfab634c98.zip
diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip
diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.5.1-bf72922237-6d901166d6.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.5.1-bf72922237-6d901166d6.zip
diff --git a/...intrc-npm-2.1.0-352060d453-d5ed0adbe2.zip → ...intrc-npm-2.1.2-feb0771c9f-bc742a1e3b.zip b/...intrc-npm-2.1.0-352060d453-d5ed0adbe2.zip → ...intrc-npm-2.1.2-feb0771c9f-bc742a1e3b.zip
diff --git a/...t-js-npm-8.44.0-66b473d41b-fc53958322.zip → ...t-js-npm-8.52.0-801dbdf7b0-490893b809.zip b/...t-js-npm-8.44.0-66b473d41b-fc53958322.zip → ...t-js-npm-8.52.0-801dbdf7b0-490893b809.zip
diff --git a/...ray-npm-0.11.10-7b63df9e7f-1b1302e240.zip → ...ray-npm-0.11.13-12314014f2-f8ea57b0d7.zip b/...ray-npm-0.11.10-7b63df9e7f-1b1302e240.zip → ...ray-npm-0.11.13-12314014f2-f8ea57b0d7.zip
diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip
diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.1-c23364bbfc-24929487b1.zip
diff --git a/.yarn/cache/@types-json-schema-npm-7.0.11-79462ae5ca-527bddfe62.zip b/.yarn/cache/@types-json-schema-npm-7.0.11-79462ae5ca-527bddfe62.zip
diff --git a/.yarn/cache/@types-json-schema-npm-7.0.12-f05cfc0e99-00239e9723.zip b/.yarn/cache/@types-json-schema-npm-7.0.12-f05cfc0e99-00239e9723.zip
diff --git a/...mver-npm-7.3.13-56212b60da-00c0724d54.zip → ...emver-npm-7.5.0-4823ff34be-0a64b9b9c7.zip b/...mver-npm-7.3.13-56212b60da-00c0724d54.zip → ...emver-npm-7.5.0-4823ff34be-0a64b9b9c7.zip
diff --git a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-5.61.0-4907256241-d9e891fb43.zip b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-5.61.0-4907256241-d9e891fb43.zip
diff --git a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.2.1-0d36314f04-e73f3fe365.zip b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.2.1-0d36314f04-e73f3fe365.zip
diff --git a/.yarn/cache/@typescript-eslint-parser-npm-5.61.0-e9d104643e-2422bca03e.zip b/.yarn/cache/@typescript-eslint-parser-npm-5.61.0-e9d104643e-2422bca03e.zip
diff --git a/.yarn/cache/@typescript-eslint-parser-npm-6.2.1-5eca572243-cf4768cbfc.zip b/.yarn/cache/@typescript-eslint-parser-npm-6.2.1-5eca572243-cf4768cbfc.zip
diff --git a/.yarn/cache/@typescript-eslint-scope-manager-npm-6.2.1-50be37182a-3bb461678c.zip b/.yarn/cache/@typescript-eslint-scope-manager-npm-6.2.1-50be37182a-3bb461678c.zip
diff --git a/.yarn/cache/@typescript-eslint-type-utils-npm-5.61.0-6001e85ba7-f0203fd48c.zip b/.yarn/cache/@typescript-eslint-type-utils-npm-5.61.0-6001e85ba7-f0203fd48c.zip
diff --git a/.yarn/cache/@typescript-eslint-type-utils-npm-6.2.1-c2052dd97a-7f8d80f03e.zip b/.yarn/cache/@typescript-eslint-type-utils-npm-6.2.1-c2052dd97a-7f8d80f03e.zip
diff --git a/.yarn/cache/@typescript-eslint-types-npm-6.2.1-45ff46aaf3-388d32f15a.zip b/.yarn/cache/@typescript-eslint-types-npm-6.2.1-45ff46aaf3-388d32f15a.zip
diff --git a/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.2.1-bb98926d47-3d9beeb5e3.zip b/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.2.1-bb98926d47-3d9beeb5e3.zip
diff --git a/.yarn/cache/@typescript-eslint-utils-npm-6.2.1-deb8def7e9-d16356a633.zip b/.yarn/cache/@typescript-eslint-utils-npm-6.2.1-deb8def7e9-d16356a633.zip
diff --git a/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.2.1-6a12bb9525-c05a1c4512.zip b/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.2.1-6a12bb9525-c05a1c4512.zip
diff --git a/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip
diff --git a/...lint-npm-8.44.0-658d375d8a-d06309ce4a.zip → ...lint-npm-8.52.0-e7f048a439-fd22d1e9bd.zip b/...lint-npm-8.44.0-658d375d8a-d06309ce4a.zip → ...lint-npm-8.52.0-e7f048a439-fd22d1e9bd.zip
diff --git a/...scope-npm-7.2.0-88784f5a38-64591a2d8b.zip → ...scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip b/...scope-npm-7.2.0-88784f5a38-64591a2d8b.zip → ...scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip
diff --git a/...-keys-npm-3.4.1-a5d0a58208-f05121d868.zip → ...-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip b/...-keys-npm-3.4.1-a5d0a58208-f05121d868.zip → ...-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip
diff --git a/.yarn/cache/espree-npm-9.6.0-8f679a5d0a-1287979510.zip b/.yarn/cache/espree-npm-9.6.0-8f679a5d0a-1287979510.zip
diff --git a/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip b/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip
diff --git a/.yarn/cache/semver-npm-7.5.0-160502ad5d-2d26693775.zip b/.yarn/cache/semver-npm-7.5.0-160502ad5d-2d26693775.zip
diff --git a/.yarn/cache/single-spa-react-npm-5.0.1-cb23a8bae8-fb0669e9c4.zip b/.yarn/cache/single-spa-react-npm-5.0.1-cb23a8bae8-fb0669e9c4.zip
diff --git a/.yarn/cache/single-spa-react-npm-5.1.4-3d5227d2a6-20a9c33c1a.zip b/.yarn/cache/single-spa-react-npm-5.1.4-3d5227d2a6-20a9c33c1a.zip
diff --git a/.yarn/cache/tough-cookie-npm-4.1.2-09068826e1-a7359e9a3e.zip b/.yarn/cache/tough-cookie-npm-4.1.2-09068826e1-a7359e9a3e.zip
diff --git a/.yarn/cache/ts-api-utils-npm-1.0.1-7c62f6caff-78794fc727.zip b/.yarn/cache/ts-api-utils-npm-1.0.1-7c62f6caff-78794fc727.zip
diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.44.0-sdk",
+  "version": "8.52.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@date-io/date-fns": "2.16.0",
+    "@date-io/date-fns": "2.17.0",
     "@emotion/cache": "11.11.0",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
@@ -40,13 +40,13 @@
     "react-redux": "8.1.1",
     "react-router-dom": "6.8.0",
     "react-scripts": "5.0.1",
-    "single-spa-react": "5.0.1",
+    "single-spa-react": "5.1.4",
     "typescript": "5.1.6",
     "web-vitals": "3.4.0"
   },
   "resolutions": {
-    "@typescript-eslint/eslint-plugin": "5.61.0",
-    "@typescript-eslint/parser": "5.61.0",
+    "@typescript-eslint/eslint-plugin": "6.2.1",
+    "@typescript-eslint/parser": "6.2.1",
     "@testing-library/react/@testing-library/dom": "9.3.1"
   },
   "scripts": {
@@ -112,16 +112,16 @@
     "@testing-library/user-event": "14.4.3",
     "@types/react-router-dom": "5.3.3",
     "@types/testing-library__jest-dom": "5.14.3",
-    "@typescript-eslint/eslint-plugin": "5.61.0",
-    "@typescript-eslint/parser": "5.61.0",
-    "@typescript-eslint/typescript-estree": "5.61.0",
+    "@typescript-eslint/eslint-plugin": "6.2.1",
+    "@typescript-eslint/parser": "6.2.1",
+    "@typescript-eslint/typescript-estree": "6.2.1",
     "@yarnpkg/sdks": "3.0.0-rc.33",
     "chart.js": "4.3.0",
     "chartjs-plugin-zoom": "2.0.0",
     "cross-env": "7.0.3",
     "cypress": "12.17.3",
     "cypress-failed-log": "2.10.0",
-    "eslint": "8.44.0",
+    "eslint": "8.52.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-config-react-app": "7.0.1",
     "eslint-plugin-cypress": "2.13.3",

diff --git a/src/search/components/shotNumber.component.tsx b/src/search/components/shotNumber.component.tsx
@@ -118,8 +118,8 @@ const ShotNumber = (props: ShotNumberProps): React.ReactElement => {
   // Stop the flash animation from playing after 1500ms
   React.useEffect(() => {
     if (
-      (typeof props.searchParameterShotnumMax === undefined &&
-        typeof props.searchParameterShotnumMin === undefined) ||
+      (typeof props.searchParameterShotnumMax === 'undefined' &&
+        typeof props.searchParameterShotnumMin === 'undefined') ||
       isDateToShotnum
     ) {
       setFlashAnimationPlaying(true);