Merge pull request #140 from nzzdev/release-3.2.1

Release v3.2.1

.nvmrc

@@ -1 +1 @@
-10
+12

.travis.yml

@@ -4,7 +4,7 @@ services:
   - docker
 language: node_js
 node_js:
-  - "10"
+  - "12"
 cache:
   directories:
     - node_modules

Dockerfile

@@ -1,5 +1,5 @@
 # Use following version of node alpine as the base image
-FROM node:10-alpine
+FROM node:12-alpine
 
 # Set work directory for run/cmd
 WORKDIR /app

README.md

@@ -1,4 +1,4 @@
-# Q Table [![Build Status](https://travis-ci.com/nzzdev/Q-table.svg?token=g43MZxbtUcZ6QyxqUoJM&branch=dev)](https://travis-ci.com/nzzdev/Q-table) [![Greenkeeper badge](https://badges.greenkeeper.io/nzzdev/Q-table.svg?token=70f2c40b32fd66edccfe705c14e1443e8e403768fadc870f4f22f749877c522b&ts=1549974271422)](https://greenkeeper.io/)
+# Q Table [![Build Status](https://travis-ci.com/nzzdev/Q-table.svg?token=g43MZxbtUcZ6QyxqUoJM&branch=dev)](https://travis-ci.com/nzzdev/Q-table) 
 
 **Maintainer**: [philipkueng](https://github.com/philipkueng)
 

index.js

@@ -1,13 +1,15 @@
-const fs = require("fs");
 const Hapi = require("@hapi/hapi");
+const Joi = require("@hapi/joi");
 
 const server = Hapi.server({
   port: process.env.PORT || 3000,
   routes: {
-    cors: true
-  }
+    cors: true,
+  },
 });
 
+server.validator(Joi);
+
 const routes = require("./routes/routes.js");
 
 async function init() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-table",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,26 +11,26 @@
   "author": "Beni Buess <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@hapi/boom": "^7.4.11",
-    "@hapi/hapi": "^18.4.0",
-    "@hapi/inert": "^5.2.2",
-    "@hapi/joi": "^15.1.1",
-    "ajv": "^6.10.2",
+    "@hapi/boom": "^9.1.0",
+    "@hapi/hapi": "^19.1.1",
+    "@hapi/inert": "^6.0.1",
+    "@hapi/joi": "^17.1.1",
+    "ajv": "^6.12.2",
     "array2d": "0.0.5",
     "clone": "^2.1.2",
-    "d3-format": "^1.4.1",
-    "nunjucks": "^3.2.0",
-    "uglify-js": "^3.6.7"
+    "d3-format": "^1.4.4",
+    "nunjucks": "^3.2.1",
+    "uglify-js": "^3.10.0"
   },
   "devDependencies": {
-    "@hapi/code": "^5.3.1",
-    "@hapi/lab": "^19.1.0",
-    "autoprefixer": "^9.7.1",
+    "@hapi/code": "^8.0.1",
+    "@hapi/lab": "^22.0.4",
+    "autoprefixer": "^9.8.4",
     "cssnano": "^4.1.10",
     "html-minifier": "^4.0.0",
-    "jsdom": "^15.2.1",
-    "postcss": "^7.0.21",
+    "jsdom": "^16.2.2",
+    "postcss": "^7.0.32",
     "postcss-import": "^12.0.1",
-    "sass": "^1.23.3"
+    "sass": "^1.26.9"
   }
 }

test/e2e-tests.js

@@ -1,6 +1,7 @@
 const Lab = require("@hapi/lab");
 const Code = require("@hapi/code");
 const Hapi = require("@hapi/hapi");
+const Joi = require("@hapi/joi");
 const lab = (exports.lab = Lab.script());
 
 const expect = Code.expect;
