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.

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

New Network Page(demo) #1426

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 3 additions & 1 deletion apps/reactotron-app/src/renderer/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Overlay from "./pages/reactNative/Overlay"
import Storybook from "./pages/reactNative/Storybook"
import CustomCommands from "./pages/customCommands"
import Help from "./pages/help"
import NetworkPage from "./pages/network"

const AppContainer = styled.div`
position: absolute;
Expand Down Expand Up @@ -56,7 +57,8 @@ function App() {

{/* Timeline */}
<Route path="/timeline" element={<Timeline />} />

{/* Network */}
<Route path="/network" element={<NetworkPage />} />
{/* State */}
<Route path="/state/subscriptions" element={<Subscriptions />} />
<Route path="/state/snapshots" element={<Snapshots />} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
MdWarning,
MdOutlineMobileFriendly,
MdMobiledataOff,
MdNetworkCell,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant and not being used.

MdNetworkCheck,
} from "react-icons/md"
import { FaMagic } from "react-icons/fa"
import styled from "styled-components"
Expand Down Expand Up @@ -58,6 +60,7 @@ function SideBar({ isOpen, serverStatus }: { isOpen: boolean; serverStatus: Serv
<SideBarContainer $isOpen={isOpen}>
<SideBarButton image={reactotronLogo} path="/" text="Home" hideTopBar />
<SideBarButton icon={MdReorder} path="/timeline" text="Timeline" />
<SideBarButton icon={MdNetworkCheck} path="/network" text="Network" />
<SideBarButton
icon={MdAssignment}
path="/state/subscriptions"
Expand Down
343 changes: 343 additions & 0 deletions apps/reactotron-app/src/renderer/pages/network/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,343 @@
import React, { useContext, useMemo } from "react"
import { clipboard } from "electron"
import fs from "fs"
import {
Header,
filterCommands,
TimelineFilterModal,
ApiResponseDrawerCommand,
EmptyState,
ReactotronContext,
TimelineContext,
} from "reactotron-core-ui"
import { MdSearch, MdDeleteSweep, MdFilterList, MdSwapVert, MdReorder } from "react-icons/md"
import { FaTimes } from "react-icons/fa"
import styled from "styled-components"
const Container = styled.div`
display: flex;
flex-direction: column;
width: 100%;
`

const NetworkPageContainer = styled.div`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hove you used this component ?I think component is defined but never used

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Muhammad, this development was not actually made to carry an ultimate goal, but only as a basis. It has some deficiencies and errors due to my workload and urgent need for a network page. I hope the community can make this perfect :)

