From 9891af476d38b9c9e88e14f012bd1afb5dc92087 Mon Sep 17 00:00:00 2001 From: Ariadna Date: Wed, 4 Jun 2025 13:40:29 +0200 Subject: [PATCH] changes for improve testing page view --- ethernet-view/index.html | 4 + ethernet-view/src/App.tsx | 1 - .../src/layouts/AppLayout/AppLayout.tsx | 7 -- .../src/pages/TestingPage/TestingPage.tsx | 100 ++++++++++++------ 4 files changed, 73 insertions(+), 39 deletions(-) diff --git a/ethernet-view/index.html b/ethernet-view/index.html index b752f2b4f..95b45b7e5 100644 --- a/ethernet-view/index.html +++ b/ethernet-view/index.html @@ -11,6 +11,10 @@ rel="stylesheet" href="src/styles/globalOverride.scss" /> + { icon: Logger, page: "logger" }, - { - icon: Chart, - page: "chart" - } ]} pageShown={pageShown} setPageShown={setPageShown} diff --git a/ethernet-view/src/pages/TestingPage/TestingPage.tsx b/ethernet-view/src/pages/TestingPage/TestingPage.tsx index 9e3f69f28..af898413c 100644 --- a/ethernet-view/src/pages/TestingPage/TestingPage.tsx +++ b/ethernet-view/src/pages/TestingPage/TestingPage.tsx @@ -1,41 +1,79 @@ -import { SplitLayout } from "layouts/SplitLayout/SplitLayout"; -import { Orientation } from "hooks/useSplit/Orientation"; +import { useState } from "react"; +// import { SplitLayout } from "layouts/SplitLayout/SplitLayout"; +// import { Orientation } from "hooks/useSplit/Orientation"; import { ReceiveColumn } from "pages/TestingPage/ReceiveColumn/ReceiveColumn"; import { OrderColumn } from "pages/TestingPage/OrderColumn/OrderColumn"; import { MessagesColumn } from "pages/TestingPage/MessagesColumn/MessagesColumn"; import { ChartsColumn } from "./ChartsColumn/ChartsColumn"; import styles from "pages/TestingPage/TestingPage.module.scss"; -import incomingMessage from "assets/svg/incoming-message.svg" -import paperAirplane from "assets/svg/paper-airplane.svg" -import outgoingMessage from "assets/svg/outgoing-message.svg" -import chart from "assets/svg/chart.svg" +import incomingMessage from "assets/svg/incoming-message.svg"; +import paperAirplane from "assets/svg/paper-airplane.svg"; +import outgoingMessage from "assets/svg/outgoing-message.svg"; +import chart from "assets/svg/chart.svg"; export const TestingPage = () => { - return ( -
-
- , - collapsedIcon: chart - }, - { - component: , - collapsedIcon: incomingMessage - }, - { - component: , - collapsedIcon: paperAirplane - }, - { - component: , - collapsedIcon: outgoingMessage - }, - ]} - orientation={Orientation.HORIZONTAL} - > + const [collapsed, setCollapsed] = useState({ + charts: false, + receive: false, + order: false, + messages: false, + }); + + const toggleCollapse = (key: keyof typeof collapsed) => { + setCollapsed((prev) => ({ ...prev, [key]: !prev[key] })); + }; + + const components = [ + { + key: "charts" as const, + icon: chart, + component: , + collapsed: collapsed.charts, + }, + { + key: "receive" as const, + icon: incomingMessage, + component: , + collapsed: collapsed.receive, + }, + { + key: "order" as const, + icon: paperAirplane, + component: , + collapsed: collapsed.order, + }, + { + key: "messages" as const, + icon: outgoingMessage, + component: , + collapsed: collapsed.messages, + }, + ]; + + const visibleComponents = components.filter(c => !c.collapsed); + + return ( +
+
+
+ {components.map(({ key }) => ( + + ))} +
+
+ {visibleComponents.map(({ key, component }) => ( +
+ {component}
+ ))}
- ); +
+
+ ); };