Skip to content

Commit 6797414

Browse files
kshmidt-digmakshmidt-digma
committed
Update Digma UI
1 parent 554b989 commit 6797414

File tree

9 files changed

+800
-540
lines changed

9 files changed

+800
-540
lines changed

‎.prettierrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"trailingComma": "none",
3-
"tabWidth": 4
2+
"trailingComma": "none",
3+
"tabWidth": 4
44
}

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
1010
"typescript.tsc.autoDetect": "off",
11-
// "editor.formatOnSave": true,
11+
"editor.formatOnSave": true,
1212
"editor.tabSize": 4,
1313
"editor.detectIndentation": false,
1414
"editor.codeActionsOnSave": {
15-
// "source.organizeImports": true
15+
"source.organizeImports": true
1616
},
1717
"[javascript][typescript][json][jsonc][scss]": {
1818
"editor.defaultFormatter": "esbenp.prettier-vscode"

‎digmaUi/index.html‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎digmaUi/main.js‎

Lines changed: 75 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/extension.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
import * as vscode from "vscode";
22
import { AnalyticsCodeLens } from "./analyticsCodeLens";
3+
import { VsCodeDebugInstrumentation } from "./instrumentation/vscodeInstrumentation";
34
import { AnalyticsProvider } from "./services/analyticsProvider";
4-
import { SymbolProvider } from "./services/languages/symbolProvider";
5-
import { PythonLanguageExtractor } from "./services/languages/python/languageExtractor";
6-
import { CSharpLanguageExtractor } from "./services/languages/csharp/languageExtractor";
7-
import { SourceControl, Git } from "./services/sourceControl";
5+
import { CodeInspector } from "./services/codeInspector";
6+
import { DocumentInfoCache } from "./services/DocumentInfoCache";
87
import { DocumentInfoProvider } from "./services/documentInfoProvider";
9-
import { MethodCallErrorTooltip } from "./services/methodCallErrorTooltip";
10-
import { CodeAnalyticsView } from "./views/codeAnalytics/codeAnalyticsView";
118
import { EditorHelper } from "./services/EditorHelper";
12-
import { CodeInspector } from "./services/codeInspector";
13-
import { VsCodeDebugInstrumentation } from "./instrumentation/vscodeInstrumentation";
9+
import { EnvironmentManager } from "./services/EnvironmentManager";
10+
import { EventManager } from "./services/EventManager";
11+
import { CSharpLanguageExtractor } from "./services/languages/csharp/languageExtractor";
1412
import { GoLanguageExtractor } from "./services/languages/go/languageExtractor";
15-
import { WorkspaceState } from "./state";
1613
import { JSLanguageExtractor } from "./services/languages/javascript/languageExtractor";
14+
import { PythonLanguageExtractor } from "./services/languages/python/languageExtractor";
15+
import { SymbolProvider } from "./services/languages/symbolProvider";
16+
import { MethodCallErrorTooltip } from "./services/methodCallErrorTooltip";
17+
import { Scheduler } from "./services/Scheduler";
18+
import { Git, SourceControl } from "./services/sourceControl";
19+
import { SpanLinkResolver } from "./services/spanLinkResolver";
20+
import { WorkspaceState } from "./state";
21+
import { CodeAnalyticsView } from "./views/codeAnalytics/codeAnalyticsView";
1722
import { ErrorsLineDecorator } from "./views/codeAnalytics/decorators/errorsLineDecorator";
1823
import { HotspotMarkerDecorator } from "./views/codeAnalytics/decorators/hotspotMarkerDecorator";
1924
import { EnvSelectStatusBar } from "./views/codeAnalytics/StatusBar/envSelectStatusBar";
2025
import { InsightsStatusBar } from "./views/codeAnalytics/StatusBar/insightsStatusBar";
21-
import { EnvironmentManager } from "./services/EnvironmentManager";
22-
import { EventManager } from "./services/EventManager";
23-
import { Scheduler } from "./services/Scheduler";
24-
import { DocumentInfoCache } from "./services/DocumentInfoCache";
25-
import { SpanLinkResolver } from "./services/spanLinkResolver";
2626
import { RecentActivityViewProvider } from "./views/RecentActivity/RecentActivityViewProvider";
2727

2828
export async function activate(context: vscode.ExtensionContext) {

‎src/services/analyticsProvider.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import fetch from "node-fetch";
21
import * as https from "https";
3-
import * as vscode from "vscode";
4-
import { Settings } from "../settings";
5-
import { Logger } from "./logger";
6-
import { Dictionary, momentJsDateParser } from "./utils";
72
import * as moment from "moment";
8-
import { decimal, integer } from "vscode-languageclient";
3+
import fetch from "node-fetch";
94
import * as os from "os";
5+
import * as vscode from "vscode";
6+
import { decimal, integer } from "vscode-languageclient";
7+
import { Settings } from "../settings";
8+
import { WorkspaceState } from "../state";
109
import {
11-
SpanInfo,
12-
Duration
10+
Duration,
11+
SpanInfo
1312
} from "../views/codeAnalytics/InsightListView/CommonInsightObjects";
14-
import { WorkspaceState } from "../state";
1513
import { Environment } from "./EnvironmentManager";
1614
import { ServerDiscoveredSpan } from "./languages/extractors";
15+
import { Logger } from "./logger";
16+
import { Dictionary, momentJsDateParser } from "./utils";
1717

1818
export enum Impact {
1919
High = "High",

‎src/views/RecentActivity/RecentActivityViewProvider.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import * as vscode from "vscode";
22
import { AnalyticsProvider, EntrySpan } from "../../services/analyticsProvider";
3-
import { WorkspaceState } from "../../state";
4-
import { TracePanel } from "../codeAnalytics/Traces/tracePanel";
5-
import { JaegerPanel } from "../codeAnalytics/Jaeger/JaegerPanel";
6-
import { Settings } from "../../settings";
7-
import { SpanLinkResolver } from "../../services/spanLinkResolver";
83
import { EditorHelper } from "../../services/EditorHelper";
94
import { CodeObjectLocationHints } from "../../services/languages/modulePathToUriConverters";
5+
import { SpanLinkResolver } from "../../services/spanLinkResolver";
6+
import { Settings } from "../../settings";
7+
import { WorkspaceState } from "../../state";
8+
import { JaegerPanel } from "../codeAnalytics/Jaeger/JaegerPanel";
9+
import { TracePanel } from "../codeAnalytics/Traces/tracePanel";
1010

1111
export class RecentActivityViewProvider implements vscode.WebviewViewProvider {
1212
public static readonly viewType = "recentActivity";
@@ -123,7 +123,7 @@ export class RecentActivityViewProvider implements vscode.WebviewViewProvider {
123123
};
124124
const panel = vscode.window.createWebviewPanel(
125125
"traceData",
126-
`${span.displayText}`,
126+
span.displayText,
127127
vscode.ViewColumn.One,
128128
options
129129
);
@@ -147,7 +147,7 @@ export class RecentActivityViewProvider implements vscode.WebviewViewProvider {
147147

148148
const panel = vscode.window.createWebviewPanel(
149149
"jaegerUI",
150-
"Jaeger",
150+
span.displayText,
151151
vscode.ViewColumn.One,
152152
{
153153
enableScripts: true,
@@ -241,6 +241,7 @@ export class RecentActivityViewProvider implements vscode.WebviewViewProvider {
241241
}
242242
}
243243

244+
// TODO: move to utils
244245
function getNonce() {
245246
let text = "";
246247
const possible =

0 commit comments

Comments
 (0)