Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 28 additions & 43 deletions src/components/DataSamplesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,10 @@ import {
HStack,
Text,
VStack,
Image,
} from "@chakra-ui/react";
import { ButtonEvent } from "@microbit/microbit-connection";
import {
ReactNode,
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useConnectActions } from "../connect-actions-hooks";
import { useConnectionStage } from "../connection-stage-hooks";
Expand All @@ -40,6 +34,7 @@ import { ConfirmDialog } from "./ConfirmDialog";
import { actionNameInputId } from "./ActionNameCard";
import { recordButtonId } from "./ActionDataSamplesCard";
import { keyboardShortcuts, useShortcut } from "../keyboard-shortcut-hooks";
import collectDataImage from "../images/collect-data.svg";

const gridCommonProps: Partial<GridProps> = {
gridTemplateColumns: "290px 1fr",
Expand All @@ -48,15 +43,19 @@ const gridCommonProps: Partial<GridProps> = {
w: "100%",
};

const headings: GridColumnHeadingItemProps[] = [
const getHeadings = (
options: {
hideItemsRight?: boolean;
} = {}
): GridColumnHeadingItemProps[] => [
{
titleId: "action-label",
descriptionId: "action-tooltip",
},
{
titleId: "data-samples-label",
descriptionId: "data-samples-tooltip",
itemsRight: (
itemsRight: options.hideItemsRight ? undefined : (
<HStack>
<ShowGraphsCheckbox />
<DataSamplesMenu />
Expand Down Expand Up @@ -225,48 +224,34 @@ const DataSamplesTable = ({
position="sticky"
top={0}
{...gridCommonProps}
headings={headings}
headings={getHeadings({
hideItemsRight: actions.length === 0 || !isConnected,
})}
/>
{actions.length === 0 ? (
{actions.length === 0 && !isConnected ? (
<VStack
gap={5}
flexGrow={1}
alignItems="center"
justifyContent="center"
justifyContent="start"
pt="5em"
>
<LoadProjectInput ref={loadProjectInputRef} accept=".json" />
<Text fontSize="lg">
<Image src={collectDataImage} width={350} opacity={0.7} />
<Text fontWeight="bold" fontSize="xl">
<FormattedMessage id="no-data-samples" />
</Text>
{!isConnected && (
<Text fontSize="lg" textAlign="center">
<FormattedMessage
id="connect-or-import"
values={{
link1: (chunks: ReactNode) => (
<Button
fontSize="lg"
color="brand.600"
variant="link"
onClick={handleConnect}
>
{chunks}
</Button>
),
link2: (chunks: ReactNode) => (
<Button
fontSize="lg"
color="brand.600"
variant="link"
onClick={() => loadProjectInputRef.current?.chooseFile()}
>
{chunks}
</Button>
),
}}
/>
</Text>
)}
<VStack gap={3}>
<Button variant="primary" onClick={handleConnect}>
<FormattedMessage id="connect-to-record" />
</Button>
<Button
variant="secondary"
onClick={() => loadProjectInputRef.current?.chooseFile()}
>
<FormattedMessage id="import-data-samples-action" />
</Button>
</VStack>
</VStack>
) : (
<Grid
Expand Down
4 changes: 3 additions & 1 deletion src/e2e/app/data-samples.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ export class DataSamplesPage {
}data-samples`;
this.navbar = new Navbar(page);
this.heading = this.page.getByRole("heading", { name: "Data samples" });
this.connectBtn = this.page.getByLabel("Connect to micro:bit");
this.connectBtn = this.page.getByRole("button", {
name: "Connect to record data samples",
});
}

async goto(flags: string[] = ["open"]) {
Expand Down
Loading