Skip to content

Commit 4d458c4

Browse files
bexsoftBenjamin Perezdvaldivia
authored
Updated Tiers module to be its own page (#1113)
Also refactored & did some cleanup in the code Signed-off-by: Benjamin Perez <[email protected]> Co-authored-by: Benjamin Perez <[email protected]> Co-authored-by: Daniel Valdivia <[email protected]>
1 parent aadc66a commit 4d458c4

File tree

19 files changed

+619
-491
lines changed

19 files changed

+619
-491
lines changed

pkg/acl/endpoints.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ var (
2626
notificationEndpoints = "/notification-endpoints"
2727
notificationEndpointsAddAny = "/notification-endpoints/add/:service"
2828
notificationEndpointsAdd = "/notification-endpoints/add"
29+
tiers = "/tiers"
30+
tiersAddAny = "/tiers/add/:service"
31+
tiersAdd = "/tiers/add"
2932
users = "/users"
3033
usersDetail = "/users/:userName+"
3134
groups = "/groups"
@@ -294,6 +297,9 @@ var endpointRules = map[string]ConfigurationActionSet{
294297
notificationEndpoints: configurationActionSet,
295298
notificationEndpointsAdd: configurationActionSet,
296299
notificationEndpointsAddAny: configurationActionSet,
300+
tiers: configurationActionSet,
301+
tiersAdd: configurationActionSet,
302+
tiersAddAny: configurationActionSet,
297303
users: usersActionSet,
298304
usersDetail: usersActionSet,
299305
groups: groupsActionSet,

pkg/acl/endpoints_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
7070
"admin:*",
7171
},
7272
},
73-
want: 26,
73+
want: 29,
7474
},
7575
{
7676
name: "all s3 endpoints",
@@ -89,7 +89,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
8989
"s3:*",
9090
},
9191
},
92-
want: 28,
92+
want: 31,
9393
},
9494
{
9595
name: "Console User - default endpoints",

portal-ui/public/aws-logo.svg

Lines changed: 38 additions & 0 deletions
Loading

portal-ui/public/azure-logo.svg

Lines changed: 1 addition & 0 deletions
Loading

portal-ui/public/gcs-logo.svg

Lines changed: 1 addition & 0 deletions
Loading

portal-ui/public/minio-logo.svg

Lines changed: 1 addition & 0 deletions
Loading

portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,17 @@ export const settingsCommon = {
376376
backContainer: {
377377
margin: "20px 38px 0",
378378
},
379+
mainCont: {
380+
paddingLeft: 50,
381+
paddingRight: 50,
382+
},
383+
mainTitle: {
384+
fontSize: 18,
385+
color: "#000",
386+
fontWeight: 600,
387+
marginBottom: 10,
388+
marginTop: 10,
389+
},
379390
};
380391

381392
export const typesSelection = {

portal-ui/src/screens/Console/Configurations/ConfigurationMain.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { Grid } from "@material-ui/core";
2020
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
2121
import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
2222
import ConfigurationsList from "./ConfigurationPanels/ConfigurationsList";
23-
import ListTiersConfiguration from "./TiersConfiguration/ListTiersConfiguration";
2423
import { AppState } from "../../../store";
2524
import { connect } from "react-redux";
2625
import { ISessionResponse } from "../types";
@@ -67,15 +66,6 @@ const ConfigurationMain = ({
6766
>
6867
<ListItemText primary="Configurations" />
6968
</ListItem>
70-
<ListItem
71-
button
72-
selected={selectedTab === 2}
73-
onClick={() => {
74-
setSelectedTab(2);
75-
}}
76-
>
77-
<ListItemText primary="Tiers" />
78-
</ListItem>
7969
</List>
8070
</Grid>
8171
<Grid item xs={10}>
@@ -85,12 +75,6 @@ const ConfigurationMain = ({
8575
<ConfigurationsList />
8676
</Grid>
8777
)}
88-
{selectedTab === 2 && distributedSetup && (
89-
<Grid item xs={12}>
90-
<h1 className={classes.sectionTitle}>Tiers</h1>
91-
<ListTiersConfiguration />
92-
</Grid>
93-
)}
9478
</Grid>
9579
</Grid>
9680
</Fragment>

0 commit comments

Comments
 (0)