plan-OIC-56403: RAB VSCode: Should not allow user to select more than…

… 200 items for both Postman Collection requests and OpenAPI method:paths (#49) * plan-OIC-54878: Copyright to 2024 * plan-OIC-54878: Copyright to 2024 for UI * Fix regression of not saving add for register, add requests * Fix regression of not saving add for register, add requests 2 * Remove file saving confirmation out of the bundle lifecycle * plan-OIC-56403: RAB VSCode: Should not allow user to select more than 200 items for both Postman Collection requests and OpenAPI method:paths * Remove schema sync
oracle-samples · Jul 1, 2024 · d2d2a41 · d2d2a41
1 parent 58f9ca6
commit d2d2a41
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 22 deletions.
diff --git a/src/providers/copilot-webview.ts b/src/providers/copilot-webview.ts
@@ -237,8 +237,31 @@ function handleWebviewLifecycle() {
 
 }
 
-const notifyPostmanWebview = (file: vscode.Uri, entryType: SharedNs.VscodeCommandPayload["updateEntryType"]) => {
-  UtilsNs.notifyWebview(SharedNs.ExtensionCommandEnum.updatePostmanRawData, JSON.parse(readFileSync(file.fsPath, 'utf8')) as PostmanNs.Root);
+const notifyPostmanWebview = ({
+  postmanFile,
+  addFile,
+  entryType
+}: {
+  postmanFile: vscode.Uri,
+  addFile?: vscode.Uri,
+  entryType: SharedNs.VscodeCommandPayload["updateEntryType"]
+}) => {
+
+  let ADD: RabAddNs.Root | undefined = undefined;
+  try {
+    if (addFile) {
+      ADD = JSON.parse(readFileSync(addFile.fsPath, 'utf8'));
+    }
+  } catch (error) {
+    log.error(`Unable to parse adapter definition document`, error);
+    return;
+  }
+
+  UtilsNs.notifyWebview(SharedNs.ExtensionCommandEnum.updatePostmanRawData, {
+    postman: JSON.parse(readFileSync(postmanFile.fsPath, 'utf8')) as PostmanNs.Root,
+    add: ADD
+  });
+
   UtilsNs.notifyWebview(SharedNs.ExtensionCommandEnum.updateEntryType, entryType);
 };
 
@@ -304,8 +327,17 @@ const openWebview = ({
 
     handleWebviewRouting(SharedNs.WebviewRouteEnum.PostmanAdd),
     handleWebviewLifecycle(),
-    notifyPostmanWebview(file, entryType),
-    UtilsNs.listenWebview(SharedNs.WebviewCommandEnum.postmanSelectReady, () => notifyPostmanWebview(file, entryType)),
+    notifyPostmanWebview({
+      postmanFile: file,
+      entryType,
+      addFile
+    }),
+    UtilsNs.listenWebview(SharedNs.WebviewCommandEnum.postmanSelectReady, () => notifyPostmanWebview({
+      postmanFile: file,
+      entryType,
+      addFile
+    }
+    )),
     UtilsNs.listenWebview(SharedNs.WebviewCommandEnum.postmanSelectRequests, (data) => {
 
       const observable = fs.checkWorkspaceInitialized().pipe(
@@ -412,7 +444,7 @@ const registerPostmanConvertCallback = (context: vscode.ExtensionContext, entryT
           switchMap(
             () => openWebview(
               {
-                file, context, entryType, 
+                file, context, entryType,
                 addFile: entryType === SharedNs.VscodeCommandPayloadEntryType.PostmanAddRequest ? getAddFile() : undefined
               }
             )
@@ -449,9 +481,9 @@ const registerOpenAPIConvertCallback = (context: vscode.ExtensionContext, entryT
         .pipe(
           tap(() => UtilsNs.showWebview(context)),
           tap(() => showInfoMessage(
-            entryType === SharedNs.VscodeCommandPayloadEntryType.OpenAPIAddRequest ? 
-            "Select the OpenAPI paths and methods to add" 
-              : "Select the OpenAPI paths and methods to convert" 
+            entryType === SharedNs.VscodeCommandPayloadEntryType.OpenAPIAddRequest ?
+              "Select the OpenAPI paths and methods to add"
+              : "Select the OpenAPI paths and methods to convert"
           )),
           switchMap(
             () => openWebview({

diff --git a/src/webview-shared-lib.ts b/src/webview-shared-lib.ts
@@ -87,7 +87,10 @@ export namespace SharedNs {
     openCopilotPostmanConvert: any;
     openCopilotAssistant: any;
 
-    updatePostmanRawData: PostmanNs.Root;
+    updatePostmanRawData: {
+      postman: PostmanNs.Root,
+      add?: RabAddNs.Root,
+    };
     updateOpenAPIRawData: {
       openapi: OpenAPINS.Root,
       add?: RabAddNs.Root,

diff --git a/webview/index.html b/webview/index.html
@@ -5,4 +5,4 @@
 <!doctype html><html lang="en-us"><head><title>Oracle JET VDOM Starter Template - Basic</title><meta charset="UTF-8"/><meta name="viewport" content="viewport-fit=cover,width=device-width,initial-scale=1"/><link rel="icon" href="styles/images/JET-Favicon-Red-32x32.png" type="image/x-icon"/><base href="/"/><link rel="stylesheet" type="text/css" href="styles/redwood/15.1.0/web/redwood.min.css">
 <link rel="stylesheet" type="text/css" href="styles/theme-redwood/15.1.0/web/theme.css">
 
-<link rel="stylesheet" type="text/css" href="styles/app.css"><link rel="stylesheet" id="uxiconFont" href="https://static.oracle.com/cdn/fnd/gallery/2310.0.1/images/iconfont/ojuxIconFont.min.css"/><link href="styles/main.c503ed20880785365d34.css" rel="stylesheet"></head><body class="oj-web-applayout-body" data-oj-binding-provider="none"><app-root></app-root><script defer="defer" src="js/runtime.c503ed20880785365d34.js"></script><script defer="defer" src="js/libs/index.c503ed20880785365d34.js"></script><script defer="defer" src="js/main.c503ed20880785365d34.js"></script></body></html>
+<link rel="stylesheet" type="text/css" href="styles/app.css"><link rel="stylesheet" id="uxiconFont" href="https://static.oracle.com/cdn/fnd/gallery/2310.0.1/images/iconfont/ojuxIconFont.min.css"/><link href="styles/main.d7ada578f1175f12b09b.css" rel="stylesheet"></head><body class="oj-web-applayout-body" data-oj-binding-provider="none"><app-root></app-root><script defer="defer" src="js/runtime.d7ada578f1175f12b09b.js"></script><script defer="defer" src="js/libs/index.d7ada578f1175f12b09b.js"></script><script defer="defer" src="js/main.d7ada578f1175f12b09b.js"></script></body></html>
diff --git a/...iew/js/libs/index.c503ed20880785365d34.js → ...iew/js/libs/index.d7ada578f1175f12b09b.js b/...iew/js/libs/index.c503ed20880785365d34.js → ...iew/js/libs/index.d7ada578f1175f12b09b.js
diff --git a/...index.c503ed20880785365d34.js.LICENSE.txt → ...index.d7ada578f1175f12b09b.js.LICENSE.txt b/...index.c503ed20880785365d34.js.LICENSE.txt → ...index.d7ada578f1175f12b09b.js.LICENSE.txt
diff --git a/webview/js/main.c503ed20880785365d34.js b/webview/js/main.c503ed20880785365d34.js
diff --git a/webview/js/main.d7ada578f1175f12b09b.js b/webview/js/main.d7ada578f1175f12b09b.js
diff --git a/webview/js/runtime.c503ed20880785365d34.js → webview/js/runtime.d7ada578f1175f12b09b.js b/webview/js/runtime.c503ed20880785365d34.js → webview/js/runtime.d7ada578f1175f12b09b.js
diff --git a/webview/styles/main.c503ed20880785365d34.css b/webview/styles/main.c503ed20880785365d34.css
diff --git a/webview/styles/main.d7ada578f1175f12b09b.css b/webview/styles/main.d7ada578f1175f12b09b.css