Skip to content

Commit 65dcd2e

Browse files
eapearsoneapearson
authored
Merge pull request #1311 from kbase/develop
Develop -> Master
2 parents b524921 + 58a63cd commit 65dcd2e

File tree

20 files changed

+591
-8
lines changed

20 files changed

+591
-8
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ docs-viewer: docs
223223
# git -c http.sslVerify=false clone https://oauth2:[email protected]:1443/devops/kbase_ui_config.git
224224
get-gitlab-config:
225225
mkdir -p dev/gitlab-config; \
226-
git clone -b master ssh://[email protected]/devops/kbase_ui_config.git dev/gitlab-config
226+
git clone -b develop ssh://[email protected]/devops/kbase_ui_config.git dev/gitlab-config
227227

228228
clean-gitlab-config:
229229
rm -rf dev/gitlab-config

‎config/plugins.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins:
77
- narrativemanager
88
- about
99
- login
10+
- developer
1011
# external:
1112
- name: typeview
1213
globalName: kbase-ui-plugin-typeview
@@ -15,7 +16,7 @@ plugins:
1516
bower: {}
1617
- name: dataview
1718
globalName: kbase-ui-plugin-dataview
18-
version: 4.5.3
19+
version: 4.5.4
1920
source:
2021
git: {}
2122
- name: dashboard
@@ -62,7 +63,7 @@ plugins:
6263
- name: job-browser2
6364
globalName: kbase-ui-plugin-job-browser2
6465
# revert to current version after next release
65-
version: 1.5.9
66+
version: 1.5.13
6667
# version: 1.1.4
6768
source:
6869
git: {}
@@ -74,7 +75,7 @@ plugins:
7475
account: kbaseIncubator
7576
- name: re-landing-pages
7677
globalName: kbase-ui-plugin-re-landing-pages
77-
version: 0.9.4
78+
version: 0.10.1
7879
source:
7980
git:
8081
account: kbaseIncubator
@@ -86,7 +87,7 @@ plugins:
8687
account: eapearson
8788
- name: sampleview
8889
globalName: kbase-ui-plugin-sampleview
89-
version: 0.4.6
90+
version: 0.6.2
9091
source:
9192
git:
9293
account: kbaseIncubator

‎config/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
---
77
# Note that this file is merged into the master config in the release namespace.
88
release:
9-
version: 2.1.4
9+
version: 2.1.5

‎deployment/templates/config.json.tmpl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
"allowRoles": [
7575
"DevToken"
7676
]
77+
}, {
78+
"id": "developer",
79+
"auth": true,
80+
"allowRoles": [
81+
"DevToken"
82+
]
7783
}]
7884
},
7985
"help": {
@@ -404,6 +410,20 @@
404410
}
405411

