Merge branch 'master' of github.com:finn-no/unleash

.gitignore

@@ -29,7 +29,7 @@ unleash-db.jar
 unleash-server.tar.gz
 
 # idea stuff:
-*.iml
+.idea/*
 
 .vagrant/
 

.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.autoSave": "onFocusChange"
+}

lib/dbPool.js

@@ -42,7 +42,10 @@ function createDbPool() {
     return knex({
         client: 'pg',
         connection: isTestEnv() ? getTestDatabaseUrl() : getDatabaseUrl(),
-        pool: { min: 2, max: 20 }
+        pool: { 
+            min: 2, 
+            max: 20
+        }
     });
 }
 

lib/eventStore.js

@@ -10,7 +10,7 @@ util.inherits(EventStore, EventEmitter);
 EventStore.prototype.create = function (event) {
     var that = this;
     return eventDb.store(event).then(function() {
-        that.emit(event.type, event);
+        return that.emit(event.type, event);
     });
 };
 

lib/featureDb.js

@@ -65,11 +65,11 @@ function rowToFeature(row) {
 function eventDataToRow(data) {
     return {
         name: data.name,
-        description: data.description,
+        description: data.description || '',
         enabled: data.enabled ? 1 : 0,
         archived: data.archived ? 1 :0,
-        strategy_name: data.strategy, // eslint-disable-line
-        parameters: data.parameters
+        strategy_name: data.strategy || 'default', // eslint-disable-line
+        parameters: data.parameters || {}
     };
 }
 

lib/strategyDb.js

@@ -50,7 +50,7 @@ function eventDataToRow(data) {
     return {
         name: data.name,
         description: data.description,
-        parameters_template: data.parametersTemplate // eslint-disable-line
+        parameters_template: data.parametersTemplate || {} // eslint-disable-line
     };
 }
 

package.json

@@ -49,7 +49,7 @@
         "ini": "1.3.3",
         "jsx-loader": "0.12.2",
         "jsxhint": "0.13.2",
-        "knex": "^0.10.0",
+        "knex": "^0.11.0",
         "lodash": "^3.5.0",
         "log4js": "0.6.22",
         "moment": "^2.11.2",

public/css/unleash.css

@@ -1,7 +1,7 @@
 .toggle-active {
     border: 1px solid black;
     display: inline-block;
-    background-color: #3B7908;
+    background-color: lawngreen;
     border-radius: 50%;
     width: 20px;
     height: 20px;
@@ -9,7 +9,7 @@
 .toggle-inactive {
     border: 1px solid black;
     display: inline-block;
-    background-color: #E7384A;
+    background-color: red;
     border-radius: 50%;
     width: 20px;
     height: 20px;

test/specHelper.js

@@ -15,7 +15,8 @@ function createStrategies() {
     return Promise.map([
         {
             name: "default",
-            description: "Default on or off Strategy."
+            description: "Default on or off Strategy.",
+            parametersTemplate: {}
         },
         {
             name: "usersWithEmail",