fix: detect running addon and add their links to the console sidebar (#57)

This commit is contained in:
Thomas E Lackey 2020-12-09 18:45:09 -06:00 committed by GitHub
parent 65b110bde7
commit 5b632a9a46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 77 additions and 4 deletions

View File

@ -11,7 +11,7 @@ app:
publicUrl: '/console' publicUrl: '/console'
api: api:
server: 'https://apollo1.kube.moon.dxos.network' server: 'http://127.0.0.1:9004'
path: '/api' path: '/api'
intervalLog: 5000 intervalLog: 5000
pollInterval: 10000 pollInterval: 10000

View File

@ -4,13 +4,17 @@
import clsx from 'clsx'; import clsx from 'clsx';
import React from 'react'; import React from 'react';
import { useQuery } from '@apollo/react-hooks';
import { useHistory, useParams } from 'react-router'; import { useHistory, useParams } from 'react-router';
import { makeStyles } from '@material-ui/core'; import { makeStyles } from '@material-ui/core';
import List from '@material-ui/core/List'; import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem'; import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon'; import ListItemIcon from '@material-ui/core/ListItemIcon';
import LinkIcon from '@material-ui/icons/ExitToApp';
import ListItemText from '@material-ui/core/ListItemText'; import ListItemText from '@material-ui/core/ListItemText';
import { useQueryStatusReducer } from "../hooks";
import ADDON_LIST from "../gql/addon_list.graphql";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
root: { root: {
@ -39,6 +43,13 @@ const Sidebar = ({ modules: { services, settings } }) => {
const history = useHistory(); const history = useHistory();
const { module } = useParams(); const { module } = useParams();
const { data: addonResponse } = useQueryStatusReducer(useQuery(ADDON_LIST));
console.log(addonResponse);
if (!addonResponse) {
return null;
}
const addons = JSON.parse(addonResponse.addon_list.json);
const isSelected = path => path === `/${module}`; const isSelected = path => path === `/${module}`;
const Modules = ({ modules }) => ( const Modules = ({ modules }) => (
@ -54,9 +65,23 @@ const Sidebar = ({ modules: { services, settings } }) => {
</List> </List>
); );
const Addons = ({ addons }) => (
<List aria-label='items' className={classes.list}>
{addons.map(({ url, title }) => (
<ListItem button key={url} onClick={() => window.location = url}>
<ListItemIcon classes={{ root: classes.icon }}>
<LinkIcon className={clsx(classes.icon)} />
</ListItemIcon>
<ListItemText primary={title} />
</ListItem>
))}
</List>
);
return ( return (
<div className={classes.root}> <div className={classes.root}>
<Modules modules={services} /> <Modules modules={services} />
<Addons addons={addons} />
<Modules modules={settings} /> <Modules modules={settings} />
</div> </div>
); );

View File

@ -0,0 +1,9 @@
#
# Copyright 2020 DXOS.org
#
query {
addon_list {
json
}
}

View File

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

View File

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

View File

@ -0,0 +1,37 @@
//
// Copyright 2020 DXOS.org
//
import childProcess from 'child_process';
// TODO(telackey): Make pluggable.
const ifRadicle = () => {
try {
const result = childProcess.execSync('docker ps -f "ancestor=dxos/radicle-seed-node" -q');
if (result) {
return { title: 'Radicle', url: '/' };
}
} catch (e) {}
};
// TODO(telackey): Use the local Sentry.
const ifSentry = () => {
return {
title: 'Sentry',
url: 'http://sentry.kube.dxos.network:9000/'
};
};
export const addonResolvers = {
Query: {
addon_list: async (_, __, { config }) => {
return {
timestamp: new Date().toUTCString(),
json: JSON.stringify([
ifSentry(),
ifRadicle()
].filter(x => x))
};
}
}
};

View File

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