fixed small bugs

Author: doppleware

src/views/codeAnalytics/CodeObjectGroups/EndpointGroup.ts

@@ -1,6 +1,7 @@
 import { StringifyOptions } from "querystring";
 import { EndpointSchema } from "../../../services/analyticsProvider";
 import { GroupItem, IListGroupItemBase } from "../../ListView/IListViewGroupItem";
+import { adjustHttpRouteIfNeeded } from "../InsightListView/EndpointInsight";
 import { ICodeObjectScopeGroupCreator } from "./ICodeObjectScopeGroupCreator";
 
 
@@ -10,17 +11,30 @@ export class EndpointGroup implements ICodeObjectScopeGroupCreator{
         ){
 
     }
+
+    private getRoutePreix(route:string){
+        if (route.startsWith(EndpointSchema.HTTP)){
+            return 'HTTP';
+        }
+        else if (route.startsWith(EndpointSchema.RPC)){
+            return 'RPC';
+        }
+        else {
+            return 'UKNOWN';
+        }
+    }
     async create(type: string, name: string): Promise<IListGroupItemBase| undefined>  {
 
+        const fullRoute = adjustHttpRouteIfNeeded(name);
         const shortRouteName = EndpointSchema.getShortRouteName(name);
         const parts = shortRouteName.split(' ');        
 
-        return new GroupItem(name, "Endpoint", `
+        return new GroupItem(fullRoute, "Endpoint", `
         <div class="group-item">
             <span class="scope">REST: </span>
             <span class="codicon codicon-symbol-interface" title="Endpoint"></span>
             <span class="uppercase">
-            <strong>HTTP </strong>${parts[0]}&nbsp;</span>
+            <strong>${this.getRoutePreix(fullRoute)} </strong>${parts[0]}&nbsp;</span>
             <span>${parts[1]}</span>
         </div>
     `);

src/views/codeAnalytics/InsightListView/EndpointInsight.ts

@@ -82,7 +82,7 @@ export class LowUsageListViewItemsCreator implements IInsightListViewItemsCreato
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint low traffic", "Servicing a low number of requests", "gauge_low.png"),
             sortIndex: 0,
-            groupId: EndpointSchema.getShortRouteName(codeObjectsInsight.route)
+            groupId: codeObjectsInsight.route
         };
     }
 
@@ -108,7 +108,7 @@ export class NormalUsageListViewItemsCreator implements IInsightListViewItemsCre
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint normal level of traffic", "Servicing an average number of requests", "guage_normal.png"),
             sortIndex: 0,
-            groupId: EndpointSchema.getShortRouteName(codeObjectsInsight.route)
+            groupId: codeObjectsInsight.route
         };
     }
 
@@ -150,7 +150,7 @@ export class HighUsageListViewItemsCreator implements IInsightListViewItemsCreat
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint high traffic", "Servicing a high number of requests", "guage_high.png"),
             sortIndex: 0,
-            groupId: EndpointSchema.getShortRouteName(codeObjectsInsight.route)
+            groupId: codeObjectsInsight.route
         };
     }
 
@@ -231,7 +231,7 @@ export class SlowestSpansListViewItemsCreator implements IInsightListViewItemsCr
         return {
             getHtml: () => html,
             sortIndex: 0,
-            groupId: EndpointSchema.getShortRouteName(codeObjectsInsight.route)
+            groupId: codeObjectsInsight.route
         };
     }
 
@@ -309,7 +309,7 @@ export class SlowEndpointListViewItemsCreator implements IInsightListViewItemsCr
         return {
             getHtml: () => html,
             sortIndex: 0,
-            groupId: EndpointSchema.getShortRouteName(codeObjectsInsight.route)
+            groupId: codeObjectsInsight.route
         };
     }
 
@@ -320,16 +320,21 @@ export class SlowEndpointListViewItemsCreator implements IInsightListViewItemsCr
 }
 
 
-export function adjustHttpRouteIfNeeded(endpointInsight: EndpointInsight): void {
-    const origValue = endpointInsight.route;
+export function adjustHttpRouteIfNeeded(route: string): string {
+    const origValue = route;
     if (origValue.startsWith(EndpointSchema.HTTP)) {
-        return;
+        return origValue;
     }
     if (origValue.startsWith(EndpointSchema.RPC)) {
-        return;
+        return origValue;
     }
     // default behaviour, to be backword compatible, where did not have the scheme part of the route, so adding it as HTTP one
-    endpointInsight.route = EndpointSchema.HTTP + origValue;
+    return EndpointSchema.HTTP + origValue;
+}
+
+export function adjustHttpInsightIfNeeded(endpointInsight: EndpointInsight): void {
+
+    endpointInsight.route = adjustHttpRouteIfNeeded(endpointInsight.route);
 }
 
 

src/views/codeAnalytics/InsightListView/IInsightListViewItemsCreator.ts

@@ -1,7 +1,7 @@
 import { UsageStatusResults } from "../../../services/analyticsProvider";
 import { IListViewItemBase } from "../../ListView/IListViewItem";
 import { CodeObjectInfo } from "../codeAnalyticsView";
-import { EndpointInsight, adjustHttpRouteIfNeeded } from "./EndpointInsight";
+import { EndpointInsight, adjustHttpRouteIfNeeded, adjustHttpInsightIfNeeded } from "./EndpointInsight";
 
 export interface CodeObjectInsight{
     codeObjectId: string,
@@ -47,7 +47,7 @@ export class InsightListViewItemsCreator implements IInsightListViewItemsCreator
         codeObjectInsights.forEach(coi => {
             if (coi.hasOwnProperty("route")) {
                 const endpointInsight = coi as EndpointInsight;
-                adjustHttpRouteIfNeeded(endpointInsight);
+                adjustHttpInsightIfNeeded(endpointInsight);
             }
         });
     }

src/views/codeAnalytics/codeAnalyticsView.ts

@@ -277,6 +277,12 @@ class CodeAnalyticsViewProvider implements vscode.WebviewViewProvider,vscode.Dis
         if (event.environment){
            await Settings.environment.set(event.environment);
         }
+        if (this._overlay.isVisible){
+            const editor = vscode.window.activeTextEditor;
+            if (editor){
+                this.getCodeObjectOrShowOverlay(editor.document,editor.selection.anchor);
+            }
+        }
         this.onTabRefreshRequested(new UiMessage.Notify.TabRefreshRequested());
     }
     public async onTabChangedEvent(event: UiMessage.Notify.TabChanged)

src/views/codeAnalytics/overlayView.ts

@@ -8,6 +8,8 @@ import { HtmlHelper } from "./common";
 
 export class OverlayView
 {
+
+
     public static UnsupportedDocumentOverlayId = "UnsupportedDocument";
     public static CodeSelectionNotFoundOverlayId = "CodeSelectionNotFound";
 
@@ -44,6 +46,8 @@ export class OverlayView
         this.show(html, OverlayView.UnsupportedDocumentOverlayId);
     }
 
+  
+
     public async showCodeSelectionNotFoundMessage(docInfo: DocumentInfo){
         const links = [];