Upgrade react router version to prevent CVE scanning warning (#56)

* Upgrade react router version to prevent CVE scanning warning

* Bump up github action version

Author: paullanoracle

.github/workflows/package.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Package Extension
       run: npm run package
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: build-${{ github.sha }}
         path: oic-rapid-adapter-builder-*.vsix

.npmrc

@@ -0,0 +1,2 @@
+# registry="https://artifacthub-iad.oci.oraclecorp.com/artifactory/api/npm/npmjs-registry"
+registry="https://registry.npmjs.org"

src/providers/copilot-webview.ts

@@ -238,7 +238,9 @@ 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);
+  UtilsNs.notifyWebview(SharedNs.ExtensionCommandEnum.updatePostmanRawData, {
+    postman: JSON.parse(readFileSync(file.fsPath, 'utf8')) as PostmanNs.Root
+  });
   UtilsNs.notifyWebview(SharedNs.ExtensionCommandEnum.updateEntryType, entryType);
 };
 

src/utils.ts

@@ -139,7 +139,7 @@ export namespace workspace {
       const specFile = JSON.parse(doc.getText()) as OpenAPINS.Root;
       return !!specFile && !!specFile.openapi && !!specFile.info?.version && !!specFile.paths;
     },
-    (file) => from(showErrorMessage(`The offered file is not a valid postman collection. File: ['${fs.parseFilename(file)}']`))
+    (file) => from(showErrorMessage(`The offered file is not a valid OpenAPI spec json. File: ['${fs.parseFilename(file)}']`))
   )
     .pipe(
       switchMap(

src/webview-shared-lib.ts

@@ -8,6 +8,7 @@ export namespace SharedNs {
   export const WebviewCommandEnum = {
     webviewRouterReady: 'webviewRouterReady' as 'webviewRouterReady',
     webviewLifecycle: 'webviewLifecycle' as 'webviewLifecycle',
+    webviewMessagePreflight: 'webviewMessagePreflight' as 'webviewMessagePreflight',
 
     postmanSelectRequests: 'postmanSelectRequests' as 'postmanSelectRequests',
     postmanDoneConvertDocument: 'postmanDoneConvertDocument' as 'postmanDoneConvertDocument',
@@ -22,9 +23,14 @@ export namespace SharedNs {
     rabAddSave: 'rabAddSave' as 'rabAddSave',
 
   }
+
+  export type WebviewCommandEnumKey = keyof typeof WebviewCommandEnum;
+  
   export const ExtensionCommandEnum = {
+
     openCopilotPostmanConvert: 'orab.webview.copilot.open.postman.convert' as 'openCopilotPostmanConvert',
     openPostmanConvertConverDocument: 'orab.convert.postman.document' as 'openPostmanConvertConverDocument',
+    openADDCompress: 'orab.add.compress' as 'openADDCompress',
     openOpenAPIConvertNewDocument: 'orab.add.convert' as 'openOpenAPIConvertNewDocument',
     openOpenAPIConvertAppendDocument: 'orab.add.convert.append' as 'openOpenAPIConvertAppendDocument',
     openCopilotAssistant: 'orab.webview.copilot.open.assistant' as 'openCopilotAssistant',
@@ -35,6 +41,9 @@ export namespace SharedNs {
     routerNavigateTo: 'routerNavigateTo' as 'routerNavigateTo',
   }
 
+  export type ExtensionCommandEnumKey = keyof typeof ExtensionCommandEnum;
+
+
   export enum WebviewRouteEnum {
     Root = `/`,
     PostmanAdd = `postman/add`,
@@ -51,18 +60,32 @@ export namespace SharedNs {
     items: string[];
     selectedItemForTestConnection?: string;
   }
+  export enum WebviewCommandPayloadADDCompressRequestEnum {
+    remove_dangling = 'remove_dangling'
+  }
+  export type WebviewCommandPayloadADDCompressRequests = {
+    [WebviewCommandPayloadADDCompressRequestEnum.remove_dangling]?: boolean
+  }
+
   export type WebviewCommandPayloadOpenAPISelectRequests = OpenAPINS.UIStateForBackend
   export interface WebviewCommandPayloadRabAddSave {
     addToSave: RabAddNs.Root;
     vsCodeEditorConfig?: VsCoderEditorConfig;
   }
 
+  export type MessagePreflightPayload = {
+    ack?: (typeof ExtensionCommandEnum)[ExtensionCommandEnumKey] | (typeof WebviewCommandEnum)[WebviewCommandEnumKey]
+    isUnlisten?: boolean
+    };
+
   export type WebviewCommandPayload = {
     webviewRouterReady: WebviewCommandPayloadWebviewRouterReady;
     webviewLifecycle: {
       type: 'close'
     };
 
+    webviewMessagePreflight: MessagePreflightPayload;
+
     postmanSelectRequests: Omit<WebviewCommandPayloadPostmanSelectRequests, "selectedItemForTestConnection">;
     postmanDoneConvertDocument: WebviewCommandPayloadPostmanSelectRequests;
     postmanSelectReady: any;
@@ -84,10 +107,14 @@ export namespace SharedNs {
   }
 
   export type VscodeCommandPayload = {
+
     openCopilotPostmanConvert: any;
     openCopilotAssistant: any;
 
-    updatePostmanRawData: PostmanNs.Root;
+    updatePostmanRawData: {
+      postman: PostmanNs.Root,
+      add?: RabAddNs.Root,
+    };
     updateOpenAPIRawData: {
       openapi: OpenAPINS.Root,
       add?: RabAddNs.Root,
@@ -96,6 +123,7 @@ export namespace SharedNs {
     updateEntryType: VscodeCommandPayloadEntryType;
 
     openPostmanConvertConverDocument: any;
+    openADDCompress: any;
 
     openOpenAPIConvertNewDocument: any;
     openOpenAPIConvertAppendDocument: any;
@@ -115,6 +143,9 @@ export namespace SharedNs {
     endOffset?: number
   }
 
+
+  export const delayInSeconds = async (timeInSeconds: number) => new Promise(resolve => setTimeout(() => resolve(true), timeInSeconds * 1000));
+
 }
 
 export namespace RabAddUtilNs {

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.fbee0a9e7bb54ef7b5d0.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.fbee0a9e7bb54ef7b5d0.js"></script><script defer="defer" src="js/libs/index.fbee0a9e7bb54ef7b5d0.js"></script><script defer="defer" src="js/main.fbee0a9e7bb54ef7b5d0.js"></script></body></html>

…ew/js/libs/index.c503ed20880785365d34.js …ew/js/libs/index.fbee0a9e7bb54ef7b5d0.jswebview/js/libs/index.c503ed20880785365d34.js renamed to webview/js/libs/index.fbee0a9e7bb54ef7b5d0.js webview/js/libs/index.c503ed20880785365d34.js renamed to webview/js/libs/index.fbee0a9e7bb54ef7b5d0.js

@@ -240,7 +240,7 @@
  */
 
 /**
- * @remix-run/router v1.9.0
+ * react-router v7.11.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -251,18 +251,7 @@
  */
 
 /**
- * React Router DOM v6.16.0
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router v6.16.0
+ * react-router-dom v7.11.0
  *
  * Copyright (c) Remix Software Inc.
  *