Skip to content

Commit bd440ad

Browse files
Bogdan-LyashenkoBogdan-Lyashenko
committed
Add show all depencdencies button
1 parent 45e562e commit bd440ad

9 files changed

Lines changed: 84 additions & 23 deletions

File tree

‎src/public/dist/bundle.js‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85762,6 +85762,7 @@ var CONTROLS_KEYS = exports.CONTROLS_KEYS = {
8576285762
SOURCE_COLLAPSE_TO_MIN: 'sourceCollapseToMin',
8576385763
SOURCE_EXPAND_ALL: 'sourceExpandAll',
8576485764
DEPENDENCIES: 'dependencies',
85765+
DEPENDENCIES_SHOW_ALL: 'dependenciesShowAll',
8576585766
CODE_CRUMBS: 'codeCrumbs',
8576685767
CODE_CRUMBS_MINIMIZE: 'codeCrumbsMinimize',
8576785768
CODE_CRUMBS_DETAILS: 'codeCrumbsDetails'
@@ -85789,6 +85790,8 @@ Object.defineProperty(exports, "__esModule", {
8578985790

8579085791
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
8579185792

85793+
var _disabledState;
85794+
8579285795
var _constants = __webpack_require__(/*! ./constants */ "./js/components/controls/ViewSwitches/store/constants.js");
8579385796

8579485797
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -85811,7 +85814,12 @@ var DefaultState = {
8581185814
}, {
8581285815
name: 'Dependencies',
8581385816
key: _constants.CONTROLS_KEYS.DEPENDENCIES,
85814-
checkBoxes: []
85817+
checkBoxes: [{
85818+
name: 'A',
85819+
title: 'Show All dependencies',
85820+
key: _constants.CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL,
85821+
type: _constants.VIEW_TYPES.BUTTON
85822+
}]
8581585823
}, {
8581685824
name: 'CodeCrumbs',
8581785825
key: _constants.CONTROLS_KEYS.CODE_CRUMBS,
@@ -85826,7 +85834,7 @@ var DefaultState = {
8582685834
}]
8582785835
}],
8582885836
checkedState: _defineProperty({}, _constants.CONTROLS_KEYS.SOURCE, true),
85829-
disabledState: _defineProperty({}, _constants.CONTROLS_KEYS.SOURCE_EXPAND_ALL, true)
85837+
disabledState: (_disabledState = {}, _defineProperty(_disabledState, _constants.CONTROLS_KEYS.SOURCE_EXPAND_ALL, true), _defineProperty(_disabledState, _constants.CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL, true), _disabledState)
8583085838
};
8583185839

8583285840
exports.default = function () {
@@ -85985,7 +85993,7 @@ exports.default = (0, _reactRedux.connect)(null, mapDispatchToProps)(DataBusCont
8598585993
Object.defineProperty(exports, "__esModule", {
8598685994
value: true
8598785995
});
85988-
exports.selectEntryPointForDependencies = exports.selectCodeCrumb = exports.closeAllFolders = exports.openAllFolders = exports.toggleFolder = exports.selectFile = exports.calcFilesTreeLayoutNodes = exports.setInitialSourceData = undefined;
85996+
exports.setDependenciesEntryPoint = exports.selectCodeCrumb = exports.closeAllFolders = exports.openAllFolders = exports.toggleFolder = exports.selectFile = exports.calcFilesTreeLayoutNodes = exports.setInitialSourceData = undefined;
8598985997

8599085998
var _constants = __webpack_require__(/*! ./constants */ "./js/components/data-bus/store/constants.js");
8599185999

@@ -86052,9 +86060,9 @@ var selectCodeCrumb = exports.selectCodeCrumb = function selectCodeCrumb(fileNod
8605286060
};
8605386061
};
8605486062

86055-
var selectEntryPointForDependencies = exports.selectEntryPointForDependencies = function selectEntryPointForDependencies(fileNode) {
86063+
var setDependenciesEntryPoint = exports.setDependenciesEntryPoint = function setDependenciesEntryPoint(fileNode) {
8605686064
return {
86057-
type: _constants.ACTIONS.SELECT_DEPENDENCIES_ENTRY_POINT,
86065+
type: _constants.ACTIONS.SET_DEPENDENCIES_ENTRY_POINT,
8605886066
payload: fileNode
8605986067
};
8606086068
};
@@ -86082,7 +86090,7 @@ var ACTIONS = exports.ACTIONS = {
8608286090
OPEN_ALL_FOLDERS: 'DATA_BUS.OPEN_ALL_FOLDERS',
8608386091
CLOSE_ALL_FOLDERS: 'DATA_BUS.CLOSE_ALL_FOLDERS',
8608486092
SELECT_CODE_CRUMB: 'DATA_BUS.SELECT_CODE_CRUMB',
86085-
SELECT_DEPENDENCIES_ENTRY_POINT: 'DATA_BUS.SELECT_DEPENDENCIES_ENTRY_POINT'
86093+
SET_DEPENDENCIES_ENTRY_POINT: 'DATA_BUS.SET_DEPENDENCIES_ENTRY_POINT'
8608686094
};
8608786095

8608886096
/***/ }),
@@ -86180,7 +86188,7 @@ exports.default = function () {
8618086188
selectedCodeCrumb: codeCrumb
8618186189
});
8618286190

