Merge branch 'dev'

bcgov · Jun 1, 2022 · 5f16f8d · 5f16f8d
2 parents 4f6c436 + 735f792
commit 5f16f8d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/nextapp/components/auth-action/auth-action.tsx b/src/nextapp/components/auth-action/auth-action.tsx
@@ -89,15 +89,6 @@ const Signin: React.FC<AuthActionProps> = ({ site }) => {
             >
               My Profile
             </MenuItem>
-            <MenuItem
-              as="a"
-              color="text"
-              target="_blank"
-              href="/ds/api/v2/console"
-              data-testid="auth-menu-api-docs"
-            >
-              API Docs
-            </MenuItem>
             <MenuItem
               as="a"
               color="text"

diff --git a/src/nextapp/components/service-account-create/service-account-create.tsx b/src/nextapp/components/service-account-create/service-account-create.tsx
@@ -102,7 +102,7 @@ const ServiceAccountCreate: React.FC<ServiceAccountCreateProps> = ({
                   <CheckboxGroup>
                     <Wrap spacing={4}>
                       {isSuccess &&
-                        data?.currentNamespace.scopes.map((s) => (
+                        data?.currentNamespace?.scopes?.map((s) => (
                           <WrapItem key={s.name}>
                             <Checkbox value={s.name} name="scopes">
                               {s.name}

diff --git a/src/nextapp/pages/login.tsx b/src/nextapp/pages/login.tsx
@@ -87,7 +87,7 @@ const LoginPage: React.FC = () => {
                   one of the options available below.
                 </Text>
                 <Box mt={7}>
-                  <LoginButtons buttons={['idir', 'bceid', 'github']} />
+                  <LoginButtons buttons={['idir', 'github']} />
                 </Box>
               </GridItem>
               <GridItem bgColor="white" p={10}>