Added object browser main paths (#302)

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>

Author: bexsoft

pkg/acl/endpoints.go

@@ -22,24 +22,26 @@ import (
 
 // endpoints definition
 var (
-	configuration   = "/configurations-list"
-	users           = "/users"
-	groups          = "/groups"
-	iamPolicies     = "/policies"
-	dashboard       = "/dashboard"
-	profiling       = "/profiling"
-	trace           = "/trace"
-	logs            = "/logs"
-	watch           = "/watch"
-	notifications   = "/notification-endpoints"
-	buckets         = "/buckets"
-	bucketsDetail   = "/buckets/:bucketName"
-	serviceAccounts = "/service-accounts"
-	tenants         = "/tenants"
-	tenantsDetail   = "/namespaces/:tenantNamespace/tenants/:tenantName"
-	heal            = "/heal"
-	remoteBuckets   = "/remote-buckets"
-	replication     = "/replication"
+	configuration     = "/configurations-list"
+	users             = "/users"
+	groups            = "/groups"
+	iamPolicies       = "/policies"
+	dashboard         = "/dashboard"
+	profiling         = "/profiling"
+	trace             = "/trace"
+	logs              = "/logs"
+	watch             = "/watch"
+	notifications     = "/notification-endpoints"
+	buckets           = "/buckets"
+	bucketsDetail     = "/buckets/:bucketName"
+	serviceAccounts   = "/service-accounts"
+	tenants           = "/tenants"
+	tenantsDetail     = "/namespaces/:tenantNamespace/tenants/:tenantName"
+	heal              = "/heal"
+	remoteBuckets     = "/remote-buckets"
+	replication       = "/replication"
+	objectBrowser     = "/object-browser/:bucket?/*"
+	mainObjectBrowser = "/object-browser"
 )
 
 type ConfigurationActionSet struct {
@@ -228,24 +230,32 @@ var replicationActionSet = ConfigurationActionSet{
 	),
 }
 
+// objectBrowserActionSet no actions needed for this module to work
+var objectBrowserActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(),
+	actions:     iampolicy.NewActionSet(),
+}
+
 // endpointRules contains the mapping between endpoints and ActionSets, additional rules can be added here
 var endpointRules = map[string]ConfigurationActionSet{
-	configuration:   configurationActionSet,
-	users:           usersActionSet,
-	groups:          groupsActionSet,
-	iamPolicies:     iamPoliciesActionSet,
-	dashboard:       dashboardActionSet,
-	profiling:       profilingActionSet,
-	trace:           traceActionSet,
-	logs:            logsActionSet,
-	watch:           watchActionSet,
-	notifications:   notificationsActionSet,
-	buckets:         bucketsActionSet,
-	bucketsDetail:   bucketsActionSet,
-	serviceAccounts: serviceAccountsActionSet,
-	heal:            healActionSet,
-	remoteBuckets:   remoteBucketsActionSet,
-	replication:     replicationActionSet,
+	configuration:     configurationActionSet,
+	users:             usersActionSet,
+	groups:            groupsActionSet,
+	iamPolicies:       iamPoliciesActionSet,
+	dashboard:         dashboardActionSet,
+	profiling:         profilingActionSet,
+	trace:             traceActionSet,
+	logs:              logsActionSet,
+	watch:             watchActionSet,
+	notifications:     notificationsActionSet,
+	buckets:           bucketsActionSet,
+	bucketsDetail:     bucketsActionSet,
+	serviceAccounts:   serviceAccountsActionSet,
+	heal:              healActionSet,
+	remoteBuckets:     remoteBucketsActionSet,
+	replication:       replicationActionSet,
+	objectBrowser:     objectBrowserActionSet,
+	mainObjectBrowser: objectBrowserActionSet,
 }
 
 // operatorRules contains the mapping between endpoints and ActionSets for operator only mode

pkg/acl/endpoints_test.go

@@ -50,7 +50,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 			args: args{
 				[]string{"admin:ServerInfo"},
 			},
-			want: 2,
+			want: 4,
 		},
 		{
 			name: "policies endpoint",
@@ -63,7 +63,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:ListUserPolicies",
 				},
 			},
-			want: 2,
+			want: 4,
 		},
 		{
 			name: "all admin endpoints",
@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 13,
+			want: 15,
 		},
 		{
 			name: "all s3 endpoints",
@@ -81,7 +81,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 4,
+			want: 6,
 		},
 		{
 			name: "all admin and s3 endpoints",
@@ -91,7 +91,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 16,
+			want: 18,
 		},
 		{
 			name: "no endpoints",

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

@@ -51,8 +51,6 @@ import Permissions from "./Permissions/Permissions";
 import Dashboard from "./Dashboard/Dashboard";
 import Menu from "./Menu/Menu";
 import api from "../../common/api";
-import storage from "local-storage-fallback";
-import NotFoundPage from "../NotFoundPage";
 import ServiceAccounts from "./ServiceAccounts/ServiceAccounts";
 import Users from "./Users/Users";
 import Groups from "./Groups/Groups";
@@ -70,6 +68,7 @@ import { saveSessionResponse } from "./actions";
 import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
 import { clearSession } from "../../common/utils";
 import RemoteBuckets from "./RemoteBuckets/RemoteBuckets";
+import ObjectBrowser from "./ObjectBrowser/ObjectBrowser";
 
 function Copyright() {
   return (
@@ -254,6 +253,14 @@ const Console = ({
       component: Buckets,
       path: "/buckets/:bucketName",
     },
+    {
+      component: ObjectBrowser,
+      path: "/object-browser/:bucket?/*",
+    },
+    {
+      component: ObjectBrowser,
+      path: "/object-browser",
+    },
     {
       component: Watch,
       path: "/watch",

portal-ui/src/screens/Console/Menu/Menu.tsx

@@ -22,6 +22,7 @@ import ListItemIcon from "@material-ui/core/ListItemIcon";
 import WebAssetIcon from "@material-ui/icons/WebAsset";
 import HealingIcon from "@material-ui/icons/Healing";
 import CloudUploadIcon from "@material-ui/icons/CloudUpload";
+import DescriptionIcon from "@material-ui/icons/Description";
 import FileCopyIcon from "@material-ui/icons/FileCopy";
 import Collapse from "@material-ui/core/Collapse";
 import ListItemText from "@material-ui/core/ListItemText";
@@ -187,17 +188,17 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       group: "User",
       type: "item",
       component: NavLink,
-      to: "/buckets",
-      name: "Buckets",
-      icon: <BucketsIcon />,
+      to: "/service-accounts",
+      name: "Service Accounts",
+      icon: <ServiceAccountsIcon />,
     },
     {
       group: "User",
       type: "item",
       component: NavLink,
-      to: "/service-accounts",
-      name: "Service Accounts",
-      icon: <ServiceAccountsIcon />,
+      to: "/object-browser",
+      name: "Object Browser",
+      icon: <DescriptionIcon />,
     },
     {
       group: "Admin",
@@ -215,6 +216,14 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       name: "Groups",
       icon: <GroupsIcon />,
     },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/buckets",
+      name: "Buckets",
+      icon: <BucketsIcon />,
+    },
     {
       group: "Admin",
       type: "item",

portal-ui/src/screens/Console/ObjectBrowser/ObjectBrowser.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+
+const ObjectBrowser = (props: any) => {
+  console.log(props);
+
+  return <React.Fragment>Object Browser</React.Fragment>;
+};
+
+export default ObjectBrowser;