boomack 0.13.0 → 0.13.2

package/client/public/css/main.css

@@ -199,11 +199,13 @@ header.home-header {
 .slot, .slot.ui.segment {
 	margin: 0;
 	padding: 0;
-	display: flex;
-	flex-direction: column;
 	overflow: hidden;
 	position: relative;
 }
+.layout-grid .slot {
+	display: flex;
+	flex-direction: column;
+}
 .slot.ui.segment.without-border {
 	border: none;
 	background: transparent;

package/client/views/parts/slot.ejs

@@ -49,11 +49,11 @@ function replaceThemePropsInStr(s) {
 		%><%= slot.zoom !== 1.0 && !contentScale ? ' zoom' : '' %><%
 	%>"
 	style="<%
-		if (!singled && panel.layout.grid) {
+		if (!singled && panel.layout.type === 'grid') {
 			%>grid-column: <%= slot.column + 1 %> / span <%= slot.columnSpan %>;<%
 			%>grid-row: <%= slot.row + 1 %> / span <%= slot.rowSpan %><%
 		}
-		if (panel.layout.document && commandSrc) {
+		if (panel.layout.type === 'document' && commandSrc) {
 			%>height: calc(100vh - 2em);<%
 		}
 		%>"
@@ -185,6 +185,9 @@ function replaceThemePropsInStr(s) {
 		if (slot.minHeight) {
 			%>min-height: <%= slot.minHeight %>;<%
 		}
+		if (slot.height) {
+			%>height: <%= slot.height %>;<%
+		}
 	%>">
 		<% if (slot.showId) { %><div class="slot-id"><%= slot.id %></div><% } %>
 	</div>
@@ -192,6 +195,9 @@ function replaceThemePropsInStr(s) {
 		if (slot.minHeight) {
 			%>min-height: <%= slot.minHeight %>;<%
 		}
+		if (slot.height) {
+			%>height: <%= slot.height %>;<%
+		}
 		if (commandBackground) {
 			%>background: <%= replaceThemePropsInStr(commandBackground) %>;<%
 		}
@@ -200,6 +206,12 @@ function replaceThemePropsInStr(s) {
 			if (!commandContent) {
 				%>display:none;<%
 			}
+			if (slot.height) {
+				%>height: <%= slot.height %>;<%
+			}
+			if (slot.maxHeight) {
+				%>max-height:<%= slot.maxHeight %>;overflow-y:scroll;<%
+			}
 			if (slot.colorFilter) {
 				if (_.isString(slot.colorFilter) && slot.colorFilter !== 'theme') {
 					%>filter: <%= slot.colorFilter %>;<%

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "boomack",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "web app for displaying hyper-media items in concert with e.g. an IDE",
   "author": "Tobias Kiertscher <dev@mastersign.de>",
   "license": "MIT",

package/server-build/model/display-request.js

@@ -39,6 +39,7 @@ function sanitizeOptions(options) {
     options.debug = utils.enforceBoolean(options.debug, false);
     options.transformation = utils.enforceString(options.transformation);
     options.syntax = utils.enforceString(options.syntax);
+    options.renderer = utils.enforceString(options.renderer);
     options.cache = utils.enforceEnum(optionsCacheEnum, options.cache, 'auto');
     options.iframe = utils.enforceBoolean(options.iframe, null);
     if (options.extend === 'beginning' ||

package/server-build/model/display-request.test.js

@@ -43,6 +43,7 @@ describe('model/display-request', function () {
                         debug: false,
                         transformation: null,
                         syntax: null,
+                        renderer: null,
                         iframe: null,
                         cache: 'auto',
                         extend: 'no',
@@ -54,6 +55,7 @@ describe('model/display-request', function () {
                     'debug',
                     'transformation',
                     'syntax',
+                    'renderer',
                     'iframe',
                     'cache',
                     'extend',
@@ -82,6 +84,7 @@ describe('model/display-request', function () {
                         debug: false,
                         transformation: null,
                         syntax: null,
+                        renderer: null,
                         iframe: null,
                         cache: 'auto',
                         extend: 'no',
@@ -104,6 +107,7 @@ describe('model/display-request', function () {
                 options: {
                     transformation: 'highlight',
                     syntax: 'xml',
+                    renderer: 'custom',
                     iframe: 'off',
                     cache: 'memory',
                     scale: 'invalid',
@@ -126,6 +130,7 @@ describe('model/display-request', function () {
                         debug: false,
                         transformation: 'highlight',
                         syntax: 'xml',
+                        renderer: 'custom',
                         iframe: false,
                         cache: 'memory',
                         extend: 'end',

package/server-build/model/layout.js

@@ -29,6 +29,8 @@ const gridSlotDefaults = _.defaults({
 }, slotDefaults);
 const documentSlotDefaults = _.defaults({
     minHeight: '0',
+    height: null,
+    maxHeight: null,
 }, slotDefaults);
 const slotTemplateDefaults = {
     history: 0,
@@ -43,6 +45,8 @@ const slotTemplateDefaults = {
     border: true,
     zoom: 1.0,
     minHeight: '0',
+    height: null,
+    maxHeight: null,
 };
 const gridLayoutDefaults = {
     columns: 1,

package/server-build/model/layout.test.js

@@ -105,6 +105,8 @@ describe('model/layout', function () {
                             border: true,
                             zoom: 1.0,
                             minHeight: '0',
+                            height: null,
+                            maxHeight: null,
                         },
                         autoSlots: 0,
                         nextIndex: 1,
@@ -228,6 +230,8 @@ describe('model/layout', function () {
                         noMaximize: true,
                         zoom: 1.25,
                         minHeight: '20px',
+                        height: '200px',
+                        maxHeight: '50vh',
                     },
                     autoSlots: 0,
                     nextIndex: 1,
@@ -250,6 +254,8 @@ describe('model/layout', function () {
                         zoom: 1.5,
                         colorFilter: 'saturate(130%)',
                         minHeight: '25vh',
+                        height: '20rem',
+                        maxHeight: '100vh',
                     },
                     stash: {
                         id: 'stash',
@@ -270,7 +276,9 @@ describe('model/layout', function () {
                             0.0, -1.0, 0.0, 1.0,
                             0.0, 0.0, 1.0, 0.0,
                         ],
-                        minHeight: '10em',
+                        minHeight: '2rem',
+                        height: '5em',
+                        maxHeight: '100px',
                     },
                 },
                 title: 'Panel Title',

package/server-build/pipeline.js

@@ -66,7 +66,7 @@ function applyDisplayRequestDefaults(displayRequest, cb) {
     if (!r.slot) {
         r.slot = defaultSlotForPanel(r.panel);
     }
-    if (!r.slot) {
+    if (panel.layout.type !== 'document' && !r.slot) {
         cb(error("Slot not found"));
         return;
     }
@@ -98,6 +98,9 @@ function applyDisplayRequestDefaults(displayRequest, cb) {
             o.transformation = null;
         }
     }
+    if (o.transformation === 'none') {
+        o.transformation = null;
+    }
     if (o.transformation !== 'highlight') {
         o.syntax = null;
     }
@@ -120,6 +123,9 @@ function applyDisplayRequestDefaults(displayRequest, cb) {
             o.renderer = null;
         }
     }
+    if (o.renderer === 'none') {
+        o.renderer = null;
+    }
     const fixedRenderer = o.renderer;
     // read configuration values
     const autoMemoryCacheThreshold = parseDataAmount(cfg.get('cache.memory.autoThreshold.global', 1 * 1024 * 1024)); // 1MB

package/server-build/routes/display-requests.js

@@ -170,19 +170,17 @@ exports.setup = function (app, io) {
                 return null;
             }
         }
-        let data;
         try {
             if (cfg.getBoolean('api.request.yaml')) {
-                data = YAML.parse(s, { schema: 'yaml-1.1' });
+                return YAML.parse(s, { schema: 'yaml-1.1' });
             }
             else {
-                data = JSON.parse(s);
+                return JSON.parse(s);
             }
         }
         catch (e) {
             return null;
         }
-        return _.isArray(data) ? data : [data];
     }
     function titleFromHttpHeader(req) {
         const titleHeader = req.get('X-Boomack-Title');
@@ -191,16 +189,12 @@ exports.setup = function (app, io) {
             null;
     }
     function optionsFromHttpHeader(req) {
-        let result = [];
-        const presetHeader = req.get('X-Boomack-Presets');
-        const presets = decodePresets(presetHeader);
-        if (presets)
-            result = presets;
         const optionsHeader = req.get('X-Boomack-Options');
-        const options = decodeOptions(optionsHeader);
-        if (options)
-            result = result.concat(options);
-        return result;
+        return decodeOptions(optionsHeader);
+    }
+    function presetsFromHttpHeader(req) {
+        const presetHeader = req.get('X-Boomack-Presets');
+        return decodePresets(presetHeader);
     }
     function handleStreamingDisplayRequest(req, res, panelId, slotId) {
         const type = req.get('Content-Type');
@@ -213,6 +207,7 @@ exports.setup = function (app, io) {
             return;
         }
         const title = titleFromHttpHeader(req);
+        const presets = presetsFromHttpHeader(req);
         const options = optionsFromHttpHeader(req);
         const displayRequest = {
             panel: panelId,
@@ -222,6 +217,8 @@ exports.setup = function (app, io) {
         };
         if (title)
             displayRequest.title = title;
+        if (presets)
+            displayRequest.presets = presets;
         if (options)
             displayRequest.options = options;
         handleDisplayRequest([displayRequest], req.authorization, res);
@@ -236,8 +233,7 @@ exports.setup = function (app, io) {
                 message: `The target panel "${panelId}" does not exist.`,
             });
         }
-        const slotId = panel.layout.defaultSlot;
-        handleStreamingDisplayRequest(req, res, panelId, slotId);
+        handleStreamingDisplayRequest(req, res, panelId, null);
     });
     app.post('/v1/panels/:panelId/slots/:slotId/display', apiAuth('content.display'), (req, res) => {
         const panelId = req.params.panelId;
@@ -252,7 +248,7 @@ exports.setup = function (app, io) {
         }
         const slotId = req.params.slotId;
         const slot = panel.layout.slots[slotId];
-        if (!slot) {
+        if (panel.layout.type != 'document' && !slot) {
             error(res, {
                 status: 404,
                 title: 'Target Not Found',

package/server-build/service/panels.js

@@ -203,7 +203,7 @@ exports.pushDisplayCommand = function (displayCommand, cb) {
         return;
     }
     const slotId = displayCommand.slot;
-    if (!panel.content.has(slotId)) {
+    if (panel.layout.type !== 'document' && !panel.content.has(slotId)) {
         cb(new BadRequestError(`Panel '${panelId}' has no slot '${slotId}'`));
         return;
     }

package/server-build/typedefs.js

@@ -98,6 +98,8 @@
  *
  * @typedef {Slot} DocumentSlot
  * @property {string} minHeight - The CSS length for the minimal height of the slot.
+ * @property {string} height - The CSS length for the height of the slot.
+ * @property {string} maxHeight - The CSS length for the maximal height of the slot.
  */
 /**
  * The structure to describe a general panel layout.