@@ -35485,7 +35485,6 @@ var actionList = {
35485
35485
SET_APP_LIFECYCLE: 'SET_APP_LIFECYCLE',
35486
35486
SET_CONFIG: 'SET_CONFIG',
35487
35487
ON_ERROR: 'ON_ERROR',
35488
- RESOLVE_ERROR: 'RESOLVE_ERROR',
35489
35488
SET_HOOKS: 'SET_HOOKS'
35490
35489
};
35491
35490
var getAction = function getAction(action) {
@@ -35502,7 +35501,7 @@ var getAction = function getAction(action) {
35502
35501
/*!******************************!*\
35503
35502
!*** ./src/actions/index.js ***!
35504
35503
\******************************/
35505
- /*! exports provided: updateProps, setRequestQueue, computeGraphs, computePaths, setLayout, setAppLifecycle, setConfig, setHooks, onError, resolveError, hydrateInitialOutputs, getCSRFHeader, redo, undo, revert, notifyObservers, handleAsyncError, serialize */
35504
+ /*! exports provided: updateProps, setRequestQueue, computeGraphs, computePaths, setLayout, setAppLifecycle, setConfig, setHooks, onError, hydrateInitialOutputs, getCSRFHeader, redo, undo, revert, notifyObservers, handleAsyncError, serialize */
35506
35505
/***/ (function(module, __webpack_exports__, __webpack_require__) {
35507
35506
35508
35507
"use strict";
@@ -35516,7 +35515,6 @@ __webpack_require__.r(__webpack_exports__);
35516
35515
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setConfig", function() { return setConfig; });
35517
35516
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setHooks", function() { return setHooks; });
35518
35517
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onError", function() { return onError; });
35519
- /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "resolveError", function() { return resolveError; });
35520
35518
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hydrateInitialOutputs", function() { return hydrateInitialOutputs; });
35521
35519
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCSRFHeader", function() { return getCSRFHeader; });
35522
35520
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "redo", function() { return redo; });
@@ -35652,7 +35650,6 @@ var setAppLifecycle = Object(redux_actions__WEBPACK_IMPORTED_MODULE_27__["create
35652
35650
var setConfig = Object(redux_actions__WEBPACK_IMPORTED_MODULE_27__["createAction"])(Object(_constants__WEBPACK_IMPORTED_MODULE_30__["getAction"])('SET_CONFIG'));
35653
35651
var setHooks = Object(redux_actions__WEBPACK_IMPORTED_MODULE_27__["createAction"])(Object(_constants__WEBPACK_IMPORTED_MODULE_30__["getAction"])('SET_HOOKS'));
35654
35652
var onError = Object(redux_actions__WEBPACK_IMPORTED_MODULE_27__["createAction"])(Object(_constants__WEBPACK_IMPORTED_MODULE_30__["getAction"])('ON_ERROR'));
35655
- var resolveError = Object(redux_actions__WEBPACK_IMPORTED_MODULE_27__["createAction"])(Object(_constants__WEBPACK_IMPORTED_MODULE_30__["getAction"])('RESOLVE_ERROR'));
35656
35653
function hydrateInitialOutputs() {
35657
35654
return function (dispatch, getState) {
35658
35655
triggerDefaultState(dispatch, getState);
@@ -37293,10 +37290,9 @@ __webpack_require__.r(__webpack_exports__);
37293
37290
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! prop-types */ "prop-types");
37294
37291
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_13__);
37295
37292
/* harmony import */ var radium__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! radium */ "./node_modules/radium/es/index.js");
37296
- /* harmony import */ var ramda__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ramda */ "./node_modules/ramda/es/index.js");
37297
- /* harmony import */ var uniqid__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! uniqid */ "./node_modules/uniqid/index.js");
37298
- /* harmony import */ var uniqid__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(uniqid__WEBPACK_IMPORTED_MODULE_16__);
37299
- /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../../actions */ "./src/actions/index.js");
37293
+ /* harmony import */ var uniqid__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! uniqid */ "./node_modules/uniqid/index.js");
37294
+ /* harmony import */ var uniqid__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(uniqid__WEBPACK_IMPORTED_MODULE_15__);
37295
+ /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../../actions */ "./src/actions/index.js");
37300
37296
37301
37297
37302
37298
@@ -37334,7 +37330,6 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
37334
37330
37335
37331
37336
37332
37337
-
37338
37333
var UnconnectedComponentErrorBoundary =
37339
37334
/*#__PURE__*/
37340
37335
function (_Component) {
@@ -37348,8 +37343,9 @@ function (_Component) {
37348
37343
_this = _possibleConstructorReturn(this, _getPrototypeOf(UnconnectedComponentErrorBoundary).call(this, props));
37349
37344
_this.state = {
37350
37345
myID: props.componentId,
37351
- myUID: uniqid__WEBPACK_IMPORTED_MODULE_16___default()(),
37352
- oldChildren: null
37346
+ myUID: uniqid__WEBPACK_IMPORTED_MODULE_15___default()(),
37347
+ oldChildren: null,
37348
+ hasError: false
37353
37349
};
37354
37350
return _this;
37355
37351
}
@@ -37358,27 +37354,25 @@ function (_Component) {
37358
37354
key: "componentDidCatch",
37359
37355
value: function componentDidCatch(error, info) {
37360
37356
var dispatch = this.props.dispatch;
37361
- dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_17__ ["onError"])({
37357
+ dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_16__ ["onError"])({
37362
37358
myUID: this.state.myUID,
37363
37359
myID: this.state.myID,
37364
37360
type: 'frontEnd',
37365
37361
error: error,
37366
37362
info: info
37367
37363
}));
37368
- dispatch(_actions__WEBPACK_IMPORTED_MODULE_17__ ["revert"]);
37364
+ dispatch(_actions__WEBPACK_IMPORTED_MODULE_16__ ["revert"]);
37369
37365
}
37370
37366
/* eslint-disable react/no-did-update-set-state */
37371
37367
37372
37368
}, {
37373
37369
key: "componentDidUpdate",
37374
37370
value: function componentDidUpdate(prevProps, prevState) {
37375
- var error = this.props.error;
37376
- var myUID = this.state.myUID;
37377
- var hasError = Object(ramda__WEBPACK_IMPORTED_MODULE_15__["includes"])(myUID, Object(ramda__WEBPACK_IMPORTED_MODULE_15__["pluck"])('myUID')(error.frontEnd));
37371
+ var prevChildren = prevProps.children;
37378
37372
37379
- if (!hasError && prevState.oldChildren !== prevProps.children && prevProps.children !== this.props.children) {
37373
+ if (!this.state. hasError && prevChildren !== prevState.oldChildren && prevChildren !== this.props.children) {
37380
37374
this.setState({
37381
- oldChildren: prevProps.children
37375
+ oldChildren: prevChildren
37382
37376
});
37383
37377
}
37384
37378
}
@@ -37387,15 +37381,17 @@ function (_Component) {
37387
37381
}, {
37388
37382
key: "render",
37389
37383
value: function render() {
37390
- var error = this.props.error;
37391
- var myUID = this.state.myUID;
37392
- var hasError = Object(ramda__WEBPACK_IMPORTED_MODULE_15__["includes"])(myUID, Object(ramda__WEBPACK_IMPORTED_MODULE_15__["pluck"])('myUID')(error.frontEnd));
37393
-
37394
- if (hasError) {
37395
- return this.state.oldChildren;
37396
- }
37397
-
37398
- return this.props.children;
37384
+ var _this$state = this.state,
37385
+ hasError = _this$state.hasError,
37386
+ oldChildren = _this$state.oldChildren;
37387
+ return hasError ? oldChildren : this.props.children;
37388
+ }
37389
+ }], [{
37390
+ key: "getDerivedStateFromError",
37391
+ value: function getDerivedStateFromError(_) {
37392
+ return {
37393
+ hasError: true
37394
+ };
37399
37395
}
37400
37396
}]);
37401
37397
@@ -37568,23 +37564,11 @@ function (_Component) {
37568
37564
37569
37565
var _this$props = this.props,
37570
37566
e = _this$props.e,
37571
- resolve = _this$props.resolve,
37572
37567
inAlertsTray = _this$props.inAlertsTray;
37573
37568
var collapsed = this.state.collapsed;
37574
- var cardClasses; // if resolve is defined, the error should be a standalone card
37575
-
37576
- if (resolve) {
37577
- cardClasses = 'dash-error-card';
37578
- } else {
37579
- cardClasses = 'dash-error-card__content';
37580
- }
37581
-
37582
- if (inAlertsTray) {
37583
- cardClasses += ' dash-error-card--alerts-tray';
37584
- }
37569
+ var cardClasses = 'dash-error-card__content' + (inAlertsTray ? ' dash-error-card--alerts-tray' : '');
37585
37570
/* eslint-disable no-inline-comments */
37586
37571
37587
-
37588
37572
var errorHeader = React.createElement("div", {
37589
37573
className: "dash-fe-error-top test-devtools-error-toggle",
37590
37574
onClick: function onClick() {
@@ -37688,7 +37672,6 @@ FrontEndError.propTypes = {
37688
37672
timestamp: prop_types__WEBPACK_IMPORTED_MODULE_19___default.a.object,
37689
37673
error: errorPropTypes
37690
37674
}),
37691
- resolve: prop_types__WEBPACK_IMPORTED_MODULE_19___default.a.func,
37692
37675
inAlertsTray: prop_types__WEBPACK_IMPORTED_MODULE_19___default.a.bool,
37693
37676
isListItem: prop_types__WEBPACK_IMPORTED_MODULE_19___default.a.bool
37694
37677
};
@@ -37799,10 +37782,11 @@ function (_Component) {
37799
37782
37800
37783
var inAlertsTray = this.props.inAlertsTray;
37801
37784
var cardClasses = 'dash-error-card dash-error-card--container';
37802
- var errorElements = this.props.errors.map(function (error) {
37785
+ var errorElements = this.props.errors.map(function (error, i ) {
37803
37786
return react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_FrontEndError_react__WEBPACK_IMPORTED_MODULE_15__["FrontEndError"], {
37804
37787
e: error,
37805
- isListItem: true
37788
+ isListItem: true,
37789
+ key: i
37806
37790
});
37807
37791
});
37808
37792
@@ -37829,7 +37813,6 @@ function (_Component) {
37829
37813
37830
37814
FrontEndErrorContainer.propTypes = {
37831
37815
errors: prop_types__WEBPACK_IMPORTED_MODULE_14___default.a.array,
37832
- resolve: prop_types__WEBPACK_IMPORTED_MODULE_14___default.a.func,
37833
37816
inAlertsTray: prop_types__WEBPACK_IMPORTED_MODULE_14___default.a.any
37834
37817
};
37835
37818
FrontEndErrorContainer.propTypes = {
@@ -37877,8 +37860,7 @@ __webpack_require__.r(__webpack_exports__);
37877
37860
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! prop-types */ "prop-types");
37878
37861
/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_13__);
37879
37862
/* harmony import */ var radium__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! radium */ "./node_modules/radium/es/index.js");
37880
- /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../actions */ "./src/actions/index.js");
37881
- /* harmony import */ var _menu_DebugMenu_react__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./menu/DebugMenu.react */ "./src/components/error/menu/DebugMenu.react.js");
37863
+ /* harmony import */ var _menu_DebugMenu_react__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./menu/DebugMenu.react */ "./src/components/error/menu/DebugMenu.react.js");
37882
37864
37883
37865
37884
37866
@@ -37915,7 +37897,6 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
37915
37897
37916
37898
37917
37899
37918
-
37919
37900
var UnconnectedGlobalErrorContainer =
37920
37901
/*#__PURE__*/
37921
37902
function (_Component) {
@@ -37928,33 +37909,16 @@ function (_Component) {
37928
37909
}
37929
37910
37930
37911
_createClass(UnconnectedGlobalErrorContainer, [{
37931
- key: "resolveError",
37932
- value: function resolveError(dispatch, type, myId) {
37933
- if (type === 'backEnd') {
37934
- dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_15__["resolveError"])({
37935
- type: type
37936
- })); // dispatch(revert);
37937
- } else {
37938
- dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_15__["resolveError"])({
37939
- myId: myId,
37940
- type: type
37941
- }));
37942
- }
37943
- }
37944
- }, {
37945
37912
key: "render",
37946
37913
value: function render() {
37947
37914
var _this$props = this.props,
37948
37915
error = _this$props.error,
37949
- dispatch = _this$props.dispatch,
37950
37916
dependenciesRequest = _this$props.dependenciesRequest;
37951
37917
return react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
37952
37918
id: "_dash-global-error-container"
37953
- }, react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_menu_DebugMenu_react__WEBPACK_IMPORTED_MODULE_16__ ["DebugMenu"], {
37919
+ }, react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_menu_DebugMenu_react__WEBPACK_IMPORTED_MODULE_15__ ["DebugMenu"], {
37954
37920
error: error,
37955
- dependenciesRequest: dependenciesRequest,
37956
- dispatch: dispatch,
37957
- resolveError: this.resolveError
37921
+ dependenciesRequest: dependenciesRequest
37958
37922
}, react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
37959
37923
id: "_dash-app-content"
37960
37924
}, this.props.children)));
@@ -37967,18 +37931,13 @@ function (_Component) {
37967
37931
UnconnectedGlobalErrorContainer.propTypes = {
37968
37932
children: prop_types__WEBPACK_IMPORTED_MODULE_13___default.a.object,
37969
37933
error: prop_types__WEBPACK_IMPORTED_MODULE_13___default.a.object,
37970
- dependenciesRequest: prop_types__WEBPACK_IMPORTED_MODULE_13___default.a.object,
37971
- dispatch: prop_types__WEBPACK_IMPORTED_MODULE_13___default.a.func
37934
+ dependenciesRequest: prop_types__WEBPACK_IMPORTED_MODULE_13___default.a.object
37972
37935
};
37973
37936
var GlobalErrorContainer = Object(react_redux__WEBPACK_IMPORTED_MODULE_11__["connect"])(function (state) {
37974
37937
return {
37975
37938
error: state.error,
37976
37939
dependenciesRequest: state.dependenciesRequest
37977
37940
};
37978
- }, function (dispatch) {
37979
- return {
37980
- dispatch: dispatch
37981
- };
37982
37941
})(Object(radium__WEBPACK_IMPORTED_MODULE_14__["default"])(UnconnectedGlobalErrorContainer));
37983
37942
/* harmony default export */ __webpack_exports__["default"] = (GlobalErrorContainer);
37984
37943
@@ -38102,7 +38061,6 @@ function (_Component) {
38102
38061
key: "render",
38103
38062
value: function render() {
38104
38063
var _this$props = this.props,
38105
- resolve = _this$props.resolve,
38106
38064
visible = _this$props.visible,
38107
38065
error = _this$props.error,
38108
38066
toastsEnabled = _this$props.toastsEnabled;
@@ -38111,8 +38069,7 @@ function (_Component) {
38111
38069
if (toastsEnabled) {
38112
38070
var errors = Object(ramda__WEBPACK_IMPORTED_MODULE_13__["concat"])(error.frontEnd, error.backEnd);
38113
38071
frontEndErrors = react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_FrontEnd_FrontEndErrorContainer_react__WEBPACK_IMPORTED_MODULE_15__["FrontEndErrorContainer"], {
38114
- errors: errors,
38115
- resolve: resolve
38072
+ errors: errors
38116
38073
});
38117
38074
}
38118
38075
@@ -38130,7 +38087,6 @@ function (_Component) {
38130
38087
38131
38088
GlobalErrorOverlay.propTypes = {
38132
38089
children: prop_types__WEBPACK_IMPORTED_MODULE_12___default.a.object,
38133
- resolve: prop_types__WEBPACK_IMPORTED_MODULE_12___default.a.func,
38134
38090
visible: prop_types__WEBPACK_IMPORTED_MODULE_12___default.a.bool,
38135
38091
error: prop_types__WEBPACK_IMPORTED_MODULE_12___default.a.object,
38136
38092
toastsEnabled: prop_types__WEBPACK_IMPORTED_MODULE_12___default.a.any
@@ -38728,8 +38684,6 @@ function (_Component) {
38728
38684
callbackGraphOpened = _this$state.callbackGraphOpened;
38729
38685
var _this$props = this.props,
38730
38686
error = _this$props.error,
38731
- resolveError = _this$props.resolveError,
38732
- dispatch = _this$props.dispatch,
38733
38687
dependenciesRequest = _this$props.dependenciesRequest;
38734
38688
var menuClasses = opened ? 'dash-debug-menu dash-debug-menu--opened' : 'dash-debug-menu dash-debug-menu--closed';
38735
38689
var menuContent = opened ? react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
@@ -38805,9 +38759,6 @@ function (_Component) {
38805
38759
});
38806
38760
}
38807
38761
}, menuContent), react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_GlobalErrorOverlay_react__WEBPACK_IMPORTED_MODULE_22__["default"], {
38808
- resolve: function resolve(type, myId) {
38809
- return resolveError(dispatch, type, myId);
38810
- },
38811
38762
error: error,
38812
38763
visible: !(Object(ramda__WEBPACK_IMPORTED_MODULE_12__["isEmpty"])(error.backEnd) && Object(ramda__WEBPACK_IMPORTED_MODULE_12__["isEmpty"])(error.frontEnd)),
38813
38764
toastsEnabled: toastsEnabled
@@ -38821,9 +38772,7 @@ function (_Component) {
38821
38772
DebugMenu.propTypes = {
38822
38773
children: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.object,
38823
38774
error: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.object,
38824
- dependenciesRequest: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.object,
38825
- resolveError: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.func,
38826
- dispatch: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.func
38775
+ dependenciesRequest: prop_types__WEBPACK_IMPORTED_MODULE_20___default.a.object
38827
38776
};
38828
38777
38829
38778
@@ -39894,6 +39843,7 @@ var graphs = function graphs() {
39894
39843
39895
39844
"use strict";
39896
39845
__webpack_require__.r(__webpack_exports__);
39846
+ /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return error; });
39897
39847
/* harmony import */ var core_js_modules_es_symbol__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol */ "./node_modules/core-js/modules/es.symbol.js");
39898
39848
/* harmony import */ var core_js_modules_es_symbol__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol__WEBPACK_IMPORTED_MODULE_0__);
39899
39849
/* harmony import */ var core_js_modules_es_symbol_description__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.symbol.description */ "./node_modules/core-js/modules/es.symbol.description.js");
@@ -39945,7 +39895,6 @@ var initialError = {
39945
39895
frontEnd: [],
39946
39896
backEnd: []
39947
39897
};
39948
-
39949
39898
function error() {
39950
39899
var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialError;
39951
39900
var action = arguments.length > 1 ? arguments[1] : undefined;
@@ -39972,35 +39921,13 @@ function error() {
39972
39921
return state;
39973
39922
}
39974
39923
39975
- case 'RESOLVE_ERROR':
39976
- {
39977
- if (action.payload.type === 'frontEnd') {
39978
- var removeIdx = Object(ramda__WEBPACK_IMPORTED_MODULE_12__["findIndex"])(Object(ramda__WEBPACK_IMPORTED_MODULE_12__["propEq"])('myUID', action.payload.myUID))(state.frontEnd);
39979
- return {
39980
- frontEnd: Object(ramda__WEBPACK_IMPORTED_MODULE_12__["remove"])(removeIdx, 1, state.frontEnd),
39981
- backEnd: state.backEnd
39982
- };
39983
- } else if (action.payload.type === 'backEnd') {
39984
- var _removeIdx = Object(ramda__WEBPACK_IMPORTED_MODULE_12__["findIndex"])(Object(ramda__WEBPACK_IMPORTED_MODULE_12__["propEq"])('myUID', action.payload.myUID))(state.backEnd);
39985
-
39986
- return {
39987
- frontEnd: state.frontEnd,
39988
- backEnd: Object(ramda__WEBPACK_IMPORTED_MODULE_12__["remove"])(_removeIdx, 1, state.backEnd)
39989
- };
39990
- }
39991
-
39992
- return state;
39993
- }
39994
-
39995
39924
default:
39996
39925
{
39997
39926
return state;
39998
39927
}
39999
39928
}
40000
39929
}
40001
39930
40002
- /* harmony default export */ __webpack_exports__["default"] = (error);
40003
-
40004
39931
/***/ }),
40005
39932
40006
39933
/***/ "./src/reducers/history.js":
0 commit comments