@@ -17,9 +18,10 @@ before(async () => {
     server = Hapi.server({
       port: process.env.PORT || 3000,
       routes: {
-        cors: true
-      }
+        cors: true,
+      },
     });
+    server.validator(Joi);
     server.route(routes);
   } catch (err) {
     expect(err).to.not.exist();
@@ -49,8 +51,8 @@ lab.experiment("rendering-info/web", () => {
       method: "POST",
       payload: {
         item: require("../resources/fixtures/data/four-column-no-header.json"),
-        toolRuntimeConfig: {}
-      }
+        toolRuntimeConfig: {},
+      },
     });
     expect(response.statusCode).to.be.equal(200);
     expect(response.result.markup).startsWith(
@@ -63,7 +65,7 @@ lab.experiment("rendering-info/web", () => {
   it("returns 400 if no payload given", async () => {
     const response = await server.inject({
       url: "/rendering-info/web?_id=someid",
-      method: "POST"
+      method: "POST",
     });
     expect(response.statusCode).to.be.equal(400);
   });
@@ -73,8 +75,8 @@ lab.experiment("rendering-info/web", () => {
       url: "/rendering-info/web?_id=someid",
       method: "POST",
       payload: {
-        item: require("../resources/fixtures/data/four-column-no-header.json")
-      }
+        item: require("../resources/fixtures/data/four-column-no-header.json"),
+      },
     });
     expect(response.statusCode).to.be.equal(400);
   });
@@ -84,8 +86,8 @@ lab.experiment("rendering-info/web", () => {
       url: "/rendering-info/web?_id=someid",
       method: "POST",
       payload: {
-        toolRuntimeConfig: {}
-      }
+        toolRuntimeConfig: {},
+      },
     });
     expect(response.statusCode).to.be.equal(400);
   });
@@ -96,8 +98,8 @@ lab.experiment("rendering-info/web", () => {
       method: "POST",
       payload: {
         item: { foo: "bar" },
-        toolRuntimeConfig: {}
-      }
+        toolRuntimeConfig: {},
+      },
     });
     expect(response.statusCode).to.be.equal(400);
   });
@@ -109,8 +111,8 @@ lab.experiment("migration endpoint", () => {
       method: "POST",
       url: "/migration",
       payload: {
-        item: require("../resources/fixtures/data/minibars-negative.json")
-      }
+        item: require("../resources/fixtures/data/minibars-negative.json"),
+      },
     };
     const response = await server.inject(request);
     expect(response.statusCode).to.be.equal(304);
@@ -123,8 +125,8 @@ lab.experiment("option availability endpoint", () => {
       method: "POST",
       url: "/option-availability/selectedColumn",
       payload: {
-        item: require("../resources/fixtures/data/minibars-mixed.json")
-      }
+        item: require("../resources/fixtures/data/minibars-mixed.json"),
+      },
     };
     const response = await server.inject(request);
     expect(response.result.available).to.be.equal(true);
@@ -135,8 +137,8 @@ lab.experiment("option availability endpoint", () => {
       method: "POST",
       url: "/option-availability/selectedColumn",
       payload: {
-        item: require("../resources/fixtures/data/two-column.json")
-      }
+        item: require("../resources/fixtures/data/two-column.json"),
+      },
     };
     const response = await server.inject(request);
     expect(response.result.available).to.be.equal(false);
@@ -149,16 +151,16 @@ lab.experiment("dynamic schema endpoint", () => {
       method: "POST",
       url: "/dynamic-schema/selectedColumn",
       payload: {
-        item: require("../resources/fixtures/data/minibars-negative.json")
-      }
+        item: require("../resources/fixtures/data/minibars-negative.json"),
+      },
     };
     const response = await server.inject(request);
     expect(response.result.enum).to.be.equal([null, 1, 2, 3]);
     expect(response.result["Q:options"].enum_titles).to.be.equal([
       "keine",
       "2016",
       "2017",
-      "+/- %"
+      "+/- %",
     ]);
   });
 });

views/table.html

@@ -1,7 +1,7 @@
 <div class="s-q-item q-table {% if initWithCardLayout %}q-table--card-layout{% endif %}" id="{{ id }}" style="opacity: 0;">
   {% if displayOptions.hideTitle !== true %}
   <h3 class="s-q-item__title">{{ item.title }}</h3>{% endif %} {%- if item.subtitle and item.subtitle !== '' %}
-  <div class="s-q-item__subtitle s-font-note">{{ item.subtitle }}</div>
+  <div class="s-q-item__subtitle">{{ item.subtitle }}</div>
   {%- endif %}
   <div style="overflow-x: auto">
     <table class="q-table__table">