From cdccb55a840a59cd0a8266a6fd723cb8bf864799 Mon Sep 17 00:00:00 2001 From: DXOS Date: Wed, 16 Dec 2020 18:08:18 +0000 Subject: [PATCH 1/4] v1.2.8-alpha.1 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index b4df07a..df16766 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.8-alpha.0", + "version": "1.2.8-alpha.1", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index 05774fa..e51921c 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.8-alpha.0", + "version": "1.2.8-alpha.1", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index 26e3933..c50797a 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.8-alpha.0", + "version": "1.2.8-alpha.1", "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.8-alpha.0", + "@dxos/console-app": "^1.2.8-alpha.1", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", From 33e2fb1653561856a265c1b1671f1dcb2a0967cf Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Fri, 18 Dec 2020 20:48:17 -0600 Subject: [PATCH 2/4] fix: big dipper --- lerna.json | 2 +- package.json | 2 +- packages/console-app/package.json | 2 +- .../console-app/src/components/Sidebar.js | 23 ++++++++++++------- packages/console-app/src/version.json | 4 ++-- packages/console-server/package.json | 4 ++-- .../src/resolvers/extensions.js | 19 +++++++++++++++ 7 files changed, 41 insertions(+), 15 deletions(-) diff --git a/lerna.json b/lerna.json index df16766..07c83bd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.8-alpha.1", + "version": "1.2.9-alpha.0", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/package.json b/package.json index 59242c2..900926a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console", - "version": "1.2.8-alpha.0", + "version": "1.2.9-alpha.0", "description": "Console", "main": "index.js", "private": true, diff --git a/packages/console-app/package.json b/packages/console-app/package.json index e51921c..29c2b81 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.8-alpha.1", + "version": "1.2.9-alpha.0", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-app/src/components/Sidebar.js b/packages/console-app/src/components/Sidebar.js index 663662b..704b27a 100644 --- a/packages/console-app/src/components/Sidebar.js +++ b/packages/console-app/src/components/Sidebar.js @@ -68,14 +68,21 @@ const Sidebar = ({ modules: { services, settings } }) => { const Extensions = ({ extensions }) => ( - {extensions.map(({ url, title }) => ( - { window.location = url; return true; }}> - - - - - - ))} + {extensions.map(({ url, title }) => { + url = url + .replace('%HOST%', window.location.host) + .replace('%PORT%', window.location.port) + .replace('%PROTOCOL%', window.location.protocol); + return ( + { window.location = url; return true; }}> + + + + + + ); + } + )} ); diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index d6ac797..0e28404 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-16T09:52:39.755Z", - "version": "1.2.8-alpha.0" + "buildDate": "2020-12-19T02:47:07.305Z", + "version": "1.2.9-alpha.0" } } diff --git a/packages/console-server/package.json b/packages/console-server/package.json index c50797a..85ad4f9 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.8-alpha.1", + "version": "1.2.9-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.8-alpha.1", + "@dxos/console-app": "^1.2.9-alpha.0", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", diff --git a/packages/console-server/src/resolvers/extensions.js b/packages/console-server/src/resolvers/extensions.js index 75c1118..b81e481 100644 --- a/packages/console-server/src/resolvers/extensions.js +++ b/packages/console-server/src/resolvers/extensions.js @@ -5,6 +5,24 @@ import childProcess from 'child_process'; // TODO(telackey): Make pluggable. + +const ifBigDipper = () => { + try { + const result = childProcess.execSync('docker ps -f "ancestor=big-dipper_app" -q'); + if (result && result.toString()) { + return { + title: 'Block Explorer', + url: 'http://%HOST%:3080/' + }; + } else { + return { + title: 'Block Explorer', + url: 'http://blockexplorer.kube.moon.dxos.network:3080/' + }; + } + } catch (e) {} +}; + const ifRadicle = () => { try { const result = childProcess.execSync('docker ps -f "ancestor=dxos/radicle-seed-node" -q'); @@ -31,6 +49,7 @@ export const extensionResolvers = { return { timestamp: new Date().toUTCString(), json: JSON.stringify([ + ifBigDipper(), ifRadicle(), ifSentry() ].filter(x => x)) From 1be419998442cb34df0299ff900e35eb3d4ba5df Mon Sep 17 00:00:00 2001 From: DXOS Date: Sat, 19 Dec 2020 02:51:42 +0000 Subject: [PATCH 3/4] v1.2.9-alpha.1 --- lerna.json | 2 +- packages/console-app/package.json | 2 +- packages/console-server/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index 07c83bd..db17ebe 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.9-alpha.0", + "version": "1.2.9-alpha.1", "useWorkspaces": true, "npmClient": "yarn" } diff --git a/packages/console-app/package.json b/packages/console-app/package.json index 29c2b81..a3f8065 100644 --- a/packages/console-app/package.json +++ b/packages/console-app/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-app", - "version": "1.2.9-alpha.0", + "version": "1.2.9-alpha.1", "description": "Kubenet Console Client", "repository": "https://github.com/dxos/console", "main": "dist/es/index.js", diff --git a/packages/console-server/package.json b/packages/console-server/package.json index 85ad4f9..62b57c3 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -1,6 +1,6 @@ { "name": "@dxos/console-server", - "version": "1.2.9-alpha.0", + "version": "1.2.9-alpha.1", "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.9-alpha.0", + "@dxos/console-app": "^1.2.9-alpha.1", "@wirelineio/wns-schema": "^0.1.1", "apollo-boost": "^0.4.9", "apollo-server-express": "^2.13.1", From 018f06e3f7c707968e7d63206dd3d994ec34d8f8 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Fri, 18 Dec 2020 20:58:29 -0600 Subject: [PATCH 4/4] fix: link --- packages/console-server/src/resolvers/extensions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/console-server/src/resolvers/extensions.js b/packages/console-server/src/resolvers/extensions.js index b81e481..1183f6d 100644 --- a/packages/console-server/src/resolvers/extensions.js +++ b/packages/console-server/src/resolvers/extensions.js @@ -17,7 +17,7 @@ const ifBigDipper = () => { } else { return { title: 'Block Explorer', - url: 'http://blockexplorer.kube.moon.dxos.network:3080/' + url: 'http://blockexplorer.moon.dxos.network:3080/' }; } } catch (e) {}