Remove [email protected] (CVE-2023-26115) (apache#1880)

* Remove [email protected] (CVE-2023-26115) * fixing conflicts * restore header * removing header
kiegroup · Dec 13, 2023 · e88be64 · e88be64
1 parent a4fa319
commit e88be64
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 105 deletions.
diff --git a/ui-packages/packages/components-common/package.json b/ui-packages/packages/components-common/package.json
@@ -34,7 +34,6 @@
     "@patternfly/react-table": "^4.113.0",
     "ajv": "^6.12.6",
     "apollo-boost": "^0.4.9",
-    "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx b/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx
@@ -32,10 +32,10 @@ import isEmpty from 'lodash/isEmpty';
 import filter from 'lodash/filter';
 import sample from 'lodash/sample';
 import keys from 'lodash/keys';
+import get from 'lodash/get';
 import reduce from 'lodash/reduce';
 import isFunction from 'lodash/isFunction';
 import uuidv4 from 'uuid';
-import jp from 'jsonpath';
 import {
   OUIAProps,
   componentOuiaProps
@@ -66,7 +66,7 @@ interface IOwnProps {
 
 const getCellData = (dataObj: Record<string, unknown>, path: string) => {
   if (dataObj && path) {
-    return !isEmpty(jp.value(dataObj, path)) ? jp.value(dataObj, path) : 'N/A';
+    return get(dataObj, path) ?? 'N/A';
   } else {
     return 'N/A';
   }
@@ -96,7 +96,7 @@ const getColumns = (data: any[], columns: DataTableColumn[]) => {
           } as ICell;
         })
       : filter(keys(sample(data)), (key) => key !== '__typename').map(
-          (key) => ({ title: key, data: `$.${key}` } as ICell)
+          (key) => ({ title: key, data: key } as ICell)
         );
   } else if (columns) {
     return filter(columns, (column) => !isEmpty(column.path)).map((column) => {

diff --git a/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx b/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx
@@ -102,24 +102,24 @@ const stateColumnTransformer = (value) => {
 const columns: DataTableColumn[] = [
   {
     label: 'ProcessId',
-    path: '$.processId'
+    path: 'processId'
   },
   {
     label: 'Name',
-    path: '$.name',
+    path: 'name',
     isSortable: true
   },
   {
     label: 'Priority',
-    path: '$.priority'
+    path: 'priority'
   },
   {
     label: 'ProcessInstanceId',
-    path: '$.processInstanceId'
+    path: 'processInstanceId'
   },
   {
     label: 'State',
-    path: '$.state',
+    path: 'state',
     bodyCellTransformer: stateColumnTransformer,
     isSortable: true
   }

diff --git a/ui-packages/pnpm-lock.yaml b/ui-packages/pnpm-lock.yaml