Fix passing a debug data

ipselon · ipselon · commit 59a18897b41a · 2020-01-14T20:30:19.000+02:00
diff --git a/src/framework/components/PageComposer/ComponentWrapper.js b/src/framework/components/PageComposer/ComponentWrapper.js
@@ -250,27 +250,7 @@ class ComponentWrapper extends Component {
   }
 
   render() {
-    const wrapperPicked = pickInObject(this.props, ['elementKey', 'wrappedComponent', 'wrappedProps', 'children']);
-    const restPicked = omitInObject(
-      this.props,
-      [
-        'isSelected',
-        'elementKey',
-        'wrappedComponent',
-        'wrappedProps',
-        'cloneProps',
-        'children',
-        'itemWasDropped',
-        'draggedItem',
-        'draggedItemPosition',
-        'onMouseDown',
-        'onContextMenuClick',
-        'onComponentInstanceInitialize',
-        'onComponentInstanceDestroy',
-        'doNotUseInFlows'
-      ]
-    );
-    const {elementKey, wrappedComponent, wrappedProps, children} = wrapperPicked;
+    const {elementKey, wrappedComponent, wrappedProps, children} = this.props;
     if (!wrappedComponent) {
       return (
         <div key={elementKey} style={style}>
@@ -285,7 +265,7 @@ class ComponentWrapper extends Component {
         </div>
       );
     }
-    return React.createElement(wrappedComponent, {...restPicked, ...wrappedProps}, children);
+    return React.createElement(wrappedComponent, wrappedProps, children);
   }
 }
 
diff --git a/src/framework/components/PageComposer/PageComposer.js b/src/framework/components/PageComposer/PageComposer.js
@@ -414,7 +414,7 @@ class PageComposer extends React.Component {
       draggedItemPosition
     } = this.state;
     selectedKeys = [];
