Skip to content

Commit 97fa10f

Browse files
Bogdan-LyashenkoBogdan-Lyashenko
committed
fix: set active folders on select node
1 parent e0adf39 commit 97fa10f

3 files changed

Lines changed: 17 additions & 6 deletions

File tree

‎src/public/dist/local/bundle/main.bundle.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47955,7 +47955,12 @@ var getMergeState = function getMergeState(state, namespace) {
4795547955
});
4795647956

4795747957
case _constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].UPDATE_FILES:
47958+
var selectedNode = namespaceState.selectedNode;
47959+
var fileForSelectedNode = action.payload.find(function (item) {
47960+
return item.path === selectedNode.path;
47961+
});
4795847962
return mergeState({
47963+
selectedNode: fileForSelectedNode ? _objectSpread({}, selectedNode, fileForSelectedNode) : selectedNode,
4795947964
filesMap: _objectSpread({}, namespaceState.filesMap, action.payload.reduce(function (acc, item) {
4796047965
acc[item.path] = _objectSpread({}, namespaceState.filesMap[item.path], item);
4796147966
return acc;
@@ -48410,7 +48415,7 @@ regeneratorRuntime.mark(reactOnSourceSet),
4841048415
regeneratorRuntime.mark(reactByUpdatingFoldersState),
4841148416
_marked8 =
4841248417
/*#__PURE__*/
48413-
regeneratorRuntime.mark(reactOnSelectNode),
48418+
regeneratorRuntime.mark(reactOnUpdateFiles),
4841448419
_marked9 =
4841548420
/*#__PURE__*/
4841648421
regeneratorRuntime.mark(rootSaga);
@@ -48826,9 +48831,9 @@ function reactByUpdatingFoldersState(_ref6) {
4882648831
}, _marked7, this);
4882748832
}
4882848833

48829-
function reactOnSelectNode(_ref7) {
48834+
function reactOnUpdateFiles(_ref7) {
4883048835
var namespace;
48831-
return regeneratorRuntime.wrap(function reactOnSelectNode$(_context8) {
48836+
return regeneratorRuntime.wrap(function reactOnUpdateFiles$(_context8) {
4883248837
while (1) {
4883348838
switch (_context8.prev = _context8.next) {
4883448839
case 0:
@@ -48850,7 +48855,7 @@ function rootSaga() {
4885048855
switch (_context9.prev = _context9.next) {
4885148856
case 0:
4885248857
_context9.next = 2;
48853-
return Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["all"])([Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_controlsBus_constants__WEBPACK_IMPORTED_MODULE_4__["ACTIONS"].TOGGLE_SWITCH, reactOnSwitchToggle), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_controlsBus_constants__WEBPACK_IMPORTED_MODULE_4__["ACTIONS"].FIRE_BUTTON_ACTION, reactOnButtonAction), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].TOGGLE_FOLDER, reactOnToggledFolder), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_INITIAL_SOURCE_DATA, reactOnSourceSet), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_CHANGED_SOURCE_DATA, reactOnSourceSet), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_DEPENDENCIES_ENTRY_POINT, reactByUpdatingFoldersState), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SELECT_CODE_CRUMBED_FLOW, reactByUpdatingFoldersState), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SELECT_NODE, reactOnSelectNode)]);
48858+
return Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["all"])([Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_controlsBus_constants__WEBPACK_IMPORTED_MODULE_4__["ACTIONS"].TOGGLE_SWITCH, reactOnSwitchToggle), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_controlsBus_constants__WEBPACK_IMPORTED_MODULE_4__["ACTIONS"].FIRE_BUTTON_ACTION, reactOnButtonAction), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].TOGGLE_FOLDER, reactOnToggledFolder), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_INITIAL_SOURCE_DATA, reactOnSourceSet), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_CHANGED_SOURCE_DATA, reactOnSourceSet), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SET_DEPENDENCIES_ENTRY_POINT, reactByUpdatingFoldersState), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].SELECT_CODE_CRUMBED_FLOW, reactByUpdatingFoldersState), Object(redux_saga_effects__WEBPACK_IMPORTED_MODULE_0__["takeLatest"])(core_dataBus_constants__WEBPACK_IMPORTED_MODULE_1__["ACTIONS"].UPDATE_FILES, reactOnUpdateFiles)]);
4885448859

4885548860
case 2:
4885648861
case "end":

‎src/public/js/core/dataBus/reducer.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,13 @@ export default (state = DefaultState, action) => {
160160
});
161161

162162
case ACTIONS.UPDATE_FILES:
163+
const { selectedNode } = namespaceState;
164+
const fileForSelectedNode = action.payload.find(item => item.path === selectedNode.path);
165+
163166
return mergeState({
167+
selectedNode: fileForSelectedNode
168+
? { ...selectedNode, ...fileForSelectedNode }
169+
: selectedNode,
164170
filesMap: {
165171
...namespaceState.filesMap,
166172
...action.payload.reduce((acc, item) => {

‎src/public/js/core/store/sagas.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function* reactByUpdatingFoldersState({ namespace }) {
115115
yield put(calcFilesTreeLayoutNodes(namespace));
116116
}
117117

118-
function* reactOnSelectNode({ namespace }) {
118+
function* reactOnUpdateFiles({ namespace }) {
119119
yield put(setDependenciesEntryPoint(undefined, namespace));
120120
}
121121

@@ -128,6 +128,6 @@ export default function* rootSaga() {
128128
takeLatest(DATA_BUS_ACTIONS.SET_CHANGED_SOURCE_DATA, reactOnSourceSet),
129129
takeLatest(DATA_BUS_ACTIONS.SET_DEPENDENCIES_ENTRY_POINT, reactByUpdatingFoldersState),
130130
takeLatest(DATA_BUS_ACTIONS.SELECT_CODE_CRUMBED_FLOW, reactByUpdatingFoldersState),
131-
takeLatest(DATA_BUS_ACTIONS.SELECT_NODE, reactOnSelectNode)
131+
takeLatest(DATA_BUS_ACTIONS.UPDATE_FILES, reactOnUpdateFiles)
132132
]);
133133
}

0 commit comments

Comments
 (0)