Skip to content

Commit 25d8fcb

Browse files
MiccWanMiccWan
committed
temp: classify actions into three types
1 parent 28494fd commit 25d8fcb

File tree

13 files changed

+137
-125
lines changed

13 files changed

+137
-125
lines changed

‎dbux-code/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -482,15 +482,15 @@
482482
}
483483
},
484484
{
485-
"command": "dbuxDataFlowView.setSearchMode.ByAccessId",
485+
"command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
486486
"title": "Search by: accessId",
487487
"icon": {
488488
"light": "resources/light/variable.svg",
489489
"dark": "resources/dark/variable.svg"
490490
}
491491
},
492492
{
493-
"command": "dbuxDataFlowView.setSearchMode.ByValueId",
493+
"command": "dbuxDataFlowView.nextSearchMode.ByValueId",
494494
"title": "Search by: valueId",
495495
"icon": {
496496
"light": "resources/light/brackets.svg",
@@ -972,12 +972,12 @@
972972
"group": "navigation@20"
973973
},
974974
{
975-
"command": "dbuxDataFlowView.setSearchMode.ByAccessId",
975+
"command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
976976
"when": "view == dbuxDataFlowView && dbuxDataFlowView.context.searchModeName == ByAccessId",
977977
"group": "navigation@1"
978978
},
979979
{
980-
"command": "dbuxDataFlowView.setSearchMode.ByValueId",
980+
"command": "dbuxDataFlowView.nextSearchMode.ByValueId",
981981
"when": "view == dbuxDataFlowView && dbuxDataFlowView.context.searchModeName == ByValueId",
982982
"group": "navigation@1"
983983
},
@@ -1328,11 +1328,11 @@
13281328
"when": "false"
13291329
},
13301330
{
1331-
"command": "dbuxDataFlowView.setSearchMode.ByAccessId",
1331+
"command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
13321332
"when": "false"
13331333
},
13341334
{
1335-
"command": "dbuxDataFlowView.setSearchMode.ByValueId",
1335+
"command": "dbuxDataFlowView.nextSearchMode.ByValueId",
13361336
"when": "false"
13371337
},
13381338
{

‎dbux-code/src/commands/dataFlowViewCommands.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import { registerCommand } from './commandUtil';
1010
*/
1111
export function initDataFlowViewCommands(context, dataFlowViewController) {
1212
registerCommand(context,
13-
'dbuxDataFlowView.setSearchMode.ByAccessId',
13+
'dbuxDataFlowView.nextSearchMode.ByAccessId',
1414
(/* node */) => {
1515
dataFlowViewController.setSearchMode(DataFlowSearchModeType.nextValue(DataFlowSearchModeType.ByAccessId));
16-
emitDataFlowViewSearchModeChangedAction(DataFlowSearchModeType.ByAccessId);
16+
emitDataFlowViewSearchModeChangedAction(dataFlowViewController.searchMode);
1717
}
1818
);
1919

2020
registerCommand(context,
21-
'dbuxDataFlowView.setSearchMode.ByValueId',
21+
'dbuxDataFlowView.nextSearchMode.ByValueId',
2222
(/* node */) => {
2323
dataFlowViewController.setSearchMode(DataFlowSearchModeType.nextValue(DataFlowSearchModeType.ByValueId));
24-
emitDataFlowViewSearchModeChangedAction(DataFlowSearchModeType.ByValueId);
24+
emitDataFlowViewSearchModeChangedAction(dataFlowViewController.searchMode);
2525
}
2626
);
2727

‎dbux-code/src/commands/globalAnalysisViewCommands.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { nextMode } from '../globalAnalysisView/nodes/GlobalModulesNode';
22
import { showInformationMessage } from '../codeUtil/codeModals';
33
import searchController from '../search/searchController';
4-
import { emitShowErrorAction } from '../userEvents';
4+
import { emitTraceUserAction } from '../userEvents';
55
import { registerCommand } from './commandUtil';
66

77
/** @typedef {import('../globalAnalysisView/GlobalAnalysisViewController').default} GlobalAnalysisViewController */
@@ -15,7 +15,7 @@ export function initGlobalAnalysisViewCommands(context, globalAnalysisViewContro
1515
async () => {
1616
const selectedNode = await globalAnalysisViewController.showError();
1717
if (selectedNode) {
18-
emitShowErrorAction(selectedNode.trace);
18+
emitTraceUserAction(selectedNode.trace);
1919
}
2020
}
2121
);

‎dbux-code/src/commands/userCommands.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { translate } from '../lang';
3030
import { getDefaultExportDirectory, getLogsDirectory } from '../codeUtil/codePath';
3131
import { runTaskWithProgressBar } from '../codeUtil/runTaskWithProgressBar';
3232
import searchController from '../search/searchController';
33-
import { emitSelectTraceAction, emitShowOutputChannelAction } from '../userEvents';
33+
import { emitTraceUserAction, emitShowOutputChannelAction } from '../userEvents';
3434
import { runFile } from './runCommands';
3535

3636
// eslint-disable-next-line no-unused-vars
@@ -218,7 +218,7 @@ export function initUserCommands(extensionContext) {
218218
}
219219
else {
220220
traceSelection.selectTrace(trace);
221-
emitSelectTraceAction(trace, UserActionType.SelectTraceById, { userInput });
221+
emitTraceUserAction(UserActionType.SelectTraceById, trace, { userInput });
222222
}
223223
}
224224

‎dbux-code/src/practice/codeEvents.js‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
import { commands, SymbolKind, window } from 'vscode';
3-
import allApplications from '@dbux/data/src/applications/allApplications';
3+
// import allApplications from '@dbux/data/src/applications/allApplications';
44
import UserActionType from '@dbux/data/src/pathways/UserActionType';
55
import { newLogger } from '@dbux/common/src/log/logger';
66
import { emitEditorAction } from '../userEvents';
7-
import { getOrCreateTracesAtCursor } from '../codeUtil/TracesAtCursor';
7+
// import { getOrCreateTracesAtCursor } from '../codeUtil/TracesAtCursor';
88
import { codeRangeToBabelLoc } from '../helpers/codeLocHelpers';
99

1010
/** @typedef {import('@dbux/projects/src/ProjectsManager').default} ProjectsManager */
@@ -21,7 +21,7 @@ const defaultNewEventLineThreshold = 8;
2121
* @param {ProjectsManager} manager
2222
*/
2323
export function initCodeEvents(manager, context) {
24-
const traceAtCursor = getOrCreateTracesAtCursor(context);
24+
// const traceAtCursor = getOrCreateTracesAtCursor(context);
2525
let _previousSelectionData, _previousVisibleRangeData;
2626

2727
window.onDidChangeTextEditorSelection(async (e) => {
@@ -37,7 +37,6 @@ export function initCodeEvents(manager, context) {
3737
return;
3838
}
3939

40-
// TODO?: take only first selection only. Do we need all selections? Can there be no selections?
4140
const firstSelection = e.selections[0];
4241
let data = {
4342
file: e.textEditor.document.uri.fsPath,
@@ -83,26 +82,26 @@ export function initCodeEvents(manager, context) {
8382
// ###########################################################################
8483

8584
async function getExtraEditorEventInfo(editor) {
86-
const trace = traceAtCursor.getMostInner();
87-
let staticTrace = null;
88-
let staticContext = null;
89-
let applicationId = null;
90-
if (trace) {
91-
const { staticTraceId } = trace;
92-
({ applicationId } = trace);
93-
const dp = allApplications.getById(applicationId).dataProvider;
94-
staticTrace = dp.collections.staticTraces.getById(staticTraceId);
95-
staticContext = dp.collections.staticContexts.getById(staticTrace.staticContextId);
96-
}
85+
// const trace = traceAtCursor.getMostInner();
86+
// let staticTrace = null;
87+
// let staticContext = null;
88+
// let applicationId = null;
89+
// if (trace) {
90+
// const { staticTraceId } = trace;
91+
// ({ applicationId } = trace);
92+
// const dp = allApplications.getById(applicationId).dataProvider;
93+
// staticTrace = dp.collections.staticTraces.getById(staticTraceId);
94+
// staticContext = dp.collections.staticContexts.getById(staticTrace.staticContextId);
95+
// }
9796
const symbol = await getSymbolAt(editor.document.uri, editor.selections[0]?.start);
98-
const { sessionId } = manager.practiceSession;
97+
// const { sessionId } = manager.practiceSession;
9998

10099
return {
101-
applicationId,
102-
staticContext,
103-
staticTrace,
100+
// applicationId,
101+
// staticContext,
102+
// staticTrace,
104103
symbol: convertVSCodeSymbol(symbol),
105-
sessionId
104+
// sessionId
106105
};
107106
}
108107
}
@@ -115,7 +114,7 @@ function convertVSCodeSymbol(symbol) {
115114
if (symbol) {
116115
return {
117116
name: symbol.name,
118-
range: codeRangeToBabelLoc(symbol.range)
117+
loc: codeRangeToBabelLoc(symbol.range)
119118
};
120119
}
121120
else {

‎dbux-code/src/traceDetailsView/nodes/AsyncTDNodes.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import PromiseLink from '@dbux/common/src/types/PromiseLink';
88
import PromiseLinkType from '@dbux/common/src/types/constants/PromiseLinkType';
99
import EmptyObject from '@dbux/common/src/util/EmptyObject';
1010
import { showInformationMessage } from '../../codeUtil/codeModals';
11-
import makeTreeItem, { makeTreeItems } from '../../helpers/makeTreeItem';
11+
import makeTreeItem from '../../helpers/makeTreeItem';
1212
import TraceDetailNode from './TraceDetailNode';
1313
import { makeArrayLengthLabel } from '../../helpers/treeViewUtil';
14-
import { emitSelectTraceAction } from '../../userEvents';
14+
import { emitTraceUserAction } from '../../userEvents';
1515

1616
/** @typedef {import('@dbux/common/src/types/Trace').default} Trace */
1717

@@ -110,7 +110,7 @@ class RootEdgesTDNode extends TraceDetailNode {
110110
const trace = dp.util.getTraceOfAsyncNode(forkParent.asyncNodeId);
111111
if (trace) {
112112
traceSelection.selectTrace(trace);
113-
emitSelectTraceAction(trace, UserActionType.TDAsyncGoToForkParent);
113+
emitTraceUserAction(UserActionType.TDAsyncGoToForkParent, trace);
114114
return;
115115
}
116116
}
@@ -123,7 +123,7 @@ class RootEdgesTDNode extends TraceDetailNode {
123123
const schedulerTrace = this.dp.collections.traces.getById(schedulerTraceId);
124124
if (schedulerTrace) {
125125
traceSelection.selectTrace(schedulerTrace);
126-
emitSelectTraceAction(schedulerTrace, UserActionType.TDAsyncGoToScheduler);
126+
emitTraceUserAction(UserActionType.TDAsyncGoToScheduler, schedulerTrace);
127127
return;
128128
}
129129
}

‎dbux-code/src/traceDetailsView/nodes/ExecutionsTDNodes.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { makeTraceValueLabel } from '@dbux/data/src/helpers/makeLabels';
22
import UserActionType from '@dbux/data/src/pathways/UserActionType';
33
import allApplications from '@dbux/data/src/applications/allApplications';
44
import EmptyArray from '@dbux/common/src/util/EmptyArray';
5-
import { emitSelectTraceAction } from '../../userEvents';
5+
import { emitTraceUserAction } from '../../userEvents';
66
import TraceNode from '../../codeUtil/treeView/TraceNode';
77
import TraceContainerNode, { UngroupedNode } from '../../codeUtil/treeView/TraceContainerNode';
88

@@ -23,7 +23,7 @@ class ExecutionNode extends TraceNode {
2323

2424
handleClick() {
2525
super.handleClick();
26-
emitSelectTraceAction(this.trace, UserActionType.TDExecutionsTraceUse);
26+
emitTraceUserAction(UserActionType.TDExecutionsTraceUse, this.trace);
2727
}
2828
}
2929

‎dbux-code/src/traceDetailsView/nodes/ObjectNode.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import allApplications from '@dbux/data/src/applications/allApplications';
22
import UserActionType from '@dbux/data/src/pathways/UserActionType';
33
import traceSelection from '@dbux/data/src/traceSelection';
4-
import { emitSelectTraceAction } from '../../userEvents';
4+
import { emitTraceUserAction } from '../../userEvents';
55
import TraceNode from '../../codeUtil/treeView/TraceNode';
66

77
export default class ObjectNode extends TraceNode {
@@ -18,6 +18,6 @@ export default class ObjectNode extends TraceNode {
1818

1919
handleClick() {
2020
super.handleClick();
21-
emitSelectTraceAction(this.trace, UserActionType.TDTrackObjectTraceUse);
21+
emitTraceUserAction(UserActionType.TDTrackObjectTraceUse, this.trace);
2222
}
2323
}

‎dbux-code/src/traceDetailsView/traceDetailsController.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import NestedError from '@dbux/common/src/NestedError';
55
import { throttle } from '@dbux/common/src/util/scheduling';
66
import allApplications from '@dbux/data/src/applications/allApplications';
77
import traceSelection from '@dbux/data/src/traceSelection';
8-
import { emitSelectTraceAction } from '../userEvents';
8+
import UserActionType from '@dbux/data/src/pathways/UserActionType';
9+
import { emitTraceUserAction } from '../userEvents';
910
import { getRelatedAppIds } from '../codeDeco/editedWarning';
1011
import { showWarningMessage } from '../codeUtil/codeModals';
1112
import TraceDetailsNodeProvider from './TraceDetailsNodeProvider';
@@ -104,7 +105,7 @@ class TraceDetailsController {
104105
}
105106
if (trace) {
106107
traceSelection.selectTrace(trace, 'selectTraceAtCursor');
107-
emitSelectTraceAction(trace);
108+
emitTraceUserAction(UserActionType.selectTrace, trace);
108109
}
109110
}
110111

0 commit comments

Comments
 (0)