Skip to content
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

Updates JSON view to be cleaner + ensures table index column has fixed width #902

Closed
wants to merge 1 commit into from
Closed

Updates JSON view to be cleaner + ensures table index column has fixed width #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 14 additions & 93 deletions ui/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@types/react-router-hash-link": "^2.4.5",
"@types/react-select": "^5.0.1",
"@types/redux-persist": "^4.3.1",
"@uiw/react-json-view": "^2.0.0-alpha.24",
"chart.js": "^4.3.0",
"chartjs-adapter-date-fns": "^3.0.0",
"chartjs-plugin-zoom": "^2.0.1",
Expand All @@ -34,7 +35,6 @@
"react-dom": "^18.2.0",
"react-draggable": "^4.4.5",
"react-icons": "^4.10.1",
"react-json-tree": "^0.18.0",
"react-markdown": "^8.0.7",
"react-micro-bar-chart": "^1.1.1",
"react-redux": "^8.1.3",
Expand Down
2 changes: 1 addition & 1 deletion ui/frontend/src/components/common/GenericTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const TableRow = <T extends object>(props: {
const labelData = (
<td
key={props.name}
className="py-4 px-3 text-sm font-semibold text-gray-500"
className="py-4 px-3 text-sm font-semibold text-gray-500 w-48"
>
{props.dataTypeDisplay
? props.dataTypeDisplay(props.name, props.data)
Expand Down
44 changes: 3 additions & 41 deletions ui/frontend/src/components/dashboard/Runs/Task/result-summaries/DictView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
import JsonView from "@uiw/react-json-view";
import {
AttributeDict1,
AttributeDict2,
} from "../../../../../state/api/friendlyApi";
import { GenericTable } from "../../../../common/GenericTable";
import { JSONTree } from "react-json-tree";

const theme = {
scheme: "shapeshifter",
author: "tyler benziger (http://tybenz.com)",
base00: "#000000",
base01: "#040404",
base02: "#102015",
base03: "#343434",
base04: "#555555",
base05: "#ababab",
base06: "#e0e0e0",
base07: "#f9f9f9",
base08: "#e92f2f",
base09: "#e09448",
base0A: "#dddd13",
base0B: "#0ed839",
base0C: "#23edda",
base0D: "#3b48e3",
base0E: "#f996e2",
base0F: "#69542d",
};

export const Dict1View = (props: {
taskName: string;
Expand All @@ -34,22 +13,13 @@ export const Dict1View = (props: {
return (
<GenericTable
data={props.runIds.map((runId, i) => {
console.log(props.values[i]);
return [runId.toString(), props.values[i]];
})}
columns={[
{
displayName: "data",
Render: (value) => {
return (
<JSONTree
invertTheme={true}
data={value}
theme={theme}
hideRoot
shouldExpandNodeInitially={() => false}
/>
);
return <JsonView value={value} collapsed={2} />;
},
},
]}
Expand All @@ -72,15 +42,7 @@ export const Dict2View = (props: {
{
displayName: "data",
Render: (value) => {
return (
<JSONTree
invertTheme={true}
data={value}
theme={theme}
hideRoot
shouldExpandNodeInitially={() => false}
/>
);
return <JsonView value={value} collapsed={2} />;
},
},
]}
Expand Down
Loading