diff --git a/packages/console-app/src/containers/panels/bots/BotRecords.js b/packages/console-app/src/containers/panels/bots/BotRecords.js index 6a424e4..97f9d81 100644 --- a/packages/console-app/src/containers/panels/bots/BotRecords.js +++ b/packages/console-app/src/containers/panels/bots/BotRecords.js @@ -12,6 +12,7 @@ import { ConsoleContext, useQueryStatusReducer, useSorter } from '../../../hooks import TableHead from '@material-ui/core/TableHead'; import TableRow from '@material-ui/core/TableRow'; import TableBody from '@material-ui/core/TableBody'; +import Link from '@material-ui/core/Link'; import Table from '../../../components/Table'; import TableCell from '../../../components/TableCell'; @@ -38,17 +39,32 @@ const BotRecords = () => { Identifier Version Name + Repository Created - {records.sort(sorter).map(({ id, names, createTime, attributes: { name: displayName, version } }) => { + {records.sort(sorter).map(({ + id, names, createTime, attributes: { name: displayName, version, versionUrl, repositoryVersion, repository, homepage } + }) => { + const url = repository || homepage; + if (!versionUrl && repository && repositoryVersion && repository.includes('github')) { + versionUrl = `${repository}/tree/${repositoryVersion}`.replace('-dirty', ''); + } return ( {names.map(name =>
{name}
)}
- {version} + + {versionUrl + ? {version} + : version} + {displayName} + + {url && + {url}} + {moment.utc(createTime).fromNow()}
diff --git a/packages/console-app/src/containers/panels/bots/Bots.js b/packages/console-app/src/containers/panels/bots/Bots.js index a3e9e4c..6b79ce0 100644 --- a/packages/console-app/src/containers/panels/bots/Bots.js +++ b/packages/console-app/src/containers/panels/bots/Bots.js @@ -33,8 +33,8 @@ const Bots = () => { setTab(value)}> - + } diff --git a/packages/console-app/src/containers/panels/bots/RunningBots.js b/packages/console-app/src/containers/panels/bots/RunningBots.js index 8f49196..5ee3255 100644 --- a/packages/console-app/src/containers/panels/bots/RunningBots.js +++ b/packages/console-app/src/containers/panels/bots/RunningBots.js @@ -53,22 +53,22 @@ const RunningBots = () => { - Identifier + Identifier Bot Id Started - Stopped + Running Parties - {botList.sort(sorter).map(({ id, botId, started, stopped, parties }) => { + {botList.sort(sorter).map(({ recordName, botId, started, stopped, parties }) => { return ( - {id} + {recordName} {botId} {moment.utc(started).fromNow()} - {String(stopped)} + {String(!stopped)} {parties && parties.map(partyId =>
{partyId}
)}
onKillBot(botId)} /> diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index b842d09..3d6b114 100644 --- a/packages/console-app/src/version.json +++ b/packages/console-app/src/version.json @@ -1,7 +1,7 @@ { "build": { "name": "@dxos/console-app", - "buildDate": "2020-12-09T23:25:12.047Z", - "version": "1.2.6-alpha.0" + "buildDate": "2020-12-10T09:59:41.380Z", + "version": "1.2.6-alpha.1" } }