Skip to content

Commit a8ff05d

Browse files
committed
Drive switcher navigates
1 parent 8f5afde commit a8ff05d

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

data-browser/src/components/SideBar/DriveSwitcher.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from 'react-icons/fa';
1010
import { useNavigate } from 'react-router-dom';
1111
import { useSettings } from '../../helpers/AppSettings';
12+
import { constructOpenURL } from '../../helpers/navigation';
1213
import { useDriveHistory } from '../../hooks/useDriveHistory';
1314
import { useSavedDrives } from '../../hooks/useSavedDrives';
1415
import { paths } from '../../routes/paths';
@@ -45,6 +46,7 @@ export function DriveSwitcher() {
4546
const buildHandleHistoryDriveClick = (subject: string) => () => {
4647
setDrive(subject);
4748
addToHistory(subject);
49+
navigate(constructOpenURL(subject));
4850
};
4951

5052
const createNewDrive = useDefaultNewInstanceHandler(
@@ -59,7 +61,10 @@ export function DriveSwitcher() {
5961
label: getTitle(resource),
6062
helper: `Switch to ${getTitle(resource)}`,
6163
disabled: subject === drive,
62-
onClick: () => setDrive(subject),
64+
onClick: () => {
65+
setDrive(subject);
66+
navigate(constructOpenURL(subject));
67+
},
6368
icon: subject === drive ? <FaRegCheckCircle /> : <FaRegCircle />,
6469
})),
6570
DIVIDER,

data-browser/src/routes/SettingsServer/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ import { useDriveHistory } from '../../hooks/useDriveHistory';
1515
import { DrivesCard } from './DrivesCard';
1616
import styled from 'styled-components';
1717
import { useSavedDrives } from '../../hooks/useSavedDrives';
18+
import { constructOpenURL } from '../../helpers/navigation';
19+
import { useNavigate } from 'react-router';
1820

1921
export function SettingsServer(): JSX.Element {
2022
const { drive: baseURL, setDrive: setBaseURL } = useSettings();
23+
const navigate = useNavigate();
2124
const [baseUrlInput, setBaseUrlInput] = useState<string>(baseURL);
2225
const [baseUrlErr, setErrBaseUrl] = useState<Error | undefined>();
2326

@@ -30,6 +33,7 @@ export function SettingsServer(): JSX.Element {
3033
setBaseURL(url);
3134
setBaseUrlInput(url);
3235
addDriveToHistory(url);
36+
navigate(constructOpenURL(url));
3337
} catch (e) {
3438
setErrBaseUrl(e);
3539
}

data-browser/tests/e2e.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ test.describe('data-browser', async () => {
5252
test('switch Server URL', async ({ page }) => {
5353
await expect(page.locator(`text=${demoInviteName}`)).not.toBeVisible();
5454
await changeDrive('https://atomicdata.dev', page);
55-
await expect(page.locator(`text=${demoInviteName}`)).toBeVisible();
55+
await expect(page.locator(`text=${demoInviteName}`).first()).toBeVisible();
5656
});
5757

58-
test('sign in with secret, edit profile, sign out', async ({ page }) => {
58+
test('sign in with secret, edit prole, sign out', async ({ page }) => {
5959
await signIn(page);
6060
await editProfileAndCommit(page);
6161

0 commit comments

Comments
 (0)