Skip to content

Let user open Settings menu in offline mode #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wojtekn merged 2 commits into from
Oct 4, 2024
Merged

Let user open Settings menu in offline mode #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
402e0f6
Let user open Settings menu in offline mode
wojtekn Oct 3, 2024
8138366
Update tests to account for the top bar button behavior change
wojtekn Oct 3, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions src/components/tests/topbar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ describe( 'TopBar', () => {
jest.clearAllMocks();
} );
it( 'Test unauthenticated TopBar has the Log in button', async () => {
const user = userEvent.setup();
const authenticate = jest.fn();
( useAuth as jest.Mock ).mockReturnValue( { isAuthenticated: false, authenticate } );
await act( async () => render( <TopBar onToggleSidebar={ jest.fn() } /> ) );
expect( screen.queryByRole( 'button', { name: 'Account' } ) ).not.toBeInTheDocument();
expect( screen.getByRole( 'button', { name: 'Log in' } ) ).toBeVisible();
await user.click( screen.getByRole( 'button', { name: 'Log in' } ) );
expect( authenticate ).toHaveBeenCalledTimes( 1 );
} );

it( 'Test authenticated TopBar does not have the log in button and it has the settings and account buttons', async () => {
Expand All @@ -39,15 +37,6 @@ describe( 'TopBar', () => {
expect( screen.queryByRole( 'button', { name: 'Log in' } ) ).not.toBeInTheDocument();
expect( screen.getByRole( 'button', { name: 'Account' } ) ).toBeVisible();
} );
it( 'disables log in button when offline', async () => {
( useOffline as jest.Mock ).mockReturnValue( true );
( useAuth as jest.Mock ).mockReturnValue( { isAuthenticated: false } );
await act( async () => render( <TopBar onToggleSidebar={ jest.fn() } /> ) );
const loginButton = screen.getByRole( 'button', { name: 'Log in' } );
expect( loginButton ).toHaveAttribute( 'aria-disabled', 'true' );
fireEvent.mouseOver( loginButton );
expect( screen.getByRole( 'tooltip', { name: 'You’re currently offline.' } ) ).toBeVisible();
} );

it( 'shows offline indicator', async () => {
( useOffline as jest.Mock ).mockReturnValue( true );
Expand Down
32 changes: 8 additions & 24 deletions src/components/top-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ function OfflineIndicator() {
}

function Authentication() {
const { isAuthenticated, authenticate, user } = useAuth();
const isOffline = useOffline();
const offlineMessage = __( 'You’re currently offline.' );
const { isAuthenticated, user } = useAuth();
if ( isAuthenticated ) {
return (
<Button
Expand All @@ -66,29 +64,15 @@ function Authentication() {
}

return (
<Tooltip
disabled={ ! isOffline }
icon={ offlineIcon }
text={ offlineMessage }
placement="right"
className="flex"
<Button
onClick={ () => getIpcApi().showUserSettings() }
aria-label={ __( 'Log in' ) }
className="flex gap-x-2 justify-between w-full text-white rounded !px-0 !py-1 h-auto active:!text-white hover:!text-white hover:underline items-end"
>
<Button
aria-description={ isOffline ? offlineMessage : '' }
aria-disabled={ isOffline }
className="flex gap-x-2 justify-between w-full text-white rounded !px-0 !py-1 h-auto active:!text-white hover:!text-white hover:underline items-end"
onClick={ () => {
if ( isOffline ) {
return;
}
authenticate();
} }
>
<WordPressLogo />
<WordPressLogo />

<div className="text-xs text-right">{ __( 'Log in' ) }</div>
</Button>
</Tooltip>
<div className="text-xs text-right">{ __( 'Log in' ) }</div>
</Button>
);
}

Expand Down