From 3cecc42e60c8cf64189740b4fbe42806f48e5a6b Mon Sep 17 00:00:00 2001 From: Craig Atkinson Date: Sun, 21 Apr 2024 08:32:35 -0500 Subject: [PATCH] Revert "fix(deps): update dependency @types/react to v18 (#1309)" This reverts commit c3fa2b79de3d947a59a47dc4ce8572fcf4dce91a. --- ui/package.json | 4 +- ui/src/Dashboard/DashboardSummary.tsx | 36 +++++----- ui/src/SideMenu/SideMenu.tsx | 2 +- ui/src/SideMenu/SideMenuExternalLink.tsx | 7 +- ui/src/SideMenu/SideMenuItem.tsx | 4 +- ui/src/TestRun/TestRunMenuWrapper.tsx | 2 +- ui/yarn.lock | 91 ++++++++++++++---------- 7 files changed, 81 insertions(+), 65 deletions(-) diff --git a/ui/package.json b/ui/package.json index ffd002c62..5d17c036c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -49,13 +49,13 @@ }, "dependencies": { "@material-table/core": "5.1.12", - "@material-ui/core": "4.12.4", + "@material-ui/core": "4.12.3", "@material-ui/lab": "4.0.0-alpha.60", "@mui/icons-material": "5.0.0", "@reach/router": "1.3.4", "@types/node": "18.19.31", "@types/reach__router": "1.3.15", - "@types/react": "18.2.79", + "@types/react": "17.0.65", "@types/react-dom": "18.2.7", "@types/styled-components": "5.1.32", "axios": "1.6.8", diff --git a/ui/src/Dashboard/DashboardSummary.tsx b/ui/src/Dashboard/DashboardSummary.tsx index 97eb11985..636bd59b5 100644 --- a/ui/src/Dashboard/DashboardSummary.tsx +++ b/ui/src/Dashboard/DashboardSummary.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { TestRunGitMetadata, TestRunSummary } from "../model/TestRunModel"; -import { Grid, List } from "@material-ui/core"; +import { Grid, Hidden, List } from "@material-ui/core"; import TestCountList from "../TestCount/TestCountList"; import PageTitle from "../PageTitle"; import TestRunDuration from "./TestRunDuration"; @@ -88,22 +88,24 @@ const DashboardSummary = ({ ) : null} {totalTestCount > 0 ? ( - - {hasDurationData && ( - - )} - + + + {hasDurationData && ( + + )} + + ) : null} ({ }, sideNavTitle: { textAlign: "center", - fontSize: "1.5rem !important", + fontSize: "1.5rem", }, })); diff --git a/ui/src/SideMenu/SideMenuExternalLink.tsx b/ui/src/SideMenu/SideMenuExternalLink.tsx index d036ca179..e012e1e07 100644 --- a/ui/src/SideMenu/SideMenuExternalLink.tsx +++ b/ui/src/SideMenu/SideMenuExternalLink.tsx @@ -12,11 +12,8 @@ interface SideMenuExternalLinkProps { const useStyles = makeStyles((theme) => ({ sideNavLink: { - color: "white !important", - textDecoration: "none !important", - "&:hover": { - textDecoration: "underline !important", - }, + color: "white", + textDecoration: "none", }, })); diff --git a/ui/src/SideMenu/SideMenuItem.tsx b/ui/src/SideMenu/SideMenuItem.tsx index 5e2ad1e1d..8f4817cec 100644 --- a/ui/src/SideMenu/SideMenuItem.tsx +++ b/ui/src/SideMenu/SideMenuItem.tsx @@ -10,8 +10,8 @@ interface SideMenuItemProps { const useStyles = makeStyles(() => ({ sideNavIcon: { - minWidth: "40px !important", - color: "white !important", + minWidth: "40px", + color: "white", }, })); diff --git a/ui/src/TestRun/TestRunMenuWrapper.tsx b/ui/src/TestRun/TestRunMenuWrapper.tsx index 7fd5fc224..5b1c51d86 100644 --- a/ui/src/TestRun/TestRunMenuWrapper.tsx +++ b/ui/src/TestRun/TestRunMenuWrapper.tsx @@ -28,7 +28,7 @@ const useStyles = makeStyles((theme) => ({ height: "42px", }, appBarLabel: { - marginLeft: "192px !important", + marginLeft: "192px", }, content: { flexGrow: 1, diff --git a/ui/yarn.lock b/ui/yarn.lock index aee78c417..ac1165fe9 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1136,16 +1136,16 @@ uuid "^3.4.0" zustand "^4.0.0-rc.1" -"@material-ui/core@4.12.4": - version "4.12.4" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" - integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== +"@material-ui/core@4.12.3": + version "4.12.3" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca" + integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.11.5" - "@material-ui/system" "^4.12.2" + "@material-ui/styles" "^4.11.4" + "@material-ui/system" "^4.12.1" "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" + "@material-ui/utils" "^4.11.2" "@types/react-transition-group" "^4.2.0" clsx "^1.0.4" hoist-non-react-statics "^3.3.2" @@ -1206,29 +1206,7 @@ jss-plugin-vendor-prefixer "^10.5.1" prop-types "^15.7.2" -"@material-ui/styles@^4.11.5": - version "4.11.5" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb" - integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== - dependencies: - "@babel/runtime" "^7.4.4" - "@emotion/hash" "^0.8.0" - "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" - clsx "^1.0.4" - csstype "^2.5.2" - hoist-non-react-statics "^3.3.2" - jss "^10.5.1" - jss-plugin-camel-case "^10.5.1" - jss-plugin-default-unit "^10.5.1" - jss-plugin-global "^10.5.1" - jss-plugin-nested "^10.5.1" - jss-plugin-props-sort "^10.5.1" - jss-plugin-rule-value-function "^10.5.1" - jss-plugin-vendor-prefixer "^10.5.1" - prop-types "^15.7.2" - -"@material-ui/system@^4.12.2": +"@material-ui/system@^4.12.1": version "4.12.2" resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b" integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== @@ -2309,14 +2287,28 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@18.2.79": - version "18.2.79" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" - integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== +"@types/react@*": + version "16.9.44" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.44.tgz#da84b179c031aef67dc92c33bd3401f1da2fa3bc" + integrity sha512-BtLoJrXdW8DVZauKP+bY4Kmiq7ubcJq+H/aCpRfvPF7RAT3RwR73Sg8szdc2YasbAlWBDrQ6Q+AFM0KwtQY+WQ== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + +"@types/react@17.0.65": + version "17.0.65" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" + integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/sinonjs__fake-timers@8.1.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3" @@ -6838,7 +6830,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -6856,6 +6848,15 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -6865,7 +6866,7 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -6879,6 +6880,13 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -7347,7 +7355,7 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -7365,6 +7373,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"