Skip to content

Commit ad240d2

Browse files
dvaldiviadvaldivia
authored
New Bucket Listing Style (#1223)
* New Bucket Listing Style Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> * Select Multiple Icon Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent 2b34fba commit ad240d2

File tree

14 files changed

+410
-330
lines changed

14 files changed

+410
-330
lines changed

‎pkg/auth/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var derivedKey = func() []byte {
5454
return pbkdf2.Key([]byte(token.GetPBKDFPassphrase()), []byte(token.GetPBKDFSalt()), 4096, 32, sha1.New)
5555
}
5656

57-
// IsSessionTokenValid returns true or false depending if the provided session token is valid or not
57+
// IsSessionTokenValid returns true or false depending upon the provided session if the token is valid or not
5858
func IsSessionTokenValid(token string) bool {
5959
_, err := SessionTokenAuthenticate(token)
6060
return err == nil

‎portal-ui/src/icons/MultipleBucketsIcon.tsx

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// This file is part of MinIO Console Server
2+
// Copyright (c) 2021 MinIO, Inc.
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Affero General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Affero General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Affero General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
17+
import * as React from "react";
18+
import { SvgIcon, SvgIconProps } from "@mui/material";
19+
20+
const MultipleBucketsIcon = (props: SvgIconProps) => {
21+
return (
22+
<SvgIcon {...props}>
23+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
24+
<g id="repliaction-icn" transform="translate(0 0)">
25+
<g
26+
id="Grupo_1696"
27+
data-name="Grupo 1696"
28+
transform="translate(3.434)"
29+
>
30+
<path
31+
id="Trazado_6841"
32+
data-name="Trazado 6841"
33+
d="M-502.661-53.081a1.054,1.054,0,0,0-.84-.432h-10.382a1.055,1.055,0,0,0-.84.432,1.272,1.272,0,0,0-.233.983l.178,1.038h7.843a1.894,1.894,0,0,1,1.509.776,2.21,2.21,0,0,1,.342.661h1.366l-.16.932h-1.107c-.005.058-.013.117-.023.175l-.518,3.021v0h1.1l-.16.932h-1.1l-.546,3.189-.005.032-.072.422h1.06a1.124,1.124,0,0,0,1.073-.975l.52-3.036c0-.006,0-.012,0-.018l.7-4.114,0-.012.518-3.024A1.271,1.271,0,0,0-502.661-53.081Z"
34+
transform="translate(514.975 53.513)"
35+
/>
36+
</g>
37+
<path
38+
id="Trazado_6842"
39+
data-name="Trazado 6842"
40+
d="M-609.21,43.432a1.055,1.055,0,0,0-.84-.432h-10.382a1.054,1.054,0,0,0-.84.432,1.271,1.271,0,0,0-.233.983c.256,1.495.8,4.646,1.226,7.16a.035.035,0,0,0,0,.005l.521,3.04a1.124,1.124,0,0,0,1.073.975h6.886a1.124,1.124,0,0,0,1.073-.975l.52-3.036,0-.018.7-4.114s0-.008,0-.012l.518-3.024A1.271,1.271,0,0,0-609.21,43.432Zm-1.924,8.519-8.214.01-.16-.932,8.534-.01Zm.708-4.131-9.629.01-.16-.932,9.949-.01Z"
41+
transform="translate(621.524 -39.595)"
42+
/>
43+
</g>
44+
</svg>
45+
</SvgIcon>
46+
);
47+
};
48+
49+
export default MultipleBucketsIcon;

‎portal-ui/src/icons/SelectMultipleIcon.tsx

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// This file is part of MinIO Console Server
2+
// Copyright (c) 2021 MinIO, Inc.
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Affero General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Affero General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Affero General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
17+
import * as React from "react";
18+
import { SvgIcon, SvgIconProps } from "@mui/material";
19+
20+
const SelectMultipleIcon = (props: SvgIconProps) => {
21+
return (
22+
<SvgIcon {...props}>
23+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
24+
<path
25+
id="bulk-icon"
26+
d="M16.5,16.5V14.356H14.357V16.5H16.5m-6.429,0V14.356H7.929V16.5h2.143m-6.429,0V14.356H1.5V16.5H3.643M16.5,10.071V7.929H14.357v2.143H16.5m-6.429,0V7.929H7.929v2.143h2.143m-6.429,0V7.929H1.5v2.143H3.643M16.5,3.643V1.5H14.357V3.643H16.5m-6.429,0V1.5H7.929V3.643h2.143m-6.429,0V1.5H1.5V3.643H3.643M17,18H13.857a1,1,0,0,1-1-1V13.857a1,1,0,0,1,1-1H17a1,1,0,0,1,1,1V17A1,1,0,0,1,17,18Zm-6.429,0H7.429a1,1,0,0,1-1-1V13.857a1,1,0,0,1,1-1h3.143a1,1,0,0,1,1,1V17A1,1,0,0,1,10.571,18ZM4.143,18H1a1,1,0,0,1-1-1V13.857a1,1,0,0,1,1-1H4.143a1,1,0,0,1,1,1V17A1,1,0,0,1,4.143,18ZM17,11.571H13.857a1,1,0,0,1-1-1V7.429a1,1,0,0,1,1-1H17a1,1,0,0,1,1,1v3.143A1,1,0,0,1,17,11.571Zm-6.429,0H7.429a1,1,0,0,1-1-1V7.429a1,1,0,0,1,1-1h3.143a1,1,0,0,1,1,1v3.143A1,1,0,0,1,10.571,11.571Zm-6.429,0H1a1,1,0,0,1-1-1V7.429a1,1,0,0,1,1-1H4.143a1,1,0,0,1,1,1v3.143A1,1,0,0,1,4.143,11.571ZM17,5.143H13.857a1,1,0,0,1-1-1V1a1,1,0,0,1,1-1H17a1,1,0,0,1,1,1V4.143A1,1,0,0,1,17,5.143Zm-6.429,0H7.429a1,1,0,0,1-1-1V1a1,1,0,0,1,1-1h3.143a1,1,0,0,1,1,1V4.143A1,1,0,0,1,10.571,5.143Zm-6.429,0H1a1,1,0,0,1-1-1V1A1,1,0,0,1,1,0H4.143a1,1,0,0,1,1,1V4.143A1,1,0,0,1,4.143,5.143Z"
27+
/>
28+
</svg>
29+
</SvgIcon>
30+
);
31+
};
32+
33+
export default SelectMultipleIcon;

‎portal-ui/src/icons/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export { default as DocumentationIcon } from "./DocumentationIcon";
5555
export { default as TrashIcon } from "./TrashIcon";
5656
export { default as DownloadIcon } from "./DownloadIcon";
5757
export { default as AllBucketsIcon } from "./AllBucketsIcon";
58+
export { default as SelectMultipleIcon } from "./SelectMultipleIcon";
5859
export { default as GroupsIcon } from "./GroupsIcon";
5960
export { default as TenantsIcon } from "./TenantsIcon";
6061
export { default as UploadFile } from "./UploadFile";

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -356,32 +356,30 @@ const BucketDetails = ({
356356
S3_DELETE_BUCKET,
357357
S3_FORCE_DELETE_BUCKET,
358358
]) && (
359-
<Tooltip title={"Delete"}>
360-
<BoxIconButton
361-
color="primary"
362-
aria-label="Delete"
363-
onClick={() => {
364-
setDeleteOpen(true);
365-
}}
366-
size="large"
367-
>
368-
<DeleteIcon />
369-
</BoxIconButton>
370-
</Tooltip>
371-
)}
372-
<Tooltip title={"Refresh"}>
373359
<BoxIconButton
360+
tooltip={"Delete"}
374361
color="primary"
375-
aria-label="Refresh List"
362+
aria-label="Delete"
376363
onClick={() => {
377-
setBucketDetailsLoad(true);
364+
setDeleteOpen(true);
378365
}}
379366
size="large"
380-
variant={"contained"}
381367
>
382-
<RefreshIcon />
368+
<DeleteIcon />
383369
</BoxIconButton>
384-
</Tooltip>
370+
)}
371+
<BoxIconButton
372+
tooltip={"Refresh"}
373+
color="primary"
374+
aria-label="Refresh List"
375+
onClick={() => {
376+
setBucketDetailsLoad(true);
377+
}}
378+
size="large"
379+
variant={"contained"}
380+
>
381+
<RefreshIcon />
382+
</BoxIconButton>
385383
</Fragment>
386384
}
387385
/>

0 commit comments

Comments
 (0)