Add UX for fix all and for individual get solutions

Display the resolutionsView panel on solution retrieval Get show resolution panel code working Add new webview routing logic Populate resolutions view from solutions Add more detailed resolution view Add hook for message handler in webview Add hooks and utils for vscode messaging from webview Check if solution uri matches return control to sidebar if resolution page closes Apply file changes from webview and track solution state Signed-off-by: Ian Bolton <[email protected]>
konveyor · Nov 19, 2024 · 52a4621 · 52a4621
1 parent 96c853c
commit 52a4621
Show file tree

Hide file tree

Showing 33 changed files with 1,451 additions and 913 deletions.
diff --git a/mocks/coolstore_fix_catalog_source_javax_ejb_Stateless.json b/mocks/coolstore_fix_catalog_source_javax_ejb_Stateless.json
@@ -0,0 +1,10 @@
+{
+  "errors": [],
+  "changes": [
+    {
+      "original": "src/main/java/com/redhat/coolstore/service/CatalogService.java",
+      "modified": "src/main/java/com/redhat/coolstore/service/CatalogService.java",
+      "diff": "diff --git a/src/main/java/com/redhat/coolstore/service/CatalogService.java b/src/main/java/com/redhat/coolstore/service/CatalogService.java\nindex 422a3f4..9a6feff 100644\n--- a/src/main/java/com/redhat/coolstore/service/CatalogService.java\n+++ b/src/main/java/com/redhat/coolstore/service/CatalogService.java\n@@ -9,12 +9,12 @@ import javax.persistence.criteria.CriteriaBuilder;\n import javax.persistence.criteria.CriteriaQuery;\n import javax.persistence.criteria.Root;\n \n-import javax.ejb.Stateless;\n+import jakarta.enterprise.context.ApplicationScoped;\n import javax.persistence.EntityManager;\n \n import com.redhat.coolstore.model.*;\n \n-@Stateless\n+@ApplicationScoped\n public class CatalogService {\n \n     @Inject\n"
+    }
+  ]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/shared/src/types/index.ts b/shared/src/types/index.ts
@@ -1,3 +1,5 @@
+import { Uri } from "vscode";
+
 export interface Incident {
   uri: string;
   lineNumber: number;
@@ -82,3 +84,17 @@ export interface GetSolutionResult {
   errors: string[];
   changes: Change[];
 }
+
+export interface LocalChange {
+  modifiedUri: Uri;
+  originalUri: Uri;
+  diff: string;
+}
+
+export interface ResolutionMessage {
+  type: string;
+  solution: GetSolutionResult;
+  violation: Violation;
+  incident: Incident;
+  isRelevantSolution: boolean;
+}
diff --git a/vscode/package.json b/vscode/package.json
@@ -181,8 +181,8 @@
       "konveyor": [
         {
           "type": "webview",
-          "id": "konveyor.konveyorGUIView",
-          "name": "Konveyor",
+          "id": "konveyor.konveyorAnalysisView",
+          "name": "Konveyor Analysis View",
           "visibility": "visible"
         },
         {
@@ -196,7 +196,7 @@
         {
           "command": "konveyor.toggleFullScreen",
           "group": "navigation@1",
-          "when": "view == konveyor.konveyorGUIView"
+          "when": "view == konveyor.konveyorAnalysisView"
         },
         {
           "command": "konveyor.applyAll",
@@ -245,7 +245,7 @@
         {
           "command": "konveyor.toggleFullScreen",
           "group": "navigation@1",
-          "when": "activeWebviewPanelId == konveyor.konveyorGUIView"
+          "when": "activeWebviewPanelId == konveyor.konveyorAnalysisView"
         }
       ],
       "explorer/context": [