-    const rootComponent = renderComponent(userComponents, componentsTree, {
+    return renderComponent(userComponents, componentsTree, {
       itemWasDropped: this.itemWasDropped,
       draggedItem,
       draggedItemPosition,
@@ -423,7 +423,6 @@ class PageComposer extends React.Component {
       onComponentInstanceInitialize: this.handleComponentInstanceInitialize,
       onComponentInstanceDestroy: this.handleComponentInstanceDestroy
     });
-    return rootComponent;
   }
 
   render () {
diff --git a/src/framework/components/PageComposition/Container.js b/src/framework/components/PageComposition/Container.js
@@ -1,5 +1,5 @@
+import cloneDeep from 'lodash/cloneDeep';
 import React from 'react';
-import { pickInObject, omitInObject } from '../../commons/utilities';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { createStructuredSelector } from 'reselect';
@@ -30,15 +30,17 @@ class Container extends React.Component {
           const handlerAction = actions[eventHandler.name];
           if (handlerAction) {
             if (process.env.NODE_ENV !== 'production') {
-              sendDebugMessage({
-                key: componentKey,
-                eventType: constants.DEBUG_MSG_COMPONENT_FIRE_EVENT,
-                eventName: eventHandler.name,
-                outputData: args && args.length > 0 ? args[0] : undefined,
-                componentName,
-                componentInstance,
-                timestamp: Date.now(),
-              });
+              if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+                sendDebugMessage({
+                  key: componentKey,
+                  eventType: constants.DEBUG_MSG_COMPONENT_FIRE_EVENT,
+                  eventName: eventHandler.name,
+                  outputData: args && args.length > 0 ? cloneDeep(args[0]) : undefined,
+                  componentName,
+                  componentInstance,
+                  timestamp: Date.now(),
+                });
+              }
             }
             handlerAction.apply(null, [args[0], args[1]]);
           } else {
@@ -54,72 +56,48 @@ class Container extends React.Component {
   shouldComponentUpdate (nextProps, nextState, nextContext) {
     if (process.env.NODE_ENV !== 'production') {
       if (nextProps.stateProps !== this.props.stateProps) {
-        const { componentName, componentInstance, componentKey } = this.props;
-        sendDebugMessage({
-          key: componentKey,
-          eventType: constants.DEBUG_MSG_NEW_PROPS_EVENT,
-          inputData: nextProps.stateProps,
-          componentName,
-          componentInstance,
-          timestamp: Date.now(),
-        });
+        if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+          const { componentName, componentInstance, componentKey } = this.props;
+          sendDebugMessage({
+            key: componentKey,
+            eventType: constants.DEBUG_MSG_NEW_PROPS_EVENT,
+            inputData: cloneDeep(nextProps.stateProps),
+            componentName,
+            componentInstance,
+            timestamp: Date.now(),
+          });
+        }
       }
     }
     return true;
   }
 
   render () {
-    const wrapperPicked = pickInObject(
-      this.props,
-      ['wrappedComponent', 'wrappedProps', 'stateProps', 'populatedProps', 'children']
-    );
-    const restPicked = omitInObject(
-      this.props,
-      [
-        'componentKey',
-        'componentName',
-        'componentInstance',
-        'containerEventHandlers',
-        'containerProperties',
-        'wrappedProps',
-        'populatedProps',
-        'wrappedComponent',
-        'children'
-      ]
-    );
     const {
       wrappedComponent,
       wrappedProps,
       stateProps,
       populatedProps,
       children
-    } = wrapperPicked;
+    } = this.props;
     return React.createElement(
       wrappedComponent,
-      { ...restPicked, ...wrappedProps, ...this.wrappedHandlers, ...populatedProps, ...stateProps },
+      { ...wrappedProps, ...this.wrappedHandlers, ...populatedProps, ...stateProps },
       children
     );
   }
 }
 
 class Component extends React.Component {
   render () {
-    const wrapperPicked = pickInObject(
-      this.props,
-      ['wrappedComponent', 'wrappedProps', 'children']
-    );
-    const restPicked = omitInObject(
-      this.props,
-      ['wrappedComponent', 'wrappedProps', 'children']
-    );
     const {
       wrappedComponent,
       wrappedProps,
       children
-    } = wrapperPicked;
+    } = this.props;
     return React.createElement(
       wrappedComponent,
-      { ...restPicked, ...wrappedProps },
+      wrappedProps,
       children
     );
   }
diff --git a/src/framework/components/PageComposition/PageComposition.js b/src/framework/components/PageComposition/PageComposition.js
@@ -6,6 +6,7 @@ import get from 'lodash/get';
 import isUndefined from 'lodash/isUndefined';
 import isArray from 'lodash/isArray';
 import isPlainObject from 'lodash/isObject';
+import cloneDeep from 'lodash/cloneDeep';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ErrorBoundary from './ErrorBoundary';
@@ -179,17 +180,19 @@ class PageComposition extends Component {
         }
       }
       if (process.env.NODE_ENV !== 'production') {
-        if (!isEmpty(populatedProps)) {
-          sendDebugMessage({
-            key: componentKey,
-            eventType: constants.DEBUG_MSG_CREATE_CONTAINER_EVENT,
-            inputData: populatedProps,
-            populatePath: normalizedRoutePath,
-            propertyName,
-            componentName: type,
-            componentInstance: instance,
-            timestamp: Date.now(),
-          });
+        if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+          if (!isEmpty(populatedProps)) {
+            sendDebugMessage({
+              key: componentKey,
+              eventType: constants.DEBUG_MSG_CREATE_CONTAINER_EVENT,
+              inputData: cloneDeep(populatedProps),
+              populatePath: normalizedRoutePath,
+              propertyName,
+              componentName: type,
+              componentInstance: instance,
+              timestamp: Date.now(),
+            });
+          }
         }
       }
       return createContainer(
diff --git a/src/framework/components/StartWrapper/StartWrapper.js b/src/framework/components/StartWrapper/StartWrapper.js
@@ -1,3 +1,4 @@
+import cloneDeep from 'lodash/cloneDeep';
 import React from 'react';
 import PropTypes from 'prop-types';
 import createContainerActions from '../../store/actions';
@@ -33,13 +34,15 @@ class StartWrapper extends React.Component {
       const onDidMountAction = actions['onApplicationStart'];
       if (onDidMountAction) {
         if (process.env.NODE_ENV !== 'production') {
-          sendDebugMessage({
-            key: componentKey,
-            eventType: constants.DEBUG_MSG_APPLICATION_START_EVENT,
-            componentName,
-            componentInstance,
-            timestamp: Date.now(),
-          });
+          if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+            sendDebugMessage({
+              key: componentKey,
+              eventType: constants.DEBUG_MSG_APPLICATION_START_EVENT,
+              componentName,
+              componentInstance,
+              timestamp: Date.now(),
+            });
+          }
         }
         store.dispatch(onDidMountAction.apply(null, null));
       }
diff --git a/src/framework/store/actions.js b/src/framework/store/actions.js
@@ -5,6 +5,7 @@ import isString from 'lodash/isString';
 import isNumber from 'lodash/isNumber';
 import isFunction from 'lodash/isFunction';
 import isUndefined from 'lodash/isUndefined';
+import cloneDeep from 'lodash/cloneDeep';
 import { COMPONENT_TYPE, USER_FUNCTION_TYPE, DISPATCH_ERROR_TYPE} from './constants';
 import { getUserFunctionByName } from './sequences';
 
@@ -76,45 +77,51 @@ function dispatchToComponent (props, payload, dispatch, helpers) {
             }
           }
           if (process.env.NODE_ENV !== 'production') {
-            sendDebugMessage({
-              key: componentKey,
-              eventType: constants.DEBUG_MSG_FORWARD_EVENT,
-              forwardPath,
-              inputData: transformedPayload,
-              propertyName,
-              pathString,
-              timestamp: Date.now(),
-            });
+            if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+              sendDebugMessage({
+                key: componentKey,
+                eventType: constants.DEBUG_MSG_FORWARD_EVENT,
+                forwardPath,
+                inputData: cloneDeep(transformedPayload),
+                propertyName,
+                pathString,
+                timestamp: Date.now(),
+              });
+            }
           }
           history.push(pathString);
         } else if (propertyName) {
           // hmmm... why there can not be the history helper?
           const targetKey = `${componentName}_${componentInstance}`;
           if (process.env.NODE_ENV !== 'production') {
+            if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+              sendDebugMessage({
+                key: componentKey,
+                eventType: constants.DEBUG_MSG_REDUCE_DATA_EVENT,
+                inputData: cloneDeep(transformedPayload),
+                componentName,
+                componentInstance,
+                propertyName,
+                timestamp: Date.now(),
+              });
+            }
+          }
+          dispatch({ type: targetKey, payload: { [propertyName]: transformedPayload } });
+        }
+      } else {
+        const targetKey = `${componentName}_${componentInstance}`;
+        if (process.env.NODE_ENV !== 'production') {
+          if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
             sendDebugMessage({
               key: componentKey,
               eventType: constants.DEBUG_MSG_REDUCE_DATA_EVENT,
-              inputData: transformedPayload,
+              inputData: cloneDeep(transformedPayload),
               componentName,
               componentInstance,
               propertyName,
               timestamp: Date.now(),
             });
           }
-          dispatch({ type: targetKey, payload: { [propertyName]: transformedPayload } });
-        }
-      } else {
-        const targetKey = `${componentName}_${componentInstance}`;
-        if (process.env.NODE_ENV !== 'production') {
-          sendDebugMessage({
-            key: componentKey,
-            eventType: constants.DEBUG_MSG_REDUCE_DATA_EVENT,
-            inputData: transformedPayload,
-            componentName,
-            componentInstance,
-            propertyName,
-            timestamp: Date.now(),
-          });
         }
         dispatch({ type: targetKey, payload: { [propertyName]: transformedPayload } });
       }
