From c63456086e08c9faf9b93e67f96d453270ae80f9 Mon Sep 17 00:00:00 2001 From: stevepodell Date: Tue, 4 Jun 2024 16:10:04 -0700 Subject: [PATCH] More lint cleanup in Twitter Sign In Resolves https://github.com/wevote/WebApp/pull/3938 [Snyk] Upgrade react-google-button Resolves https://github.com/wevote/WebApp/pull/3937 [Snyk] Upgrade @emotion/react Resolves https://github.com/wevote/WebApp/pull/3935 [Snyk] Upgrade @mui/icons-material Resolves https://github.com/wevote/WebApp/pull/3936 [Snyk] Upgrade @loadable/component --- package-lock.json | 38 +++++++++---------- package.json | 8 ++-- .../Navigation/HamburgerMenuRow.jsx | 1 + src/js/components/Navigation/HeaderBar.jsx | 4 +- .../Navigation/HeaderBarProfilePopUp.jsx | 16 ++++---- src/js/components/Twitter/TwitterSignIn.jsx | 8 ++-- .../EditCandidateForExtension.jsx | 1 + src/js/pages/Settings/HamburgerMenu.jsx | 1 + 8 files changed, 40 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1b1a0d0a3..39e527720 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,10 @@ "license": "MIT", "dependencies": { "@emotion/is-prop-valid": "^1.1.2", - "@emotion/react": "^11.10.0", + "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@loadable/component": "^5.14.1", - "@mui/icons-material": "^5.15.15", + "@loadable/component": "^5.16.4", + "@mui/icons-material": "^5.15.19", "@mui/lab": "^5.0.0-alpha.96", "@mui/material": "^5.15.18", "@mui/styled-engine-sc": "^5.10.1", @@ -47,7 +47,7 @@ "react-fullstory": "^1.4.0", "react-ga4": "^2.1.0", "react-google-autocomplete": "^2.6.1", - "react-google-button": "^0.7.2", + "react-google-button": "^0.8.0", "react-google-recaptcha-v3": "^1.10.1", "react-gtm-module": "^2.0.11", "react-helmet-async": "^1.3.0", @@ -2137,9 +2137,9 @@ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/react": { - "version": "11.11.3", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.3.tgz", - "integrity": "sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", @@ -3101,11 +3101,11 @@ } }, "node_modules/@loadable/component": { - "version": "5.16.3", - "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.16.3.tgz", - "integrity": "sha512-2mVvHs2988oVX2/zM0y6nYhJ4rTVHhkhRnpupBA0Rjl5tS8op9uSR4u5SLVfMLxzpspr2UiIBQD+wEuMsuq4Dg==", + "version": "5.16.4", + "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.16.4.tgz", + "integrity": "sha512-fJWxx9b5WHX90QKmizo9B+es2so8DnBthI1mbflwCoOyvzEwxiZ/SVDCTtXEnHG72/kGBdzr297SSIekYtzSOQ==", "dependencies": { - "@babel/runtime": "^7.7.7", + "@babel/runtime": "^7.12.18", "hoist-non-react-statics": "^3.3.1", "react-is": "^16.12.0" }, @@ -3196,9 +3196,9 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.15.15", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.15.tgz", - "integrity": "sha512-kkeU/pe+hABcYDH6Uqy8RmIsr2S/y5bP2rp+Gat4CcRjCcVne6KudS1NrZQhUCRysrTDCAhcbcf9gt+/+pGO2g==", + "version": "5.15.19", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.19.tgz", + "integrity": "sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA==", "dependencies": { "@babel/runtime": "^7.23.9" }, @@ -23562,14 +23562,14 @@ } }, "node_modules/react-google-button": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/react-google-button/-/react-google-button-0.7.2.tgz", - "integrity": "sha512-LPIqU2hIlc212kqks8MtKjRstquVkP3SIjxlK5B1nIfg2R7YqSusJAxZUkJA5dv/z6QeSuGyI9ujwV/VWMTyAA==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/react-google-button/-/react-google-button-0.8.0.tgz", + "integrity": "sha512-0u6mbDcTUmWzgXsld8FJpbrXP+zDsNQVYPIt225aBqwgJ/CdrDiep1PZOpnyntyjsejWG0TtQr6uZB4eIaXlJQ==", "dependencies": { - "prop-types": "^15.7.2" + "prop-types": "^15.8.1" }, "peerDependencies": { - "react": "*" + "react": ">= 16.8.0" } }, "node_modules/react-google-recaptcha-v3": { diff --git a/package.json b/package.json index e06b10b88..c73e9c770 100644 --- a/package.json +++ b/package.json @@ -106,10 +106,10 @@ }, "dependencies": { "@emotion/is-prop-valid": "^1.1.2", - "@emotion/react": "^11.10.0", + "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@loadable/component": "^5.14.1", - "@mui/icons-material": "^5.15.15", + "@loadable/component": "^5.16.4", + "@mui/icons-material": "^5.15.19", "@mui/lab": "^5.0.0-alpha.96", "@mui/material": "^5.15.18", "@mui/styled-engine-sc": "^5.10.1", @@ -143,7 +143,7 @@ "react-fullstory": "^1.4.0", "react-ga4": "^2.1.0", "react-google-autocomplete": "^2.6.1", - "react-google-button": "^0.7.2", + "react-google-button": "^0.8.0", "react-google-recaptcha-v3": "^1.10.1", "react-gtm-module": "^2.0.11", "react-helmet-async": "^1.3.0", diff --git a/src/js/components/Navigation/HamburgerMenuRow.jsx b/src/js/components/Navigation/HamburgerMenuRow.jsx index 15d137103..51062da14 100644 --- a/src/js/components/Navigation/HamburgerMenuRow.jsx +++ b/src/js/components/Navigation/HamburgerMenuRow.jsx @@ -24,6 +24,7 @@ class HamburgerMenuRow extends Component { // "indented" not currently used return ( + {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}   diff --git a/src/js/components/Navigation/HeaderBar.jsx b/src/js/components/Navigation/HeaderBar.jsx index c00861f9c..4070ab636 100644 --- a/src/js/components/Navigation/HeaderBar.jsx +++ b/src/js/components/Navigation/HeaderBar.jsx @@ -464,7 +464,7 @@ class HeaderBar extends Component { let donateVisible; const friendsVisible = false; // 2023-09-04 Dale We are turning off Friends header link for now let howItWorksValue; - //const squadsVisible = isWebApp(); + // const squadsVisible = isWebApp(); const squadsVisible = false; let squadsValue; // let howItWorksVisible; @@ -888,4 +888,4 @@ const StyledHeaderMenuTabs = styled(Tabs)` // {() => (isIOSAppOnMac() ? '' : displayNoneIfSmallerThanDesktop())}; `; -export default withStyles(styles)(HeaderBar); \ No newline at end of file +export default withStyles(styles)(HeaderBar); diff --git a/src/js/components/Navigation/HeaderBarProfilePopUp.jsx b/src/js/components/Navigation/HeaderBarProfilePopUp.jsx index 4fc38864f..ebf007d6e 100644 --- a/src/js/components/Navigation/HeaderBarProfilePopUp.jsx +++ b/src/js/components/Navigation/HeaderBarProfilePopUp.jsx @@ -33,13 +33,13 @@ class HeaderBarProfilePopUp extends Component { renderLog('HeaderBarProfilePopUp'); // Set LOG_RENDER_EVENTS to log all renders const { classes, isWelcomeMobilePage, voter, profilePopUpOpen } = this.props; let isSignedIn = false; - let voterOrganizationWeVoteId = ''; - let voterTwitterScreenName = ''; + // let voterOrganizationWeVoteId = ''; + // let voterTwitterScreenName = ''; if (voter) { ({ is_signed_in: isSignedIn, - linked_organization_we_vote_id: voterOrganizationWeVoteId, - twitter_screen_name: voterTwitterScreenName, + // linked_organization_we_vote_id: voterOrganizationWeVoteId, + // twitter_screen_name: voterTwitterScreenName, } = voter); } @@ -51,9 +51,9 @@ class HeaderBarProfilePopUp extends Component { return ''; }()); - const yourVoterGuideLink = voterTwitterScreenName ? - `/${voterTwitterScreenName}` : - `/voterguide/${voterOrganizationWeVoteId}`; + // const yourVoterGuideLink = voterTwitterScreenName ? + // `/${voterTwitterScreenName}` : + // `/voterguide/${voterOrganizationWeVoteId}`; return (
@@ -237,4 +237,4 @@ const ListItemWrapper = styled('div')` padding: 5px 0 5px 0; `; -export default withStyles(styles)(HeaderBarProfilePopUp); \ No newline at end of file +export default withStyles(styles)(HeaderBarProfilePopUp); diff --git a/src/js/components/Twitter/TwitterSignIn.jsx b/src/js/components/Twitter/TwitterSignIn.jsx index 6bb6416dc..a7452c58d 100644 --- a/src/js/components/Twitter/TwitterSignIn.jsx +++ b/src/js/components/Twitter/TwitterSignIn.jsx @@ -22,7 +22,7 @@ class TwitterSignIn extends Component { const search = url.replace(new RegExp('&', 'g'), '&').replace('wevotetwitterscheme://', ''); const urlParams = new URLSearchParams(search); - urlParams.forEach( (entry) => oAuthLog('urlParams key: ', entry.key, entry.value)); + urlParams.forEach((entry) => oAuthLog('urlParams key: ', entry.key, entry.value)); if (urlParams.has('twitter_redirect_url')) { const redirectURL = urlParams.get('twitter_redirect_url'); @@ -58,9 +58,9 @@ class TwitterSignIn extends Component { } else if (urlParams.has('oauth_verifier')) { if (urlParams.get('success') === 'True') { oAuthLog('twitterSignIn cordova, received oauth_verifier -- push /twittersigninprocess/'); - const oauth_token = urlParams.get('oauth_token'); - const oauth_verifier = urlParams.get('oauth_verifier'); - historyPush(`/twittersigninprocess/?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`); + const oauthToken = urlParams.get('oauth_token'); + const oauthVerifier = urlParams.get('oauth_verifier'); + historyPush(`/twittersigninprocess/?oauth_token=${oauthToken}&oauth_verifier=${oauthVerifier}`); } else { oAuthLog('twitterSignIn cordova, FAILED to receive valid oauth_verifier -- push /twitter_sign_in'); historyPush('/twitter_sign_in'); diff --git a/src/js/pages/Ballot/EditCandidateForExtension/EditCandidateForExtension.jsx b/src/js/pages/Ballot/EditCandidateForExtension/EditCandidateForExtension.jsx index 1b242ab9e..7f874a121 100644 --- a/src/js/pages/Ballot/EditCandidateForExtension/EditCandidateForExtension.jsx +++ b/src/js/pages/Ballot/EditCandidateForExtension/EditCandidateForExtension.jsx @@ -82,6 +82,7 @@ export default function EditCandidateForExtension () { return ( + {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */} diff --git a/src/js/pages/Settings/HamburgerMenu.jsx b/src/js/pages/Settings/HamburgerMenu.jsx index ac9808091..acfc65221 100644 --- a/src/js/pages/Settings/HamburgerMenu.jsx +++ b/src/js/pages/Settings/HamburgerMenu.jsx @@ -299,6 +299,7 @@ export default class HamburgerMenu extends Component { )} + {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}