height: 100%;
overflow-y: auto;
overflow-x: hidden;
`

const SearchContainer = styled.div`
display: flex;
align-items: center;
padding-bottom: 10px;
padding-top: 4px;
padding-right: 10px;
`
const SearchLabel = styled.p`
padding: 0 10px;
font-size: 14px;
color: ${(props) => props.theme.foregroundDark};
`
const SearchInput = styled.input`
border-radius: 4px;
padding: 10px;
flex: 1;
background-color: ${(props) => props.theme.backgroundSubtleDark};
border: none;
color: ${(props) => props.theme.foregroundDark};
font-size: 14px;
`
export const ButtonContainer = styled.div`
padding: 10px;
cursor: pointer;
`

export const NetworkTable = styled.table`
width: 100%;
border-collapse: collapse;
border-spacing: 0;
border: 1px solid ${(props) => props.theme.chromeLine};
border-radius: 4px;
margin-bottom: 10px;
color: ${(props) => props.theme.foregroundDark};
`

export const NetworkTableHeader = styled.thead`
background-color: ${(props) => props.theme.backgroundSubtleDark};
color: ${(props) => props.theme.foregroundDark};
font-size: 14px;
font-weight: bold;
text-align: left;
`
export const NetworkTableHeaderCell = styled.th`
padding: 0 10px;
`

export const NetworkTableHeaderRow = styled.tr`
height: 30px;
"& th": {
padding: 0 10px;
}
`
export const NetworkTableBody = styled.tbody`
font-size: 14px;
color: ${(props) => props.theme.foregroundDark};
font-weight: normal;
text-align: left;
`
export const NetworkTableRow = styled.tr`
height: 30px;
`

export const NetworkTableCell = styled.td`
padding: 0 10px;
`

export const NetworkContainer = styled.div`
height: 100%;
display: flex;
flex-direction: row;
width: 100%;
`
export const NetworkInspector = styled.div`
height: 100%;
overflow-y: auto;
overflow-x: hidden;
width: 400px;
resize: horizontal;
max-width: 600px;
`

type NetworkCommandType = {
type: string
important: boolean
payload: {
request: {
url: string
method: string
data: string
headers: Record<string, string>
params: any
}
response: {
body: unknown
status: number
headers: Record<string, string>
}
duration: number
}
connectionId: number
messageId: number
date: Date
deltaTime: number
clientId: string
}

function NetworkPage() {
const [resizeEnabled, setResizeEnabled] = React.useState<boolean>(false)
const { sendCommand, clearCommands, commands, openDispatchModal } = useContext(ReactotronContext)
const [selectedRequest, setSelectedRequest] = React.useState<NetworkCommandType | null>(null)
const [width, setWidth] = React.useState<number>(localStorage.getItem("networkInspectorWidth") ? parseInt(localStorage.getItem("networkInspectorWidth") as string) : 400)
const {
isSearchOpen,
toggleSearch,
closeSearch,
setSearch,
search,
isReversed,
toggleReverse,
openFilter,
closeFilter,
isFilterOpen,
hiddenCommands,
setHiddenCommands,
} = useContext(TimelineContext)

let filteredCommands = useMemo(() => {
const cmds = filterCommands(commands, search, hiddenCommands).filter((a) =>
a.type.startsWith("api.")
)
return cmds as NetworkCommandType[]
}, [commands, search, hiddenCommands])

if (isReversed) {
filteredCommands = filteredCommands.reverse()
}
console.log("filteredCommands", filteredCommands)

return (
<Container>
<Header
title="Timeline"
isDraggable
actions={[
{
tip: "Search",
icon: MdSearch,
onClick: () => {
toggleSearch()
},
},
{
tip: "Filter",
icon: MdFilterList,
onClick: () => {
openFilter()
},
},
{
tip: "Reverse Order",
icon: MdSwapVert,
onClick: () => {
toggleReverse()
},
},
{
tip: "Clear",
icon: MdDeleteSweep,
onClick: () => {
clearCommands()
},
},
]}
>
{isSearchOpen && (
<SearchContainer>
<SearchLabel>Search</SearchLabel>
<SearchInput autoFocus value={search} onChange={(e) => setSearch(e.target.value)} />
<ButtonContainer
onClick={() => {
if (search === "") {
closeSearch()
} else {
setSearch("")
}
}}
>
<FaTimes size={24} />
</ButtonContainer>
</SearchContainer>
)}
</Header>
<NetworkPageContainer>
{filteredCommands.length === 0 ? (
<EmptyState icon={MdReorder} title="No Activity">
Once your app connects and starts sending events, they will appear here.
</EmptyState>
) : (
<NetworkContainer>
<div >
<NetworkTable>
<NetworkTableHeader>
<NetworkTableHeaderRow>
<NetworkTableHeaderCell>Time</NetworkTableHeaderCell>
<NetworkTableHeaderCell>Method</NetworkTableHeaderCell>
<NetworkTableHeaderCell>URL</NetworkTableHeaderCell>
<NetworkTableHeaderCell>Duration</NetworkTableHeaderCell>
<NetworkTableHeaderCell>Status</NetworkTableHeaderCell>
<NetworkTableHeaderCell>Size</NetworkTableHeaderCell>
</NetworkTableHeaderRow>
</NetworkTableHeader>
<NetworkTableBody>
{filteredCommands.map((command, index) => {
const { payload } = command
const { request, response, duration } = payload
const { url, method, headers } = request
const { status, headers: responseHeaders } = response
const size =
response?.["Content-Length"] || JSON.stringify(response.body).length
return (
<NetworkTableRow
key={index}
onClick={() => {
setSelectedRequest((f) => {
if (f === null) {
return command
}
if (f.clientId === command.clientId) {
return null
}
return command
})
}}
>
<NetworkTableCell>{command.date.toISOString()}</NetworkTableCell>
<NetworkTableCell>{method}</NetworkTableCell>
<NetworkTableCell>{url}</NetworkTableCell>
<NetworkTableCell>{duration}ms</NetworkTableCell>
<NetworkTableCell>{status}</NetworkTableCell>
<NetworkTableCell>{size}</NetworkTableCell>
</NetworkTableRow>
)
})}
</NetworkTableBody>
</NetworkTable>
</div>
{!!selectedRequest && (
<NetworkInspector style={{width,position:"relative"}}>
<div
style={{
position: "absolute",
top: 0,
left: 0,
height: "100%",
width: "5px",
backgroundColor: "transparent",
cursor: "col-resize",
zIndex: 1000,
}}
onClick={(e) => {
setResizeEnabled(true)
}
}
onMouseUp={() => {
setResizeEnabled(false)
}}
onMouseMove={(ev)=>{
// if click and drag on the divider, resize the inspector
if(resizeEnabled){
setWidth((f) => {
const newWidth = f - ev.movementX
localStorage.setItem("networkInspectorWidth", newWidth.toString())
return newWidth
})
}
}} />
<ResponseDetailComponent command={selectedRequest} />
</NetworkInspector>
)}
</NetworkContainer>
)}
</NetworkPageContainer>
<TimelineFilterModal
isOpen={isFilterOpen}
onClose={() => {
closeFilter()
}}
hiddenCommands={hiddenCommands}
setHiddenCommands={setHiddenCommands}
/>
</Container>
)
}

const ResponseDetailComponent = ({ command }: { command: NetworkCommandType }) => {
return (
<ApiResponseDrawerCommand
key={command.messageId}
//@ts-ignore
command={command}
isOpen={true}
copyToClipboard={clipboard.writeText}
readFile={(path) => {
return new Promise((resolve, reject) => {
fs.readFile(path, "utf-8", (err, data) => {
if (err || !data) reject(new Error("Something failed"))
else resolve(data)
})
})
}}
/>
)
}

export default NetworkPage
2 changes: 2 additions & 0 deletions lib/reactotron-core-ui/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import TimelineCommand from "./components/TimelineCommand"
import TimelineCommandTabButton from "./components/TimelineCommandTabButton"
import Timestamp from "./components/Timestamp"
import TreeView from "./components/TreeView"
import { ApiResponseDrawerCommand } from "./timelineCommands/ApiResponseCommand"

// Contexts
import ReactotronContext, { ReactotronProvider } from "./contexts/Reactotron"
Expand Down Expand Up @@ -50,6 +51,7 @@ export {
SnapshotRenameModal,
SubscriptionAddModal,
TimelineFilterModal,
ApiResponseDrawerCommand,
Timestamp,
TreeView,
repairSerialization,
Expand Down
Loading