86183-
case _constants2.ACTIONS.SELECT_DEPENDENCIES_ENTRY_POINT:
86191+
case _constants2.ACTIONS.SET_DEPENDENCIES_ENTRY_POINT:
8618486192
return _extends({}, state, {
8618586193
dependenciesEntryPoint: action.payload
8618686194
});
@@ -86475,7 +86483,7 @@ var mapStateToProps = function mapStateToProps(state) {
8647586483
var mapDispatchToProps = {
8647686484
onCodeCrumbSelect: _actions.selectCodeCrumb,
8647786485
onFileSelect: _actions.selectFile,
86478-
onFileIconClick: _actions.selectEntryPointForDependencies,
86486+
onFileIconClick: _actions.setDependenciesEntryPoint,
8647986487
onFolderClick: _actions.toggleFolder
8648086488
};
8648186489

@@ -87953,7 +87961,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
8795387961
var _marked = /*#__PURE__*/regeneratorRuntime.mark(reactOnSwitchToggle),
8795487962
_marked2 = /*#__PURE__*/regeneratorRuntime.mark(reactOnButtonAction),
8795587963
_marked3 = /*#__PURE__*/regeneratorRuntime.mark(reactOnToggledFolder),
87956-
_marked4 = /*#__PURE__*/regeneratorRuntime.mark(rootSaga);
87964+
_marked4 = /*#__PURE__*/regeneratorRuntime.mark(reactDependenciesEntryPointChange),
87965+
_marked5 = /*#__PURE__*/regeneratorRuntime.mark(rootSaga);
8795787966

8795887967
function reactOnSwitchToggle(action) {
8795987968
var switchKey;
@@ -88011,6 +88020,18 @@ function reactOnButtonAction(action) {
8801188020
return _context2.abrupt('return', _context2.sent);
8801288021

8801388022
case 9:
88023+
if (!(buttonKey === _constants2.CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL)) {
88024+
_context2.next = 13;
88025+
break;
88026+
}
88027+
88028+
_context2.next = 12;
88029+
return (0, _effects.put)((0, _actions.setDependenciesEntryPoint)(null));
88030+
88031+
case 12:
88032+
return _context2.abrupt('return', _context2.sent);
88033+
88034+
case 13:
8801488035
case 'end':
8801588036
return _context2.stop();
8801688037
}
@@ -88051,13 +88072,13 @@ function reactOnToggledFolder(action) {
8805188072
}, _marked3, this);
8805288073
}
8805388074

