From 27d7f943a965559a85e3a4369e943706bbcb106f Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Fri, 8 Apr 2016 11:35:47 +0530 Subject: [PATCH] fixed props data that was passed --- dist/client/ui/action_logger.js | 15 ++++----------- dist/client/ui/admin.js | 12 +++++++++++- src/client/ui/action_logger.js | 17 ++++------------- src/client/ui/admin.js | 6 +++++- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dist/client/ui/action_logger.js b/dist/client/ui/action_logger.js index d47125f7a2f7..52e2e2750dc0 100644 --- a/dist/client/ui/action_logger.js +++ b/dist/client/ui/action_logger.js @@ -28,10 +28,6 @@ var _react = require('react'); var _react2 = _interopRequireDefault(_react); -var _jsonStringifySafe = require('json-stringify-safe'); - -var _jsonStringifySafe2 = _interopRequireDefault(_jsonStringifySafe); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var preStyle = { @@ -95,19 +91,16 @@ var ActionLogger = function (_Component) { }, { key: 'getActionData', value: function getActionData() { - var _props$data$actions = this.props.data.actions; - var actions = _props$data$actions === undefined ? [] : _props$data$actions; - - return actions.map(function (action, i) { + return this.props.actionLogs.map(function (action, i) { // assuming that the first object in the array is the latest addition. return i === 0 ? _react2.default.createElement( 'div', { style: latestActionLogStyle, ref: 'actionLogger', key: i }, - (0, _jsonStringifySafe2.default)(action, null, 2) + action ) : _react2.default.createElement( 'div', { key: i }, - (0, _jsonStringifySafe2.default)(action, null, 2) + action ); }); } @@ -142,7 +135,7 @@ var ActionLogger = function (_Component) { ActionLogger.propTypes = { onClear: _react2.default.PropTypes.func, - data: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.array.isRequired, _react2.default.PropTypes.object.isRequired]) + actionLogs: _react2.default.PropTypes.array }; exports.default = ActionLogger; \ No newline at end of file diff --git a/dist/client/ui/admin.js b/dist/client/ui/admin.js index c4676cc638a3..3fd7403b75a8 100644 --- a/dist/client/ui/admin.js +++ b/dist/client/ui/admin.js @@ -22,6 +22,10 @@ var _reactDom = require('react-dom'); var _reactDom2 = _interopRequireDefault(_reactDom); +var _jsonStringifySafe = require('json-stringify-safe'); + +var _jsonStringifySafe2 = _interopRequireDefault(_jsonStringifySafe); + var _controls = require('./controls'); var _controls2 = _interopRequireDefault(_controls); @@ -95,7 +99,13 @@ function getIframe(data) { } function getActionLogger(data) { - return _react2.default.createElement(_action_logger2.default, { data: data, onClear: clearLogs }); + var _data$actions = data.actions; + var actions = _data$actions === undefined ? [] : _data$actions; + + var logs = actions.map(function (action) { + return (0, _jsonStringifySafe2.default)(action, null, 2); + }); + return _react2.default.createElement(_action_logger2.default, { actionLogs: logs, onClear: clearLogs }); } function renderMain(data) { diff --git a/src/client/ui/action_logger.js b/src/client/ui/action_logger.js index 76a11fc7366f..8109e659be6f 100644 --- a/src/client/ui/action_logger.js +++ b/src/client/ui/action_logger.js @@ -1,5 +1,4 @@ import React, { Component } from 'react'; -import stringify from 'json-stringify-safe'; const preStyle = { color: '#666', @@ -53,18 +52,13 @@ class ActionLogger extends Component { } getActionData() { - const { actions = [] } = this.props.data; - return actions + return this.props.actionLogs .map((action, i) => { // assuming that the first object in the array is the latest addition. return i === 0 ? ( -
- {stringify(action, null, 2)} -
+
{action}
) : ( -
- {stringify(action, null, 2)} -
+
{action}
); }); } @@ -85,10 +79,7 @@ class ActionLogger extends Component { ActionLogger.propTypes = { onClear: React.PropTypes.func, - data: React.PropTypes.oneOfType([ - React.PropTypes.array.isRequired, - React.PropTypes.object.isRequired, - ]), + actionLogs: React.PropTypes.array, }; export default ActionLogger; diff --git a/src/client/ui/admin.js b/src/client/ui/admin.js index c8d3f3ec4764..8cf0a370614c 100644 --- a/src/client/ui/admin.js +++ b/src/client/ui/admin.js @@ -1,5 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; +import stringify from 'json-stringify-safe'; import StorybookControls from './controls'; import ActionLogger from './action_logger'; import Layout from './layout'; @@ -65,7 +66,10 @@ export function getIframe(data) { } export function getActionLogger(data) { - return (); + const { actions = [] } = data; + const logs = actions + .map((action) => stringify(action, null, 2)); + return (); } export function renderMain(data) {