Skip to content

Commit 1842caf

Browse files
authored
Fix secure component having multiple childs (#1455)
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent 80d3e8c commit 1842caf

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

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

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,35 +1158,37 @@ const ListObjects = ({
11581158
scopes={[IAM_SCOPES.S3_PUT_OBJECT]}
11591159
errorProps={{ disabled: true }}
11601160
>
1161-
<UploadFilesButton
1162-
uploadFileFunction={(closeMenu) => {
1163-
if (fileUpload && fileUpload.current) {
1164-
fileUpload.current.click();
1165-
}
1166-
closeMenu();
1167-
}}
1168-
uploadFolderFunction={(closeMenu) => {
1169-
if (folderUpload && folderUpload.current) {
1170-
folderUpload.current.click();
1171-
}
1172-
closeMenu();
1173-
}}
1174-
/>
1175-
1176-
<input
1177-
type="file"
1178-
multiple
1179-
onChange={handleUploadButton}
1180-
style={{ display: "none" }}
1181-
ref={fileUpload}
1182-
/>
1183-
<input
1184-
type="file"
1185-
multiple
1186-
onChange={handleUploadButton}
1187-
style={{ display: "none" }}
1188-
ref={folderUpload}
1189-
/>
1161+
<Fragment>
1162+
<UploadFilesButton
1163+
uploadFileFunction={(closeMenu) => {
1164+
if (fileUpload && fileUpload.current) {
1165+
fileUpload.current.click();
1166+
}
1167+
closeMenu();
1168+
}}
1169+
uploadFolderFunction={(closeMenu) => {
1170+
if (folderUpload && folderUpload.current) {
1171+
folderUpload.current.click();
1172+
}
1173+
closeMenu();
1174+
}}
1175+
/>
1176+
1177+
<input
1178+
type="file"
1179+
multiple
1180+
onChange={handleUploadButton}
1181+
style={{ display: "none" }}
1182+
ref={fileUpload}
1183+
/>
1184+
<input
1185+
type="file"
1186+
multiple
1187+
onChange={handleUploadButton}
1188+
style={{ display: "none" }}
1189+
ref={folderUpload}
1190+
/>
1191+
</Fragment>
11901192
</SecureComponent>
11911193
</Fragment>
11921194
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const styles = (theme: Theme) =>
3636
listUploadIcons: {
3737
"& .min-icon": {
3838
width: 18,
39-
fill: "rgba(0,0,0,0.87)"
39+
fill: "rgba(0,0,0,0.87)",
4040
},
4141
},
4242
});

portal-ui/tests/permissions/bucketRead.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ test
8585
.setFilesToUpload(elements.uploadInput, "../uploads/test.txt")
8686
.click(logoutItem);
8787
})("Object list table is enabled", async (t) => {
88-
const bucketsTableExists = elements.table.exists;
89-
const testBucketBrowseButton = testBucketBrowseButtonFor("bucketread3");
88+
await new Promise((resolve) => setTimeout(resolve, 2000));
9089
await t
9190
.useRole(roles.bucketRead)
92-
.click(testBucketBrowseButton)
93-
.expect(bucketsTableExists)
91+
.navigateTo("http://localhost:9090/buckets")
92+
.click(testBucketBrowseButtonFor("bucketread3"))
93+
.expect(elements.table.exists)
9494
.ok();
9595
})
9696
.after(async (t) => {

0 commit comments

Comments
 (0)