Merge pull request #149 from i-VRESSE/table-from-ui

Use table components from haddock3-ui

app/caprieval/CaprievalReport.client.tsx

@@ -1,13 +1,11 @@
-import {
-  ClusterTable,
-  StructureTable,
-} from "@i-vresse/haddock3-analysis-components";
-import "./CaprievalReport.client.css";
+import { ClusterTable } from "@i-vresse/haddock3-ui/table/ClusterTable";
+import { StructureTable } from "@i-vresse/haddock3-ui/table/StructureTable";
 
 import { ScatterPlots } from "./ScatterPlots";
 import { useSearchParams } from "@remix-run/react";
 import { BoxPlots } from "./BoxPlots";
 import type { CaprievalData } from "./caprieval.server";
+import { useTheme } from "remix-themes";
 
 /*
  * Component has to be client only due
@@ -16,11 +14,13 @@ import type { CaprievalData } from "./caprieval.server";
 
 export const CaprievalReport = ({ scatters, boxes, table }: CaprievalData) => {
   const [searchParams, setSearchParams] = useSearchParams();
+  const [theme] = useTheme();
+  const style = { colorScheme: theme === "dark" ? "dark" : "light" };
   const hasOtherCluster =
     "clusters" in table &&
     table.clusters.some((c) => c["cluster_id"] === "Other");
   return (
-    <div className="caprieval-report flex flex-col gap-4">
+    <div className="caprieval-report flex flex-col gap-4" style={style}>
       {"clusters" in table ? (
         <ClusterTable {...table} />
       ) : (

app/caprieval/caprieval.server.ts

@@ -25,10 +25,8 @@ import {
   CAPRIEVAL_SCATTERPLOT_CHOICES,
   CAPRIEVAL_BOXPLOT_CHOICES,
 } from "./constants";
-import type {
-  ClusterTable,
-  StructureTable,
-} from "@i-vresse/haddock3-analysis-components";
+import type { ClusterTable } from "@i-vresse/haddock3-ui/table/ClusterTable";
+import type { StructureTable } from "@i-vresse/haddock3-ui/table/StructureTable";
 import { BartenderError } from "~/models/errors";
 import { getDataFromHtml, getPlotFromHtml } from "~/lib/html";
 

package.json

@@ -35,8 +35,7 @@
     "/coverage"
   ],
   "dependencies": {
-    "@i-vresse/haddock3-analysis-components": "^0.4.4",
-    "@i-vresse/haddock3-ui": "^0.1.9",
+    "@i-vresse/haddock3-ui": "^0.2.2",
     "@i-vresse/wb-core": "^3.2.1",
     "@i-vresse/wb-form": "^2.0.1",
     "@radix-ui/react-checkbox": "^1.0.4",