Skip to content

Commit e82103c

Browse files
AlevskAlevsk
authored
Remove yarn warnings from portal-ui (#1207)
Signed-off-by: Lenin Alevski <[email protected]>
1 parent c2f0889 commit e82103c

File tree

11 files changed

+61
-47
lines changed

11 files changed

+61
-47
lines changed

‎pkg/acl/permissions.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,5 @@ var BucketAdminRole = iampolicy.NewActionSet(
7878
iampolicy.ReplicateTagsAction,
7979
iampolicy.GetObjectVersionForReplicationAction,
8080
iampolicy.AllActions,
81+
iampolicy.AllAdminActions,
8182
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const AccessDetails = ({
136136
setLoadingUsers(false);
137137
}
138138
}
139-
}, [loadingUsers, setErrorSnackMessage, bucketName]);
139+
}, [loadingUsers, setErrorSnackMessage, bucketName, displayUsersList]);
140140

141141
useEffect(() => {
142142
if (loadingPolicies) {
@@ -156,7 +156,7 @@ const AccessDetails = ({
156156
setLoadingPolicies(false);
157157
}
158158
}
159-
}, [loadingPolicies, setErrorSnackMessage, bucketName]);
159+
}, [loadingPolicies, setErrorSnackMessage, bucketName, displayPoliciesList]);
160160

161161
return (
162162
<Fragment>

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ const AddReplicationModal = ({
8181
const [useTLS, setUseTLS] = useState<boolean>(true);
8282
const [repDeleteMarker, setRepDeleteMarker] = useState<boolean>(true);
8383
const [repDelete, setRepDelete] = useState<boolean>(true);
84-
const [repMetadata, setRepMetadata] = useState<boolean>(true);
8584
const [tags, setTags] = useState<string>("");
8685
const [replicationMode, setReplicationMode] = useState<string>("async");
8786
const [bandwidthScalar, setBandwidthScalar] = useState<string>("100");
@@ -116,7 +115,6 @@ const AddReplicationModal = ({
116115
tags: tags,
117116
replicateDeleteMarkers: repDeleteMarker,
118117
replicateDeletes: repDelete,
119-
replicateMetadata: repMetadata,
120118
};
121119

122120
api
@@ -365,20 +363,6 @@ const AddReplicationModal = ({
365363
description={"Replicate versioned deletes"}
366364
/>
367365
</Grid>
368-
{/*TODO: This will be enabled later on when we update the dependency on mc*/}
369-
{/*<Grid item xs={12}>*/}
370-
{/* <FormSwitchWrapper*/}
371-
{/* checked={repMetadata}*/}
372-
{/* id="repMetadata"*/}
373-
{/* name="repMeta"*/}
374-
{/* label="Replicate Metadata"*/}
375-
{/* onChange={(e) => {*/}
376-
{/* setRepMetadata(e.target.checked);*/}
377-
{/* }}*/}
378-
{/* value={repMetadata}*/}
379-
{/* description={"Replicate object metadata"}*/}
380-
{/* />*/}
381-
{/*</Grid>*/}
382366
</Grid>
383367
<Grid item xs={12} className={classes.buttonContainer}>
384368
<Button

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const BucketEventsPanel = ({
113113
setLoadingEvents(false);
114114
}
115115
}
116-
}, [loadingEvents, setErrorSnackMessage, bucketName]);
116+
}, [loadingEvents, setErrorSnackMessage, bucketName, displayEvents]);
117117

118118
const eventsDisplay = (events: string[]) => {
119119
return <Fragment>{events.join(", ")}</Fragment>;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ const BucketLifecyclePanel = ({
111111
setLoadingLifecycle(false);
112112
}
113113
}
114-
}, [loadingLifecycle, setLoadingLifecycle, bucketName]);
114+
}, [
115+
loadingLifecycle,
116+
setLoadingLifecycle,
117+
bucketName,
118+
displayLifeCycleRules,
119+
]);
115120

116121
const closeEditLCAndRefresh = (refresh: boolean) => {
117122
setEditLifecycleOpen(false);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,12 @@ const BucketReplicationPanel = ({
116116
setLoadingReplication(false);
117117
}
118118
}
119-
}, [loadingReplication, setErrorSnackMessage, bucketName]);
119+
}, [
120+
loadingReplication,
121+
setErrorSnackMessage,
122+
bucketName,
123+
displayReplicationRules,
124+
]);
120125

