Merge branch 'main' into release

This commit is contained in:
Thomas E Lackey 2020-12-03 14:52:42 -06:00
commit 4566c10f61
8 changed files with 16 additions and 11 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "1.2.3", "version": "1.2.4-alpha.3",
"useWorkspaces": true, "useWorkspaces": true,
"npmClient": "yarn" "npmClient": "yarn"
} }

View File

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

View File

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

View File

@ -17,8 +17,9 @@ import { getServiceUrl } from '../util/config';
const PackageLink = ({ config, type, pkg, text }) => { const PackageLink = ({ config, type, pkg, text }) => {
// eslint-disable-next-line default-case // eslint-disable-next-line default-case
switch (type) { switch (type) {
// Apps // Apps and Files
case 'wrn:app': { case 'wrn:app':
case 'wrn:file': {
const cid = pkg['/']; const cid = pkg['/'];
const ipfsUrl = getServiceUrl(config, 'ipfs.gateway', { path: `${cid}` }); const ipfsUrl = getServiceUrl(config, 'ipfs.gateway', { path: `${cid}` });
if (!cid) { if (!cid) {

View File

@ -23,6 +23,9 @@ const QUERY = `
value { value {
string string
json json
reference {
id
}
} }
} }
} }

View File

@ -36,6 +36,7 @@ const types = [
{ key: 'wrn:app', label: 'App' }, { key: 'wrn:app', label: 'App' },
{ key: 'wrn:bot', label: 'Bot' }, { key: 'wrn:bot', label: 'Bot' },
{ key: 'wrn:bot-factory', label: 'Bot Factory' }, { key: 'wrn:bot-factory', label: 'Bot Factory' },
{ key: 'wrn:file', label: 'File' },
{ key: 'wrn:type', label: 'Type' } { key: 'wrn:type', label: 'Type' }
]; ];
@ -94,7 +95,7 @@ const RegistryRecords = ({ type }) => {
<TableBody> <TableBody>
{records.sort(sorter) {records.sort(sorter)
.map((record) => { .map((record) => {
const { id, names, createTime, attributes: { type, name: displayName, version, description, service, package: pkg } } = record; const { id, names, createTime, attributes: { type, name: displayName, fileName, version, description, service, package: pkg } } = record;
let pkgLink; let pkgLink;
let appLinks; let appLinks;
@ -125,7 +126,7 @@ const RegistryRecords = ({ type }) => {
{version} {version}
</TableCell> </TableCell>
<TableCell> <TableCell>
{displayName || service || description} {displayName || service || fileName || description}
</TableCell> </TableCell>
<TableCell> <TableCell>
{moment.utc(createTime).fromNow()} {moment.utc(createTime).fromNow()}

View File

@ -1,7 +1,7 @@
{ {
"build": { "build": {
"name": "@dxos/console-app", "name": "@dxos/console-app",
"buildDate": "2020-12-03T20:25:47.000Z", "buildDate": "2020-12-03T20:40:32.208Z",
"version": "1.2.3" "version": "1.2.4-alpha.2"
} }
} }

View File

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