88054-
function rootSaga() {
88055-
return regeneratorRuntime.wrap(function rootSaga$(_context4) {
88075+
function reactDependenciesEntryPointChange(action) {
88076+
return regeneratorRuntime.wrap(function reactDependenciesEntryPointChange$(_context4) {
8805688077
while (1) {
8805788078
switch (_context4.prev = _context4.next) {
8805888079
case 0:
8805988080
_context4.next = 2;
88060-
return (0, _effects.all)([(0, _effects.takeEvery)(_constants2.ACTIONS.TOGGLE_SWITCH, reactOnSwitchToggle), (0, _effects.takeEvery)(_constants2.ACTIONS.FIRE_BUTTON_ACTION, reactOnButtonAction), (0, _effects.takeEvery)(_constants.ACTIONS.TOGGLE_FOLDER, reactOnToggledFolder)]);
88081+
return (0, _effects.put)((0, _actions2.setDisabledControl)(_constants2.CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL, !action.payload));
8806188082

8806288083
case 2:
8806388084
case 'end':
@@ -88067,6 +88088,22 @@ function rootSaga() {
8806788088
}, _marked4, this);
8806888089
}
8806988090

88091+
function rootSaga() {
88092+
return regeneratorRuntime.wrap(function rootSaga$(_context5) {
88093+
while (1) {
88094+
switch (_context5.prev = _context5.next) {
88095+
case 0:
88096+
_context5.next = 2;
88097+
return (0, _effects.all)([(0, _effects.takeEvery)(_constants2.ACTIONS.TOGGLE_SWITCH, reactOnSwitchToggle), (0, _effects.takeEvery)(_constants2.ACTIONS.FIRE_BUTTON_ACTION, reactOnButtonAction), (0, _effects.takeEvery)(_constants.ACTIONS.TOGGLE_FOLDER, reactOnToggledFolder), (0, _effects.takeEvery)(_constants.ACTIONS.SET_DEPENDENCIES_ENTRY_POINT, reactDependenciesEntryPointChange)]);
88098+
88099+
case 2:
88100+
case 'end':
88101+
return _context5.stop();
88102+
}
88103+
}
88104+
}, _marked5, this);
88105+
}
88106+
8807088107
/***/ }),
8807188108

8807288109
/***/ "./js/utils/connection.js":

‎src/public/dist/bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/public/js/components/controls/ViewSwitches/store/constants.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export const CONTROLS_KEYS = {
99
SOURCE_COLLAPSE_TO_MIN: 'sourceCollapseToMin',
1010
SOURCE_EXPAND_ALL: 'sourceExpandAll',
1111
DEPENDENCIES: 'dependencies',
12+
DEPENDENCIES_SHOW_ALL: 'dependenciesShowAll',
1213
CODE_CRUMBS: 'codeCrumbs',
1314
CODE_CRUMBS_MINIMIZE: 'codeCrumbsMinimize',
1415
CODE_CRUMBS_DETAILS: 'codeCrumbsDetails'

‎src/public/js/components/controls/ViewSwitches/store/reducer.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@ const DefaultState = {
2323
{
2424
name: 'Dependencies',
2525
key: CONTROLS_KEYS.DEPENDENCIES,
26-
checkBoxes: []
26+
checkBoxes: [
27+
{
28+
name: 'A',
29+
title: 'Show All dependencies',
30+
key: CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL,
31+
type: VIEW_TYPES.BUTTON
32+
}
33+
]
2734
},
2835
{
2936
name: 'CodeCrumbs',
@@ -46,7 +53,8 @@ const DefaultState = {
4653
[CONTROLS_KEYS.SOURCE]: true
4754
},
4855
disabledState: {
49-
[CONTROLS_KEYS.SOURCE_EXPAND_ALL]: true
56+
[CONTROLS_KEYS.SOURCE_EXPAND_ALL]: true,
57+
[CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL]: true
5058
}
5159
};
5260

‎src/public/js/components/data-bus/store/actions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const selectCodeCrumb = (fileNode, codeCrumb) => ({
4545
payload: { fileNode, codeCrumb }
4646
});
4747

48-
export const selectEntryPointForDependencies = (fileNode) => ({
49-
type: ACTIONS.SELECT_DEPENDENCIES_ENTRY_POINT,
48+
export const setDependenciesEntryPoint = (fileNode) => ({
49+
type: ACTIONS.SET_DEPENDENCIES_ENTRY_POINT,
5050
payload: fileNode
5151
});

‎src/public/js/components/data-bus/store/constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export const ACTIONS = {
66
OPEN_ALL_FOLDERS: 'DATA_BUS.OPEN_ALL_FOLDERS',
77
CLOSE_ALL_FOLDERS: 'DATA_BUS.CLOSE_ALL_FOLDERS',
88
SELECT_CODE_CRUMB: 'DATA_BUS.SELECT_CODE_CRUMB',
9-
SELECT_DEPENDENCIES_ENTRY_POINT: 'DATA_BUS.SELECT_DEPENDENCIES_ENTRY_POINT'
9+
SET_DEPENDENCIES_ENTRY_POINT: 'DATA_BUS.SET_DEPENDENCIES_ENTRY_POINT'
1010
};

‎src/public/js/components/data-bus/store/reducer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default (state = DefaultState, action) => {
7777
selectedCodeCrumb: codeCrumb
7878
};
7979

80-
case ACTIONS.SELECT_DEPENDENCIES_ENTRY_POINT:
80+
case ACTIONS.SET_DEPENDENCIES_ENTRY_POINT:
8181
return {
8282
...state,
8383
dependenciesEntryPoint: action.payload

‎src/public/js/components/tree-diagram/TreeDiagramContainer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import TreeDiagram from './component/TreeDiagram';
33
import {
44
selectCodeCrumb,
55
selectFile,
6-
selectEntryPointForDependencies,
6+
setDependenciesEntryPoint,
77
toggleFolder
88
} from '../data-bus/store/actions';
99

@@ -32,7 +32,7 @@ const mapStateToProps = state => {
3232
const mapDispatchToProps = {
3333
onCodeCrumbSelect: selectCodeCrumb,
3434
onFileSelect: selectFile,
35-
onFileIconClick: selectEntryPointForDependencies,
35+
onFileIconClick: setDependenciesEntryPoint,
3636
onFolderClick: toggleFolder
3737
};
3838

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { ACTIONS as DATA_BUS_ACTIONS } from '../components/data-bus/store/consta
44
import {
55
calcFilesTreeLayoutNodes,
66
openAllFolders,
7-
closeAllFolders
7+
closeAllFolders,
8+
setDependenciesEntryPoint
89
} from '../components/data-bus/store/actions';
910

1011
import {
@@ -39,6 +40,10 @@ function* reactOnButtonAction(action) {
3940
put(calcFilesTreeLayoutNodes())
4041
]);
4142
}
43+
44+
if (buttonKey === CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL) {
45+
return yield put(setDependenciesEntryPoint(null));
46+
}
4247
}
4348

4449
function* reactOnToggledFolder(action) {
@@ -67,10 +72,20 @@ function* reactOnToggledFolder(action) {
6772
yield put(calcFilesTreeLayoutNodes());
6873
}
6974

75+
function* reactDependenciesEntryPointChange(action) {
76+
yield put(
77+
setDisabledControl(CONTROLS_KEYS.DEPENDENCIES_SHOW_ALL, !action.payload)
78+
);
79+
}
80+
7081
export default function* rootSaga() {
7182
yield all([
7283
takeEvery(SWITCHES_ACTIONS.TOGGLE_SWITCH, reactOnSwitchToggle),
7384
takeEvery(SWITCHES_ACTIONS.FIRE_BUTTON_ACTION, reactOnButtonAction),
74-
takeEvery(DATA_BUS_ACTIONS.TOGGLE_FOLDER, reactOnToggledFolder)
85+
takeEvery(DATA_BUS_ACTIONS.TOGGLE_FOLDER, reactOnToggledFolder),
86+
takeEvery(
87+
DATA_BUS_ACTIONS.SET_DEPENDENCIES_ENTRY_POINT,
88+
reactDependenciesEntryPointChange
89+
)
7590
]);
7691
}

0 commit comments

Comments
 (0)