121126
const closeAddReplication = () => {
122127
setOpenReplicationOpen(false);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ const BucketSummary = ({
261261
setLoadingEncryption(false);
262262
}
263263
}
264-
}, [loadingEncryption, bucketName]);
264+
}, [loadingEncryption, bucketName, displayGetBucketEncryptionConfiguration]);
265265

266266
useEffect(() => {
267267
if (loadingVersioning && distributedSetup) {
@@ -308,6 +308,7 @@ const BucketSummary = ({
308308
setErrorSnackMessage,
309309
bucketName,
310310
distributedSetup,
311+
displayGetBucketQuota,
311312
]);
312313

313314
useEffect(() => {
@@ -333,6 +334,7 @@ const BucketSummary = ({
333334
bucketName,
334335
loadingVersioning,
335336
distributedSetup,
337+
displayGetBucketObjectLockConfiguration,
336338
]);
337339

338340
useEffect(() => {

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ import ShareFile from "../ObjectDetails/ShareFile";
9797
import { displayComponent } from "../../../../../../utils/permissions";
9898
import {
9999
S3_DELETE_OBJECT,
100-
S3_GET_OBJECT,
101100
S3_LIST_BUCKET,
102101
S3_PUT_OBJECT,
103102
} from "../../../../../../types";
@@ -295,10 +294,6 @@ const ListObjects = ({
295294
S3_PUT_OBJECT,
296295
]);
297296

298-
const displayGetObject = displayComponent(bucketInfo?.allowedActions, [
299-
S3_GET_OBJECT,
300-
]);
301-
302297
const displayDeleteObject = displayComponent(bucketInfo?.allowedActions, [
303298
S3_DELETE_OBJECT,
304299
]);
@@ -363,7 +358,14 @@ const ListObjects = ({
363358
setLoadingVersioning(false);
364359
}
365360
}
366-
}, [bucketName, loadingVersioning, setErrorSnackMessage]);
361+
}, [
362+
bucketName,
363+
loadingVersioning,
364+
setErrorSnackMessage,
365+
bucketInfo?.allowedActions,
366+
bucketInfo?.name,
367+
displayListObjects,
368+
]);
367369

368370
// Rewind
369371
useEffect(() => {
@@ -555,6 +557,7 @@ const ListObjects = ({
555557
internalPaths,
556558
setFileModeEnabled,
557559
bucketInfo,
560+
displayListObjects,
558561
]);
559562

560563
// bucket info

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ const styles = (theme: Theme) =>
110110
textDecoration: "underline !important",
111111
color: theme.palette.info.main,
112112
},
113+
linkButton: {
114+
fontFamily: '"Lato", sans-serif',
115+
fontWeight: "normal",
116+
textTransform: "none",
117+
fontSize: "inherit",
118+
height: 0,
119+
padding: 0,
120+
margin: 0,
121+
},
113122
tableContainer: {
114123
marginLeft: 28,
115124
},
@@ -579,12 +588,15 @@ const License = ({ classes, operatorMode }: ILicenseProps) => {
579588
sure it remains free software for all its users.
580589
</Typography>
581590
<div className={classes.linkMore}>
582-
<a
583-
className={clsx(classes.link)}
591+
<Button
592+
variant="text"
593+
color="primary"
594+
size="small"
595+
className={clsx(classes.link, classes.linkButton)}
584596
onClick={() => setLicenseModal(true)}
585597
>
586598
Read more
587-
</a>
599+
</Button>
588600
</div>
589601
</Grid>
590602
</Fragment>
@@ -797,12 +809,18 @@ const License = ({ classes, operatorMode }: ILicenseProps) => {
797809
<Fragment>
798810
{item.communityLink !== undefined &&
799811
item.communityLink ? (
800-
<a
801-
className={classes.link}
812+
<Button
813+
variant="text"
814+
color="primary"
815+
size="small"
816+
className={clsx(
817+
classes.link,
818+
classes.linkButton
819+
)}
802820
onClick={() => setLicenseModal(true)}
803821
>
804822
{item.community}
805-
</a>
823+
</Button>
806824
) : (
807825
item.community
808826
)}

‎restapi/user_buckets.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ func getPolicyActionSetForBucket(bucketName string, statement []minioIAMPolicy.S
551551
bucketNameARN := fmt.Sprintf("arn:aws:s3:::%s/*", bucketName)
552552
for _, st := range statement {
553553
if st.Effect == "Allow" {
554-
555554
if len(st.Resources.ToSlice()) == 0 {
556555
mergedActions := append(bucketActions.ToSlice(), st.Actions.ToSlice()...)
557556
bucketActions = minioIAMPolicy.NewActionSet(mergedActions...)

0 commit comments

Comments
 (0)