Adoptions from ivis-core

client/package-lock.json

@@ -4507,11 +4507,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4528,7 +4530,8 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -4657,6 +4660,7 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }

client/src/lib/bootstrap-components.js

@@ -146,7 +146,8 @@ export class ButtonDropdown extends Component {
 export class ActionLink extends Component {
     static propTypes = {
         onClickAsync: PropTypes.func,
-        className: PropTypes.string
+        className: PropTypes.string,
+        href: PropTypes.string
     }
 
     @withAsyncErrorHandler
@@ -163,7 +164,7 @@ export class ActionLink extends Component {
         const props = this.props;
 
         return (
-            <a href="" className={props.className} onClick={::this.onClick}>{props.children}</a>
+            <a href={props.href || ''} className={props.className} onClick={::this.onClick}>{props.children}</a>
         );
     }
 }

client/src/lib/decorator-helpers.js

@@ -28,16 +28,21 @@ export function withComponentMixins(mixins, delegateFuns) {
 
     return TargetClass => {
         const ctors = [];
+        const mixinDelegateFuns = [];
 
-        function TargetClassWithCtors(props, context) {
+        if (delegateFuns) {
+            mixinDelegateFuns.push(...delegateFuns);
+        }
+
+        function TargetClassWithCtors(props) {
             if (!new.target) {
                 throw new TypeError();
             }
 
-            const self = Reflect.construct(TargetClass, [props, context], new.target);
+            const self = Reflect.construct(TargetClass, [props], new.target);
 
             for (const ctor of ctors) {
-                ctor(self);
+                ctor(self, props);
             }
 
             return self;
@@ -76,6 +81,10 @@ export function withComponentMixins(mixins, delegateFuns) {
             if (res.ctor) {
                 ctors.push(res.ctor);
             }
+
+            if (res.delegateFuns) {
+                mixinDelegateFuns.push(...res.delegateFuns);
+            }
         }
 
         class ComponentMixinsOuter extends React.Component {
@@ -107,13 +116,11 @@ export function withComponentMixins(mixins, delegateFuns) {
             }
         }
 
-        if (delegateFuns) {
+        for (const fun of mixinDelegateFuns) {
-            for (const fun of delegateFuns) {
             ComponentMixinsOuter.prototype[fun] = function (...args) {
                 return this._decoratorInnerInstance[fun](...args);
             }
         }
-        }
 
         return ComponentMixinsOuter;
     };

client/src/lib/styles.scss

@@ -82,7 +82,6 @@
   background-color: white;
 }
 
-
 :global h3.legend {
   font-size: 21px;
   margin-bottom: 20px;
@@ -101,6 +100,21 @@
   }
 }
 
+.colorPickerSwatchWrapper {
+  padding: 7px;
+  background: #fff;
+  border: 1px solid #AAB2BD;
+  border-radius: 4px;
+  display: inline-block;
+  cursor: pointer;
+
+  .colorPickerSwatchColor {
+    width: 60px;
+    height: 18px;
+    borderRadius: 2px;
+  }
+}
+
 .colorPickerWrapper {
   text-align: right;
 }

client/src/lib/untrusted.js

@@ -87,7 +87,8 @@ export class UntrustedContentHost extends Component {
     }
 
     sendMessage(type, data) {
-        if (this.contentNodeIsLoaded) { // This is to avoid errors: Failed to execute 'postMessage' on 'DOMWindow': The target origin provided ('http://localhost:8081') does not match the recipient window's origin ('http://localhost:3000')"
+        if (this.contentNodeIsLoaded && this.contentNode) { // This is to avoid errors: Failed to execute 'postMessage' on 'DOMWindow': The target origin provided ('http://localhost:8081') does not match the recipient window's origin ('http://localhost:3000')"
+                                                            // When the child window is closed during processing of the message, the this.contentNode becomes null and we can't deliver the response
             this.contentNode.contentWindow.postMessage({type, data}, getSandboxUrl());
         }
     }

server/index.js

@@ -141,7 +141,6 @@ dbcheck(err => { // Check if database needs upgrading before starting the server
             )
         )
     );
-*/
 });