Make posibile to expend view preset list on report page (via Widget#o…

…ptions.viewPresets)
discoveryjs · Jan 16, 2019 · 5b6541e · 5b6541e
1 parent 31307c8
commit 5b6541e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/client/pages/report.css b/client/pages/report.css
@@ -95,6 +95,7 @@
 }
 .page-report .data-query-result {
     margin: 1em 0 1em -40px;
+    overflow: hidden;
 }
 .page-report .view-editor-form {
     margin: 0 -40px 12px;
@@ -158,7 +159,6 @@
     padding: 2px 12px;
     background: #f4f4f4;
     font-size: 12px;
-    text-transform: capitalize;
     cursor: pointer;
 }
 .page-report .view-editor-form .tab:first-child {

diff --git a/client/pages/report.js b/client/pages/report.js
@@ -11,9 +11,9 @@ const viewModeSource = {
     default: () => '{\n    view: \'struct\',\n    expanded: 1\n}',
     custom: results => viewModeSource.default(results)
 };
-const viewPresets = {
-    table: () => '"table"'
-};
+const defaultViewPresets = [
+    { name: 'Table', content: '"table"' }
+];
 
 function valueDescriptor(value) {
     if (Array.isArray(value)) {
@@ -118,6 +118,9 @@ export default function(discovery) {
     let currentContext;
     let lastQuery = {};
     let lastView = {};
+    const viewPresets = Array.isArray(discovery.options.viewPresets)
+        ? defaultViewPresets.concat(discovery.options.viewPresets)
+        : defaultViewPresets;
 
     function renderQueryAutocompleteItem(el, self, { entry: { value, current, type }}) {
         const startChar = current[0];
@@ -401,17 +404,17 @@ export default function(discovery) {
                 class: 'tab',
                 'data-mode': id,
                 onclick: () => setViewMode(id)
-            }, id)
+            }, id.replace(/^./, fc => fc.toUpperCase())) // captitalize
         )),
-        createElement('div', 'tabs presets', Object.keys(viewPresets).map(id =>
+        createElement('div', 'tabs presets', viewPresets.map(({ name, content }) =>
             createElement('div', {
                 class: 'tab',
                 onclick: () =>
                     discovery.setPageParams({
                         ...discovery.pageParams,
-                        view: viewPresets[id](lastView.data)
+                        view: content
                     })
-            }, id)
+            }, name || 'Untitled preset')
         )),
         viewSetupEl = createElement('div', {
             class: 'view-editor',