IF YOU WOULD LIKE TO GET AN ACCOUNT, please write an email to s dot adaszewski at gmail dot com. User accounts are meant only to report issues and/or generate pull requests. This is a purpose-specific Git hosting for ADARED projects. Thank you for your understanding!
Browse Source

Decided to go for native frontend/backend instead of Dash.

master
parent
commit
cb37bf41aa
10 changed files with 144 additions and 14 deletions
  1. +3
    -1
      .gitignore
  2. +19
    -0
      frontend/package.json
  3. +35
    -0
      frontend/rollup.config.js
  4. +0
    -0
      frontend/src/css/index.css
  5. +0
    -0
      frontend/src/html/index.html
  6. +0
    -0
      frontend/src/js/index.js
  7. +32
    -8
      wbadvanced/__main__.py
  8. +4
    -4
      wbadvanced/collections.py
  9. +49
    -0
      wbadvanced/processes.py
  10. +2
    -1
      wbadvanced/projects.py

+ 3
- 1
.gitignore View File

@@ -1,3 +1,5 @@
__pycache__
*.pyc

node_modules
package-lock.json
/frontend/dist/

+ 19
- 0
frontend/package.json View File

@@ -0,0 +1,19 @@
{
"dependencies": {
"linkstate": "^1.1.1",
"preact": "^8.2.9",
"preact-router": "^2.6.1",
"rollup": "^0.62.0",
"rollup-plugin-buble": "^0.19.2",
"rollup-plugin-copy": "^0.2.3",
"rollup-plugin-includepaths": "^0.2.3",
"rollup-plugin-license": "^0.7.0",
"rollup-plugin-minify": "^1.0.3",
"rollup-plugin-node-resolve": "^3.3.0",
"watch": "^1.0.2"
},
"scripts": {
"rollup": "rollup -c",
"watch": "watch \"rollup -c\" src"
}
}

+ 35
- 0
frontend/rollup.config.js View File

@@ -0,0 +1,35 @@
import resolve from 'rollup-plugin-node-resolve'
import buble from 'rollup-plugin-buble';
import minify from 'rollup-plugin-minify';
import copy from 'rollup-plugin-copy';
import includePaths from 'rollup-plugin-includepaths';
import license from 'rollup-plugin-license';
export default {
//dest: 'dist/app.min.js',
input: 'src/js/index.js',
output: {
file: 'dist/js/app.min.js',
name: 'CHEMTOP',
format: 'umd',
sourceMap: true
},
plugins: [
includePaths({
paths: ['src/js', 'src/js/widget', 'src/js/misc']
}),
copy({
'src/html/index.html': 'dist/index.html',
'src/css/index.css': 'dist/css/index.css',
verbose: true
}),
buble({jsx: 'h'}),
resolve({}),
license({
banner: 'Copyright (C) F. Hoffmann-La Roche AG, 2020.\nAuthor: stanislaw.adaszewski@roche.com\nAll Rights Reserved.',
}) /* ,
minify({
iife: 'dist/app.min.js'
}) */
]
}

+ 0
- 0
frontend/src/css/index.css View File


+ 0
- 0
frontend/src/html/index.html View File


+ 0
- 0
frontend/src/js/index.js View File


+ 32
- 8
wbadvanced/__main__.py View File

