wip

Author: ibolton336

vscode/package.json

@@ -181,13 +181,13 @@
       "konveyor": [
         {
           "type": "webview",
-          "id": "konveyor.konveyorSidebarView",
+          "id": "konveyor.konveyorAnalysisView",
           "name": "Konveyor Analysis View",
           "visibility": "visible"
         },
         {
           "id": "konveyor.diffView",
-          "name": "Konveyor Solution Tree View"
+          "name": "Konveyor Resolutions"
         }
       ]
     },
@@ -196,7 +196,7 @@
         {
           "command": "konveyor.toggleFullScreen",
           "group": "navigation@1",
-          "when": "view == konveyor.konveyorSidebarView"
+          "when": "view == konveyor.konveyorAnalysisView"
         },
         {
           "command": "konveyor.applyAll",
@@ -245,7 +245,7 @@
         {
           "command": "konveyor.toggleFullScreen",
           "group": "navigation@1",
-          "when": "activeWebviewPanelId == konveyor.konveyorSidebarView"
+          "when": "activeWebviewPanelId == konveyor.konveyorAnalysisView"
         }
       ],
       "explorer/context": [

vscode/src/KonveyorGUIWebviewViewProvider.ts

@@ -16,7 +16,7 @@ import { getUri } from "./utilities/getUri";
 import { getNonce } from "./utilities/getNonce";
 
 export class KonveyorGUIWebviewViewProvider implements WebviewViewProvider {
-  public static readonly SIDEBAR_VIEW_TYPE = "konveyor.konveyorSidebarView";
+  public static readonly SIDEBAR_VIEW_TYPE = "konveyor.konveyorAnalysisView";
   public static readonly RESOLUTION_VIEW_TYPE = "konveyor.konveyorResolutionView";
 
   private static instance: KonveyorGUIWebviewViewProvider;
@@ -192,6 +192,7 @@ export class KonveyorGUIWebviewViewProvider implements WebviewViewProvider {
         type: "loadStoredAnalysis",
         data,
       });
+      //TODO Commenting out in favor of hardcoded solution data in webviewMessageHandler.ts
       // const localChanges = this._extensionState.localChanges;
       // webview.postMessage({
       //   type: "loadSolutions",

vscode/src/commands.ts

@@ -34,7 +34,9 @@ let fullScreenPanel: WebviewPanel | undefined;
 
 function getFullScreenTab() {
   const tabs = window.tabGroups.all.flatMap((tabGroup) => tabGroup.tabs);
-  return tabs.find((tab) => (tab.input as any)?.viewType?.endsWith("konveyor.konveyorSidebarView"));
+  return tabs.find((tab) =>
+    (tab.input as any)?.viewType?.endsWith("konveyor.konveyorAnalysisView"),
+  );
 }
 
 const commandsMap: (state: ExtensionState) => {
@@ -69,7 +71,7 @@ const commandsMap: (state: ExtensionState) => {
     "konveyor.focusKonveyorInput": async () => {
       const fullScreenTab = getFullScreenTab();
       if (!fullScreenTab) {
-        commands.executeCommand("konveyor.konveyorSidebarView.focus");
+        commands.executeCommand("konveyor.konveyorAnalysisView.focus");
       } else {
         fullScreenPanel?.reveal();
       }

vscode/src/data/loadResults.ts

@@ -40,6 +40,7 @@ export const loadSolution = async (state: ExtensionState, solution: GetSolutionR
     ({ originalUri: uri }) => new Location(uri, new Position(0, 0)),
   );
   state.fileModel.updateLocations(locations);
+  //TODO use this if we need to load solutions for development purposes into the resolutions webview
   // const resolutionsProvider = state.webviewProviders?.get("resolutions");
   // resolutionsProvider?.webview?.postMessage({
   //   command: "loadSolution",

vscode/src/data/loadStaticResults.ts

@@ -53,6 +53,7 @@ export const loadResultsFromDataFolder = async () => {
   if (analysisResults) {
     vscode.commands.executeCommand("konveyor.loadRuleSets", analysisResults);
   }
+  //Commenting out in favor of hardcoded solution for now to simulate the e2e flow
   // if (solution) {
   //   vscode.commands.executeCommand("konveyor.loadSolution", solution);
   // }