Skip to content

Commit 38472e4

Browse files
bexsoftbexsoft
authored
Updated Console dependencies (#3157)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent 9db5d1e commit 38472e4

File tree

13 files changed

+229
-176
lines changed

13 files changed

+229
-176
lines changed

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ require (
3232
github.com/stretchr/testify v1.8.4
3333
github.com/tidwall/gjson v1.16.0
3434
github.com/unrolled/secure v1.13.0
35-
golang.org/x/crypto v0.14.0
35+
golang.org/x/crypto v0.16.0
3636
golang.org/x/net v0.17.0
3737
golang.org/x/oauth2 v0.12.0
3838
// Added to include security fix for
3939
// https://github.com/golang/go/issues/56152
40-
golang.org/x/text v0.13.0 // indirect
40+
golang.org/x/text v0.14.0 // indirect
4141
gopkg.in/yaml.v2 v2.4.0 // indirect
4242
)
4343

@@ -85,10 +85,10 @@ require (
8585
github.com/juju/ratelimit v1.0.2 // indirect
8686
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
8787
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
88-
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
88+
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
8989
github.com/lestrrat-go/httpcc v1.0.1 // indirect
9090
github.com/lestrrat-go/iter v1.0.2 // indirect
91-
github.com/lestrrat-go/jwx v1.2.26 // indirect
91+
github.com/lestrrat-go/jwx v1.2.27 // indirect
9292
github.com/lestrrat-go/option v1.0.1 // indirect
9393
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
9494
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
@@ -145,8 +145,8 @@ require (
145145
go.uber.org/multierr v1.11.0 // indirect
146146
go.uber.org/zap v1.25.0 // indirect
147147
golang.org/x/sync v0.3.0 // indirect
148-
golang.org/x/sys v0.13.0 // indirect
149-
golang.org/x/term v0.13.0 // indirect
148+
golang.org/x/sys v0.15.0 // indirect
149+
golang.org/x/term v0.15.0 // indirect
150150
google.golang.org/appengine v1.6.8 // indirect
151151
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
152152
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect

‎go.sum

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
189189
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
190190
github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
191191
github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
192-
github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80=
193-
github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
192+
github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k=
193+
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
194194
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
195195
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
196196
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
197197
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
198-
github.com/lestrrat-go/jwx v1.2.26 h1:4iFo8FPRZGDYe1t19mQP0zTRqA7n8HnJ5lkIiDvJcB0=
199-
github.com/lestrrat-go/jwx v1.2.26/go.mod h1:MaiCdGbn3/cckbOFSCluJlJMmp9dmZm5hDuIkx8ftpQ=
198+
github.com/lestrrat-go/jwx v1.2.27 h1:cvnTnda/YzdyFuWdEAMkI6BsLtItSrASEVCI3C/IUEQ=
199+
github.com/lestrrat-go/jwx v1.2.27/go.mod h1:Stob9LjSqR3lOmNdxF0/TvZo60V3hUGv8Fr7Bwzla3k=
200200
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
201201
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
202202
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
@@ -421,9 +421,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
421421
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
422422
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
423423
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
424-
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
425-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
426-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
424+
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
425+
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
427426
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
428427
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
429428
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -488,16 +487,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
488487
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
489488
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
490489
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
491-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
492-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
490+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
491+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
493492
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
494493
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
495494
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
496495
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
497496
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
498497
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
499-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
500-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
498+
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
499+
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
501500
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
502501
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
503502
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -507,8 +506,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
507506
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
508507
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
509508
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
510-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
511-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
509+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
510+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
512511
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
513512
golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
514513
golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

‎portal-ui/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"react-dropzone": "^14.2.3",
1919
"react-markdown": "8.0.7",
2020
"react-redux": "^8.1.3",
21-
"react-router-dom": "6.16.0",
21+
"react-router-dom": "6.20.1",
2222
"react-virtualized": "^9.22.5",
23-
"react-window": "^1.8.9",
23+
"react-window": "^1.8.10",
2424
"react-window-infinite-loader": "^1.0.9",
25-
"recharts": "^2.6.2",
25+
"recharts": "^2.10.3",
2626
"styled-components": "^5.3.11",
2727
"superagent": "^8.0.8",
2828
"tinycolor2": "^1.6.0",
@@ -59,26 +59,26 @@
5959
"devDependencies": {
6060
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
6161
"@playwright/test": "^1.38.1",
62-
"@types/lodash": "^4.14.199",
63-
"@types/luxon": "^3.3.0",
62+
"@types/lodash": "^4.14.202",
63+
"@types/luxon": "^3.3.7",
6464
"@types/minio": "7.1.1",
6565
"@types/node": "18.16.0",
66-
"@types/react": "18.2.24",
66+
"@types/react": "18.2.43",
6767
"@types/react-copy-to-clipboard": "^5.0.5",
68-
"@types/react-dom": "18.2.8",
69-
"@types/react-redux": "^7.1.27",
70-
"@types/react-virtualized": "^9.21.23",
68+
"@types/react-dom": "18.2.17",
69+
"@types/react-redux": "^7.1.32",
70+
"@types/react-virtualized": "^9.21.29",
7171
"@types/react-window": "^1.8.6",
7272
"@types/react-window-infinite-loader": "^1.0.7",
73-
"@types/recharts": "^1.8.25",
74-
"@types/superagent": "^4.1.19",
73+
"@types/recharts": "^1.8.29",
74+
"@types/superagent": "^4.1.24",
7575
"@types/webpack-env": "^1.18.2",
76-
"@types/websocket": "^1.0.7",
76+
"@types/websocket": "^1.0.10",
7777
"babel-plugin-istanbul": "^6.1.1",
7878
"customize-cra": "^1.0.0",
7979
"minio": "^7.1.3",
8080
"nyc": "^15.1.0",
81-
"prettier": "3.0.3",
81+
"prettier": "3.1.1",
8282
"react-app-rewire-hot-loader": "^2.0.1",
8383
"react-app-rewired": "^2.2.1",
8484
"react-scripts": "5.0.1",
@@ -89,7 +89,7 @@
8989
"resolutions": {
9090
"nth-check": "^2.0.1",
9191
"yaml": "^2.3.1",
92-
"postcss": "^8.4.31",
92+
"postcss": "^8.4.32",
9393
"react-scripts/**/node-forge": "^1.3.0",
9494
"react-scripts/**/async": "^2.6.4",
9595
"react-scripts/workbox-webpack-plugin/workbox-build/@surma/rollup-plugin-off-main-thread/ejs/jake/async": "^2.6.4",
@@ -104,7 +104,7 @@
104104
"fast-xml-parser": "^4.2.4",
105105
"semver": "^7.5.2",
106106
"testcafe/**/tough-cookie": "^4.1.3",
107-
"styled-components/**/@babel/traverse": "^7.23.2"
107+
"styled-components/**/@babel/traverse": "^7.23.6"
108108
},
109109
"main": "index.js"
110110
}

‎portal-ui/src/api/consoleApi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,8 +1661,8 @@ export class HttpClient<SecurityDataType = unknown> {
16611661
property instanceof Blob
16621662
? property
16631663
: typeof property === "object" && property !== null
1664-
? JSON.stringify(property)
1665-
: `${property}`,
1664+
? JSON.stringify(property)
1665+
: `${property}`,
16661666
);
16671667
return formData;
16681668
}, new FormData()),

‎portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ const AddLifecycleModal = ({
301301
? parseInt(lifecycleDays) <= 0
302302
? `Number of ${expiryUnit} to retain must be greater than zero`
303303
: parseInt(lifecycleDays) > 2147483647
304-
? `Number of ${expiryUnit} must be less than or equal to 2147483647`
305-
: ""
304+
? `Number of ${expiryUnit} must be less than or equal to 2147483647`
305+
: ""
306306
: ""
307307
}
308308
id="expiry_days"

‎portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ const ListBuckets = () => {
247247
!hasBuckets
248248
? ""
249249
: bulkSelect
250-
? "Unselect Buckets"
251-
: "Select Multiple Buckets"
250+
? "Unselect Buckets"
251+
: "Select Multiple Buckets"
252252
}
253253
>
254254
<Button
@@ -269,8 +269,8 @@ const ListBuckets = () => {
269269
!hasBuckets
270270
? ""
271271
: selectedBuckets.length === filteredRecords.length
272-
? "Unselect All Buckets"
273-
: "Select All Buckets"
272+
? "Unselect All Buckets"
273+
: "Select All Buckets"
274274
}
275275
>
276276
<Button
@@ -287,15 +287,15 @@ const ListBuckets = () => {
287287
!hasBuckets
288288
? ""
289289
: !canPutLifecycle
290-
? permissionTooltipHelper(
291-
IAM_PERMISSIONS[IAM_ROLES.BUCKET_LIFECYCLE],
292-
"configure lifecycle for the selected buckets",
293-
)
294-
: selectedBuckets.length === 0
295-
? bulkSelect
296-
? "Please select at least one bucket on which to configure Lifecycle"
297-
: "Use the Select Multiple Buckets button to choose buckets on which to configure Lifecycle"
298-
: "Set Lifecycle"
290+
? permissionTooltipHelper(
291+
IAM_PERMISSIONS[IAM_ROLES.BUCKET_LIFECYCLE],
292+
"configure lifecycle for the selected buckets",
293+
)
294+
: selectedBuckets.length === 0
295+
? bulkSelect
296+
? "Please select at least one bucket on which to configure Lifecycle"
297+
: "Use the Select Multiple Buckets button to choose buckets on which to configure Lifecycle"
298+
: "Set Lifecycle"
299299
}
300300
>
301301
<Button
@@ -314,10 +314,10 @@ const ListBuckets = () => {
314314
!hasBuckets
315315
? ""
316316
: selectedBuckets.length === 0
317-
? bulkSelect
318-
? "Please select at least one bucket on which to configure Replication"
319-
: "Use the Select Multiple Buckets button to choose buckets on which to configure Replication"
320-
: "Set Replication"
317+
? bulkSelect
318+
? "Please select at least one bucket on which to configure Replication"
319+
: "Use the Select Multiple Buckets button to choose buckets on which to configure Replication"
320+
: "Set Replication"
321321
}
322322
>
323323
<Button

‎portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ const ListObjects = () => {
846846
let createdTime = DateTime.now();
847847

848848
if (bucketInfo?.creation_date) {
849-
createdTime = DateTime.fromISO(bucketInfo.creation_date);
849+
createdTime = DateTime.fromISO(bucketInfo.creation_date) as DateTime<true>;
850850
}
851851

852852
const downloadToolTip =

‎portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/FileVersionItem.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ const FileVersionItem = ({
212212
let lastModified = DateTime.now();
213213

214214
if (versionInfo.last_modified) {
215-
lastModified = DateTime.fromISO(versionInfo.last_modified);
215+
lastModified = DateTime.fromISO(
216+
versionInfo.last_modified,
217+
) as DateTime<true>;
216218
}
217219

218220
return (

‎portal-ui/src/screens/Console/Groups/Groups.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ const Groups = () => {
231231
checkedGroups.length < 1
232232
? "Please select Groups on which you want to apply Policies"
233233
: applyPolicy
234-
? "Select Policy"
235-
: permissionTooltipHelper(
236-
applyPolicyPermissions,
237-
"apply policies to Groups",
238-
)
234+
? "Select Policy"
235+
: permissionTooltipHelper(
236+
applyPolicyPermissions,
237+
"apply policies to Groups",
238+
)
239239
}
240240
>
241241
<Button
@@ -261,11 +261,11 @@ const Groups = () => {
261261
checkedGroups.length === 0
262262
? "Select Groups to delete"
263263
: getGroup
264-
? "Delete Selected"
265-
: permissionTooltipHelper(
266-
getGroupPermissions,
267-
"delete Groups",
268-
)
264+
? "Delete Selected"
265+
: permissionTooltipHelper(
266+
getGroupPermissions,
267+
"delete Groups",
268+
)
269269
}
270270
>
271271
<Button

‎portal-ui/src/screens/Console/IDP/IDPConfigurationDetails.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,10 @@ const IDPConfigurationDetails = ({
121121
}
122122

123123
if (item.isEnv) {
124-
overrideFields[
125-
item.key
126-
] = `MINIO_IDENTITY_OPENID_${item.key.toUpperCase()}${
127-
configurationName !== "_" ? `_${configurationName}` : ""
128-
}`;
124+
overrideFields[item.key] =
125+
`MINIO_IDENTITY_OPENID_${item.key.toUpperCase()}${
126+
configurationName !== "_" ? `_${configurationName}` : ""
127+
}`;
129128
totEnv++;
130129
}
131130

0 commit comments

Comments
 (0)