From cf61ca24e36777f8bda60e9e070c68b2ecd422f1 Mon Sep 17 00:00:00 2001 From: JzoNg Date: Mon, 19 Aug 2024 16:05:12 +0800 Subject: [PATCH] new style of table --- web/app/components/app/workflow-log/index.tsx | 8 +-- web/app/components/app/workflow-log/list.tsx | 64 ++++++++++--------- .../app/workflow-log/style.module.css | 6 -- web/app/components/workflow/run/index.tsx | 2 +- .../components/workflow/run/output-panel.tsx | 2 +- 5 files changed, 40 insertions(+), 42 deletions(-) diff --git a/web/app/components/app/workflow-log/index.tsx b/web/app/components/app/workflow-log/index.tsx index b7f0d6e3bd..2dc3d8cb91 100644 --- a/web/app/components/app/workflow-log/index.tsx +++ b/web/app/components/app/workflow-log/index.tsx @@ -35,12 +35,12 @@ const EmptyElement: FC<{ appUrl: string }> = ({ appUrl }) => { const pathSegments = pathname.split('/') pathSegments.pop() return
-
- {t('appLog.table.empty.element.title')} -
+
+ {t('appLog.table.empty.element.title')} +
, testLink: }} + components={{ shareLink: , testLink: }} />
diff --git a/web/app/components/app/workflow-log/list.tsx b/web/app/components/app/workflow-log/list.tsx index 07fe874263..b9552a0ea9 100644 --- a/web/app/components/app/workflow-log/list.tsx +++ b/web/app/components/app/workflow-log/list.tsx @@ -2,7 +2,7 @@ import type { FC } from 'react' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import s from './style.module.css' +// import s from './style.module.css' import DetailPanel from './detail' import cn from '@/utils/classnames' import type { WorkflowAppLogDetail, WorkflowLogsResponse } from '@/models/log' @@ -34,33 +34,33 @@ const WorkflowAppLogList: FC = ({ logs, appDetail, onRefresh }) => { const statusTdRender = (status: string) => { if (status === 'succeeded') { return ( -
+
- Success + Success
) } if (status === 'failed') { return ( -
+
- Fail + Fail
) } if (status === 'stopped') { return ( -
+
- Stop + Stop
) } if (status === 'running') { return ( -
+
- Running + Running
) } @@ -77,43 +77,47 @@ const WorkflowAppLogList: FC = ({ logs, appDetail, onRefresh }) => { return (
- - +
+ - - - - - - - {/* */} + + + + + + - + {logs.data.map((log: WorkflowAppLogDetail) => { const endUser = log.created_by_end_user ? log.created_by_end_user.session_id : defaultValue return { setCurrentLog(log) setShowDrawer(true) }}> - - - - + + + - - + - {/* */} })} @@ -123,7 +127,7 @@ const WorkflowAppLogList: FC = ({ logs, appDetail, onRefresh }) => { onClose={onCloseDrawer} mask={isMobile} footer={null} - panelClassname='mt-16 mx-2 sm:mr-2 mb-3 !p-0 !max-w-[600px] rounded-xl border border-gray-200' + panelClassname='mt-16 mx-2 sm:mr-2 mb-3 !p-0 !max-w-[600px] rounded-xl border border-components-panel-border' > diff --git a/web/app/components/app/workflow-log/style.module.css b/web/app/components/app/workflow-log/style.module.css index 67a9fe3bf5..adb32a39db 100644 --- a/web/app/components/app/workflow-log/style.module.css +++ b/web/app/components/app/workflow-log/style.module.css @@ -1,9 +1,3 @@ -.logTable td { - padding: 7px 8px; - box-sizing: border-box; - max-width: 200px; -} - .pagination li { list-style: none; } diff --git a/web/app/components/workflow/run/index.tsx b/web/app/components/workflow/run/index.tsx index dc0a8f495d..dc85c7efb3 100644 --- a/web/app/components/workflow/run/index.tsx +++ b/web/app/components/workflow/run/index.tsx @@ -197,7 +197,7 @@ const RunPanel: FC = ({ hideResult, activeTab = 'RESULT', runID, getRe >{t('runLog.tracing')} {/* panel detal */} -
+
{loading && (
diff --git a/web/app/components/workflow/run/output-panel.tsx b/web/app/components/workflow/run/output-panel.tsx index 48a3806aeb..6b8d4cde1a 100644 --- a/web/app/components/workflow/run/output-panel.tsx +++ b/web/app/components/workflow/run/output-panel.tsx @@ -20,7 +20,7 @@ const OutputPanel: FC = ({ height, }) => { return ( -
+
{isRunning && (
{t('appLog.table.header.startTime')}{t('appLog.table.header.status')}{t('appLog.table.header.runtime')}{t('appLog.table.header.tokens')}{t('appLog.table.header.user')}{t('appLog.table.header.version')}{t('appLog.table.header.startTime')}{t('appLog.table.header.status')}{t('appLog.table.header.runtime')}{t('appLog.table.header.tokens')}{t('appLog.table.header.user')}
{!log.read_at && }{formatTime(log.created_at, t('appLog.dateTimeFormat') as string)}{statusTdRender(log.workflow_run.status)} + + {!log.read_at && ( +
+ +
+ )} +
{formatTime(log.created_at, t('appLog.dateTimeFormat') as string)}{statusTdRender(log.workflow_run.status)}
{`${log.workflow_run.elapsed_time.toFixed(3)}s`}
{log.workflow_run.total_tokens} -
+
{log.workflow_run.total_tokens} +
{endUser}
VERSION