@@ -151,14 +158,16 @@ function executeUserFunctionDispatch (
       if (eventTargets && eventTargets.length > 0) {
         payload = dispatchPayloads[dispatchType];
         if (process.env.NODE_ENV !== 'production') {
-          sendDebugMessage({
-            key: functionKey,
-            eventType: constants.DEBUG_MSG_FUNCTION_FIRE_EVENT,
-            eventName: dispatchType,
-            outputData: payload,
-            functionName: functionName,
-            timestamp: Date.now(),
-          });
+          if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+            sendDebugMessage({
+              key: functionKey,
+              eventType: constants.DEBUG_MSG_FUNCTION_FIRE_EVENT,
+              eventName: dispatchType,
+              outputData: cloneDeep(payload),
+              functionName: functionName,
+              timestamp: Date.now(),
+            });
+          }
         }
         eventTargets.forEach(eventTarget => {
           const { type: eventTargetType, props: eventTargetProps } = eventTarget;
@@ -240,13 +249,15 @@ function createTasks (targets) {
                     transformFirstArgument(props.functionKey, props.transformScript, args[0]);
                   // execute user function with passed in args
                   if (process.env.NODE_ENV !== 'production') {
-                    sendDebugMessage({
-                      key: props.functionKey,
-                      eventType: constants.DEBUG_MSG_FUNCTION_CALL_EVENT,
-                      inputData: firstArgument,
-                      functionName: props.functionName,
-                      timestamp: Date.now(),
-                    });
+                    if (window.__webcodeskIsListeningToFramework && window.__sendFrameworkMessage) {
+                      sendDebugMessage({
+                        key: props.functionKey,
+                        eventType: constants.DEBUG_MSG_FUNCTION_CALL_EVENT,
+                        inputData: cloneDeep(firstArgument),
+                        functionName: props.functionName,
+                        timestamp: Date.now(),
+                      });
+                    }
                   }
                   // the secondary argument is used in the store items function
                   // to determine if we are reading from the store item or writing to it