@@ -1,11 +1,18 @@
import dash
import dash_bootstrap_components as dbc
import dash_html_components as html
import dash_core_components as dcc
import socket
import arvados
import functools
from .projects import list_projects_html
from .collections import list_collections_html
from .processes import list_processes_html
# list_projects_html = functools.lru_cache(maxsize=128)(list_projects_html)
# list_collections_html = functools.lru_cache(maxsize=128)(list_collections_html)
# list_processes_html = functools.lru_cache(maxsize=128)(list_processes_html)
def main():
@@ -13,19 +20,36 @@ def main():
arv = arvados.api('v1')
user = arv.users().current().execute()
# nav_btns = [ dbc.Button(a['name']) for a in projects ]
projects_table = list_projects_html(arv, user['uuid'])
collections_table = list_collections_html(arv, user['uuid'])
app.layout = html.Div([
html.H5('Projects'),
projects_table,
html.H5('Collections'),
collections_table
dcc.Location(id='url', refresh=False),
html.Div(id='page-content')
], style={ 'margin': '10px' })
app.run_server(host=socket.getfqdn(), debug=True)
projects_table = list_projects_html(arv, user['uuid'])
collections_table = list_collections_html(arv, user['uuid'])
processes_table = list_processes_html(arv, user['uuid'])
@app.callback(dash.dependencies.Output('page-content', 'children'),
[ dash.dependencies.Input('url', 'pathname') ])
def display_page(pathname):
print('display_page(), pathname:', pathname)
return html.Div([
dbc.Tabs([
dbc.Tab(projects_table, label="Projects",
label_style={ 'cursor': 'pointer' })
], style={ 'borderBottom': 'none' }),
dbc.Tabs([
dbc.Tab(collections_table, label="Collections",
label_style={ 'cursor': 'pointer' }),
dbc.Tab(processes_table, label="Processes",
label_style={ 'cursor': 'pointer' })
], style={ 'borderBottom': 'none' })
])
app.run_server(host=socket.getfqdn(), debug=False)
main()

+ 4
- 4
wbadvanced/collections.py View File

@@ -4,18 +4,18 @@ import humanize
from .users import get_user
def list_collections(arv, owner_uuid):
def list_collections(arv, owner_uuid, limit=100):
res = arv.collections().list(where = {
'owner_uuid': owner_uuid
}).execute()
}, limit=limit).execute()
res = res['items']
#while res['items_available'] > len(res['items']):
#res = arv.collections().list(where = {})
return res
def list_collections_html(arv, parent):
projects = list_collections(arv, parent)
def list_collections_html(arv, parent, limit=100):
projects = list_collections(arv, parent, limit=limit)
header = html.Tr([
html.Th('Name'),


+ 49
- 0
wbadvanced/processes.py View File

@@ -0,0 +1,49 @@
import dash_bootstrap_components as dbc
import dash_html_components as html
from .users import get_user
def list_processes(arv, parent, limit=100):
res = arv.container_requests().list(where={
'owner_uuid': parent
}, limit=100).execute()['items']
return res
def list_processes_html(arv, parent, limit=100):
processes = list_processes(arv, parent, limit=limit)
header = html.Tr([
html.Th('Name'),
html.Th('Description'),
html.Th('Owner')
])
header = [ html.Thead(header) ]
rows = []
for a in processes:
owner = get_user(arv, a['owner_uuid'])
rows.append(
html.Tr([
html.Td([
html.Div(html.A(href='/processes/' + a['uuid'],
children=a['name'])),
html.Div(a['uuid'])
]),
html.Td(a['description'] or 'Process'),
html.Td([
html.Div(html.A(href='mailto:' + owner['email'],
children=owner['first_name'] + ' ' + owner['last_name'])),
html.Div(a['owner_uuid'])
])
]))
rows = [ html.Tbody(rows) ]
res = dbc.Table(header + rows,
striped=True,
hover=True,
responsive=True)
return res

+ 2
- 1
wbadvanced/projects.py View File

@@ -1,5 +1,6 @@
import dash_bootstrap_components as dbc
import dash_html_components as html
import dash_core_components as dcc
from .users import get_user
@@ -27,7 +28,7 @@ def list_projects_html(arv, parent):
rows.append(
html.Tr([
html.Td([
html.Div(html.A(href='/projects/' + a['uuid'],
html.Div(dcc.Link(href='/projects/' + a['uuid'],
children=a['name'])),
html.Div(a['uuid'])
]),


Loading…
Cancel
Save