temp: classify actions into three types

Domiii · May 2, 2022 · 25d8fcb · 25d8fcb
1 parent 28494fd
commit 25d8fcb
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 125 deletions.
diff --git a/dbux-code/package.json b/dbux-code/package.json
@@ -482,15 +482,15 @@
         }
       },
       {
-        "command": "dbuxDataFlowView.setSearchMode.ByAccessId",
+        "command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
         "title": "Search by: accessId",
         "icon": {
           "light": "resources/light/variable.svg",
           "dark": "resources/dark/variable.svg"
         }
       },
       {
-        "command": "dbuxDataFlowView.setSearchMode.ByValueId",
+        "command": "dbuxDataFlowView.nextSearchMode.ByValueId",
         "title": "Search by: valueId",
         "icon": {
           "light": "resources/light/brackets.svg",
@@ -972,12 +972,12 @@
           "group": "navigation@20"
         },
         {
-          "command": "dbuxDataFlowView.setSearchMode.ByAccessId",
+          "command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
           "when": "view == dbuxDataFlowView && dbuxDataFlowView.context.searchModeName == ByAccessId",
           "group": "navigation@1"
         },
         {
-          "command": "dbuxDataFlowView.setSearchMode.ByValueId",
+          "command": "dbuxDataFlowView.nextSearchMode.ByValueId",
           "when": "view == dbuxDataFlowView && dbuxDataFlowView.context.searchModeName == ByValueId",
           "group": "navigation@1"
         },
@@ -1328,11 +1328,11 @@
           "when": "false"
         },
         {
-          "command": "dbuxDataFlowView.setSearchMode.ByAccessId",
+          "command": "dbuxDataFlowView.nextSearchMode.ByAccessId",
           "when": "false"
         },
         {
-          "command": "dbuxDataFlowView.setSearchMode.ByValueId",
+          "command": "dbuxDataFlowView.nextSearchMode.ByValueId",
           "when": "false"
         },
         {

diff --git a/dbux-code/src/commands/dataFlowViewCommands.js b/dbux-code/src/commands/dataFlowViewCommands.js
@@ -10,18 +10,18 @@ import { registerCommand } from './commandUtil';
  */
 export function initDataFlowViewCommands(context, dataFlowViewController) {
   registerCommand(context,
-    'dbuxDataFlowView.setSearchMode.ByAccessId',
+    'dbuxDataFlowView.nextSearchMode.ByAccessId',
     (/* node */) => {
       dataFlowViewController.setSearchMode(DataFlowSearchModeType.nextValue(DataFlowSearchModeType.ByAccessId));
-      emitDataFlowViewSearchModeChangedAction(DataFlowSearchModeType.ByAccessId);
+      emitDataFlowViewSearchModeChangedAction(dataFlowViewController.searchMode);
     }
   );
 
   registerCommand(context,
-    'dbuxDataFlowView.setSearchMode.ByValueId',
+    'dbuxDataFlowView.nextSearchMode.ByValueId',
     (/* node */) => {
       dataFlowViewController.setSearchMode(DataFlowSearchModeType.nextValue(DataFlowSearchModeType.ByValueId));
-      emitDataFlowViewSearchModeChangedAction(DataFlowSearchModeType.ByValueId);
+      emitDataFlowViewSearchModeChangedAction(dataFlowViewController.searchMode);
     }
   );
 

diff --git a/dbux-code/src/commands/globalAnalysisViewCommands.js b/dbux-code/src/commands/globalAnalysisViewCommands.js
@@ -1,7 +1,7 @@
 import { nextMode } from '../globalAnalysisView/nodes/GlobalModulesNode';
 import { showInformationMessage } from '../codeUtil/codeModals';
 import searchController from '../search/searchController';
-import { emitShowErrorAction } from '../userEvents';
+import { emitTraceUserAction } from '../userEvents';
 import { registerCommand } from './commandUtil';
 
 /** @typedef {import('../globalAnalysisView/GlobalAnalysisViewController').default} GlobalAnalysisViewController */
@@ -15,7 +15,7 @@ export function initGlobalAnalysisViewCommands(context, globalAnalysisViewContro
     async () => {
       const selectedNode = await globalAnalysisViewController.showError();
       if (selectedNode) {
-        emitShowErrorAction(selectedNode.trace);
+        emitTraceUserAction(selectedNode.trace);
       }
     }
   );

diff --git a/dbux-code/src/commands/userCommands.js b/dbux-code/src/commands/userCommands.js
@@ -30,7 +30,7 @@ import { translate } from '../lang';
 import { getDefaultExportDirectory, getLogsDirectory } from '../codeUtil/codePath';
 import { runTaskWithProgressBar } from '../codeUtil/runTaskWithProgressBar';
 import searchController from '../search/searchController';
-import { emitSelectTraceAction, emitShowOutputChannelAction } from '../userEvents';
+import { emitTraceUserAction, emitShowOutputChannelAction } from '../userEvents';
 import { runFile } from './runCommands';
 
 // eslint-disable-next-line no-unused-vars
@@ -218,7 +218,7 @@ export function initUserCommands(extensionContext) {
     }
     else {
       traceSelection.selectTrace(trace);
-      emitSelectTraceAction(trace, UserActionType.SelectTraceById, { userInput });
+      emitTraceUserAction(UserActionType.SelectTraceById, trace, { userInput });
     }
   }
 

diff --git a/dbux-code/src/practice/codeEvents.js b/dbux-code/src/practice/codeEvents.js
@@ -1,10 +1,10 @@
 
 import { commands, SymbolKind, window } from 'vscode';
-import allApplications from '@dbux/data/src/applications/allApplications';
+// import allApplications from '@dbux/data/src/applications/allApplications';
 import UserActionType from '@dbux/data/src/pathways/UserActionType';
 import { newLogger } from '@dbux/common/src/log/logger';
 import { emitEditorAction } from '../userEvents';
-import { getOrCreateTracesAtCursor } from '../codeUtil/TracesAtCursor';
+// import { getOrCreateTracesAtCursor } from '../codeUtil/TracesAtCursor';
 import { codeRangeToBabelLoc } from '../helpers/codeLocHelpers';
 
 /** @typedef {import('@dbux/projects/src/ProjectsManager').default} ProjectsManager */
@@ -21,7 +21,7 @@ const defaultNewEventLineThreshold = 8;
  * @param {ProjectsManager} manager 
  */
 export function initCodeEvents(manager, context) {
-  const traceAtCursor = getOrCreateTracesAtCursor(context);
+  // const traceAtCursor = getOrCreateTracesAtCursor(context);
   let _previousSelectionData, _previousVisibleRangeData;
 
   window.onDidChangeTextEditorSelection(async (e) => {
@@ -37,7 +37,6 @@ export function initCodeEvents(manager, context) {
       return;
     }
 
-    // TODO?: take only first selection only. Do we need all selections? Can there be no selections?
     const firstSelection = e.selections[0];
     let data = {
       file: e.textEditor.document.uri.fsPath,
@@ -83,26 +82,26 @@ export function initCodeEvents(manager, context) {
   // ###########################################################################
 
   async function getExtraEditorEventInfo(editor) {
-    const trace = traceAtCursor.getMostInner();
-    let staticTrace = null;
-    let staticContext = null;
-    let applicationId = null;
-    if (trace) {
-      const { staticTraceId } = trace;
-      ({ applicationId } = trace);
-      const dp = allApplications.getById(applicationId).dataProvider;
-      staticTrace = dp.collections.staticTraces.getById(staticTraceId);
-      staticContext = dp.collections.staticContexts.getById(staticTrace.staticContextId);
-    }
+    // const trace = traceAtCursor.getMostInner();
+    // let staticTrace = null;
+    // let staticContext = null;
+    // let applicationId = null;
+    // if (trace) {
+    //   const { staticTraceId } = trace;
+    //   ({ applicationId } = trace);
+    //   const dp = allApplications.getById(applicationId).dataProvider;
+    //   staticTrace = dp.collections.staticTraces.getById(staticTraceId);
+    //   staticContext = dp.collections.staticContexts.getById(staticTrace.staticContextId);
+    // }
     const symbol = await getSymbolAt(editor.document.uri, editor.selections[0]?.start);
-    const { sessionId } = manager.practiceSession;
+    // const { sessionId } = manager.practiceSession;
 
     return {
-      applicationId,
-      staticContext,
-      staticTrace,
+      // applicationId,
+      // staticContext,
+      // staticTrace,
       symbol: convertVSCodeSymbol(symbol),
-      sessionId
+      // sessionId
     };
   }
 }
@@ -115,7 +114,7 @@ function convertVSCodeSymbol(symbol) {
   if (symbol) {
     return {
       name: symbol.name,
-      range: codeRangeToBabelLoc(symbol.range)
+      loc: codeRangeToBabelLoc(symbol.range)
     };
   }
   else {

diff --git a/dbux-code/src/traceDetailsView/nodes/AsyncTDNodes.js b/dbux-code/src/traceDetailsView/nodes/AsyncTDNodes.js
@@ -8,10 +8,10 @@ import PromiseLink from '@dbux/common/src/types/PromiseLink';
 import PromiseLinkType from '@dbux/common/src/types/constants/PromiseLinkType';
 import EmptyObject from '@dbux/common/src/util/EmptyObject';
 import { showInformationMessage } from '../../codeUtil/codeModals';
-import makeTreeItem, { makeTreeItems } from '../../helpers/makeTreeItem';
+import makeTreeItem from '../../helpers/makeTreeItem';
 import TraceDetailNode from './TraceDetailNode';
 import { makeArrayLengthLabel } from '../../helpers/treeViewUtil';
-import { emitSelectTraceAction } from '../../userEvents';
+import { emitTraceUserAction } from '../../userEvents';
 
 /** @typedef {import('@dbux/common/src/types/Trace').default} Trace */
 
@@ -110,7 +110,7 @@ class RootEdgesTDNode extends TraceDetailNode {
       const trace = dp.util.getTraceOfAsyncNode(forkParent.asyncNodeId);
       if (trace) {
         traceSelection.selectTrace(trace);
-        emitSelectTraceAction(trace, UserActionType.TDAsyncGoToForkParent);
+        emitTraceUserAction(UserActionType.TDAsyncGoToForkParent, trace);
         return;
       }
     }
@@ -123,7 +123,7 @@ class RootEdgesTDNode extends TraceDetailNode {
       const schedulerTrace = this.dp.collections.traces.getById(schedulerTraceId);
       if (schedulerTrace) {
         traceSelection.selectTrace(schedulerTrace);
-        emitSelectTraceAction(schedulerTrace, UserActionType.TDAsyncGoToScheduler);
+        emitTraceUserAction(UserActionType.TDAsyncGoToScheduler, schedulerTrace);
         return;
       }
     }

diff --git a/dbux-code/src/traceDetailsView/nodes/ExecutionsTDNodes.js b/dbux-code/src/traceDetailsView/nodes/ExecutionsTDNodes.js
@@ -2,7 +2,7 @@ import { makeTraceValueLabel } from '@dbux/data/src/helpers/makeLabels';
 import UserActionType from '@dbux/data/src/pathways/UserActionType';
 import allApplications from '@dbux/data/src/applications/allApplications';
 import EmptyArray from '@dbux/common/src/util/EmptyArray';
-import { emitSelectTraceAction } from '../../userEvents';
+import { emitTraceUserAction } from '../../userEvents';
 import TraceNode from '../../codeUtil/treeView/TraceNode';
 import TraceContainerNode, { UngroupedNode } from '../../codeUtil/treeView/TraceContainerNode';
 
@@ -23,7 +23,7 @@ class ExecutionNode extends TraceNode {
 
   handleClick() {
     super.handleClick();
-    emitSelectTraceAction(this.trace, UserActionType.TDExecutionsTraceUse);
+    emitTraceUserAction(UserActionType.TDExecutionsTraceUse, this.trace);
   }
 }
 

diff --git a/dbux-code/src/traceDetailsView/nodes/ObjectNode.js b/dbux-code/src/traceDetailsView/nodes/ObjectNode.js
@@ -1,7 +1,7 @@
 import allApplications from '@dbux/data/src/applications/allApplications';
 import UserActionType from '@dbux/data/src/pathways/UserActionType';
 import traceSelection from '@dbux/data/src/traceSelection';
-import { emitSelectTraceAction } from '../../userEvents';
+import { emitTraceUserAction } from '../../userEvents';
 import TraceNode from '../../codeUtil/treeView/TraceNode';
 
 export default class ObjectNode extends TraceNode {
@@ -18,6 +18,6 @@ export default class ObjectNode extends TraceNode {
 
   handleClick() {
     super.handleClick();
-    emitSelectTraceAction(this.trace, UserActionType.TDTrackObjectTraceUse);
+    emitTraceUserAction(UserActionType.TDTrackObjectTraceUse, this.trace);
   }
 }
diff --git a/dbux-code/src/traceDetailsView/traceDetailsController.js b/dbux-code/src/traceDetailsView/traceDetailsController.js
@@ -5,7 +5,8 @@ import NestedError from '@dbux/common/src/NestedError';
 import { throttle } from '@dbux/common/src/util/scheduling';
 import allApplications from '@dbux/data/src/applications/allApplications';
 import traceSelection from '@dbux/data/src/traceSelection';
-import { emitSelectTraceAction } from '../userEvents';
+import UserActionType from '@dbux/data/src/pathways/UserActionType';
+import { emitTraceUserAction } from '../userEvents';
 import { getRelatedAppIds } from '../codeDeco/editedWarning';
 import { showWarningMessage } from '../codeUtil/codeModals';
 import TraceDetailsNodeProvider from './TraceDetailsNodeProvider';
@@ -104,7 +105,7 @@ class TraceDetailsController {
     }
     if (trace) {
       traceSelection.selectTrace(trace, 'selectTraceAtCursor');
-      emitSelectTraceAction(trace);
+      emitTraceUserAction(UserActionType.selectTrace, trace);
     }
   }