Skip to content

handle empty history #10

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
merged 2 commits into from
Nov 14, 2024
Merged

handle empty history #10

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
693e13f
handle empty history
imaitland Nov 11, 2024
926c792
fixup
imaitland Nov 11, 2024
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
21 changes: 13 additions & 8 deletions app/routes/devices.$id.hardware.$hardware_name.history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import * as Evolver from "client/services.gen";
import { db } from "~/utils/db.server";
import { HardwareLineChart } from "~/components/LineChart";
import { loader as rootLoader } from "~/root";
import { XCircleIcon } from "@heroicons/react/24/solid";

export const handle = {
breadcrumb: (
Expand Down Expand Up @@ -47,18 +48,16 @@ export async function loader({ params, request }: LoaderFunctionArgs) {

const properties = searchParams.get("properties")?.split(",");

const {
data: { data },
} = await Evolver.history({
body: {
const { data } = await Evolver.history({
query: {
name: hardware_name,
vials,
properties,
},
query: { name: hardware_name },
client: evolverClient,
});

return json({ data });
return json({ data: data?.data });
}

export default function Hardware() {
Expand All @@ -69,8 +68,14 @@ export default function Hardware() {
const excludedProperties = EXCLUDED_PROPERTIES?.split(",") ?? [];
const [searchParams] = useSearchParams();
const { hardware_name } = useParams();
if (!hardware_name) {
return <div>Hardware not found</div>;

if (!data || !hardware_name || !data[hardware_name]) {
return (
<div className="flex flex-col items-center justify-center p-10">
<XCircleIcon className="w-6 h-6" />
<div>Data not found</div>
</div>
);
}
const hardwareHistory = data[hardware_name];
const allHardwareVials = Object.keys(hardwareHistory[0].data);
Expand Down
2 changes: 1 addition & 1 deletion app/routes/devices.$id.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function ErrorBoundary() {
</div>
</div>

<Link to="/" className="link">
<Link to="/devices" className="link">
home
</Link>
</div>
Expand Down