Merge pull request #3787 from DaleMcGrew/Dale_WebApp_Nov30-2023

A snyk security upgrade moved forward the version of glob we are using, which required a minor syntax change. Also fixed spacing errors caught by ESLINT. Added comment to PoliticianImageDesktop fix.
wevote · Dec 1, 2023 · 4327e16 · 4327e16
2 parents 9de694b + 9204ecb
commit 4327e16
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/js/common/components/Style/PoliticianDetailsStyles.jsx b/src/js/common/components/Style/PoliticianDetailsStyles.jsx
@@ -46,7 +46,7 @@ export const PoliticianImageMobile = styled('img')`
 export const PoliticianImageDesktop = styled('img')`
   border-radius: 5px;
   height: 100%;
-  max-height: 200px;
+  max-height: 200px; // Needs to be revisited when rectangular campaign images are used
 `;
 
 export const PoliticianImageSharedStyles = css`

diff --git a/src/js/common/node/webPackPostBuild.js b/src/js/common/node/webPackPostBuild.js
@@ -1,5 +1,5 @@
 const fs = require('fs');
-const glob = require('glob');
+const { glob } = require('glob');
 
 // builds a tiny html file, that contains the name of the main.hash.js chunk which is
 // consumed by the WeVote API Server.  When the Server is queried by Fastly to generate an index.html

diff --git a/src/js/pages/Ballot/Ballot.jsx b/src/js/pages/Ballot/Ballot.jsx
@@ -596,15 +596,15 @@ class Ballot extends Component {
         if (voter && voter.is_signed_in) {
           // console.log('onVoterStoreChange, about to historyPush(pathname):', pathname);
           // Return to the same page without the 'voter_refresh_timer_on' variable
-                    historyPush(pathname, true);
+          historyPush(pathname, true);
         } else if (numberOfVoterRetrieveAttempts < 3) {
           // console.log('About to startTimerToRetrieveVoter');
           this.startTimerToRetrieveVoter();
         } else {
           // We have exceeded the number of allowed attempts and want to 'turn off' the request to refresh the voter object
           // Return to the same page without the 'voter_refresh_timer_on' variable
           // console.log('Exiting voterRefreshTimerOn');
-                    historyPush(pathname, true);
+          historyPush(pathname, true);
         }
       } else {
         // console.log('Ballot.jsx onVoterStoreChange VoterStore.getVoter: ', VoterStore.getVoter());

diff --git a/src/js/pages/Campaigns/CampaignsHome.jsx b/src/js/pages/Campaigns/CampaignsHome.jsx
@@ -572,7 +572,7 @@ class CampaignsHome extends Component {
       const newPathname = this.getStateNamePathnameFromStateCode(e.target.value);
       const { location: { pathname } } = window;
       if (pathname !== newPathname) {
-                historyPush(newPathname);
+        historyPush(newPathname);
       } else {
         this.setState({ stateCode: e.target.value });
       }
@@ -624,7 +624,7 @@ class CampaignsHome extends Component {
 
   render () {
     renderLog('CampaignsHome');  // Set LOG_RENDER_EVENTS to log all renders
-      const {
+    const {
       campaignList, campaignListTimeStampOfChange,
       campaignsShowing,
       candidateListOther, candidateListTimeStampOfChange,