Merge pull request #16 from lsst-sqre/tickets/DM-29971

DM-29971: Switch UserMenu to show username, not name
lsst-sqre · Apr 30, 2021 · 76e8496 · 76e8496
2 parents 54a1976 + 4a2e8c7
commit 76e8496
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 21 deletions.
diff --git a/components/page.js b/components/page.js
@@ -33,8 +33,6 @@ const StyledLayout = styled.div`
  * content, and footer.
  */
 export default function Page({ children, loginData }) {
-  console.log(loginData);
-
   return (
     <StyledLayout>
       <Meta />

diff --git a/components/userMenu.js b/components/userMenu.js
@@ -62,7 +62,7 @@ export const UserMenu = ({ loginData, pageUrl }) => {
   return (
     <Menu>
       <StyledMenuButton>
-        {loginData.data.name} <StyledFontAwesomeIcon icon="angle-down" />
+        {loginData.data.username} <StyledFontAwesomeIcon icon="angle-down" />
       </StyledMenuButton>
       <StyledMenuList>
         <MenuLink href="/auth/tokens">Security tokens</MenuLink>

diff --git a/hooks/currentUrl.js b/hooks/currentUrl.js
@@ -7,8 +7,6 @@ const { publicRuntimeConfig } = getConfig();
 
 export const useCurrentUrl = () => {
   const { baseUrl } = publicRuntimeConfig;
-  console.log(`useCurrentUrl getConfig baseUrl ${baseUrl}`);
   const router = useRouter();
-
   return new URL(router.pathname, baseUrl);
 };
diff --git a/next.config.js b/next.config.js
@@ -27,28 +27,22 @@ const readYamlConfig = (configPath, schemaPath) => {
 const readPublicYamlConfig = () => {
   const p = process.env.SQUAREONE_CONFIG_PATH || 'squareone.config.yaml';
   const configPath = path.isAbsolute(p) ? p : path.join(process.cwd(), p);
-  console.log(`Public config path: ${configPath}`);
-
+  console.log(`Reading public squareone config from ${configPath}`);
   const schemaPath = path.join(__dirname, 'squareone.config.schema.json');
-
   const data = readYamlConfig(configPath, schemaPath);
   return data;
 };
 
 const readServerYamlConfig = () => {
   const p = process.env.SQUAREONE_CONFIG_PATH || 'squareone.serverconfig.yaml';
   const configPath = path.isAbsolute(p) ? p : path.join(process.cwd(), p);
-  console.log(`Server config path: ${configPath}`);
-
+  console.log(`Reading server-side squareone config from ${configPath}`);
   const schemaPath = path.join(__dirname, 'squareone.serverconfig.schema.json');
-
   const data = readYamlConfig(configPath, schemaPath);
   return data;
 };
 
 module.exports = (phase, { defaultConfig }) => {
-  console.log(`Read config in ${phase}`);
-
   const publicYamlConfig = readPublicYamlConfig();
   const serverYamlConfig = readServerYamlConfig();
 
@@ -65,6 +59,5 @@ module.exports = (phase, { defaultConfig }) => {
       ];
     },
   };
-  console.log(config);
   return config;
 };
diff --git a/pages/api/dev/user-info.js b/pages/api/dev/user-info.js
@@ -3,7 +3,6 @@
 import { getDevState } from '../../../devstate';
 
 export default function handler(req, res) {
-  console.log('user-info');
   const { loggedIn, username, name, uid } = getDevState();
   if (!loggedIn) {
     res.status(401).end('Not logged in');

diff --git a/pages/login.js b/pages/login.js
@@ -22,9 +22,7 @@ export default function Login({ baseUrl }) {
       method: 'POST',
       body,
       headers: { 'Content-Type': 'application/json' },
-    })
-      .then((response) => console.log(response))
-      .then(sleep(100).then(() => window.location.assign('/')));
+    }).then(sleep(100).then(() => window.location.assign('/')));
   };
 
   return (

diff --git a/pages/logout.js b/pages/logout.js
@@ -14,9 +14,7 @@ export default function Logout({ baseUrl }) {
     event.preventDefault();
     fetch(getDevLogoutEndpoint(currentUrl), {
       method: 'POST',
-    })
-      .then((response) => console.log(response))
-      .then(sleep(100).then(() => window.location.assign('/')));
+    }).then(sleep(100).then(() => window.location.assign('/')));
   };
 
   return (