diff --git a/src/Header/Header.tsx b/src/Header/Header.tsx index ccd0457e3..147e9c923 100644 --- a/src/Header/Header.tsx +++ b/src/Header/Header.tsx @@ -34,10 +34,6 @@ const StyledIconButton = styled(IconButton)( }), ); -const StyledToolbar = styled(Toolbar)({ - // justifyContent: 'space-between', -}); - type HeaderMenuIconProps = { isOpen: boolean; buttonId?: string; @@ -121,7 +117,7 @@ export const Header = ({ ...sx, }} > - + {hasSidebar && ( - + diff --git a/src/itemLogin/ItemLoginScreen.tsx b/src/itemLogin/ItemLoginScreen.tsx index ceb57be23..dc1953f52 100644 --- a/src/itemLogin/ItemLoginScreen.tsx +++ b/src/itemLogin/ItemLoginScreen.tsx @@ -13,7 +13,6 @@ import { ItemLoginSchemaType, UUID } from '@graasp/sdk'; import Button from '../buttons/Button/Button.js'; import ForbiddenText from './ForbiddenText.js'; -import { isMemberIdValid } from './utils.js'; export type SignInPropertiesType = { memberId?: string; @@ -115,16 +114,12 @@ const ItemLoginScreen = ({ }; const shouldSignInBeDisabled = (): boolean => { - const usernameError = !username?.length || isMemberIdValid(username); + const usernameError = !username?.length; const passwordError = withPassword && !password?.length; return usernameError || passwordError; }; - const isMemberId = isMemberIdValid(username); - const error = Boolean(username?.length && isMemberId); - const helperText = isMemberId - ? t('This is a member id. You should switch the sign in mode.') - : null; + const error = Boolean(username?.length); return ( @@ -138,7 +133,6 @@ const ItemLoginScreen = ({ variant='outlined' fullWidth type='text' - helperText={helperText} id={usernameInputId} value={username} onKeyDown={handleUsernamePressEnter} diff --git a/src/itemLogin/utils.test.ts b/src/itemLogin/utils.test.ts deleted file mode 100644 index 967d71b28..000000000 --- a/src/itemLogin/utils.test.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { v4 } from 'uuid'; -import { describe, expect, it } from 'vitest'; - -import { isMemberIdValid } from './utils.js'; - -describe('Validate MemberId', () => { - it('Valid ID', () => { - const id = v4(); - expect(isMemberIdValid(id)).toBeTruthy(); - }); - - it('Valid ID with whitespace', () => { - const id = ` ${v4()} `; - expect(isMemberIdValid(id)).toBeTruthy(); - }); - - it('Invalid ID', () => { - const id = ` bobo `; - expect(isMemberIdValid(id)).toBeFalsy(); - }); -}); diff --git a/src/itemLogin/utils.ts b/src/itemLogin/utils.ts deleted file mode 100644 index 62fafe69d..000000000 --- a/src/itemLogin/utils.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { validate } from 'uuid'; - -export const isMemberIdValid = (memberId?: string): boolean => { - if (!memberId) { - return false; - } - return validate(memberId?.trim()); -};