This is an automated email from the ASF dual-hosted git repository.
yamer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 5e0079bf7 Remove [email protected] (CVE-2023-26115) (#1880)
5e0079bf7 is described below
commit 5e0079bf7de43cf211b591dffc8607ee944f9d48
Author: Pere Fernández <[email protected]>
AuthorDate: Tue Oct 17 08:20:26 2023 +0200
Remove [email protected] (CVE-2023-26115) (#1880)
* Remove [email protected] (CVE-2023-26115)
* fixing conflicts
* restore header
* removing header
---
.../packages/components-common/package.json | 1 -
.../src/components/DataTable/DataTable.tsx | 6 +-
.../components/DataTable/tests/DataTable.test.tsx | 10 +--
ui-packages/pnpm-lock.yaml | 99 +---------------------
4 files changed, 11 insertions(+), 105 deletions(-)
diff --git a/ui-packages/packages/components-common/package.json
b/ui-packages/packages/components-common/package.json
index 158d63f81..99a1d69ce 100755
--- 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
index 7168435a0..81371bdc6 100644
---
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
index ea2d40160..49dca7723 100644
---
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
index cd663124f..c6e760410 100644
--- a/ui-packages/pnpm-lock.yaml
+++ b/ui-packages/pnpm-lock.yaml
@@ -1,22 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
lockfileVersion: '6.0'
settings:
@@ -204,9 +185,6 @@ importers:
apollo-boost:
specifier: ^0.4.9
version: 0.4.9([email protected])
- jsonpath:
- specifier: ^1.1.1
- version: 1.1.1
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -10378,6 +10356,7 @@ packages:
/[email protected]:
resolution: {integrity:
sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+ dev: true
/[email protected]:
resolution: {integrity:
sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
@@ -10942,19 +10921,6 @@ packages:
engines: {node: '>=10'}
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==}
- engines: {node: '>=4.0'}
- hasBin: true
- dependencies:
- esprima: 4.0.1
- estraverse: 4.3.0
- esutils: 2.0.3
- optionator: 0.8.3
- optionalDependencies:
- source-map: 0.6.1
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
engines: {node: '>=6.0'}
@@ -11128,12 +11094,6 @@ packages:
eslint-visitor-keys: 1.3.0
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==}
- engines: {node: '>=0.4.0'}
- hasBin: true
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
engines: {node: '>=4'}
@@ -11163,6 +11123,7 @@ packages:
/[email protected]:
resolution: {integrity:
sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
engines: {node: '>=0.10.0'}
+ dev: true
/[email protected]:
resolution: {integrity:
sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
@@ -11455,6 +11416,7 @@ packages:
/[email protected]:
resolution: {integrity:
sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+ dev: true
/[email protected]:
resolution: {integrity:
sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
@@ -14026,14 +13988,6 @@ packages:
resolution: {integrity:
sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==}
- dependencies:
- esprima: 1.2.2
- static-eval: 2.0.2
- underscore: 1.12.1
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
engines: {'0': node >=0.6.0}
@@ -14151,14 +14105,6 @@ packages:
engines: {node: '>=6'}
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
- engines: {node: '>= 0.8.0'}
- dependencies:
- prelude-ls: 1.1.2
- type-check: 0.3.2
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
engines: {node: '>= 0.8.0'}
@@ -15229,18 +15175,6 @@ packages:
dependencies:
'@wry/context': 0.4.4
- /[email protected]:
- resolution: {integrity:
sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
- engines: {node: '>= 0.8.0'}
- dependencies:
- deep-is: 0.1.4
- fast-levenshtein: 2.0.6
- levn: 0.3.0
- prelude-ls: 1.1.2
- type-check: 0.3.2
- word-wrap: 1.2.3
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
engines: {node: '>= 0.8.0'}
@@ -15945,11 +15879,6 @@ packages:
resolution: {integrity:
sha512-gdr1MBNVT0drzTq95CbSNdsrBDoHGlb2aDJP/FoY+1e+jSDPOb1Cv554gH2MGiSr2WTcXi/zu+NaFzfcHQkfBQ==}
dev: false
- /[email protected]:
- resolution: {integrity:
sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
- engines: {node: '>= 0.8.0'}
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
@@ -17741,12 +17670,6 @@ packages:
- supports-color
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==}
- dependencies:
- escodegen: 1.14.3
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
engines: {node: '>=0.10.0'}
@@ -18514,13 +18437,6 @@ packages:
resolution: {integrity:
sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
- engines: {node: '>= 0.8.0'}
- dependencies:
- prelude-ls: 1.1.2
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
engines: {node: '>= 0.8.0'}
@@ -18605,10 +18521,6 @@ packages:
resolution: {integrity:
sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
dev: true
- /[email protected]:
- resolution: {integrity:
sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==}
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
engines: {node: '>=4'}
@@ -19650,11 +19562,6 @@ packages:
/[email protected]:
resolution: {integrity:
sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
- /[email protected]:
- resolution: {integrity:
sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
- engines: {node: '>=0.10.0'}
- dev: false
-
/[email protected]:
resolution: {integrity:
sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
engines: {node: '>=6'}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