406412
},
413+
"dynamicServices": {
414+
"JobBrowserBFF": {
415+
"version": "{{default .Env.dynamicServices_JobBrowserBFF_version "auto"}}"
416+
},
417+
"SampleService": {
418+
"version": "{{default .Env.dynamicServices_SampleService_version "auto"}}"
419+
},
420+
"OntologyAPI": {
421+
"version": "{{default .Env.dynamicServices_OntologyAPI_version "auto"}}"
422+
},
423+
"TaxonomyAPI": {
424+
"version": "{{default .Env.dynamicServices_TaxonomyAPI_version "auto"}}"
425+
}
426+
},
407427
"resources": {
408428
"docSite": {
409429
"base": {

‎release-notes/RELEASE_NOTES_2.1.5.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# KBase kbase-ui 2.1.5 Release Notes
2+
3+
Fixes ui bugs in the job browser.
4+
Note, requires updated bff.
5+
6+
## CHANGES
7+
8+
none
9+
10+
### NEW
11+
12+
added (crude) config editor to developer plugin
13+
14+
### REMOVED
15+
16+
none
17+
18+
### UNRELEASED
19+
20+
sampleview: iteration on the mvp
21+
22+
### IMPROVEMENTS
23+
24+
none
25+
26+
### FIXES
27+
28+
job-browser2: fix a few more bugs
29+
30+
## Dependency Changes
31+
32+
job-browser2: 1.5.9 -> 1.5.13

‎release-notes/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
| Version | Date | Notes |
88
| --------------------------------- | ---------- | ------------------- |
9+
| [2.1.5](RELEASE_NOTES_2.1.5.md) | 2020-06-11 | |
910
| [2.1.4](RELEASE_NOTES_2.1.4.md) | 2020-05-25 | |
1011
| [2.1.3](RELEASE_NOTES_2.1.3.md) | 2020-05-25 | |
1112
| [2.1.2](RELEASE_NOTES_2.1.2.md) | 2020-05-14 | |

‎src/client/modules/app/runtime.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ define([
2929
return this.configProps.hasItem(prop);
3030
}
3131

32+
setConfig(prop, value) {
33+
this.configProps.setItem(prop, value);
34+
}
35+
3236
rawConfig() {
3337
return this.configProps.getRaw();
3438
}

‎src/plugins/developer/config.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## Welcome Panel
2+
---
3+
package:
4+
name: developer
5+
description: A developer tool
6+
author: Erik Pearson
7+
type: legacy
8+
install:
9+
widgets:
10+
- module: developer
11+
id: developer
12+
type: es6
13+
routes:
14+
- path: ["developer", {type: rest, name: path}]
15+
widget: developer
16+
queryParams: {}
17+
menu:
18+
- name: developer
19+
path: developer/main
20+
label: Developer
21+
icon: cogs

‎src/plugins/developer/modules/developer.js

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
define([
2+
'preact',
3+
'htm',
4+
'./reactComponents/Developer',
5+
'./reactComponents/ConfigEditor',
6+
'bootstrap'],
7+
function (
8+
preact,
9+
htm,
10+
Developer,
11+
ConfigEditor
12+
) {
13+
'use strict';
14+
15+
const {h, render} = preact;
16+
const html = htm.bind(h);
17+
18+
class DeveloperPanel {
19+
constructor({ runtime }) {
20+
this.runtime = runtime;
21+
22+
// this.mount = null;
23+
this.container = null;
24+
}
25+
26+
// Widget API
27+
attach(node) {
28+
this.container = node;
29+
// this.mount = node;
30+
// this.container = this.mount.appendChild(document.createElement('div'));
31+
}
32+
33+
renderMain() {
34+
const props = {
35+
runtime: this.runtime
36+
};
37+
return html`<${Developer} ...${props} />`;
38+
}
39+
40+
renderNotFound() {
41+
return html`<div>
42+
<p>Not Found</p>
43+
<p>Try <a href="/#developer/main" target="_parent">home</a></p>
44+
</div>`;
45+
}
46+
47+
// renderRoute(view, params) {
48+
// if (typeof view === 'undefined') {
49+
// view = 'main';
50+
// }
51+
52+
// switch (view) {
53+
// case 'main':
54+
// return this.renderMain();
55+
// case 'config':
56+
// return this.renderConfigEditor(params);
57+
// default:
58+
// return this.renderNotFound();
59+
// }
60+
// }
61+
62+
start(params) {
63+
render(this.renderMain(), this.container);
64+
// let content;
65+
// if (params.path) {
66+
// const [view, ...rest] = params.path;
67+
// content = this.renderRoute(view, rest);
68+
// } else {
69+
// content = this.renderNotFound();
70+
// }
71+
// render(content, this.container);
72+
}
73+
74+
stop() {
75+
return null;
76+
}
77+
78+
detach() {
79+
if (this.container && this.container.parentNode) {
80+
this.container.parentNode.removeChild(this.container);
81+
this.container = null;
82+
}
83+
}
84+
}
85+
return DeveloperPanel;
86+
});

‎src/plugins/developer/modules/reactComponents/ConfigEditor.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.path {
2+
font-style: italic;
3+
}

0 commit comments

Comments
 (0)