Skip to content

Commit

Permalink
Updated Console dependencies (#3157)
Browse files Browse the repository at this point in the history 
Signed-off-by: Benjamin Perez <[email protected]>
  • Loading branch information
@bexsoft
bexsoft authored Dec 12, 2023
1 parent 9db5d1e commit 38472e4
Show file tree
Hide file tree
Showing 13 changed files with 229 additions and 176 deletions.
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tidwall/gjson v1.16.0
github.com/unrolled/secure v1.13.0
golang.org/x/crypto v0.14.0
golang.org/x/crypto v0.16.0
golang.org/x/net v0.17.0
golang.org/x/oauth2 v0.12.0
// Added to include security fix for
// https://github.com/golang/go/issues/56152
golang.org/x/text v0.13.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

Expand Down Expand Up @@ -85,10 +85,10 @@ require (
github.com/juju/ratelimit v1.0.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx v1.2.26 // indirect
github.com/lestrrat-go/jwx v1.2.27 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
Expand Down Expand Up @@ -145,8 +145,8 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
Expand Down
25 changes: 12 additions & 13 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80=
github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k=
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
github.com/lestrrat-go/jwx v1.2.26 h1:4iFo8FPRZGDYe1t19mQP0zTRqA7n8HnJ5lkIiDvJcB0=
github.com/lestrrat-go/jwx v1.2.26/go.mod h1:MaiCdGbn3/cckbOFSCluJlJMmp9dmZm5hDuIkx8ftpQ=
github.com/lestrrat-go/jwx v1.2.27 h1:cvnTnda/YzdyFuWdEAMkI6BsLtItSrASEVCI3C/IUEQ=
github.com/lestrrat-go/jwx v1.2.27/go.mod h1:Stob9LjSqR3lOmNdxF0/TvZo60V3hUGv8Fr7Bwzla3k=
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
Expand Down Expand Up @@ -421,9 +421,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
Expand Down Expand Up @@ -488,16 +487,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand All @@ -507,8 +506,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
Expand Down
30 changes: 15 additions & 15 deletions portal-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"react-dropzone": "^14.2.3",
"react-markdown": "8.0.7",
"react-redux": "^8.1.3",
"react-router-dom": "6.16.0",
"react-router-dom": "6.20.1",
"react-virtualized": "^9.22.5",
"react-window": "^1.8.9",
"react-window": "^1.8.10",
"react-window-infinite-loader": "^1.0.9",
"recharts": "^2.6.2",
"recharts": "^2.10.3",
"styled-components": "^5.3.11",
"superagent": "^8.0.8",
"tinycolor2": "^1.6.0",
Expand Down Expand Up @@ -59,26 +59,26 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@playwright/test": "^1.38.1",
"@types/lodash": "^4.14.199",
"@types/luxon": "^3.3.0",
"@types/lodash": "^4.14.202",
"@types/luxon": "^3.3.7",
"@types/minio": "7.1.1",
"@types/node": "18.16.0",
"@types/react": "18.2.24",
"@types/react": "18.2.43",
"@types/react-copy-to-clipboard": "^5.0.5",
"@types/react-dom": "18.2.8",
"@types/react-redux": "^7.1.27",
"@types/react-virtualized": "^9.21.23",
"@types/react-dom": "18.2.17",
"@types/react-redux": "^7.1.32",
"@types/react-virtualized": "^9.21.29",
"@types/react-window": "^1.8.6",
"@types/react-window-infinite-loader": "^1.0.7",
"@types/recharts": "^1.8.25",
"@types/superagent": "^4.1.19",
"@types/recharts": "^1.8.29",
"@types/superagent": "^4.1.24",
"@types/webpack-env": "^1.18.2",
"@types/websocket": "^1.0.7",
"@types/websocket": "^1.0.10",
"babel-plugin-istanbul": "^6.1.1",
"customize-cra": "^1.0.0",
"minio": "^7.1.3",
"nyc": "^15.1.0",
"prettier": "3.0.3",
"prettier": "3.1.1",
"react-app-rewire-hot-loader": "^2.0.1",
"react-app-rewired": "^2.2.1",
"react-scripts": "5.0.1",
Expand All @@ -89,7 +89,7 @@
"resolutions": {
"nth-check": "^2.0.1",
"yaml": "^2.3.1",
"postcss": "^8.4.31",
"postcss": "^8.4.32",
"react-scripts/**/node-forge": "^1.3.0",
"react-scripts/**/async": "^2.6.4",
"react-scripts/workbox-webpack-plugin/workbox-build/@surma/rollup-plugin-off-main-thread/ejs/jake/async": "^2.6.4",
Expand All @@ -104,7 +104,7 @@
"fast-xml-parser": "^4.2.4",
"semver": "^7.5.2",
"testcafe/**/tough-cookie": "^4.1.3",
"styled-components/**/@babel/traverse": "^7.23.2"
"styled-components/**/@babel/traverse": "^7.23.6"
},
"main": "index.js"
}
4 changes: 2 additions & 2 deletions portal-ui/src/api/consoleApi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1661,8 +1661,8 @@ export class HttpClient<SecurityDataType = unknown> {
property instanceof Blob
? property
: typeof property === "object" && property !== null
? JSON.stringify(property)
: `${property}`,
? JSON.stringify(property)
: `${property}`,
);
return formData;
}, new FormData()),
Expand Down
4 changes: 2 additions & 2 deletions portal-ui/src/screens/Console/Buckets/BucketDetails/AddLifecycleModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ const AddLifecycleModal = ({
? parseInt(lifecycleDays) <= 0
? `Number of ${expiryUnit} to retain must be greater than zero`
: parseInt(lifecycleDays) > 2147483647
? `Number of ${expiryUnit} must be less than or equal to 2147483647`
: ""
? `Number of ${expiryUnit} must be less than or equal to 2147483647`
: ""
: ""
}
id="expiry_days"
Expand Down
34 changes: 17 additions & 17 deletions portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ const ListBuckets = () => {
!hasBuckets
? ""
: bulkSelect
? "Unselect Buckets"
: "Select Multiple Buckets"
? "Unselect Buckets"
: "Select Multiple Buckets"
}
>
<Button
Expand All @@ -269,8 +269,8 @@ const ListBuckets = () => {
!hasBuckets
? ""
: selectedBuckets.length === filteredRecords.length
? "Unselect All Buckets"
: "Select All Buckets"
? "Unselect All Buckets"
: "Select All Buckets"
}
>
<Button
Expand All @@ -287,15 +287,15 @@ const ListBuckets = () => {
!hasBuckets
? ""
: !canPutLifecycle
? permissionTooltipHelper(
IAM_PERMISSIONS[IAM_ROLES.BUCKET_LIFECYCLE],
"configure lifecycle for the selected buckets",
)
: selectedBuckets.length === 0
? bulkSelect
? "Please select at least one bucket on which to configure Lifecycle"
: "Use the Select Multiple Buckets button to choose buckets on which to configure Lifecycle"
: "Set Lifecycle"
? permissionTooltipHelper(
IAM_PERMISSIONS[IAM_ROLES.BUCKET_LIFECYCLE],
"configure lifecycle for the selected buckets",
)
: selectedBuckets.length === 0
? bulkSelect
? "Please select at least one bucket on which to configure Lifecycle"
: "Use the Select Multiple Buckets button to choose buckets on which to configure Lifecycle"
: "Set Lifecycle"
}
>
<Button
Expand All @@ -314,10 +314,10 @@ const ListBuckets = () => {
!hasBuckets
? ""
: selectedBuckets.length === 0
? bulkSelect
? "Please select at least one bucket on which to configure Replication"
: "Use the Select Multiple Buckets button to choose buckets on which to configure Replication"
: "Set Replication"
? bulkSelect
? "Please select at least one bucket on which to configure Replication"
: "Use the Select Multiple Buckets button to choose buckets on which to configure Replication"
: "Set Replication"
}
>
<Button
Expand Down
2 changes: 1 addition & 1 deletion portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ const ListObjects = () => {
let createdTime = DateTime.now();

if (bucketInfo?.creation_date) {
createdTime = DateTime.fromISO(bucketInfo.creation_date);
createdTime = DateTime.fromISO(bucketInfo.creation_date) as DateTime<true>;
}

const downloadToolTip =
Expand Down
4 changes: 3 additions & 1 deletion portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/FileVersionItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ const FileVersionItem = ({
let lastModified = DateTime.now();

if (versionInfo.last_modified) {
lastModified = DateTime.fromISO(versionInfo.last_modified);
lastModified = DateTime.fromISO(
versionInfo.last_modified,
) as DateTime<true>;
}

return (
Expand Down
20 changes: 10 additions & 10 deletions portal-ui/src/screens/Console/Groups/Groups.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ const Groups = () => {
checkedGroups.length < 1
? "Please select Groups on which you want to apply Policies"
: applyPolicy
? "Select Policy"
: permissionTooltipHelper(
applyPolicyPermissions,
"apply policies to Groups",
)
? "Select Policy"
: permissionTooltipHelper(
applyPolicyPermissions,
"apply policies to Groups",
)
}
>
<Button
Expand All @@ -261,11 +261,11 @@ const Groups = () => {
checkedGroups.length === 0
? "Select Groups to delete"
: getGroup
? "Delete Selected"
: permissionTooltipHelper(
getGroupPermissions,
"delete Groups",
)
? "Delete Selected"
: permissionTooltipHelper(
getGroupPermissions,
"delete Groups",
)
}
>
<Button
Expand Down
9 changes: 4 additions & 5 deletions portal-ui/src/screens/Console/IDP/IDPConfigurationDetails.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,10 @@ const IDPConfigurationDetails = ({
}

if (item.isEnv) {
overrideFields[
item.key
] = `MINIO_IDENTITY_OPENID_${item.key.toUpperCase()}${
configurationName !== "_" ? `_${configurationName}` : ""
}`;
overrideFields[item.key] =
`MINIO_IDENTITY_OPENID_${item.key.toUpperCase()}${
configurationName !== "_" ? `_${configurationName}` : ""
}`;
totEnv++;
}

Expand Down
5 changes: 2 additions & 3 deletions portal-ui/src/screens/Console/Logs/logsSlice.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ export const logsSlice = createSlice({
) {
for (let m in msgs) {
if (msgs[m].time.getFullYear() === 1) {
msgs[
m
].ConsoleMsg = `${msgs[m].ConsoleMsg}\n${action.payload.ConsoleMsg}`;
msgs[m].ConsoleMsg =
`${msgs[m].ConsoleMsg}\n${action.payload.ConsoleMsg}`;
}
}
} else {
Expand Down
38 changes: 19 additions & 19 deletions portal-ui/src/screens/Console/Users/UserDetails.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,25 +284,25 @@ const UserDetails = () => {
enableEnabled || disableEnabled
? ""
: hasPermission(
CONSOLE_UI_RESOURCE,
enableUserPermissions,
)
? permissionTooltipHelper(
disableUserPermissions,
"disable users",
)
: hasPermission(
CONSOLE_UI_RESOURCE,
disableUserPermissions,
)
? permissionTooltipHelper(
enableUserPermissions,
"enable users",
)
: permissionTooltipHelper(
enableDisableUserPermissions,
"enable or disable users",
)
CONSOLE_UI_RESOURCE,
enableUserPermissions,
)
? permissionTooltipHelper(
disableUserPermissions,
"disable users",
)
: hasPermission(
CONSOLE_UI_RESOURCE,
disableUserPermissions,
)
? permissionTooltipHelper(
enableUserPermissions,
"enable users",
)
: permissionTooltipHelper(
enableDisableUserPermissions,
"enable or disable users",
)
}
>
<Switch
Expand Down
Loading

0 comments on commit 38472e4

Please sign in to comment.