Merge branch 'main' into release

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.6",
+  "version": "1.2.7-alpha.0",
   "useWorkspaces": true,
   "npmClient": "yarn"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/console",
-  "version": "1.2.6-alpha.0",
+  "version": "1.2.7-alpha.0",
   "description": "Console",
   "main": "index.js",
   "private": true,

packages/console-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/console-app",
-  "version": "1.2.6",
+  "version": "1.2.7-alpha.0",
   "description": "Kubenet Console Client",
   "repository": "https://github.com/dxos/console",
   "main": "dist/es/index.js",

packages/console-app/src/components/Sidebar.js

@@ -13,8 +13,9 @@ import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import LinkIcon from '@material-ui/icons/ExitToApp';
 import ListItemText from '@material-ui/core/ListItemText';
+
+import EXTENSIONS from '../gql/extensions.graphql';
 import { useQueryStatusReducer } from '../hooks';
-import ADDON_LIST from '../gql/addon_list.graphql';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -35,6 +36,10 @@ const useStyles = makeStyles(theme => ({
 
   selected: {
     color: theme.palette.primary.main
+  },
+
+  expand: {
+    flex: 1
   }
 }));
 
@@ -43,12 +48,8 @@ const Sidebar = ({ modules: { services, settings } }) => {
   const history = useHistory();
   const { module } = useParams();
 
-  const { data: addonResponse } = useQueryStatusReducer(useQuery(ADDON_LIST));
+  const { data: extensionsData } = useQueryStatusReducer(useQuery(EXTENSIONS));
-  console.log(addonResponse);
+  const extensions = extensionsData ? JSON.parse(extensionsData.extensions.json) : [];
-  if (!addonResponse) {
-    return null;
-  }
-  const addons = JSON.parse(addonResponse.addon_list.json);
 
   const isSelected = path => path === `/${module}`;
 
@@ -65,9 +66,9 @@ const Sidebar = ({ modules: { services, settings } }) => {
     </List>
   );
 
-  const Addons = ({ addons }) => (
+  const Extensions = ({ extensions }) => (
     <List aria-label='items' className={classes.list}>
-      {addons.map(({ url, title }) => (
+      {extensions.map(({ url, title }) => (
         <ListItem button key={url} onClick={() => { window.location = url; return true; }}>
           <ListItemIcon classes={{ root: classes.icon }}>
             <LinkIcon className={clsx(classes.icon)} />
@@ -81,7 +82,8 @@ const Sidebar = ({ modules: { services, settings } }) => {
   return (
     <div className={classes.root}>
       <Modules modules={services} />
-      <Addons addons={addons} />
+      <Extensions extensions={extensions} />
+      <div className={classes.expand} />
       <Modules modules={settings} />
     </div>
   );

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 = () => {
           <TableCell onClick={sortBy('names[0]')}>Identifier</TableCell>
           <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
           <TableCell onClick={sortBy('attributes.name')}>Name</TableCell>
+          <TableCell onClick={sortBy('attributes.repository')}>Repository</TableCell>
           <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
           <TableCell size='icon' />
         </TableRow>
       </TableHead>
       <TableBody>
-        {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 (
             <TableRow key={id} size='small'>
               <TableCell monospace>{names.map(name => <div key={name}>{name}</div>)}</TableCell>
-              <TableCell monospace>{version}</TableCell>
+              <TableCell monospace>
+                {versionUrl
+                  ? <Link href={versionUrl}>{version}</Link>
+                  : version}
+              </TableCell>
               <TableCell>{displayName}</TableCell>
+              <TableCell>
+                {url &&
+                  <Link href={url} target={url}>{url}</Link>}
+              </TableCell>
               <TableCell>{moment.utc(createTime).fromNow()}</TableCell>
               <TableCell />
             </TableRow>

packages/console-app/src/containers/panels/bots/Bots.js

@@ -33,8 +33,8 @@ const Bots = () => {
         <Toolbar>
           <Tabs value={tab} onChange={(_, value) => setTab(value)}>
             <Tab value={TAB_RECORDS} label='Records' />
-            <Tab value={TAB_LOG} label='Log' />
             <Tab value={TAB_DATA} label='Running Bots' />
+            <Tab value={TAB_LOG} label='Log' />
           </Tabs>
         </Toolbar>
       }

packages/console-app/src/containers/panels/bots/RunningBots.js

@@ -53,22 +53,22 @@ const RunningBots = () => {
     <Table>
       <TableHead>
         <TableRow>
-          <TableCell onClick={sortBy('id')}>Identifier</TableCell>
+          <TableCell onClick={sortBy('recordName')}>Identifier</TableCell>
           <TableCell onClick={sortBy('botId')} size='small'>Bot Id</TableCell>
           <TableCell onClick={sortBy('started')}>Started</TableCell>
-          <TableCell onClick={sortBy('stopped')}>Stopped</TableCell>
+          <TableCell onClick={sortBy('stopped')}>Running</TableCell>
           <TableCell onClick={sortBy('parties')} size='small'>Parties</TableCell>
           <TableCell size='icon' />
         </TableRow>
       </TableHead>
       <TableBody>
-        {botList.sort(sorter).map(({ id, botId, started, stopped, parties }) => {
+        {botList.sort(sorter).map(({ recordName, botId, started, stopped, parties }) => {
           return (
             <TableRow key={botId} size='small'>
-              <TableCell monospace>{id}</TableCell>
+              <TableCell monospace>{recordName}</TableCell>
               <TableCell monospace>{botId}</TableCell>
               <TableCell>{moment.utc(started).fromNow()}</TableCell>
-              <TableCell monospace>{String(stopped)}</TableCell>
+              <TableCell monospace>{String(!stopped)}</TableCell>
               <TableCell monospace>{parties && parties.map(partyId => <div key={partyId}>{partyId}</div>)}</TableCell>
               <TableCell monospace>
                 <BotControls onStop={() => onKillBot(botId)} />

packages/console-app/src/gql/extensions.graphql

@@ -3,7 +3,7 @@
 #
 
 query {
-  addon_list {
+  extensions {
     json
   }
 }

packages/console-app/src/version.json

@@ -1,7 +1,7 @@
 {
   "build": {
     "name":      "@dxos/console-app",
-    "buildDate": "2020-12-10T03:59:58.111Z",
+    "buildDate": "2020-12-10T18:33:21.012Z",
-    "version":   "1.2.6-alpha.0"
+    "version":   "1.2.7-alpha.0"
   }
 }

packages/console-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/console-server",
-  "version": "1.2.6",
+  "version": "1.2.7-alpha.0",
   "description": "Kubenet Console Server",
   "main": "dist/es/index.js",
   "bin": {
@@ -31,7 +31,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.8.7",
     "@babel/runtime": "^7.8.7",
-    "@dxos/console-app": "^1.2.6",
+    "@dxos/console-app": "^1.2.7-alpha.0",
     "@wirelineio/wns-schema": "^0.1.1",
     "apollo-boost": "^0.4.9",
     "apollo-server-express": "^2.13.1",

packages/console-server/src/gql/api.graphql

@@ -22,7 +22,7 @@ type Query {
   system_status: JSONResult!
   wns_status: JSONResult!
   bot_list: JSONResult!
-  addon_list: JSONResult!
+  extensions: JSONResult!
 }
 
 type Mutation {

packages/console-server/src/resolvers/extensions.js

@@ -9,7 +9,10 @@ const ifRadicle = () => {
   try {
     const result = childProcess.execSync('docker ps -f "ancestor=dxos/radicle-seed-node" -q');
     if (result && result.toString()) {
-      return { title: 'Radicle', url: '/radicle/' };
+      return {
+        title: 'Radicle',
+        url: '/radicle/'
+      };
     }
   } catch (e) {}
 };
@@ -22,9 +25,9 @@ const ifSentry = () => {
   };
 };
 
-export const addonResolvers = {
+export const extensionResolvers = {
   Query: {
-    addon_list: async (_, __, { config }) => {
+    extensions: async (_, __, { config }) => {
       return {
         timestamp: new Date().toUTCString(),
         json: JSON.stringify([

packages/console-server/src/resolvers/index.js

@@ -5,7 +5,7 @@
 import debug from 'debug';
 import defaultsDeep from 'lodash.defaultsdeep';
 
-import { addonResolvers } from './addons';
+import { extensionResolvers } from './extensions';
 import { ipfsResolvers } from './ipfs';
 import { systemResolvers } from './system';
 import { logResolvers } from './log';
@@ -23,4 +23,4 @@ export const resolvers = defaultsDeep({
   // TODO(burdon): Auth.
   // https://www.apollographql.com/docs/apollo-server/data/errors/#codes
 
-}, ipfsResolvers, systemResolvers, logResolvers, botsResolvers, addonResolvers);
+}, ipfsResolvers, systemResolvers, logResolvers, botsResolvers, extensionResolvers);