Adopt JS standards once userinfo data is in frontend (#1930)

client/src/actions/index.js

@@ -43,12 +43,12 @@ async function configFetch(dispatch) {
 
 async function userInfoFetch(dispatch) {
   return fetchJson("userinfo").then((response) => {
-    const { userinfo } = response || {};
+    const { userinfo: userInfo } = response || {};
     dispatch({
-      type: "userinfo load complete",
-      userinfo,
+      type: "userInfo load complete",
+      userInfo,
     });
-    return userinfo;
+    return userInfo;
   });
 }
 

client/src/components/autosave/filenameDialog.js

@@ -15,7 +15,7 @@ import {
   idhash: state.config?.parameters?.["annotations-user-data-idhash"] ?? null,
   annotations: state.annotations,
   auth: state.config?.authentication,
-  userinfo: state.userinfo,
+  userInfo: state.userInfo,
   writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
 }))
 class FilenameDialog extends React.Component {
@@ -97,7 +97,7 @@ class FilenameDialog extends React.Component {
       writableCategoriesEnabled,
       annotations,
       idhash,
-      userinfo,
+      userInfo,
     } = this.props;
     const { filenameText } = this.state;
 
@@ -105,7 +105,7 @@ class FilenameDialog extends React.Component {
       annotations.promptForFilename &&
       !annotations.dataCollectionNameIsReadOnly &&
       !annotations.dataCollectionName &&
-      userinfo.is_authenticated ? (
+      userInfo.is_authenticated ? (
       <Dialog
         icon="tag"
         title="Annotations Collection"

client/src/components/categorical/index.js

@@ -15,7 +15,7 @@ import actions from "../../actions";
   writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
   schema: state.annoMatrix?.schema,
   ontology: state.ontology,
-  userinfo: state.userinfo,
+  userInfo: state.userInfo,
 }))
 class Categories extends React.Component {
   constructor(props) {
@@ -132,7 +132,7 @@ class Categories extends React.Component {
       writableCategoriesEnabled,
       schema,
       ontology,
-      userinfo,
+      userInfo,
     } = this.props;
     const ontologyEnabled = ontology?.enabled ?? false;
     /* all names, sorted in display order.  Will be rendered in this order */
@@ -213,7 +213,7 @@ class Categories extends React.Component {
         {writableCategoriesEnabled ? (
           <Tooltip
             content={
-              userinfo.is_authenticated
+              userInfo.is_authenticated
                 ? "Create a new category"
                 : "You must be logged in to create new categorical fields"
             }
@@ -230,7 +230,7 @@ class Categories extends React.Component {
               data-testid="open-annotation-dialog"
               onClick={this.handleEnableAnnoMode}
               intent="primary"
-              disabled={!userinfo.is_authenticated}
+              disabled={!userInfo.is_authenticated}
             >
               Create new category
             </AnchorButton>

client/src/components/menubar/authButtons.js

@@ -31,11 +31,11 @@ const LOGIN_PROMPT_OFF = "off";
 const Auth = React.memo((props) => {
   const [isPromptOpen, setIsPromptOpen] = useState(shouldShowPrompt());
 
-  const { auth, userinfo } = props;
+  const { auth, userInfo } = props;
 
-  const isAuthenticated = userinfo && userinfo.is_authenticated;
+  const isAuthenticated = userInfo && userInfo.is_authenticated;
 
-  window.userinfo = userinfo;
+  window.userInfo = userInfo;
 
   const randomInt = Math.random() * 15;
   const sexIndex = Math.floor(randomInt / 5);
@@ -55,7 +55,7 @@ const Auth = React.memo((props) => {
       <Menu>
         <MenuItem
           data-testid="user-email"
-          text={`Logged in as: ${userinfo.email}`}
+          text={`Logged in as: ${userInfo.email}`}
         />
         <MenuItem
           data-testid="log-out"
@@ -74,8 +74,8 @@ const Auth = React.memo((props) => {
           style={{ padding: 0 }}
         >
           {/*  eslint-disable-next-line no-constant-condition -- disable profile picture until CSP is tweaked */}
-          {userinfo?.picture && false ? (
-            <img alt="profile" size="21px" src={userinfo?.picture} />
+          {userInfo?.picture && false ? (
+            <img alt="profile" size="21px" src={userInfo?.picture} />
           ) : (
             <span style={{ fontSize: "18px" }}>{scientist}</span>
           )}

client/src/components/menubar/index.js

@@ -42,7 +42,7 @@ import { getEmbSubsetView } from "../../util/stateManager/viewStackHelpers";
     celllist2: state.differential.celllist2,
     libraryVersions: state.config?.["library_versions"],
     auth: state.config?.authentication,
-    userinfo: state.userinfo,
+    userInfo: state.userInfo,
     undoDisabled: state["@@undoable/past"].length === 0,
     redoDisabled: state["@@undoable/future"].length === 0,
     aboutLink: state.config?.links?.["about-dataset"],
@@ -217,7 +217,7 @@ class MenuBar extends React.PureComponent {
       subsetPossible,
       subsetResetPossible,
       enableReembedding,
-      userinfo,
+      userInfo,
       auth,
     } = this.props;
     const { pendingClipPercentiles } = this.state;
@@ -244,7 +244,7 @@ class MenuBar extends React.PureComponent {
           zIndex: 3,
         }}
       >
-        <AuthButtons auth={auth} userinfo={userinfo} />
+        <AuthButtons {...{ auth, userInfo }} />
         <UndoRedoReset
           dispatch={dispatch}
           undoDisabled={undoDisabled}

client/src/reducers/index.js

@@ -4,7 +4,7 @@ import thunk from "redux-thunk";
 import cascadeReducers from "./cascade";
 import undoable from "./undoable";
 import config from "./config";
-import userinfo from "./userinfo";
+import userInfo from "./userInfo";
 import annoMatrix from "./annoMatrix";
 import obsCrossfilter from "./obsCrossfilter";
 import categoricalSelection from "./categoricalSelection";
@@ -43,7 +43,7 @@ const Reducer = undoable(
     ["pointDilation", pointDialation],
     ["reembedController", reembedController],
     ["autosave", autosave],
-    ["userinfo", userinfo],
+    ["userInfo", userInfo],
   ]),
   [
     "annoMatrix",

client/src/reducers/userInfo.js

@@ -1,4 +1,3 @@
-// jshint esversion: 6
 const UserInfo = (state = {}, action) => {
   switch (action.type) {
     case "initial data load start":
@@ -7,12 +6,12 @@ const UserInfo = (state = {}, action) => {
         loading: true,
         error: null,
       };
-    case "userinfo load complete":
+    case "userInfo load complete":
       return {
         ...state,
         loading: false,
         error: null,
-        ...action.userinfo,
+        ...action.userInfo,
       };
     case "initial data load error":
       return {