Skip to content

Commit

Permalink
Views list fix
Browse files Browse the repository at this point in the history
  • Loading branch information
exdis committed Nov 22, 2018
1 parent 65780bc commit 880d9cf
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.6 (22-11-2018)

* Views list fix

## 1.0.5 (22-11-2018)

* Updated Discovery
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsondiscovery",
"version": "1.0.5",
"version": "1.0.6",
"description": "DiscoveryJson",
"author": "[email protected]",
"license": "MIT",
Expand Down
26 changes: 22 additions & 4 deletions src/discovery/lib.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,12 @@ function _default(discovery) {
}), true);
}

function updateAvailableViewList() {
availableViewListEl.innerHTML = discovery.view.views.map(function (name) {
return "<span class=\"view\">".concat(name, "</span>");
}).join(', ');
}

function updateViewModeTabs() {
viewSetupEl.hidden = viewMode !== 'custom';
tabsEls.forEach(function (el) {
Expand Down Expand Up @@ -1328,6 +1334,7 @@ function _default(discovery) {
var contentEl;
var viewSetupEl;
var viewEditorEl;
var availableViewListEl;
var tabsEls;
var dataViewEl = (0, _dom.createElement)('div', 'data-view', [(0, _dom.createElement)('div', 'view-switcher', [(0, _dom.createElement)('div', 'tabs', tabsEls = [(0, _dom.createElement)('div', {
class: 'tab',
Expand All @@ -1346,9 +1353,7 @@ function _default(discovery) {
hidden: true
}, [viewEditorEl = (0, _dom.createElement)('textarea', {
placeholder: 'View'
}), (0, _dom.createElement)('div', 'editor-toolbar', [(0, _dom.createElement)('div', 'editor-toolbar-view-dict', [(0, _dom.createText)('Available views: '), (0, _dom.createElement)('span', 'editor-toolbar-view-list', discovery.view.views.map(function (name) {
return "<span class=\"view\">".concat(name, "</span>");
}).join(', '))]), (0, _dom.createElement)('label', null, [(0, _dom.createElement)('input', {
}), (0, _dom.createElement)('div', 'editor-toolbar', [(0, _dom.createElement)('div', 'editor-toolbar-view-dict', [(0, _dom.createText)('Available views: '), availableViewListEl = (0, _dom.createElement)('span', 'editor-toolbar-view-list')]), (0, _dom.createElement)('label', null, [(0, _dom.createElement)('input', {
class: 'live-update',
type: 'checkbox',
checked: true,
Expand All @@ -1363,7 +1368,20 @@ function _default(discovery) {
applyQuery();
discovery.renderPage();
}
}, 'Build')])])])]), contentEl = (0, _dom.createElement)('div', 'content')]);
}, 'Build')])])])]), contentEl = (0, _dom.createElement)('div', 'content')]); // FIXME: find a better way to update a view list

updateAvailableViewList();
var oldViewDefine = discovery.view.define;

discovery.view.define = function () {
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}

oldViewDefine.apply(this, args);
updateAvailableViewList();
};

var queryEditor = createPageQueryEditor(queryEditorEl);
var viewEditor = createPageQueryEditor(viewEditorEl);
discovery.definePage('report', function (el, data, context) {
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
name: 'JsonDiscovery',
version: '1.0.5',
version: '1.0.6',
description: 'Extension for discovery json APIs and data',
author: 'exdis',
manifest_version: 2, // eslint-disable-line camelcase
Expand Down

0 comments on commit 880d9cf

Please sign in to comment.