From c7d9ae1c8bdd038cd5c57c316aad93c4f6644325 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Fri, 22 Sep 2023 10:43:44 -0700 Subject: [PATCH] ui(trace): make drawer appear under action list (#27260) --- packages/trace-viewer/src/ui/actionList.tsx | 2 +- packages/trace-viewer/src/ui/uiModeView.tsx | 2 +- packages/trace-viewer/src/ui/workbench.tsx | 86 ++++++++++----------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/packages/trace-viewer/src/ui/actionList.tsx b/packages/trace-viewer/src/ui/actionList.tsx index e6dd6a5577..1f5b06709f 100644 --- a/packages/trace-viewer/src/ui/actionList.tsx +++ b/packages/trace-viewer/src/ui/actionList.tsx @@ -94,7 +94,7 @@ export const renderAction = ( else if (!isLive) time = '-'; return <> -
+
{action.apiName} {locator &&
{locator}
} {action.method === 'goto' && action.params.url &&
{action.params.url}
} diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx index bcde089ea4..9c04722b83 100644 --- a/packages/trace-viewer/src/ui/uiModeView.tsx +++ b/packages/trace-viewer/src/ui/uiModeView.tsx @@ -498,7 +498,7 @@ const TestList: React.FC<{ dataTestId='test-tree' render={treeItem => { return
-
{treeItem.title}
+
{treeItem.title}
{!!treeItem.duration && treeItem.status !== 'skipped' &&
{msToString(treeItem.duration)}
} runTreeItem(treeItem)} disabled={!!runningState}> diff --git a/packages/trace-viewer/src/ui/workbench.tsx b/packages/trace-viewer/src/ui/workbench.tsx index ce32b9a7ca..4ff57b5716 100644 --- a/packages/trace-viewer/src/ui/workbench.tsx +++ b/packages/trace-viewer/src/ui/workbench.tsx @@ -193,8 +193,8 @@ export const Workbench: React.FunctionComponent<{ selectedTime={selectedTime} setSelectedTime={setSelectedTime} /> - - + + { - if (!isInspecting) - selectPropertiesTab('inspector'); - setIsInspecting(!isInspecting); - }} /> + tabs={[ + { + id: 'actions', + title: 'Actions', + component: selectPropertiesTab('console')} + isLive={isLive} + /> + }, + { + id: 'metadata', + title: 'Metadata', + component: + }, ]} - rightToolbar={[ - sidebarLocation === 'bottom' ? - { - setSidebarLocation('right'); - }} /> : - { - setSidebarLocation('bottom'); - }} /> - ]} - /> + selectedTab={selectedNavigatorTab} setSelectedTab={setSelectedNavigatorTab}/> selectPropertiesTab('console')} - isLive={isLive} - /> - }, - { - id: 'metadata', - title: 'Metadata', - component: - }, + tabs={tabs} + selectedTab={selectedPropertiesTab} + setSelectedTab={selectPropertiesTab} + leftToolbar={[ + { + if (!isInspecting) + selectPropertiesTab('inspector'); + setIsInspecting(!isInspecting); + }} /> ]} - selectedTab={selectedNavigatorTab} setSelectedTab={setSelectedNavigatorTab}/> + rightToolbar={[ + sidebarLocation === 'bottom' ? + { + setSidebarLocation('right'); + }} /> : + { + setSidebarLocation('bottom'); + }} /> + ]} + />
; };