mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-21 08:11:24 +02:00
Shared Table component
This commit is contained in:
@@ -11,7 +11,7 @@ import {
|
|||||||
TableHeaderCell,
|
TableHeaderCell,
|
||||||
TableRow,
|
TableRow,
|
||||||
TruncatedWideTableCell,
|
TruncatedWideTableCell,
|
||||||
} from '../components/core/Table';
|
} from '@yaakapp-internal/ui';
|
||||||
import { activeWorkspaceIdAtom } from '../hooks/useActiveWorkspace';
|
import { activeWorkspaceIdAtom } from '../hooks/useActiveWorkspace';
|
||||||
import { createFastMutation } from '../hooks/useFastMutation';
|
import { createFastMutation } from '../hooks/useFastMutation';
|
||||||
import { showDialog } from '../lib/dialog';
|
import { showDialog } from '../lib/dialog';
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { Checkbox } from './core/Checkbox';
|
|||||||
import { IconButton } from './core/IconButton';
|
import { IconButton } from './core/IconButton';
|
||||||
import { PlainInput } from './core/PlainInput';
|
import { PlainInput } from './core/PlainInput';
|
||||||
import { HStack, VStack } from './core/Stacks';
|
import { HStack, VStack } from './core/Stacks';
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from './core/Table';
|
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
workspace: Workspace;
|
workspace: Workspace;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import { Icon } from '@yaakapp-internal/ui';
|
|||||||
import { IconButton } from '../core/IconButton';
|
import { IconButton } from '../core/IconButton';
|
||||||
import { PlainInput } from '../core/PlainInput';
|
import { PlainInput } from '../core/PlainInput';
|
||||||
import { HStack, VStack } from '../core/Stacks';
|
import { HStack, VStack } from '../core/Stacks';
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '../core/Table';
|
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
|
||||||
|
|
||||||
const HOLD_KEYS = ['Shift', 'Control', 'Alt', 'Meta'];
|
const HOLD_KEYS = ['Shift', 'Control', 'Alt', 'Meta'];
|
||||||
const LAYOUT_INSENSITIVE_KEYS = [
|
const LAYOUT_INSENSITIVE_KEYS = [
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import { InlineCode } from '../core/InlineCode';
|
|||||||
import { Link } from '../core/Link';
|
import { Link } from '../core/Link';
|
||||||
import { PlainInput } from '../core/PlainInput';
|
import { PlainInput } from '../core/PlainInput';
|
||||||
import { HStack } from '../core/Stacks';
|
import { HStack } from '../core/Stacks';
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '../core/Table';
|
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
|
||||||
import { TabContent, Tabs } from '../core/Tabs/Tabs';
|
import { TabContent, Tabs } from '../core/Tabs/Tabs';
|
||||||
import { EmptyStateText } from '../EmptyStateText';
|
import { EmptyStateText } from '../EmptyStateText';
|
||||||
import { SelectFile } from '../SelectFile';
|
import { SelectFile } from '../SelectFile';
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useGit } from '@yaakapp-internal/git';
|
|||||||
import { showDialog } from '../../lib/dialog';
|
import { showDialog } from '../../lib/dialog';
|
||||||
import { Button } from '../core/Button';
|
import { Button } from '../core/Button';
|
||||||
import { IconButton } from '../core/IconButton';
|
import { IconButton } from '../core/IconButton';
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '../core/Table';
|
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
|
||||||
import { gitCallbacks } from './callbacks';
|
import { gitCallbacks } from './callbacks';
|
||||||
import { addGitRemote } from './showAddRemoteDialog';
|
import { addGitRemote } from './showAddRemoteDialog';
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
TableHeaderCell,
|
TableHeaderCell,
|
||||||
TableRow,
|
TableRow,
|
||||||
TruncatedWideTableCell,
|
TruncatedWideTableCell,
|
||||||
} from '../core/Table';
|
} from '@yaakapp-internal/ui';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
log: GitCommit[];
|
log: GitCommit[];
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import Papa from 'papaparse';
|
import Papa from 'papaparse';
|
||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '../core/Table';
|
import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
text: string | null;
|
text: string | null;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"moduleResolution": "Node",
|
"moduleResolution": "Node",
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
"jsx": "react-jsx",
|
"jsx": "react-jsx",
|
||||||
|
|||||||
@@ -1,6 +1,15 @@
|
|||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||||
import { type } from '@tauri-apps/plugin-os';
|
import { type } from '@tauri-apps/plugin-os';
|
||||||
import { HeaderSize } from '@yaakapp-internal/ui';
|
import {
|
||||||
|
HeaderSize,
|
||||||
|
Table,
|
||||||
|
TableBody,
|
||||||
|
TableCell,
|
||||||
|
TableHead,
|
||||||
|
TableHeaderCell,
|
||||||
|
TableRow,
|
||||||
|
TruncatedWideTableCell,
|
||||||
|
} from '@yaakapp-internal/ui';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { createStore, Provider, useAtomValue } from 'jotai';
|
import { createStore, Provider, useAtomValue } from 'jotai';
|
||||||
import { StrictMode } from 'react';
|
import { StrictMode } from 'react';
|
||||||
@@ -11,6 +20,7 @@ import './main.css';
|
|||||||
import { initHotkeys } from './hotkeys';
|
import { initHotkeys } from './hotkeys';
|
||||||
import { listen, rpc } from './rpc';
|
import { listen, rpc } from './rpc';
|
||||||
import { useRpcQueryWithEvent } from './rpc-hooks';
|
import { useRpcQueryWithEvent } from './rpc-hooks';
|
||||||
|
import type { ProxyHeader } from '@yaakapp-internal/proxy-lib';
|
||||||
import { applyChange, dataAtom, httpExchangesAtom, replaceAll } from './store';
|
import { applyChange, dataAtom, httpExchangesAtom, replaceAll } from './store';
|
||||||
|
|
||||||
const queryClient = new QueryClient();
|
const queryClient = new QueryClient();
|
||||||
@@ -85,36 +95,59 @@ function App() {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="text-xs font-mono">
|
{exchanges.length === 0 ? (
|
||||||
{exchanges.length === 0 ? (
|
<p className="text-text-subtlest text-sm">No traffic yet</p>
|
||||||
<p className="text-text-subtlest">No traffic yet</p>
|
) : (
|
||||||
) : (
|
<Table scrollable>
|
||||||
<table className="w-full text-left">
|
<TableHead>
|
||||||
<thead>
|
<TableRow>
|
||||||
<tr className="text-text-subtlest border-b border-border-subtle">
|
<TableHeaderCell>Method</TableHeaderCell>
|
||||||
<th className="py-1 pr-3 font-medium">Method</th>
|
<TableHeaderCell>URL</TableHeaderCell>
|
||||||
<th className="py-1 pr-3 font-medium">URL</th>
|
<TableHeaderCell>Status</TableHeaderCell>
|
||||||
<th className="py-1 pr-3 font-medium">Status</th>
|
<TableHeaderCell>Content-Type</TableHeaderCell>
|
||||||
</tr>
|
</TableRow>
|
||||||
</thead>
|
</TableHead>
|
||||||
<tbody>
|
<TableBody>
|
||||||
{exchanges.map((ex) => (
|
{exchanges.map((ex) => (
|
||||||
<tr key={ex.id} className="border-b border-border-subtle">
|
<TableRow key={ex.id}>
|
||||||
<td className="py-1 pr-3">{ex.method}</td>
|
<TableCell className="font-mono text-xs">{ex.method}</TableCell>
|
||||||
<td className="py-1 pr-3 truncate max-w-md">{ex.url}</td>
|
<TruncatedWideTableCell className="font-mono text-xs">
|
||||||
<td className="py-1 pr-3">{ex.resStatus ?? '—'}</td>
|
{ex.url}
|
||||||
</tr>
|
</TruncatedWideTableCell>
|
||||||
))}
|
<TableCell>
|
||||||
</tbody>
|
<StatusBadge status={ex.resStatus} error={ex.error} />
|
||||||
</table>
|
</TableCell>
|
||||||
)}
|
<TableCell className="text-text-subtle text-xs">
|
||||||
</div>
|
{getContentType(ex.resHeaders)}
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
))}
|
||||||
|
</TableBody>
|
||||||
|
</Table>
|
||||||
|
)}
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function StatusBadge({ status, error }: { status: number | null; error: string | null }) {
|
||||||
|
if (error) return <span className="text-xs text-danger">Error</span>;
|
||||||
|
if (status == null) return <span className="text-xs text-text-subtlest">—</span>;
|
||||||
|
|
||||||
|
const color =
|
||||||
|
status >= 500 ? 'text-danger' : status >= 400 ? 'text-warning' : status >= 300 ? 'text-notice' : 'text-success';
|
||||||
|
|
||||||
|
return <span className={classNames('text-xs font-mono', color)}>{status}</span>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getContentType(headers: ProxyHeader[]): string {
|
||||||
|
const ct = headers.find((h) => h.name.toLowerCase() === 'content-type')?.value;
|
||||||
|
if (ct == null) return '—';
|
||||||
|
// Strip parameters (e.g. "; charset=utf-8")
|
||||||
|
return ct.split(';')[0]?.trim() ?? ct;
|
||||||
|
}
|
||||||
|
|
||||||
createRoot(document.getElementById('root') as HTMLElement).render(
|
createRoot(document.getElementById('root') as HTMLElement).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
|
|||||||
@@ -17,3 +17,4 @@ export type { TreeNode } from "./components/tree/common";
|
|||||||
export type { TreeItemProps } from "./components/tree/TreeItem";
|
export type { TreeItemProps } from "./components/tree/TreeItem";
|
||||||
export { isSelectedFamily, selectedIdsFamily } from "./components/tree/atoms";
|
export { isSelectedFamily, selectedIdsFamily } from "./components/tree/atoms";
|
||||||
export { minPromiseMillis } from "./lib/minPromiseMillis";
|
export { minPromiseMillis } from "./lib/minPromiseMillis";
|
||||||
|
export { Table, TableBody, TableHead, TableRow, TableCell, TruncatedWideTableCell, TableHeaderCell } from "./components/Table";
|
||||||
|
|||||||
Reference in New Issue
Block a user