update to v0.4.3

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

README.md

@@ -101,8 +101,6 @@ Additionally, you can create policies to limit the privileges for `console` user
 To run the server:
 
 ```
-export CONSOLE_HMAC_JWT_SECRET=YOURJWTSIGNINGSECRET
-
 #required to encrypt jwet payload
 export CONSOLE_PBKDF_PASSPHRASE=SECRET
 

docs/console_operator_mode.md

@@ -2,7 +2,7 @@
 
 `Console` will authenticate against `Kubernetes`using bearer tokens via HTTP `Authorization` header. The user will provide this token once
 in the login form, Console will validate it against Kubernetes (list apis) and if valid will generate and return a new Console sessions 
-with encrypted claims (the user Service account token will be inside the JWT in the data field)
+with encrypted claims (the user Service account token will be inside the session encrypted token
 
 # Kubernetes
 

k8s/console/base/console-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.4.0
+          image: minio/console:v0.4.3
           imagePullPolicy: "IfNotPresent"
           args:
             - server

k8s/operator-console/base/console-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: minio/console:v0.4.0
+          image: minio/console:v0.4.3
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CONSOLE_OPERATOR_MODE

models/bucket_object.go

@@ -35,14 +35,41 @@ type BucketObject struct {
 	// content type
 	ContentType string `json:"content_type,omitempty"`
 
+	// expiration
+	Expiration string `json:"expiration,omitempty"`
+
+	// expiration rule id
+	ExpirationRuleID string `json:"expiration_rule_id,omitempty"`
+
+	// is delete marker
+	IsDeleteMarker bool `json:"is_delete_marker,omitempty"`
+
+	// is latest
+	IsLatest bool `json:"is_latest,omitempty"`
+
 	// last modified
 	LastModified string `json:"last_modified,omitempty"`
 
+	// legal hold status
+	LegalHoldStatus string `json:"legal_hold_status,omitempty"`
+
 	// name
 	Name string `json:"name,omitempty"`
 
+	// retention mode
+	RetentionMode string `json:"retention_mode,omitempty"`
+
+	// retention until date
+	RetentionUntilDate string `json:"retention_until_date,omitempty"`
+
 	// size
 	Size int64 `json:"size,omitempty"`
+
+	// user tags
+	UserTags map[string]string `json:"user_tags,omitempty"`
+
+	// version id
+	VersionID string `json:"version_id,omitempty"`
 }
 
 // Validate validates this bucket object

models/object_legal_hold_status.go

@@ -0,0 +1,80 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"encoding/json"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/validate"
+)
+
+// ObjectLegalHoldStatus object legal hold status
+//
+// swagger:model objectLegalHoldStatus
+type ObjectLegalHoldStatus string
+
+const (
+
+	// ObjectLegalHoldStatusEnabled captures enum value "enabled"
+	ObjectLegalHoldStatusEnabled ObjectLegalHoldStatus = "enabled"
+
+	// ObjectLegalHoldStatusDisabled captures enum value "disabled"
+	ObjectLegalHoldStatusDisabled ObjectLegalHoldStatus = "disabled"
+)
+
+// for schema
+var objectLegalHoldStatusEnum []interface{}
+
+func init() {
+	var res []ObjectLegalHoldStatus
+	if err := json.Unmarshal([]byte(`["enabled","disabled"]`), &res); err != nil {
+		panic(err)
+	}
+	for _, v := range res {
+		objectLegalHoldStatusEnum = append(objectLegalHoldStatusEnum, v)
+	}
+}
+
+func (m ObjectLegalHoldStatus) validateObjectLegalHoldStatusEnum(path, location string, value ObjectLegalHoldStatus) error {
+	if err := validate.EnumCase(path, location, value, objectLegalHoldStatusEnum, true); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Validate validates this object legal hold status
+func (m ObjectLegalHoldStatus) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	// value enum
+	if err := m.validateObjectLegalHoldStatusEnum("", "body", m); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

models/put_object_legal_hold_request.go

@@ -0,0 +1,83 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// PutObjectLegalHoldRequest put object legal hold request
+//
+// swagger:model putObjectLegalHoldRequest
+type PutObjectLegalHoldRequest struct {
+
+	// status
+	// Required: true
+	Status ObjectLegalHoldStatus `json:"status"`
+}
+
+// Validate validates this put object legal hold request
+func (m *PutObjectLegalHoldRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateStatus(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *PutObjectLegalHoldRequest) validateStatus(formats strfmt.Registry) error {
+
+	if err := m.Status.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("status")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *PutObjectLegalHoldRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *PutObjectLegalHoldRequest) UnmarshalBinary(b []byte) error {
+	var res PutObjectLegalHoldRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

pkg/acl/endpoints.go

@@ -42,6 +42,7 @@ var (
 	replication       = "/replication"
 	objectBrowser     = "/object-browser/:bucket?"
 	mainObjectBrowser = "/object-browser"
+	license           = "/license"
 )
 
 type ConfigurationActionSet struct {
@@ -236,6 +237,12 @@ var objectBrowserActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
+// licenseActionSet no actions needed for this module to work
+var licenseActionSet = 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,
@@ -256,6 +263,7 @@ var endpointRules = map[string]ConfigurationActionSet{
 	replication:       replicationActionSet,
 	objectBrowser:     objectBrowserActionSet,
 	mainObjectBrowser: objectBrowserActionSet,
+	license:           licenseActionSet,
 }
 
 // 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: 4,
+			want: 5,
 		},
 		{
 			name: "policies endpoint",
@@ -63,7 +63,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:ListUserPolicies",
 				},
 			},
-			want: 4,
+			want: 5,
 		},
 		{
 			name: "all admin endpoints",
@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 15,
+			want: 16,
 		},
 		{
 			name: "all s3 endpoints",
@@ -81,7 +81,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 6,
+			want: 7,
 		},
 		{
 			name: "all admin and s3 endpoints",
@@ -91,7 +91,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 18,
+			want: 19,
 		},
 		{
 			name: "no endpoints",

pkg/auth/token/config.go

@@ -23,10 +23,9 @@ import (
 	"github.com/minio/minio/pkg/env"
 )
 
-// ConsoleSTSAndJWTDurationSeconds returns the default session duration for the STS requested tokens and the generated JWTs.
-// Ideally both values should match so jwt and Minio sts sessions expires at the same time.
-func GetConsoleSTSAndJWTDurationInSeconds() int {
-	duration, err := strconv.Atoi(env.Get(ConsoleSTSAndJWTDurationSeconds, "3600"))
+// ConsoleSTSDurationSeconds returns the default session duration for the STS requested tokens.
+func GetConsoleSTSDurationInSeconds() int {
+	duration, err := strconv.Atoi(env.Get(ConsoleSTSDurationSeconds, "3600"))
 	if err != nil {
 		duration = 3600
 	}

pkg/auth/token/const.go

@@ -17,7 +17,7 @@
 package token
 
 const (
-	ConsoleSTSAndJWTDurationSeconds = "CONSOLE_STS_AND_JWT_DURATION_SECONDS"
-	ConsolePBKDFPassphrase          = "CONSOLE_PBKDF_PASSPHRASE"
-	ConsolePBKDFSalt                = "CONSOLE_PBKDF_SALT"
+	ConsoleSTSDurationSeconds = "CONSOLE_STS_DURATION_SECONDS"
+	ConsolePBKDFPassphrase    = "CONSOLE_PBKDF_PASSPHRASE"
+	ConsolePBKDFSalt          = "CONSOLE_PBKDF_SALT"
 )

pkg/auth/token_test.go

@@ -60,17 +60,17 @@ func TestJWTAuthenticate(t *testing.T) {
 		funcAssert.Equal(claims.SecretAccessKey, creds.SecretAccessKey)
 		funcAssert.Equal(claims.SessionToken, creds.SessionToken)
 	}
-	// Test-2 : SessionTokenAuthenticate() return an error because of a tampered jwt
+	// Test-2 : SessionTokenAuthenticate() return an error because of a tampered token
 	if _, err := SessionTokenAuthenticate(badToken); err != nil {
 		funcAssert.Equal("session token internal data is malformed", err.Error())
 	}
-	// Test-3 : SessionTokenAuthenticate() return an error because of an empty jwt
+	// Test-3 : SessionTokenAuthenticate() return an error because of an empty token
 	if _, err := SessionTokenAuthenticate(""); err != nil {
 		funcAssert.Equal("session token missing", err.Error())
 	}
 }
 
-func TestIsJWTValid(t *testing.T) {
+func TestSessionTokenValid(t *testing.T) {
 	funcAssert := assert.New(t)
 	// Test-1 : SessionTokenAuthenticate() provided token is valid
 	funcAssert.Equal(true, IsSessionTokenValid(goodToken))

portal-ui/package.json

@@ -28,7 +28,6 @@
     "local-storage-fallback": "^4.1.1",
     "lodash": "^4.17.19",
     "moment": "^2.24.0",
-    "npm": "^6.14.4",
     "react": "^16.13.1",
     "react-app-rewire-hot-loader": "^2.0.1",
     "react-app-rewired": "^2.1.6",
@@ -40,7 +39,7 @@
     "react-moment": "^0.9.7",
     "react-redux": "^7.1.3",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "3.4.1",
+    "react-scripts": "3.4.4",
     "recharts": "^1.8.5",
     "redux": "^4.0.4",
     "redux-thunk": "^2.3.0",

portal-ui/public/images/BG_IllustrationDarker.svg

@@ -0,0 +1,67 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 368.999 192.934">
+    <defs>
+        <style>
+            .cls-1{opacity:0.35;}.cls-12,.cls-15,.cls-16,.cls-17,.cls-2,.cls-5,.cls-6,.cls-7,.cls-8{opacity:0.5;}.cls-10,.cls-11,.cls-12,.cls-13,.cls-14,.cls-15,.cls-16,.cls-17,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-9{fill:none;stroke:#707070;stroke-miterlimit:10;}.cls-4{stroke-width:1px;}.cls-10,.cls-11,.cls-5,.cls-9{stroke-width:1.2px;}.cls-5{stroke-dasharray:2.619
+            2.182;}.cls-12,.cls-15,.cls-16,.cls-17,.cls-5,.cls-6,.cls-7,.cls-8{isolation:isolate;}.cls-6{stroke-width:1.6px;stroke-dasharray:2.144
+            1.786;}.cls-7{stroke-width:1.6px;stroke-dasharray:2.23 1.858;}.cls-10{stroke-dasharray:2.646
+            2.204;}.cls-11{stroke-dasharray:2.585 2.154;}.cls-12{stroke-width:1.8px;stroke-dasharray:2.484
+            2.07;}.cls-13{stroke-dasharray:2.984 2.487;}.cls-14{stroke-dasharray:2.773
+            2.311;}.cls-16{stroke-width:1.8px;}.cls-17{stroke-width:1.8px;}
+        </style>
+    </defs>
+    <title>BG_Illustration</title>
+    <g id="Layer_2" data-name="Layer 2">
+        <g id="Layer_1-2" data-name="Layer 1">
+            <g id="BG_Illustration" data-name="BG Illustration" class="cls-1">
+                <g id="Group_118" data-name="Group 118" class="cls-2">
+                    <path id="Path_56" data-name="Path 56" class="cls-3"
+                          d="M211.5,140.678l-52.726,29.078L79.687,126.139V29.652L132.411.571,211.5,44.188Z"/>
+                    <path id="Path_58" data-name="Path 58" class="cls-3"
+                          d="M158.776,169.756V73.271L211.5,44.193,158.776,73.271,79.688,29.654"/>
+                    <path id="Path_59" data-name="Path 59" class="cls-4" d="M84.681,41l69.1,38.11v79.3l-69.1-38.11Z"/>
+                    <line id="Line_37" data-name="Line 37" class="cls-4" x1="106.25" y1="52.782" x2="106.25"
+                          y2="132.086"/>
+                    <line id="Line_38" data-name="Line 38" class="cls-4" x1="153.783" y1="92.327" x2="106.25"
+                          y2="65.999"/>
+                    <line id="Line_39" data-name="Line 39" class="cls-4" x1="153.783" y1="105.545" x2="106.25"
+                          y2="79.217"/>
+                    <line id="Line_40" data-name="Line 40" class="cls-4" x1="153.783" y1="118.762" x2="106.25"
+                          y2="92.434"/>
+                    <line id="Line_41" data-name="Line 41" class="cls-4" x1="153.783" y1="131.979" x2="106.25"
+                          y2="105.651"/>
+                    <line id="Line_42" data-name="Line 42" class="cls-4" x1="153.783" y1="145.197" x2="106.25"
+                          y2="118.869"/>
+                    <path id="Path_60" data-name="Path 60" class="cls-4"
+                          d="M166.723,151.031l38.8-22.487V62.916L166.723,85.4Z"/>
+                </g>
+                <path id="Path_62" data-name="Path 62" class="cls-5" d="M117.106,148.062l-76.18,43.33"/>
+                <path id="Path_63" data-name="Path 63" class="cls-6" d="M271.394,167.271l-44.483,25.3"/>
+                <path id="Path_64" data-name="Path 64" class="cls-7" d="M190.722,155.708l61.951,36.031"/>
+                <path id="Path_65" data-name="Path 65" class="cls-5" d="M237.7,36.385l28.182,17.229"/>
+                <g id="Path_66" data-name="Path 66" class="cls-8">
+                    <line class="cls-9" x1="362.563" y1="69.327" x2="361.42" y2="68.688"/>
+                    <line class="cls-10" x1="359.496" y1="67.613" x2="305.418" y2="37.39"/>
+                    <polyline class="cls-9" points="304.456 36.852 303.313 36.213 302.158 36.83"/>
+                    <line class="cls-11" x1="300.258" y1="37.844" x2="213.418" y2="84.213"/>
+                    <line class="cls-9" x1="212.468" y1="84.72" x2="211.313" y2="85.337"/>
+                </g>
+                <path id="Path_67" data-name="Path 67" class="cls-12"
+                      d="M79.648,192.571,31.786,166.344h-.868l-23.579,14.2"/>
+                <g id="Path_68" data-name="Path 68" class="cls-8">
+                    <line class="cls-3" x1="22.871" y1="84.641" x2="24.156" y2="83.867"/>
+                    <line class="cls-13" x1="26.286" y1="82.584" x2="48.654" y2="69.113"/>
+                    <polyline class="cls-3" points="49.719 68.471 51.004 67.698 52.307 68.441"/>
+                    <line class="cls-14" x1="54.315" y1="69.585" x2="75.395" y2="81.606"/>
+                    <line class="cls-3" x1="76.399" y1="82.178" x2="77.702" y2="82.921"/>
+                </g>
+                <circle id="Ellipse_11" data-name="Ellipse 11" class="cls-15" cx="4.092" cy="183.59" r="3.592"/>
+                <circle id="Ellipse_12" data-name="Ellipse 12" class="cls-15" cx="274.986" cy="165.477" r="3.592"/>
+                <ellipse id="Ellipse_13" data-name="Ellipse 13" class="cls-16" cx="364.957" cy="71.922" rx="3.592"
+                         ry="2.904"/>
+                <circle id="Ellipse_14" data-name="Ellipse 14" class="cls-15" cx="19.279" cy="87.681" r="3.592"/>
+                <ellipse id="Ellipse_15" data-name="Ellipse 15" class="cls-17" cx="234.106" cy="32.58" rx="3.592"
+                         ry="2.649"/>
+            </g>
+        </g>
+    </g>
+</svg>

portal-ui/src/Routes.tsx

@@ -15,7 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React from "react";
-import { Redirect, Route, Router, Switch } from "react-router-dom";
+import {
+  Redirect,
+  Route,
+  Router,
+  Switch,
+  BrowserRouter,
+} from "react-router-dom";
 import history from "./history";
 import Login from "./screens/LoginPage/LoginPage";
 import Console from "./screens/Console/Console";
@@ -27,6 +33,22 @@ import { userLoggedIn } from "./actions";
 import LoginCallback from "./screens/LoginPage/LoginCallback";
 import { hot } from "react-hot-loader/root";
 
+interface ProtectedRouteProps {
+  loggedIn: boolean;
+  component: any;
+}
+
+export class ProtectedRoute extends React.Component<ProtectedRouteProps> {
+  render() {
+    const Component = this.props.component;
+    return this.props.loggedIn ? (
+      <Component />
+    ) : (
+      <Redirect to={{ pathname: "/login" }} />
+    );
+  }
+}
+
 const isLoggedIn = () => {
   return (
     storage.getItem("token") !== undefined &&
@@ -47,29 +69,14 @@ interface RoutesProps {
 }
 
 class Routes extends React.Component<RoutesProps> {
-  componentDidMount(): void {
-    if (isLoggedIn()) {
-      this.props.userLoggedIn(true);
-    }
-  }
-
   render() {
+    const loggedIn = isLoggedIn();
     return (
       <Router history={history}>
         <Switch>
           <Route exact path="/oauth_callback" component={LoginCallback} />
           <Route exact path="/login" component={Login} />
-          {this.props.loggedIn ? (
-            <Switch>
-              <Route path="/*" component={Console} />
-              <Route component={NotFoundPage} />
-            </Switch>
-          ) : (
-            <Switch>
-              <Route exact path="/" component={Login} />
-              <Redirect to="/" />
-            </Switch>
-          )}
+          <ProtectedRoute component={Console} loggedIn={loggedIn} />
         </Switch>
       </Router>
     );

portal-ui/src/icons/AddIcon.tsx

@@ -0,0 +1,34 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class AddIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon viewBox="0 0 12 12">
+        <path
+          fill="#081c42"
+          className="a"
+          d="M-13160.269,1885.114h-3.235v-4.381h-4.382V1877.5h4.382v-4.381h3.235v4.381h4.383v3.238h-4.383v4.38Z"
+          transform="translate(13167.886 -1873.114)"
+        />
+      </SvgIcon>
+    );
+  }
+}
+
+export default AddIcon;

portal-ui/src/icons/AllBucketsIcon.tsx

@@ -0,0 +1,75 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class AllBucketsIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon viewBox="0 0 15.834 17.375">
+        <defs>
+          <linearGradient
+            id="a"
+            y1="0.5"
+            x2="1"
+            y2="0.5"
+            gradientUnits="objectBoundingBox"
+          >
+            <stop offset="0.044" stopColor="#362585" />
+            <stop offset="0.301" stopColor="#281b6f" />
+            <stop offset="1" stopColor="#1e1560" />
+          </linearGradient>
+        </defs>
+        <g transform="translate(0 0.375)">
+          <circle
+            style={{ opacity: 0.1, fill: "url(#a)" }}
+            cx="6.625"
+            cy="6.625"
+            r="6.625"
+            transform="translate(0 3.75)"
+          />
+          <g transform="translate(3.092)">
+            <ellipse
+              style={{
+                fill: "none",
+                stroke: "#707070",
+                strokeMiterlimit: 10,
+                strokeWidth: "0.75px",
+              }}
+              cx="6.183"
+              cy="1.244"
+              rx="6.183"
+              ry="1.244"
+              transform="translate(0)"
+            />
+            <path
+              style={{
+                fill: "none",
+                stroke: "#707070",
+                strokeMiterlimit: 10,
+                strokeWidth: "0.75px",
+              }}
+              d="M-3722.174,1225.225l-1.687,10.292a.858.858,0,0,1-.578.669,12.182,12.182,0,0,1-3.918.647,12.187,12.187,0,0,1-3.894-.639.878.878,0,0,1-.6-.678q-.843-5.145-1.687-10.291"
+              transform="translate(3734.541 -1223.981)"
+            />
+          </g>
+        </g>
+      </SvgIcon>
+    );
+  }
+}
+
+export default AllBucketsIcon;

portal-ui/src/icons/ConsoleIcon.tsx

@@ -0,0 +1,37 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class ConsoleIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+          <g transform="translate(-518 -361)">
+            <path
+              d="M-126,0V10h10V0Zm1.5,8.5V2.95h7V8.5Z"
+              transform="translate(644 361)"
+            />
+            <rect width="2" height="1" transform="translate(520.272 364.772)" />
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default ConsoleIcon;

portal-ui/src/icons/EgressIcon.tsx

@@ -0,0 +1,73 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class EgressIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon viewBox="0 0 18.344 17.009">
+        <defs>
+          <linearGradient
+            id="a"
+            y1="0.5"
+            x2="1"
+            y2="0.5"
+            gradientUnits="objectBoundingBox"
+          >
+            <stop offset="0.044" stopColor="#362585" />
+            <stop offset="0.301" stopColor="#281b6f" />
+            <stop offset="1" stopColor="#1e1560" />
+          </linearGradient>
+        </defs>
+        <g transform="translate(0 0.25)">
+          <ellipse
+            style={{ opacity: 0.1, fill: "url(#a)" }}
+            cx="7.462"
+            cy="7.462"
+            rx="7.462"
+            ry="7.462"
+            transform="translate(0 1.835)"
+          />
+          <rect
+            style={{
+              fill: "none",
+              stroke: "#707070",
+              strokeMiterlimit: 10,
+              strokeWidth: "0.5px",
+            }}
+            width="9.323"
+            height="9.323"
+            transform="translate(4.083)"
+          />
+          <rect
+            style={{
+              fill: "none",
+              stroke: "#707070",
+              strokeMiterlimit: 10,
+              strokeWidth: "0.5px",
+            }}
+            width="8.223"
+            height="8.223"
+            transform="translate(9.871 5.307)"
+          />
+        </g>
+      </SvgIcon>
+    );
+  }
+}
+
+export default EgressIcon;

portal-ui/src/icons/HealIcon.tsx

@@ -0,0 +1,53 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class HealIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.014 9.993">
+          <path
+            className="a"
+            d="M9.162,5.971h0L8.192,5,9.346,3.846a2.257,2.257,0,0,0,0-3.192,2.311,2.311,0,0,0-3.192,0L5,1.808,4.029.837,3.846.654a2.311,2.311,0,0,0-3.192,0,2.257,2.257,0,0,0,0,3.192l.184.183h0L1.808,5,.654,6.154A2.257,2.257,0,0,0,3.846,9.346L5,8.192l.971.971.183.183A2.257,2.257,0,0,0,9.346,6.154Zm-2.29-4.6a1.27,1.27,0,0,1,1.757,0,1.242,1.242,0,0,1,0,1.757L7.475,4.283,5.717,2.525Zm-5.5,1.757A1.243,1.243,0,0,1,3.129,1.371l.183.183L1.555,3.312Zm1.757,5.5a1.27,1.27,0,0,1-1.757,0,1.242,1.242,0,0,1,0-1.757L2.525,5.717,4.283,7.475Zm2.843-.9-.254-.253L2.525,4.283l-.253-.254L4.029,2.272l.254.253L7.475,5.717l.253.254Zm2.657.9a1.271,1.271,0,0,1-1.757,0l-.183-.183L8.446,6.688l.183.183h0a1.241,1.241,0,0,1,0,1.757Z"
+            transform="translate(0.007 -0.014)"
+          />
+          <circle
+            cx="0.5"
+            cy="0.5"
+            r="0.5"
+            transform="translate(4.507 4.486)"
+          />
+          <circle
+            cx="0.5"
+            cy="0.5"
+            r="0.5"
+            transform="translate(3.507 3.486)"
+          />
+          <circle
+            cx="0.5"
+            cy="0.5"
+            r="0.5"
+            transform="translate(5.507 5.486)"
+          />
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default HealIcon;

portal-ui/src/icons/LicenseIcon.tsx

@@ -0,0 +1,47 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+
+class LicenseIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 11">
+          <path fill="#fff" d="M11 11H0V2h11v9zM2 8v1h7V8zm0-3v1h5V5z"></path>
+          <g
+            fill="#07274a"
+            stroke="#fdfdfd"
+            strokeWidth="0.5"
+            transform="translate(7)"
+          >
+            <circle cx="3" cy="3" r="3" stroke="none"></circle>
+            <circle cx="3" cy="3" r="2.75" fill="none"></circle>
+          </g>
+          <path
+            fill="none"
+            stroke="#fff"
+            strokeWidth="0.5"
+            d="M8.73 2.794l.954.953 1.471-1.471"
+          ></path>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default LicenseIcon;

portal-ui/src/icons/LogoutIcon.tsx

@@ -0,0 +1,47 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class LogoutIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12.122 10.571">
+          <g transform="translate(0 0.5)">
+            <path
+              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+              d="M4816.27,3755.205v-2.939h8.539v9.571h-8.539v-2.932"
+              transform="translate(-4813.187 -3752.266)"
+            />
+            <path
+              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+              d="M4813.187,3757.052h8.081"
+              transform="translate(-4813.187 -3752.266)"
+            />
+            <path
+              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+              d="M4806.5,3756.511l2.265,2.063-2.265,2.063"
+              transform="translate(-4800.808 -3753.863)"
+            />
+          </g>
+        </svg>
+      </SvgIcon>
+    );
+  }
+}
+
+export default LogoutIcon;

portal-ui/src/icons/RemoveIcon.tsx

@@ -14,19 +14,20 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-export interface IRemoteBucketsResponse {
-  buckets: IRemoteBucket[];
-  total: number;
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class RemoveIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon viewBox="0 0 11.656 3.101">
+        <path
+          fill="#081c42"
+          d="M-13157.172,1879.551h-11.656v-3.1h11.656v3.1Z"
+          transform="translate(13168.828 -1876.449)"
+        />
+      </SvgIcon>
+    );
+  }
 }
 
-export interface IRemoteBucket {
-  name: string;
-  accessKey: string;
-  secretKey: string;
-  sourceBucket: string;
-  targetURL: string;
-  targetBucket: string;
-  remoteARN: string;
-  status: string;
-  service: string;
-}
+export default RemoveIcon;

portal-ui/src/icons/UsageIcon.tsx

@@ -0,0 +1,64 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+class UsageIcon extends React.Component {
+  render() {
+    return (
+      <SvgIcon viewBox="0 0 16.172 17.187">
+        <defs>
+          <linearGradient
+            id="a"
+            y1="0.5"
+            x2="1"
+            y2="0.5"
+            gradientUnits="objectBoundingBox"
+          >
+            <stop offset="0.044" stopColor="#362585" />
+            <stop offset="0.301" stopColor="#281b6f" />
+            <stop offset="1" stopColor="#1e1560" />
+          </linearGradient>
+        </defs>
+        <path
+          style={{
+            fill: "none",
+            stroke: "#707070",
+            strokeMiterlimit: 10,
+            strokeWidth: "0.5px",
+          }}
+          d="M-4778.1,2239.582v6.425h6.425"
+          transform="translate(4787.594 -2239.582)"
+        />
+        <path
+          fill={"#707070"}
+          d="M-4784.238,2247.532v-.581c0-.027.009-.054.012-.081.039-.313.055-.632.121-.939a6.744,6.744,0,0,1,3.064-4.441,6.514,6.514,0,0,1,3.293-1.032,6.923,6.923,0,0,1,2.667.423,6.793,6.793,0,0,1,4.119,4.333,6.053,6.053,0,0,1,.279,1.337c.006.083.014.164.021.247v.86c-.011.131-.018.261-.032.392a6.494,6.494,0,0,1-.626,2.147,6.807,6.807,0,0,1-4.044,3.528,6.052,6.052,0,0,1-1.663.3,6.576,6.576,0,0,1-2.565-.325,6.73,6.73,0,0,1-3.947-3.451,6.627,6.627,0,0,1-.658-2.288C-4784.212,2247.816-4784.225,2247.674-4784.238,2247.532Zm13.025-.306c-.024-.309-.021-.661-.082-1a6.206,6.206,0,0,0-1.658-3.293,6.153,6.153,0,0,0-4.1-1.9,5.984,5.984,0,0,0-2.476.355,6.188,6.188,0,0,0-4.134,5.708,6.453,6.453,0,0,0,.228,1.881,6.127,6.127,0,0,0,1.984,3.052,6.046,6.046,0,0,0,3.806,1.445,6.043,6.043,0,0,0,1.235-.065,6.249,6.249,0,0,0,3.783-2.2,6.2,6.2,0,0,0,1.352-3.048C-4771.228,2247.863-4771.233,2247.563-4771.212,2247.226Z"
+          transform="translate(4786.834 -2240.452)"
+        />
+        <ellipse
+          style={{ opacity: 0.1, fill: "url(#a)" }}
+          cx="6.151"
+          cy="6.151"
+          rx="6.151"
+          ry="6.151"
+          transform="translate(0 4.886)"
+        />
+      </SvgIcon>
+    );
+  }
+}
+
+export default UsageIcon;

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

@@ -38,6 +38,7 @@ import {
 } from "../actions";
 import { useDebounce } from "use-debounce";
 import { MakeBucketRequest } from "../types";
+import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -52,7 +53,12 @@ const styles = (theme: Theme) =>
       alignItems: "center" as const,
       justifyContent: "flex-start" as const,
     },
+    quotaSizeContainer: {
+      flexGrow: 1,
+    },
     sizeFactorContainer: {
+      flexGrow: 0,
+      maxWidth: 80,
       marginLeft: 8,
       alignSelf: "flex-start" as const,
     },
@@ -97,6 +103,7 @@ const AddBucket = ({
   const [bName, setBName] = useState<string>(bucketName);
   const [addLoading, setAddLoading] = useState<boolean>(false);
   const [addError, setAddError] = useState<string>("");
+  const [sendEnabled, setSendEnabled] = useState<boolean>(false);
 
   const addRecord = (event: React.FormEvent) => {
     event.preventDefault();
@@ -135,10 +142,34 @@ const AddBucket = ({
   const [value] = useDebounce(bName, 1000);
 
   useEffect(() => {
-    console.log("called");
     addBucketName(value);
   }, [value]);
 
+  const resetForm = () => {
+    setBName("");
+    addBucketVersioned(false);
+    addBucketQuota(false);
+    addBucketQuotaType("hard");
+    addBucketQuotaSize("1");
+    addBucketQuotaUnit("TiB");
+  };
+
+  useEffect(() => {
+    let valid = false;
+
+    if (bName.trim() !== "") {
+      valid = true;
+    }
+
+    if (enableQuota && valid) {
+      if (quotaSize.trim() === "" || parseInt(quotaSize) === 0) {
+        valid = false;
+      }
+    }
+
+    setSendEnabled(valid);
+  }, [bName, versioned, quotaType, quotaSize, quotaUnit, enableQuota]);
+
   return (
     <ModalWrapper
       title="Create Bucket"
@@ -182,7 +213,7 @@ const AddBucket = ({
               />
             </Grid>
             <Grid item xs={12}>
-              <CheckboxWrapper
+              <FormSwitchWrapper
                 value="versioned"
                 id="versioned"
                 name="versioned"
@@ -190,11 +221,12 @@ const AddBucket = ({
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                   addBucketVersioned(event.target.checked);
                 }}
-                label={"Turn On Versioning"}
+                label={"Versioning"}
+                indicatorLabel={"On"}
               />
             </Grid>
             <Grid item xs={12}>
-              <CheckboxWrapper
+              <FormSwitchWrapper
                 value="bucket_quota"
                 id="bucket_quota"
                 name="bucket_quota"
@@ -203,6 +235,7 @@ const AddBucket = ({
                   addBucketQuota(event.target.checked);
                 }}
                 label={"Enable Bucket Quota"}
+                indicatorLabel={"On"}
               />
             </Grid>
             {enableQuota && (
@@ -224,7 +257,7 @@ const AddBucket = ({
                 </Grid>
                 <Grid item xs={12}>
                   <div className={classes.multiContainer}>
-                    <div>
+                    <div className={classes.quotaSizeContainer}>
                       <InputBoxWrapper
                         type="number"
                         id="quota_size"
@@ -232,7 +265,7 @@ const AddBucket = ({
                         onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                           addBucketQuotaSize(e.target.value);
                         }}
-                        label="Size"
+                        label="Quota"
                         value={quotaSize}
                         required
                         min="1"
@@ -240,7 +273,7 @@ const AddBucket = ({
                     </div>
                     <div className={classes.sizeFactorContainer}>
                       <SelectWrapper
-                        label=""
+                        label="&nbsp;"
                         id="quota_unit"
                         name="quota_unit"
                         value={quotaUnit}
@@ -258,11 +291,19 @@ const AddBucket = ({
             )}
           </Grid>
           <Grid item xs={12} className={classes.buttonContainer}>
+            <button
+              type="button"
+              color="primary"
+              className={classes.clearButton}
+              onClick={resetForm}
+            >
+              Clear
+            </button>
             <Button
               type="submit"
               variant="contained"
               color="primary"
-              disabled={addLoading}
+              disabled={addLoading || !sendEnabled}
             >
               Save
             </Button>

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

@@ -33,9 +33,12 @@ import { CreateIcon } from "../../../../icons";
 import { niceBytes } from "../../../../common/utils";
 import { AppState } from "../../../../store";
 import { connect } from "react-redux";
-import { logMessageReceived, logResetMessages } from "../../Logs/actions";
 import { addBucketOpen, addBucketReset } from "../actions";
-import { containerForHeader } from "../../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../../Common/PageHeader/PageHeader";
 
 const styles = (theme: Theme) =>
@@ -68,18 +71,8 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 

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

@@ -26,7 +26,6 @@ import {
   LinearProgress,
 } from "@material-ui/core";
 import api from "../../../../../../common/api";
-import { BucketObjectsList } from "../ListObjects/types";
 import Typography from "@material-ui/core/Typography";
 
 const styles = (theme: Theme) =>
@@ -68,13 +67,14 @@ class DeleteObject extends React.Component<
     if (selectedObject.endsWith("/")) {
       recursive = true;
     }
+
     this.setState({ deleteLoading: true }, () => {
       api
         .invoke(
           "DELETE",
           `/api/v1/buckets/${selectedBucket}/objects?path=${selectedObject}&recursive=${recursive}`
         )
-        .then((res: BucketObjectsList) => {
+        .then((res: any) => {
           this.setState(
             {
               deleteLoading: false,
@@ -142,10 +142,12 @@ class DeleteObject extends React.Component<
           </Button>
           <Button
             onClick={() => {
-              this.removeRecord();
+              this.setState({ deleteError: "" }, () => {
+                this.removeRecord();
+              });
             }}
             color="secondary"
-            autoFocus
+            disabled={deleteLoading}
           >
             Delete
           </Button>

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

@@ -16,21 +16,29 @@
 
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import Grid from "@material-ui/core/Grid";
-import { Button } from "@material-ui/core";
-import Typography from "@material-ui/core/Typography";
 import TextField from "@material-ui/core/TextField";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
 import { BucketObject, BucketObjectsList } from "./types";
 import api from "../../../../../../common/api";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import TableWrapper from "../../../../Common/TableWrapper/TableWrapper";
-import { MinTablePaginationActions } from "../../../../../../common/MinTablePaginationActions";
-import { CreateIcon } from "../../.././../../../icons";
 import { niceBytes } from "../../../../../../common/utils";
-import Moment from "react-moment";
 import DeleteObject from "./DeleteObject";
 
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../../../../Common/FormComponents/common/styleLibrary";
+import PageHeader from "../../../../Common/PageHeader/PageHeader";
+import storage from "local-storage-fallback";
+import { isNullOrUndefined } from "util";
+import { Button, Input } from "@material-ui/core";
+import * as reactMoment from "react-moment";
+import { CreateIcon } from "../../../../../../icons";
+import Snackbar from "@material-ui/core/Snackbar";
+
 const styles = (theme: Theme) =>
   createStyles({
     seeMore: {
@@ -61,18 +69,9 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
+    ...containerForHeader(theme.spacing(4)),
   });
 
 interface IListObjectsProps {
@@ -90,6 +89,8 @@ interface IListObjectsState {
   selectedObject: string;
   selectedBucket: string;
   filterObjects: string;
+  openSnackbar: boolean;
+  snackBarMessage: string;
 }
 
 class ListObjects extends React.Component<
@@ -106,6 +107,8 @@ class ListObjects extends React.Component<
     selectedObject: "",
     selectedBucket: "",
     filterObjects: "",
+    openSnackbar: false,
+    snackBarMessage: "",
   };
 
   fetchRecords = () => {
@@ -143,6 +146,105 @@ class ListObjects extends React.Component<
     });
   }
 
+  showSnackBarMessage(text: string) {
+    this.setState({ openSnackbar: true, snackBarMessage: text });
+  }
+
+  closeSnackBar() {
+    this.setState({ openSnackbar: false, snackBarMessage: `` });
+  }
+
+  upload(e: any, bucketName: string, path: string) {
+    let listObjects = this;
+    if (isNullOrUndefined(e) || isNullOrUndefined(e.target)) {
+      return;
+    }
+    const token: string = storage.getItem("token")!;
+    e.preventDefault();
+    let file = e.target.files[0];
+    const fileName = file.name;
+
+    const objectName = `${path}${fileName}`;
+    let uploadUrl = `/api/v1/buckets/${bucketName}/objects/upload?prefix=${objectName}`;
+    let xhr = new XMLHttpRequest();
+
+    xhr.open("POST", uploadUrl, true);
+    xhr.setRequestHeader("Authorization", `Bearer ${token}`);
+
+    xhr.withCredentials = false;
+    xhr.onload = function (event) {
+      // TODO: handle status
+      if (xhr.status == 401 || xhr.status == 403) {
+        listObjects.showSnackBarMessage(
+          "An error occurred while uploading the file."
+        );
+      }
+      if (xhr.status == 500) {
+        listObjects.showSnackBarMessage(
+          "An error occurred while uploading the file."
+        );
+      }
+      if (xhr.status == 200) {
+        listObjects.showSnackBarMessage("Object uploaded successfully.");
+        listObjects.fetchRecords();
+      }
+    };
+
+    xhr.upload.addEventListener("error", (event) => {
+      // TODO: handle error
+      this.showSnackBarMessage("An error occurred while uploading the file.");
+    });
+
+    xhr.upload.addEventListener("progress", (event) => {
+      // TODO: handle progress with event.loaded, event.total
+    });
+
+    xhr.onerror = () => {
+      listObjects.showSnackBarMessage(
+        "An error occurred while uploading the file."
+      );
+    };
+
+    var formData = new FormData();
+    var blobFile = new Blob([file]);
+
+    formData.append("upfile", blobFile);
+    xhr.send(formData);
+    e.target.value = null;
+  }
+
+  download(bucketName: string, objectName: string) {
+    var anchor = document.createElement("a");
+    document.body.appendChild(anchor);
+    const token: string = storage.getItem("token")!;
+    var xhr = new XMLHttpRequest();
+
+    xhr.open(
+      "GET",
+      `/api/v1/buckets/${bucketName}/objects/download?prefix=${objectName}`,
+      true
+    );
+    xhr.setRequestHeader("Authorization", `Bearer ${token}`);
+    xhr.responseType = "blob";
+
+    xhr.onload = function (e) {
+      if (this.status == 200) {
+        var blob = new Blob([this.response], {
+          type: "octet/stream",
+        });
+        var blobUrl = window.URL.createObjectURL(blob);
+
+        anchor.href = blobUrl;
+        anchor.download = objectName;
+
+        anchor.click();
+        window.URL.revokeObjectURL(blobUrl);
+        anchor.remove();
+      }
+    };
+    xhr.send();
+  }
+
   bucketFilter(): void {}
 
   render() {
@@ -154,16 +256,42 @@ class ListObjects extends React.Component<
       selectedBucket,
       deleteOpen,
       filterObjects,
+      snackBarMessage,
+      openSnackbar,
     } = this.state;
     const displayParsedDate = (date: string) => {
-      return <Moment>{date}</Moment>;
+      return <reactMoment.default>{date}</reactMoment.default>;
     };
 
     const confirmDeleteObject = (object: string) => {
       this.setState({ deleteOpen: true, selectedObject: object });
     };
 
+    const downloadObject = (object: string) => {
+      this.download(selectedBucket, object);
+    };
+
+    const uploadObject = (e: any): void => {
+      // TODO: handle deeper paths/folders
+      let file = e.target.files[0];
+      this.showSnackBarMessage(`Uploading: ${file.name}`);
+      this.upload(e, selectedBucket, "");
+    };
+
+    const snackBarAction = (
+      <Button
+        color="secondary"
+        size="small"
+        onClick={() => {
+          this.closeSnackBar();
+        }}
+      >
+        Dismiss
+      </Button>
+    );
+
     const tableActions = [
+      { type: "download", onClick: downloadObject, sendOnlyId: true },
       { type: "delete", onClick: confirmDeleteObject, sendOnlyId: true },
     ];
 
@@ -191,58 +319,77 @@ class ListObjects extends React.Component<
             }}
           />
         )}
+        <Snackbar
+          open={openSnackbar}
+          message={snackBarMessage}
+          action={snackBarAction}
+        />
+        <PageHeader label="Objects" />
         <Grid container>
-          <Grid item xs={12}>
-            <Typography variant="h6">Objects</Typography>
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12} className={classes.actionsTray}>
-            <TextField
-              placeholder="Search Objects"
-              className={classes.searchField}
-              id="search-resource"
-              label=""
-              onChange={(val) => {
-                this.setState({
-                  filterObjects: val.target.value,
-                });
-              }}
-              InputProps={{
-                disableUnderline: true,
-                startAdornment: (
-                  <InputAdornment position="start">
-                    <SearchIcon />
-                  </InputAdornment>
-                ),
-              }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12}>
-            <TableWrapper
-              itemActions={tableActions}
-              columns={[
-                { label: "Name", elementKey: "name" },
-                {
-                  label: "Last Modified",
-                  elementKey: "last_modified",
-                  renderFunction: displayParsedDate,
-                },
-                {
-                  label: "Size",
-                  elementKey: "size",
-                  renderFunction: niceBytes,
-                },
-              ]}
-              isLoading={loading}
-              entityName="Objects"
-              idField="name"
-              records={filteredRecords}
-            />
+          <Grid item xs={12} className={classes.container}>
+            <Grid item xs={12} className={classes.actionsTray}>
+              <TextField
+                placeholder="Search Objects"
+                className={classes.searchField}
+                id="search-resource"
+                label=""
+                onChange={(val) => {
+                  this.setState({
+                    filterObjects: val.target.value,
+                  });
+                }}
+                InputProps={{
+                  disableUnderline: true,
+                  startAdornment: (
+                    <InputAdornment position="start">
+                      <SearchIcon />
+                    </InputAdornment>
+                  ),
+                }}
+              />
+
+              <>
+                <Button
+                  variant="contained"
+                  color="primary"
+                  startIcon={<CreateIcon />}
+                  component="label"
+                >
+                  Upload Object
+                  <Input
+                    type="file"
+                    onChange={(e) => uploadObject(e)}
+                    id="file-input"
+                    style={{ display: "none" }}
+                  />
+                </Button>
+              </>
+            </Grid>
+            <Grid item xs={12}>
+              <br />
+            </Grid>
+            <Grid item xs={12}>
+              <TableWrapper
+                itemActions={tableActions}
+                columns={[
+                  { label: "Name", elementKey: "name" },
+                  {
+                    label: "Last Modified",
+                    elementKey: "last_modified",
+                    renderFunction: displayParsedDate,
+                  },
+                  {
+                    label: "Size",
+                    elementKey: "size",
+                    renderFunction: niceBytes,
+                  },
+                ]}
+                isLoading={loading}
+                entityName="Objects"
+                idField="name"
+                records={filteredRecords}
+              />
+            </Grid>
           </Grid>
         </Grid>
       </React.Fragment>

portal-ui/src/screens/Console/Buckets/ViewBucket/AddReplicationModal.tsx

@@ -25,11 +25,7 @@ import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBo
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
 import { Button, LinearProgress } from "@material-ui/core";
 import api from "../../../../common/api";
-import {
-  IRemoteBucket,
-  IRemoteBucketsResponse,
-} from "../../RemoteBuckets/types";
-import RemoteBucketsList from "../../RemoteBuckets/RemoteBuckets";
+import { IRemoteBucket } from "../types";
 
 interface IReplicationModal {
   open: boolean;
@@ -64,42 +60,61 @@ const AddReplicationModal = ({
   bucketName,
 }: IReplicationModal) => {
   const [addError, setAddError] = useState("");
-  const [loadingForm, setLoadingForm] = useState(true);
   const [addLoading, setAddLoading] = useState(false);
-  const [remoteURL, setRemoteURL] = useState("");
-  const [source, setSource] = useState("");
-  const [target, setTarget] = useState("");
-  const [ARN, setARN] = useState("");
-  const [arnValues, setARNValues] = useState([]);
-
-  useEffect(() => {
-    if (addLoading) {
-      addRecord();
-    }
-  }, [addLoading]);
-
-  useEffect(() => {
-    if (loadingForm) {
-      getARNValues();
-    }
-  });
+  const [accessKey, setAccessKey] = useState("");
+  const [secretKey, setSecretKey] = useState("");
+  const [targetURL, setTargetURL] = useState("");
+  const [targetBucket, setTargetBucket] = useState("");
+  const [region, setRegion] = useState("");
 
   const addRecord = () => {
-    const replicationInfo = {
-      destination_bucket: target,
-      arn: ARN,
+    const remoteBucketInfo = {
+      accessKey: accessKey,
+      secretKey: secretKey,
+      sourceBucket: bucketName,
+      targetURL: targetURL,
+      targetBucket: targetBucket,
+      region: region,
     };
 
     api
-      .invoke(
-        "POST",
-        `/api/v1/buckets/${bucketName}/replication`,
-        replicationInfo
-      )
-      .then((res) => {
-        setAddLoading(false);
-        setAddError("");
-        closeModalAndRefresh();
+      .invoke("POST", "/api/v1/remote-buckets", remoteBucketInfo)
+      .then(() => {
+        api
+          .invoke("GET", "/api/v1/remote-buckets")
+          .then((res: any) => {
+            const remoteBuckets = get(res, "buckets", []);
+            const remoteBucket = remoteBuckets.find(
+              (itemRemote: IRemoteBucket) => {
+                return itemRemote.sourceBucket === bucketName;
+              }
+            );
+            if (remoteBucket && remoteBucket.remoteARN) {
+              const remoteARN = remoteBucket.remoteARN;
+              const replicationInfo = {
+                destination_bucket: targetBucket,
+                arn: remoteARN,
+              };
+              api
+                .invoke(
+                  "POST",
+                  `/api/v1/buckets/${bucketName}/replication`,
+                  replicationInfo
+                )
+                .then(() => {
+                  setAddLoading(false);
+                  setAddError("");
+                  closeModalAndRefresh();
+                })
+                .catch((err) => {
+                  setAddLoading(false);
+                  setAddError(err);
+                });
+            }
+          })
+          .catch((err) => {
+            setAddError(err);
+          });
       })
       .catch((err) => {
         setAddLoading(false);
@@ -107,23 +122,6 @@ const AddReplicationModal = ({
       });
   };
 
-  const getARNValues = () => {
-    api
-      .invoke("GET", "/api/v1/remote-buckets")
-      .then((res: any) => {
-        const remoteBuckets = get(res, "buckets", []);
-
-        const remoteARNS = remoteBuckets.map((itemRemote: IRemoteBucket) => {
-          return { label: itemRemote.remoteARN, value: itemRemote.remoteARN };
-        });
-        setLoadingForm(false);
-        setARNValues(remoteARNS);
-      })
-      .catch((err) => {
-        setLoadingForm(false);
-      });
-  };
-
   return (
     <ModalWrapper
       modalOpen={open}
@@ -139,71 +137,96 @@ const AddReplicationModal = ({
         onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
           e.preventDefault();
           setAddLoading(true);
+          addRecord();
         }}
       >
-        {loadingForm && (
-          <Grid container>
+        <Grid container>
+          <Grid item xs={12} className={classes.formScrollable}>
+            {addError !== "" && (
+              <Grid item xs={12}>
+                <Typography
+                  component="p"
+                  variant="body1"
+                  className={classes.errorBlock}
+                >
+                  {addError}
+                </Typography>
+              </Grid>
+            )}
+
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="target"
+                name="target"
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setAccessKey(e.target.value);
+                }}
+                label="Access Key"
+                value={accessKey}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="target"
+                name="target"
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setSecretKey(e.target.value);
+                }}
+                label="Secret Key"
+                value={secretKey}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="target"
+                name="target"
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setTargetURL(e.target.value);
+                }}
+                placeholder="https://play.min.io:9000"
+                label="Target URL"
+                value={targetURL}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="target"
+                name="target"
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setTargetBucket(e.target.value);
+                }}
+                label="Target Bucket"
+                value={targetBucket}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="target"
+                name="target"
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setRegion(e.target.value);
+                }}
+                label="Region"
+                value={region}
+              />
+            </Grid>
+          </Grid>
+          <Grid item xs={12} className={classes.buttonContainer}>
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              disabled={addLoading}
+            >
+              Save
+            </Button>
+          </Grid>
+          {addLoading && (
             <Grid item xs={12}>
               <LinearProgress />
             </Grid>
-          </Grid>
-        )}
-        {!loadingForm && (
-          <Grid container>
-            <Grid item xs={12} className={classes.formScrollable}>
-              {addError !== "" && (
-                <Grid item xs={12}>
-                  <Typography
-                    component="p"
-                    variant="body1"
-                    className={classes.errorBlock}
-                  >
-                    {addError}
-                  </Typography>
-                </Grid>
-              )}
-
-              <Grid item xs={12}>
-                <InputBoxWrapper
-                  id="target"
-                  name="target"
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                    setTarget(e.target.value);
-                  }}
-                  label="Destination Bucket"
-                  value={target}
-                />
-              </Grid>
-              <Grid item xs={12}>
-                <SelectWrapper
-                  onChange={(e: React.ChangeEvent<{ value: unknown }>) => {
-                    setARN(e.target.value as string);
-                  }}
-                  id="arn"
-                  name="arn"
-                  label={"ARN"}
-                  value={ARN}
-                  options={arnValues}
-                />
-              </Grid>
-            </Grid>
-            <Grid item xs={12} className={classes.buttonContainer}>
-              <Button
-                type="submit"
-                variant="contained"
-                color="primary"
-                disabled={addLoading}
-              >
-                Save
-              </Button>
-            </Grid>
-            {addLoading && (
-              <Grid item xs={12}>
-                <LinearProgress />
-              </Grid>
-            )}
-          </Grid>
-        )}
+          )}
+        </Grid>
       </form>
     </ModalWrapper>
   );

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

@@ -515,51 +515,53 @@ class ViewBucket extends React.Component<IViewBucketProps, IViewBucketState> {
             <Grid item xs={12}>
               <br />
             </Grid>
-            <Grid item xs={6}>
-              <Tabs
-                value={curTab}
-                onChange={(e: React.ChangeEvent<{}>, newValue: number) => {
-                  this.setState({ curTab: newValue });
-                }}
-                indicatorColor="primary"
-                textColor="primary"
-                aria-label="cluster-tabs"
-              >
-                <Tab label="Events" {...a11yProps(0)} />
-                <Tab label="Replication" {...a11yProps(1)} />
-              </Tabs>
-            </Grid>
-            <Grid item xs={6} className={classes.actionsTray}>
-              {curTab === 0 && (
-                <Button
-                  variant="contained"
-                  color="primary"
-                  startIcon={<CreateIcon />}
-                  size="medium"
-                  onClick={() => {
-                    this.setState({
-                      addScreenOpen: true,
-                    });
+            <Grid container item xs={12}>
+              <Grid item xs={6}>
+                <Tabs
+                  value={curTab}
+                  onChange={(e: React.ChangeEvent<{}>, newValue: number) => {
+                    this.setState({ curTab: newValue });
                   }}
+                  indicatorColor="primary"
+                  textColor="primary"
+                  aria-label="cluster-tabs"
                 >
-                  Subscribe to Event
-                </Button>
-              )}
-              {curTab === 1 && (
-                <Button
-                  variant="contained"
-                  color="primary"
-                  startIcon={<CreateIcon />}
-                  size="medium"
-                  onClick={() => {
-                    this.setState({
-                      openSetReplication: true,
-                    });
-                  }}
-                >
-                  Add Replication Rule
-                </Button>
-              )}
+                  <Tab label="Events" {...a11yProps(0)} />
+                  <Tab label="Replication" {...a11yProps(1)} />
+                </Tabs>
+              </Grid>
+              <Grid item xs={6} className={classes.actionsTray}>
+                {curTab === 0 && (
+                  <Button
+                    variant="contained"
+                    color="primary"
+                    startIcon={<CreateIcon />}
+                    size="medium"
+                    onClick={() => {
+                      this.setState({
+                        addScreenOpen: true,
+                      });
+                    }}
+                  >
+                    Subscribe to Event
+                  </Button>
+                )}
+                {curTab === 1 && (
+                  <Button
+                    variant="contained"
+                    color="primary"
+                    startIcon={<CreateIcon />}
+                    size="medium"
+                    onClick={() => {
+                      this.setState({
+                        openSetReplication: true,
+                      });
+                    }}
+                  >
+                    Add Replication Rule
+                  </Button>
+                )}
+              </Grid>
             </Grid>
             <Grid item xs={12}>
               <TabPanel index={0} value={curTab}>

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

@@ -79,3 +79,15 @@ export interface MakeBucketRequest {
   versioning: boolean;
   quota?: QuotaRequest;
 }
+
+export interface IRemoteBucket {
+  name: string;
+  accessKey: string;
+  secretKey: string;
+  sourceBucket: string;
+  targetURL: string;
+  targetBucket: string;
+  remoteARN: string;
+  status: string;
+  service: string;
+}

portal-ui/src/screens/Console/Common/FormComponents/CSVMultiSelector/CSVMultiSelector.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -13,21 +13,32 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import React, { useState, useEffect, createRef, ChangeEvent } from "react";
+import React, {
+  useState,
+  useEffect,
+  createRef,
+  useLayoutEffect,
+  ChangeEvent,
+  useRef,
+} from "react";
+import get from "lodash/get";
+import debounce from "lodash/debounce";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import Grid from "@material-ui/core/Grid";
-import get from "lodash/get";
-import InputBoxWrapper from "../InputBoxWrapper/InputBoxWrapper";
+import HelpIcon from "@material-ui/icons/Help";
 import { InputLabel, Tooltip } from "@material-ui/core";
 import { fieldBasic, tooltipHelper } from "../common/styleLibrary";
-import HelpIcon from "@material-ui/icons/Help";
+import InputBoxWrapper from "../InputBoxWrapper/InputBoxWrapper";
+import AddIcon from "../../../../../icons/AddIcon";
 
 interface ICSVMultiSelector {
   elements: string;
   name: string;
   label: string;
   tooltip?: string;
+  commonPlaceholder?: string;
   classes: any;
+  withBorder?: boolean;
   onChange: (elements: string) => void;
 }
 
@@ -35,16 +46,13 @@ const styles = (theme: Theme) =>
   createStyles({
     ...fieldBasic,
     ...tooltipHelper,
-    inputLabel: {
-      ...fieldBasic.inputLabel,
-      width: 116,
-    },
-    inputContainer: {
+    inputWithBorder: {
+      border: "1px solid #EAEAEA",
+      padding: 15,
       height: 150,
       overflowY: "auto",
-      padding: 15,
       position: "relative",
-      border: "1px solid #c4c4c4",
+      marginTop: 15,
     },
     labelContainer: {
       display: "flex",
@@ -56,7 +64,9 @@ const CSVMultiSelector = ({
   name,
   label,
   tooltip = "",
+  commonPlaceholder = "",
   onChange,
+  withBorder = false,
   classes,
 }: ICSVMultiSelector) => {
   const [currentElements, setCurrentElements] = useState<string[]>([""]);
@@ -75,29 +85,37 @@ const CSVMultiSelector = ({
 
       setCurrentElements(elementsSplit);
     }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [elements, currentElements]);
 
   // Use effect to send new values to onChange
   useEffect(() => {
-    const elementsString = currentElements
-      .filter((element) => element.trim() !== "")
-      .join(",");
-    onChange(elementsString);
+    const refScroll = bottomList.current;
+    if (refScroll) {
+      refScroll.scrollIntoView(false);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [currentElements]);
 
+  // We avoid multiple re-renders / hang issue typing too fast
+  const firstUpdate = useRef(true);
+  useLayoutEffect(() => {
+    if (firstUpdate.current) {
+      firstUpdate.current = false;
+      return;
+    }
+
+    debouncedOnChange();
+  }, [currentElements]);
+
   // If the last input is not empty, we add a new one
   const addEmptyLine = (elementsUp: string[]) => {
     if (elementsUp[elementsUp.length - 1].trim() !== "") {
-      elementsUp.push("");
-      const refScroll = bottomList.current;
-
-      if (refScroll) {
-        refScroll.scrollIntoView(false);
-      }
+      const cpList = [...elementsUp];
+      cpList.push("");
+      setCurrentElements(cpList);
     }
-
-    return elementsUp;
   };
 
   // Onchange function for input box, we get the dataset-index & only update that value in the array
@@ -108,10 +126,18 @@ const CSVMultiSelector = ({
     const index = get(e.target, "dataset.index", 0);
     updatedElement[index] = e.target.value;
 
-    updatedElement = addEmptyLine(updatedElement);
     setCurrentElements(updatedElement);
   };
 
+  // Debounce for On Change
+  const debouncedOnChange = debounce(() => {
+    const elementsString = currentElements
+      .filter((element) => element.trim() !== "")
+      .join(",");
+
+    onChange(elementsString);
+  }, 500);
+
   const inputs = currentElements.map((element, index) => {
     return (
       <InputBoxWrapper
@@ -122,6 +148,11 @@ const CSVMultiSelector = ({
         onChange={onChangeElement}
         index={index}
         key={`csv-${name}-${index.toString()}`}
+        placeholder={commonPlaceholder}
+        overlayIcon={index === currentElements.length - 1 ? <AddIcon /> : null}
+        overlayAction={() => {
+          addEmptyLine(currentElements);
+        }}
       />
     );
   });
@@ -139,7 +170,11 @@ const CSVMultiSelector = ({
             </div>
           )}
         </InputLabel>
-        <Grid item xs={12} className={classes.inputContainer}>
+        <Grid
+          item
+          xs={12}
+          className={`${withBorder ? classes.inputWithBorder : ""}`}
+        >
           {inputs}
           <div ref={bottomList} />
         </Grid>
@@ -147,5 +182,4 @@ const CSVMultiSelector = ({
     </React.Fragment>
   );
 };
-
 export default withStyles(styles)(CSVMultiSelector);

portal-ui/src/screens/Console/Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper.tsx

@@ -0,0 +1,83 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import HelpIcon from "@material-ui/icons/Help";
+import Grid from "@material-ui/core/Grid";
+import { Controlled as CodeMirror } from "react-codemirror2";
+import { InputLabel, Tooltip } from "@material-ui/core";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import { fieldBasic } from "../common/styleLibrary";
+import "./ConsoleCodeMirror.css";
+
+require("codemirror/mode/javascript/javascript");
+
+interface ICodeWrapper {
+  value: string;
+  label?: string;
+  tooltip?: string;
+  classes: any;
+  onChange?: (editor: any, data: any, value: string) => any;
+  onBeforeChange: (editor: any, data: any, value: string) => any;
+  readOnly?: boolean;
+}
+
+const styles = (theme: Theme) =>
+  createStyles({
+    ...fieldBasic,
+  });
+
+const CodeMirrorWrapper = ({
+  value,
+  label = "",
+  tooltip = "",
+  classes,
+  onChange = () => {},
+  onBeforeChange,
+  readOnly = false,
+}: ICodeWrapper) => {
+  return (
+    <React.Fragment>
+      <InputLabel className={classes.inputLabel}>
+        <span>{label}</span>
+        {tooltip !== "" && (
+          <div className={classes.tooltipContainer}>
+            <Tooltip title={tooltip} placement="top-start">
+              <HelpIcon className={classes.tooltip} />
+            </Tooltip>
+          </div>
+        )}
+      </InputLabel>
+      <Grid item xs={12}>
+        <br />
+      </Grid>
+      <Grid item xs={12}>
+        <CodeMirror
+          value={value}
+          options={{
+            mode: "javascript",
+            lineNumbers: true,
+            readOnly,
+          }}
+          onBeforeChange={onBeforeChange}
+          onChange={onChange}
+        />
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(CodeMirrorWrapper);

portal-ui/src/screens/Console/Common/FormComponents/CodeMirrorWrapper/ConsoleCodeMirror.css

@@ -0,0 +1,353 @@
+/* BASICS */
+
+.CodeMirror {
+    /* Set height, width, borders, and global font properties here */
+    font-family: monospace;
+    height: 300px;
+    color: #fff;
+    background: #081C42;
+    direction: ltr;
+    font-size: 13px;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+    padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+    padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    background-color: rgba(255,255,255,0.8); /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+    border-right: 1px solid #ddd;
+    background-color: #ffffff80;
+    white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+    padding: 0 3px 0 5px;
+    min-width: 20px;
+    white-space: nowrap;
+    color: #000;
+    font-size: 10px;
+    height: 18px;
+    line-height: 18px;
+    text-align: center;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+    border-left: 1px solid white;
+    border-right: none;
+    width: 0;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+    border-left: 1px solid silver;
+}
+.cm-fat-cursor .CodeMirror-cursor {
+    width: auto;
+    border: 0 !important;
+    background: #7e7;
+}
+.cm-fat-cursor div.CodeMirror-cursors {
+    z-index: 1;
+}
+.cm-fat-cursor-mark {
+    background-color: rgba(20, 255, 20, 0.5);
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+}
+.cm-animate-fat-cursor {
+    width: auto;
+    border: 0;
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+    background-color: #7e7;
+}
+@-moz-keyframes blink {
+    0% {}
+    50% { background-color: transparent; }
+    100% {}
+}
+@-webkit-keyframes blink {
+    0% {}
+    50% { background-color: transparent; }
+    100% {}
+}
+@keyframes blink {
+    0% {}
+    50% { background-color: transparent; }
+    100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-rulers {
+    position: absolute;
+    left: 0; right: 0; top: -50px; bottom: 0;
+    overflow: hidden;
+}
+.CodeMirror-ruler {
+    border-left: 1px solid #ccc;
+    top: 0; bottom: 0;
+    position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {color: #fff;}
+.cm-s-default .cm-quote {color: #fff;}
+.cm-negative {color: #fff;}
+.cm-positive {color: #fff;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-keyword {color: #fff;}
+.cm-s-default .cm-atom {color: #fff;}
+.cm-s-default .cm-number {color: #fff;}
+.cm-s-default .cm-def {color: #fff;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #fff;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #fff;}
+.cm-s-default .cm-comment {color: #fff;}
+.cm-s-default .cm-string {color: #fff;}
+.cm-s-default .cm-string-2 {color: #fff;}
+.cm-s-default .cm-meta {color: #fff;}
+.cm-s-default .cm-qualifier {color: #fff;}
+.cm-s-default .cm-builtin {color: #fff;}
+.cm-s-default .cm-bracket {color: #fff;}
+.cm-s-default .cm-tag {color: #fff;}
+.cm-s-default .cm-attribute {color: #fff;}
+.cm-s-default .cm-hr {color: #fff;}
+.cm-s-default .cm-link {color: #fff;}
+
+.cm-s-default .cm-error {color: #fff;}
+.cm-invalidchar {color: #fff;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #fff;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #fff;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+    position: relative;
+    overflow: hidden;
+}
+
+.CodeMirror-scroll {
+    overflow: scroll !important; /* Things will break if this is overridden */
+    /* 50px is the magic margin used to hide the element's real scrollbars */
+    /* See overflow: hidden in .CodeMirror */
+    margin-bottom: -50px; margin-right: -50px;
+    padding-bottom: 50px;
+    height: 100%;
+    outline: none; /* Prevent dragging from highlighting the element */
+    position: relative;
+}
+.CodeMirror-sizer {
+    position: relative;
+    border-right: 50px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    position: absolute;
+    z-index: 6;
+    display: none;
+}
+.CodeMirror-vscrollbar {
+    right: 0; top: 0;
+    overflow-x: hidden;
+    overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+    bottom: 0; left: 0;
+    overflow-y: hidden;
+    overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+    right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+    left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+    position: absolute; left: 0; top: 0;
+    min-height: 100%;
+    z-index: 3;
+}
+.CodeMirror-gutter {
+    white-space: normal;
+    height: 100%;
+    display: inline-block;
+    vertical-align: top;
+    margin-bottom: -50px;
+}
+.CodeMirror-gutter-wrapper {
+    position: absolute;
+    z-index: 4;
+    background: none !important;
+    border: none !important;
+}
+.CodeMirror-gutter-background {
+    position: absolute;
+    top: 0; bottom: 0;
+    z-index: 4;
+}
+.CodeMirror-gutter-elt {
+    position: absolute;
+    cursor: default;
+    z-index: 4;
+}
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+
+.CodeMirror-lines {
+    cursor: text;
+    min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+    /* Reset some styles that the rest of the page might have set */
+    -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+    border-width: 0;
+    background: transparent;
+    font-family: inherit;
+    font-size: inherit;
+    margin: 0;
+    white-space: pre;
+    word-wrap: normal;
+    line-height: inherit;
+    color: inherit;
+    z-index: 2;
+    position: relative;
+    overflow: visible;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-variant-ligatures: contextual;
+    font-variant-ligatures: contextual;
+}
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: normal;
+}
+
+.CodeMirror-linebackground {
+    position: absolute;
+    left: 0; right: 0; top: 0; bottom: 0;
+    z-index: 0;
+}
+
+.CodeMirror-linewidget {
+    position: relative;
+    z-index: 2;
+    padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-rtl pre { direction: rtl; }
+
+.CodeMirror-code {
+    outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+    position: absolute;
+    width: 100%;
+    height: 0;
+    overflow: hidden;
+    visibility: hidden;
+}
+
+.CodeMirror-cursor {
+    position: absolute;
+    pointer-events: none;
+}
+.CodeMirror-measure pre { position: static; }
+
+div.CodeMirror-cursors {
+    visibility: hidden;
+    position: relative;
+    z-index: 3;
+}
+div.CodeMirror-dragcursors {
+    visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+    visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+    background-color: #ffa;
+    background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+    /* Hide the cursor when printing */
+    .CodeMirror div.CodeMirror-cursors {
+        visibility: hidden;
+    }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }

portal-ui/src/screens/Console/Common/FormComponents/CommentBoxWrapper/CommentBoxWrapper.tsx

@@ -0,0 +1,158 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import React from "react";
+import {
+  Grid,
+  InputLabel,
+  TextField,
+  TextFieldProps,
+  Tooltip,
+} from "@material-ui/core";
+import { OutlinedInputProps } from "@material-ui/core/OutlinedInput";
+import {
+  createStyles,
+  makeStyles,
+  Theme,
+  withStyles,
+} from "@material-ui/core/styles";
+import { fieldBasic, tooltipHelper } from "../common/styleLibrary";
+import HelpIcon from "@material-ui/icons/Help";
+
+interface CommentBoxProps {
+  label: string;
+  classes: any;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  value: string | boolean;
+  id: string;
+  name: string;
+  disabled?: boolean;
+  tooltip?: string;
+  index?: number;
+  error?: string;
+  required?: boolean;
+  placeholder?: string;
+}
+
+const styles = (theme: Theme) =>
+  createStyles({
+    ...fieldBasic,
+    ...tooltipHelper,
+    inputLabel: {
+      ...fieldBasic.inputLabel,
+      marginBottom: 16,
+      fontSize: 14,
+    },
+    textBoxContainer: {
+      flexGrow: 1,
+      position: "relative",
+    },
+    errorState: {
+      color: "#b53b4b",
+      fontSize: 14,
+      position: "absolute",
+      top: 7,
+      right: 7,
+    },
+    cssOutlinedInput: {
+      borderColor: "#9C9C9C",
+      padding: 16,
+    },
+    rootContainer: {
+      "& .MuiOutlinedInput-inputMultiline": {
+        ...fieldBasic.inputLabel,
+        fontSize: 13,
+        minHeight: 150,
+      },
+    },
+  });
+
+const CommentBoxWrapper = ({
+  label,
+  onChange,
+  value,
+  id,
+  name,
+  disabled = false,
+  tooltip = "",
+  index = 0,
+  error = "",
+  required = false,
+  placeholder = "",
+  classes,
+}: CommentBoxProps) => {
+  let inputProps: any = { "data-index": index };
+
+  return (
+    <React.Fragment>
+      <Grid
+        item
+        xs={12}
+        className={`${classes.fieldContainer} ${
+          error !== "" ? classes.errorInField : ""
+        }`}
+      >
+        {label !== "" && (
+          <InputLabel
+            htmlFor={id}
+            className={`${error !== "" ? classes.fieldLabelError : ""} ${
+              classes.inputLabel
+            }`}
+          >
+            <span>
+              {label}
+              {required ? "*" : ""}
+            </span>
+            {tooltip !== "" && (
+              <div className={classes.tooltipContainer}>
+                <Tooltip title={tooltip} placement="top-start">
+                  <HelpIcon className={classes.tooltip} />
+                </Tooltip>
+              </div>
+            )}
+          </InputLabel>
+        )}
+
+        <div className={classes.textBoxContainer}>
+          <TextField
+            id={id}
+            name={name}
+            fullWidth
+            value={value}
+            disabled={disabled}
+            onChange={onChange}
+            multiline
+            inputProps={inputProps}
+            error={error !== ""}
+            helperText={error}
+            placeholder={placeholder}
+            InputLabelProps={{
+              shrink: true,
+            }}
+            InputProps={{
+              classes: {
+                notchedOutline: classes.cssOutlinedInput,
+                root: classes.rootContainer,
+              },
+            }}
+            variant="outlined"
+          />
+        </div>
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(CommentBoxWrapper);

portal-ui/src/screens/Console/Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper.tsx

@@ -0,0 +1,225 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { useEffect, useState } from "react";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import { InputLabel, Switch, Tooltip } from "@material-ui/core";
+import Grid from "@material-ui/core/Grid";
+import { actionsTray, fieldBasic } from "../common/styleLibrary";
+import HelpIcon from "@material-ui/icons/Help";
+
+interface IFormSwitch {
+  label?: string;
+  classes: any;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  value: string | boolean;
+  id: string;
+  name: string;
+  disabled?: boolean;
+  tooltip?: string;
+  index?: number;
+  indicatorLabel?: string;
+  checked: boolean;
+  switchOnly?: boolean;
+}
+
+const styles = (theme: Theme) =>
+  createStyles({
+    seeMore: {
+      marginTop: theme.spacing(3),
+    },
+    paper: {
+      display: "flex",
+      overflow: "auto",
+      flexDirection: "column",
+      paddingTop: 15,
+      boxShadow: "none",
+    },
+    addSideBar: {
+      width: "320px",
+      padding: "20px",
+    },
+    errorBlock: {
+      color: "red",
+    },
+    tableToolbar: {
+      paddingLeft: theme.spacing(2),
+      paddingRight: theme.spacing(0),
+    },
+    wrapCell: {
+      maxWidth: "200px",
+      whiteSpace: "normal",
+      wordWrap: "break-word",
+    },
+    minTableHeader: {
+      color: "#393939",
+      "& tr": {
+        "& th": {
+          fontWeight: "bold",
+        },
+      },
+    },
+    noFound: {
+      textAlign: "center",
+      padding: "10px 0",
+    },
+    tableContainer: {
+      maxHeight: 200,
+    },
+    stickyHeader: {
+      backgroundColor: "#fff",
+    },
+    actionsTitle: {
+      fontWeight: 600,
+      color: "#081C42",
+      fontSize: 16,
+      alignSelf: "center",
+    },
+    tableBlock: {
+      marginTop: 15,
+    },
+    filterField: {
+      width: 375,
+      fontWeight: 600,
+      "& .input": {
+        "&::placeholder": {
+          fontWeight: 600,
+          color: "#081C42",
+        },
+      },
+    },
+    wrapperContainer: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center",
+      borderBottom: "#9c9c9c 1px solid",
+      paddingBottom: 14,
+      marginBottom: 20,
+    },
+    indicatorLabel: {
+      fontSize: 12,
+      fontWeight: 600,
+      color: "#081C42",
+      margin: "0 8px 0 10px",
+    },
+    switchContainer: {
+      display: "flex",
+    },
+    ...actionsTray,
+    ...fieldBasic,
+  });
+
+const StyledSwitch = withStyles({
+  root: {
+    alignItems: "flex-start",
+    height: 18,
+    padding: "0 12px",
+    display: "flex",
+    position: "relative",
+  },
+  switchBase: {
+    color: "#fff",
+    padding: 0,
+    top: "initial",
+    "&$checked": {
+      color: "#fff",
+    },
+    "&$checked + $track": {
+      backgroundColor: "#081C42",
+      opacity: 1,
+      height: 15,
+    },
+  },
+  checked: {},
+  track: {
+    height: 15,
+    backgroundColor: "#081C42",
+    opacity: 1,
+    padding: 0,
+    marginTop: 1.5,
+  },
+  thumb: {
+    backgroundColor: "#fff",
+    border: "#081C42 1px solid",
+    boxShadow: "none",
+    width: 18,
+    height: 18,
+    padding: 0,
+    marginLeft: 10,
+  },
+})(Switch);
+
+const FormSwitchWrapper = ({
+  label = "",
+  onChange,
+  value,
+  id,
+  name,
+  checked = false,
+  disabled = false,
+  switchOnly = false,
+  tooltip = "",
+  indicatorLabel = "",
+  classes,
+}: IFormSwitch) => {
+  const switchComponent = (
+    <React.Fragment>
+      <div className={classes.switchContainer}>
+        <StyledSwitch
+          checked={checked}
+          onChange={onChange}
+          color="primary"
+          name={name}
+          inputProps={{ "aria-label": "primary checkbox" }}
+          disabled={disabled}
+          disableRipple
+          disableFocusRipple
+          disableTouchRipple
+          value={value}
+        />
+        {indicatorLabel !== "" && (
+          <span className={classes.indicatorLabel}>{indicatorLabel}</span>
+        )}
+      </div>
+    </React.Fragment>
+  );
+
+  if (switchOnly) {
+    return switchComponent;
+  }
+
+  return (
+    <React.Fragment>
+      <Grid item xs={12} className={`${classes.wrapperContainer}`}>
+        {label !== "" && (
+          <InputLabel htmlFor={id} className={classes.inputLabel}>
+            <span>{label}</span>
+            {tooltip !== "" && (
+              <div className={classes.tooltipContainer}>
+                <Tooltip title={tooltip} placement="top-start">
+                  <HelpIcon className={classes.tooltip} />
+                </Tooltip>
+              </div>
+            )}
+          </InputLabel>
+        )}
+        {switchComponent}
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(FormSwitchWrapper);

portal-ui/src/screens/Console/Common/FormComponents/InputBoxWrapper/InputBoxWrapper.tsx

@@ -16,6 +16,7 @@
 import React from "react";
 import {
   Grid,
+  IconButton,
   InputLabel,
   TextField,
   TextFieldProps,
@@ -49,6 +50,8 @@ interface InputBoxProps {
   placeholder?: string;
   min?: string;
   max?: string;
+  overlayIcon?: any;
+  overlayAction?: () => void;
 }
 
 const styles = (theme: Theme) =>
@@ -57,7 +60,10 @@ const styles = (theme: Theme) =>
     ...tooltipHelper,
     textBoxContainer: {
       flexGrow: 1,
+    },
+    textBoxWithIcon: {
       position: "relative",
+      paddingRight: 25,
     },
     errorState: {
       color: "#b53b4b",
@@ -66,18 +72,40 @@ const styles = (theme: Theme) =>
       top: 7,
       right: 7,
     },
+    overlayAction: {
+      position: "absolute",
+      right: 0,
+      top: 15,
+      "& svg": {
+        maxWidth: 15,
+        maxHeight: 15,
+      },
+    },
   });
 
 const inputStyles = makeStyles((theme: Theme) =>
   createStyles({
     root: {
-      borderColor: "#393939",
       borderRadius: 0,
+      "&::before": {
+        borderColor: "#9c9c9c",
+      },
+    },
+    disabled: {
+      "&.MuiInput-underline::before": {
+        borderColor: "#eaeaea",
+        borderBottomStyle: "solid",
+      },
     },
     input: {
-      padding: "11px 20px",
+      padding: "15px 30px 10px 5px",
       color: "#393939",
-      fontSize: 14,
+      fontSize: 13,
+      fontWeight: 600,
+      "&:placeholder": {
+        color: "#393939",
+        opacity: 1,
+      },
     },
     error: {
       color: "#b53b4b",
@@ -114,6 +142,8 @@ const InputBoxWrapper = ({
   placeholder = "",
   min,
   max,
+  overlayIcon = null,
+  overlayAction,
   classes,
 }: InputBoxProps) => {
   let inputProps: any = { "data-index": index };
@@ -160,7 +190,6 @@ const InputBoxWrapper = ({
           <InputField
             id={id}
             name={name}
-            variant="outlined"
             fullWidth
             value={value}
             disabled={disabled}
@@ -172,8 +201,28 @@ const InputBoxWrapper = ({
             error={error !== ""}
             helperText={error}
             placeholder={placeholder}
+            className={classes.inputRebase}
           />
         </div>
+        {overlayIcon && (
+          <div className={classes.overlayAction}>
+            <IconButton
+              onClick={
+                overlayAction
+                  ? () => {
+                      overlayAction();
+                    }
+                  : () => null
+              }
+              size={"small"}
+              disableFocusRipple={false}
+              disableRipple={false}
+              disableTouchRipple={false}
+            >
+              {overlayIcon}
+            </IconButton>
+          </div>
+        )}
       </Grid>
     </React.Fragment>
   );

portal-ui/src/screens/Console/Common/FormComponents/RadioGroupSelector/RadioGroupSelector.tsx

@@ -25,7 +25,7 @@ import {
   withStyles,
   makeStyles,
 } from "@material-ui/core/styles";
-import { fieldBasic, tooltipHelper } from "../common/styleLibrary";
+import { fieldBasic, radioIcons, tooltipHelper } from "../common/styleLibrary";
 import HelpIcon from "@material-ui/icons/Help";
 
 export interface SelectorTypes {
@@ -49,8 +49,20 @@ const styles = (theme: Theme) =>
   createStyles({
     ...fieldBasic,
     ...tooltipHelper,
-    radioBoxContainer: {
-      flexGrow: 1,
+    radioBoxContainer: {},
+    fieldContainer: {
+      ...fieldBasic.fieldContainer,
+      display: "flex",
+      justifyContent: "space-between",
+      borderBottom: "#9c9c9c 1px solid",
+      paddingBottom: 10,
+      marginTop: 11,
+    },
+    checkedOption: {
+      "& .MuiFormControlLabel-label": {
+        color: "#000",
+        fontWeight: 700,
+      },
     },
   });
 
@@ -60,31 +72,7 @@ const radioStyles = makeStyles({
       backgroundColor: "transparent",
     },
   },
-  icon: {
-    borderRadius: "100%",
-    width: 14,
-    height: 14,
-    border: "1px solid #000",
-  },
-  checkedIcon: {
-    borderRadius: "100%",
-    width: 14,
-    height: 14,
-    border: "1px solid #000",
-    padding: 4,
-    position: "relative",
-    "&::after": {
-      content: '" "',
-      width: 8,
-      height: 8,
-      borderRadius: "100%",
-      display: "block",
-      position: "absolute",
-      backgroundColor: "#000",
-      top: 2,
-      left: 2,
-    },
-  },
+  ...radioIcons,
 });
 
 const RadioButton = (props: RadioProps) => {
@@ -95,8 +83,8 @@ const RadioButton = (props: RadioProps) => {
       className={classes.root}
       disableRipple
       color="default"
-      checkedIcon={<span className={classes.checkedIcon} />}
-      icon={<span className={classes.icon} />}
+      checkedIcon={<span className={classes.radioSelectedIcon} />}
+      icon={<span className={classes.radioUnselectedIcon} />}
       {...props}
     />
   );
@@ -143,6 +131,11 @@ export const RadioGroupSelector = ({
                   value={selectorOption.value}
                   control={<RadioButton />}
                   label={selectorOption.label}
+                  className={
+                    selectorOption.value === currentSelection
+                      ? classes.checkedOption
+                      : ""
+                  }
                 />
               );
             })}

portal-ui/src/screens/Console/Common/FormComponents/SelectWrapper/SelectWrapper.tsx

@@ -50,26 +50,25 @@ const styles = (theme: Theme) =>
   createStyles({
     ...fieldBasic,
     ...tooltipHelper,
-    inputLabel: {
-      ...fieldBasic.inputLabel,
-      width: 215,
-    },
   });
 
 const SelectStyled = withStyles((theme: Theme) =>
   createStyles({
     root: {
+      lineHeight: 1,
       "label + &": {
         marginTop: theme.spacing(3),
       },
     },
     input: {
-      borderRadius: 0,
       position: "relative",
       color: "#393939",
-      fontSize: 14,
-      padding: "11px 20px",
-      border: "1px solid #c4c4c4",
+      fontSize: 13,
+      fontWeight: 600,
+      padding: "15px 20px 10px 10px",
+      borderBottom: "1px solid #9c9c9c",
+      display: "flex",
+      alignItems: "center",
       "&:hover": {
         borderColor: "#393939",
       },
@@ -106,7 +105,7 @@ const SelectWrapper = ({
             )}
           </InputLabel>
         )}
-        <FormControl variant="outlined" fullWidth>
+        <FormControl fullWidth>
           <Select
             id={id}
             name={name}

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

@@ -18,28 +18,24 @@
 
 export const fieldBasic = {
   inputLabel: {
-    fontWeight: 500,
+    fontWeight: 600,
     marginRight: 10,
-    width: 160,
-    fontSize: 14,
-    color: "#393939",
-    textAlign: "right" as const,
-    display: "flex",
-    textOverflow: "ellipsis",
+    fontSize: 15,
+    color: "#000",
+    textAlign: "left" as const,
     overflow: "hidden",
-    justifyContent: "flex-end",
     "& span": {
       display: "flex",
       alignItems: "center",
     },
+    display: "flex",
   },
   fieldLabelError: {
     paddingBottom: 22,
   },
   fieldContainer: {
-    display: "flex",
-    alignItems: "center",
-    marginBottom: 10,
+    marginBottom: 20,
+    position: "relative" as const,
   },
   tooltipContainer: {
     marginLeft: 5,
@@ -57,6 +53,30 @@ export const modalBasic = {
   formSlider: {
     marginLeft: 0,
   },
+  clearButton: {
+    border: "0",
+    backgroundColor: "transparent",
+    color: "#393939",
+    fontWeight: 600,
+    fontSize: 14,
+    marginRight: 10,
+    outline: "0",
+    padding: "16px 25px 16px 25px",
+    cursor: "pointer",
+  },
+  floatingEnabled: {
+    position: "absolute" as const,
+    right: 58,
+    zIndex: 1000,
+    marginTop: -38,
+  },
+  configureString: {
+    border: "#EAEAEA 1px solid",
+    borderRadius: 4,
+    padding: "24px 50px",
+    overflowY: "auto" as const,
+    height: 170,
+  },
 };
 
 export const tooltipHelper = {
@@ -66,17 +86,32 @@ export const tooltipHelper = {
 };
 
 const checkBoxBasic = {
-  width: 16,
-  height: 16,
-  borderRadius: 3,
+  width: 14,
+  height: 14,
+  borderRadius: 2,
 };
 
 export const checkboxIcons = {
-  unCheckedIcon: { ...checkBoxBasic, border: "1px solid #d0d0d0" },
+  unCheckedIcon: { ...checkBoxBasic, border: "1px solid #c3c3c3" },
   checkedIcon: {
     ...checkBoxBasic,
-    border: "1px solid #201763",
-    backgroundColor: "#201763",
+    border: "1px solid #081C42",
+    backgroundColor: "#081C42",
+  },
+};
+
+const radioBasic = {
+  width: 12,
+  height: 12,
+  borderRadius: "100%",
+};
+
+export const radioIcons = {
+  radioUnselectedIcon: { ...radioBasic, border: "1px solid #000" },
+  radioSelectedIcon: {
+    ...radioBasic,
+    border: "1px solid #000",
+    backgroundColor: "#000",
   },
 };
 
@@ -89,9 +124,58 @@ export const containerForHeader = (bottomSpacing: any) => ({
       fontSize: 14,
     },
     "& p": {
-      "& span": {
+      "& span:not(*[class*='smallUnit'])": {
         fontSize: 16,
       },
     },
   },
 });
+
+export const actionsTray = {
+  actionsTray: {
+    display: "flex",
+    justifyContent: "space-between",
+    "& button": {
+      flexGrow: 0,
+      marginLeft: 15,
+    },
+  },
+};
+
+export const searchField = {
+  searchField: {
+    flexGrow: 1,
+    height: 40,
+    background: "#FFFFFF",
+    borderRadius: 5,
+    border: "#EAEDEE 1px solid",
+    display: "flex",
+    justifyContent: "center",
+    padding: "0 16px",
+    "& input": {
+      fontSize: 14,
+      color: "#000",
+      "&::placeholder": {
+        color: "#393939",
+        opacity: 1,
+      },
+    },
+  },
+};
+
+export const predefinedList = {
+  predefinedTitle: {
+    fontSize: 16,
+    fontWeight: 600,
+    color: "#000",
+    margin: "10px 0",
+  },
+  predefinedList: {
+    backgroundColor: "#eaeaea",
+    padding: "12px 10px",
+    color: "#393939",
+    fontSize: 12,
+    fontWeight: 600,
+    minHeight: 41,
+  },
+};

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

@@ -16,7 +16,12 @@
 import React from "react";
 import { Dialog, DialogContent, DialogTitle } from "@material-ui/core";
 import IconButton from "@material-ui/core/IconButton";
-import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import {
+  createStyles,
+  makeStyles,
+  Theme,
+  withStyles,
+} from "@material-ui/core/styles";
 
 interface IModalProps {
   classes: any;
@@ -24,23 +29,24 @@ interface IModalProps {
   modalOpen: boolean;
   title: string;
   children: any;
+  wideLimit?: boolean;
 }
 
 const baseCloseLine = {
   content: '" "',
-  borderLeft: "2px solid #707070",
+  borderLeft: "2px solid #9C9C9C",
   height: 33,
   width: 1,
-  position: "absolute"
+  position: "absolute",
 };
 
 const styles = (theme: Theme) =>
   createStyles({
     dialogContainer: {
-      padding: "12px 26px 22px"
+      padding: "8px 15px 22px",
     },
     closeContainer: {
-      textAlign: "right"
+      textAlign: "right",
     },
     closeButton: {
       width: 45,
@@ -48,40 +54,52 @@ const styles = (theme: Theme) =>
       padding: 0,
       backgroundColor: "initial",
       "&:hover": {
-        backgroundColor: "initial"
+        backgroundColor: "initial",
       },
       "&:active": {
-        backgroundColor: "initial"
-      }
+        backgroundColor: "initial",
+      },
     },
     modalCloseIcon: {
       fontSize: 35,
-      color: "#707070",
+      color: "#9C9C9C",
       fontWeight: 300,
       "&:hover": {
-        color: "#000"
-      }
+        color: "#9C9C9C",
+      },
     },
     closeIcon: {
       "&::before": {
         ...baseCloseLine,
-        transform: "rotate(45deg)"
+        transform: "rotate(45deg)",
       },
       "&::after": {
         ...baseCloseLine,
-        transform: "rotate(-45deg)"
+        transform: "rotate(-45deg)",
       },
       "&:hover::before, &:hover::after": {
-        borderColor: "#000"
+        borderColor: "#9C9C9C",
       },
       width: 24,
       height: 24,
       display: "block",
-      position: "relative"
+      position: "relative",
     },
     titleClass: {
-      padding: "0px 24px 12px"
-    }
+      padding: "0px 50px 12px",
+      "& h2": {
+        fontWeight: 600,
+        color: "#000",
+        fontSize: 22,
+      },
+    },
+    modalContent: {
+      padding: "0 50px",
+    },
+    customDialogSize: {
+      width: "100%",
+      maxWidth: 765,
+    },
   });
 
 const ModalWrapper = ({
@@ -89,16 +107,23 @@ const ModalWrapper = ({
   modalOpen,
   title,
   children,
-  classes
+  classes,
+  wideLimit = true,
 }: IModalProps) => {
+  const customSize = wideLimit
+    ? {
+        classes: {
+          paper: classes.customDialogSize,
+        },
+      }
+    : { maxWidth: "md" as const, fullWidth: true };
   return (
     <Dialog
       open={modalOpen}
       onClose={onClose}
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
-      maxWidth={"md"}
-      fullWidth
+      {...customSize}
     >
       <div className={classes.dialogContainer}>
         <div className={classes.closeContainer}>
@@ -114,7 +139,9 @@ const ModalWrapper = ({
         <DialogTitle id="alert-dialog-title" className={classes.titleClass}>
           {title}
         </DialogTitle>
-        <DialogContent>{children}</DialogContent>
+        <DialogContent className={classes.modalContent}>
+          {children}
+        </DialogContent>
       </div>
     </Dialog>
   );

portal-ui/src/screens/Console/Common/TableWrapper/TableActionButton.tsx

@@ -22,6 +22,8 @@ import DeleteIcon from "./TableActionIcons/DeleteIcon";
 import DescriptionIcon from "./TableActionIcons/DescriptionIcon";
 import CloudIcon from "./TableActionIcons/CloudIcon";
 import ConsoleIcon from "./TableActionIcons/ConsoleIcon";
+import GetAppIcon from "@material-ui/icons/GetApp";
+import SvgIcon from "@material-ui/core/SvgIcon";
 import { Link } from "react-router-dom";
 
 interface IActionButton {
@@ -48,6 +50,10 @@ const defineIcon = (type: string, selected: boolean) => {
       return <CloudIcon active={selected} />;
     case "console":
       return <ConsoleIcon active={selected} />;
+    case "download":
+      return (
+        <SvgIcon component={GetAppIcon} fontSize="small" color="primary" />
+      );
   }
 
   return null;

portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/DescriptionIcon.tsx

@@ -7,12 +7,13 @@ const PencilIcon = ({ active = false }: IIcon) => {
       xmlns="http://www.w3.org/2000/svg"
       width="16"
       height="16"
-      viewBox="0 0 24 24"
+      viewBox="0 0 10 11.429"
     >
       <path
         fill={active ? selected : unSelected}
-        d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z"
-      ></path>
+        d="M-43.375,11.429-48.35,8.664l-5.025,2.764V0h10Z"
+        transform="translate(53.375)"
+      />
     </svg>
   );
 };

portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/common.ts

@@ -2,5 +2,5 @@ export interface IIcon {
   active: boolean;
 }
 
-export const unSelected = "#adadad";
-export const selected = "#201763";
+export const unSelected = "#081C42";
+export const selected = "#081C42";

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

@@ -33,7 +33,10 @@ import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { TablePaginationActionsProps } from "@material-ui/core/TablePagination/TablePaginationActions";
 import TableActionButton from "./TableActionButton";
 import history from "../../../../history";
-import { checkboxIcons } from "../FormComponents/common/styleLibrary";
+import {
+  checkboxIcons,
+  radioIcons,
+} from "../FormComponents/common/styleLibrary";
 
 //Interfaces for table Items
 
@@ -49,6 +52,7 @@ interface IColumns {
   elementKey: string;
   sortable?: boolean;
   renderFunction?: (input: any) => any;
+  renderFullObject?: boolean;
   globalClass?: any;
 }
 
@@ -80,6 +84,8 @@ interface TableWrapperProps {
   entityName: string;
   selectedItems?: string[];
   stickyHeader?: boolean;
+  radioSelection?: boolean;
+  customEmptyMessage?: string;
   paginatorConfig?: IPaginatorConfig;
 }
 
@@ -102,6 +108,9 @@ const styles = (theme: Theme) =>
       flexDirection: "column",
       padding: "19px 38px",
       minHeight: "200px",
+      boxShadow: "none",
+      border: "#EAEDEE 1px solid",
+      borderRadius: 3,
     },
     minTableHeader: {
       color: "#393939",
@@ -119,7 +128,8 @@ const styles = (theme: Theme) =>
     },
     rowSelected: {
       ...rowText,
-      color: "#201763",
+      color: "#081C42",
+      fontWeight: 600,
     },
     paginatorContainer: {
       display: "flex",
@@ -156,6 +166,7 @@ const styles = (theme: Theme) =>
       cursor: "pointer",
     },
     ...checkboxIcons,
+    ...radioIcons,
   });
 
 // Function that renders Title Columns
@@ -183,9 +194,11 @@ const rowColumnsMap = (
     const itemElement = isString(itemData)
       ? itemData
       : get(itemData, column.elementKey, null); // If the element is just a string, we render it as it is
+    const renderConst = column.renderFullObject ? itemData : itemElement;
+
     const renderElement = column.renderFunction
-      ? column.renderFunction(itemElement)
-      : itemElement; // If render function is set, we send the value to the function.
+      ? column.renderFunction(renderConst)
+      : renderConst; // If render function is set, we send the value to the function.
     return (
       <TableCell
         key={`tbRE-${column.elementKey}-${index}`}
@@ -236,6 +249,8 @@ const TableWrapper = ({
   idField,
   classes,
   stickyHeader = false,
+  radioSelection = false,
+  customEmptyMessage = "",
   paginatorConfig,
 }: TableWrapperProps) => {
   const findView = itemActions
@@ -330,8 +345,24 @@ const TableWrapper = ({
                             e.stopPropagation();
                             e.preventDefault();
                           }}
-                          checkedIcon={<span className={classes.checkedIcon} />}
-                          icon={<span className={classes.unCheckedIcon} />}
+                          checkedIcon={
+                            <span
+                              className={
+                                radioSelection
+                                  ? classes.radioSelectedIcon
+                                  : classes.checkedIcon
+                              }
+                            />
+                          }
+                          icon={
+                            <span
+                              className={
+                                radioSelection
+                                  ? classes.radioUnselectedIcon
+                                  : classes.unCheckedIcon
+                              }
+                            />
+                          }
                         />
                       </TableCell>
                     )}
@@ -359,7 +390,13 @@ const TableWrapper = ({
           </Table>
         ) : (
           <React.Fragment>
-            {!isLoading && <div>{`There are no ${entityName} yet.`}</div>}
+            {!isLoading && (
+              <div>
+                {customEmptyMessage !== ""
+                  ? customEmptyMessage
+                  : `There are no ${entityName} yet.`}
+              </div>
+            )}
           </React.Fragment>
         )}
       </Paper>

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

@@ -22,6 +22,8 @@ import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
 import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
 import RadioGroupSelector from "../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
 import CSVMultiSelector from "../Common/FormComponents/CSVMultiSelector/CSVMultiSelector";
+import CommentBoxWrapper from "../Common/FormComponents/CommentBoxWrapper/CommentBoxWrapper";
+import FormSwitchWrapper from "../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 interface IConfGenericProps {
   onChange: (newValue: IElementValue[]) => void;
@@ -94,20 +96,21 @@ const ConfTargetGeneric = ({
   const fieldDefinition = (field: KVField, item: number) => {
     switch (field.type) {
       case "on|off":
+        const value = valueHolder[item] ? valueHolder[item].value : "false";
+
         return (
-          <RadioGroupSelector
-            currentSelection={valueHolder[item] ? valueHolder[item].value : ""}
+          <FormSwitchWrapper
+            indicatorLabel="On"
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+              const value = e.target.checked ? "true" : "false";
+              setValueElement(field.name, value, item);
+            }}
             id={field.name}
             name={field.name}
             label={field.label}
+            value={"switch_on"}
             tooltip={field.tooltip}
-            onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-              setValueElement(field.name, e.target.value, item)
-            }
-            selectorOptions={[
-              { label: "On", value: "true" },
-              { label: "Off", value: "false" },
-            ]}
+            checked={value === "true"}
           />
         );
       case "csv":
@@ -120,6 +123,22 @@ const ConfTargetGeneric = ({
               setValueElement(field.name, value, item)
             }
             tooltip={field.tooltip}
+            commonPlaceholder={field.placeholder}
+            withBorder={!!field.withBorder}
+          />
+        );
+      case "comment":
+        return (
+          <CommentBoxWrapper
+            id={field.name}
+            name={field.name}
+            label={field.label}
+            tooltip={field.tooltip}
+            value={valueHolder[item] ? valueHolder[item].value : ""}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+              setValueElement(field.name, e.target.value, item)
+            }
+            placeholder={field.placeholder}
           />
         );
       default:
@@ -134,6 +153,7 @@ const ConfTargetGeneric = ({
               setValueElement(field.name, e.target.value, item)
             }
             multiline={!!field.multiline}
+            placeholder={field.placeholder}
           />
         );
     }

portal-ui/src/screens/Console/Configurations/ConfigurationPanels/ConfigurationsList.tsx

@@ -27,7 +27,11 @@ import TableWrapper from "../../Common/TableWrapper/TableWrapper";
 import { configurationElements } from "../utils";
 import { IConfigurationElement } from "../types";
 import EditConfiguration from "../CustomForms/EditConfiguration";
-import { containerForHeader } from "../../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../../Common/PageHeader/PageHeader";
 
 interface IListConfiguration {
@@ -45,21 +49,11 @@ const styles = (theme: Theme) =>
     keyName: {
       marginLeft: 5,
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
     iconText: {
       lineHeight: "24px",
     },
+    ...searchField,
+    ...actionsTray,
     ...containerForHeader(theme.spacing(4)),
   });
 

portal-ui/src/screens/Console/Configurations/CustomForms/ConfMySql.tsx

@@ -21,7 +21,12 @@ import Grid from "@material-ui/core/Grid";
 import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
 import RadioGroupSelector from "../../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
 import { IElementValue } from "../types";
-import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../../Common/FormComponents/common/styleLibrary";
+import CommentBoxWrapper from "../../Common/FormComponents/CommentBoxWrapper/CommentBoxWrapper";
+import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 interface IConfMySqlProps {
   onChange: (newValue: IElementValue[]) => void;
@@ -31,6 +36,7 @@ interface IConfMySqlProps {
 const styles = (theme: Theme) =>
   createStyles({
     ...modalBasic,
+    ...predefinedList,
   });
 
 const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
@@ -104,44 +110,41 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
     setDsnString(cs);
   }, [user, dbName, password, port, host, setDsnString, configToDsnString]);
 
+  const switcherChangeEvt = (event: React.ChangeEvent<HTMLInputElement>) => {
+    if (event.target.checked) {
+      // build dsn_string
+      const cs = configToDsnString();
+      setDsnString(cs);
+    } else {
+      // parse dsn_string
+      const kv = parseDsnString(dsnString, [
+        "host",
+        "port",
+        "dbname",
+        "user",
+        "password",
+      ]);
+      setHostname(kv.get("host") ? kv.get("host") + "" : "");
+      setPort(kv.get("port") ? kv.get("port") + "" : "");
+      setDbName(kv.get("dbname") ? kv.get("dbname") + "" : "");
+      setUser(kv.get("user") ? kv.get("user") + "" : "");
+      setPassword(kv.get("password") ? kv.get("password") + "" : "");
+    }
+
+    setUseDsnString(event.target.checked);
+  };
+
   return (
     <Grid container className={classes.formScrollable}>
       <Grid item xs={12}>
-        <FormControlLabel
-          control={
-            <Switch
-              checked={useDsnString}
-              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                if (event.target.checked) {
-                  // build dsn_string
-                  const cs = configToDsnString();
-                  setDsnString(cs);
-                } else {
-                  // parse dsn_string
-                  const kv = parseDsnString(dsnString, [
-                    "host",
-                    "port",
-                    "dbname",
-                    "user",
-                    "password",
-                  ]);
-                  setHostname(kv.get("host") ? kv.get("host") + "" : "");
-                  setPort(kv.get("port") ? kv.get("port") + "" : "");
-                  setDbName(kv.get("dbname") ? kv.get("dbname") + "" : "");
-                  setUser(kv.get("user") ? kv.get("user") + "" : "");
-                  setPassword(
-                    kv.get("password") ? kv.get("password") + "" : ""
-                  );
-                }
-
-                setUseDsnString(event.target.checked);
-              }}
-              name="checkedB"
-              color="primary"
-            />
-          }
-          label="Enter DSN String"
-          className={classes.formSlider}
+        <FormSwitchWrapper
+          label={"Enter DNS String"}
+          checked={useDsnString}
+          id="checkedB"
+          name="checkedB"
+          onChange={switcherChangeEvt}
+          value={"dnsString"}
+          indicatorLabel={"On"}
         />
       </Grid>
       {useDsnString ? (
@@ -160,62 +163,78 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
         </React.Fragment>
       ) : (
         <React.Fragment>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="host"
-              name="host"
-              label="Host"
-              value={host}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setHostname(e.target.value);
-              }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="db-name"
-              name="db-name"
-              label="DB Name"
-              value={dbName}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setDbName(e.target.value);
-              }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="port"
-              name="port"
-              label="Port"
-              value={port}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setPort(e.target.value);
-              }}
-            />
-          </Grid>
+          <Grid item xs={12} className={classes.configureString}>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="host"
+                name="host"
+                label=""
+                placeholder="Enter Host"
+                value={host}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setHostname(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="db-name"
+                name="db-name"
+                label=""
+                placeholder="Enter DB Name"
+                value={dbName}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setDbName(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="port"
+                name="port"
+                label=""
+                placeholder="Enter Port"
+                value={port}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setPort(e.target.value);
+                }}
+              />
+            </Grid>
 
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="user"
-              name="user"
-              label="User"
-              value={user}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setUser(e.target.value);
-              }}
-            />
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="user"
+                name="user"
+                label=""
+                placeholder="Enter User"
+                value={user}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setUser(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="password"
+                name="password"
+                label=""
+                placeholder="Enter Password"
+                type="password"
+                value={password}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setPassword(e.target.value);
+                }}
+              />
+            </Grid>
+          </Grid>
+          <Grid item xs={12} className={classes.predefinedTitle}>
+            Connection String
+          </Grid>
+          <Grid item xs={12} className={classes.predefinedList}>
+            {dsnString}
           </Grid>
           <Grid item xs={12}>
-            <InputBoxWrapper
-              id="password"
-              name="password"
-              label="Password"
-              type="password"
-              value={password}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setPassword(e.target.value);
-              }}
-            />
+            <br />
           </Grid>
         </React.Fragment>
       )}
@@ -224,6 +243,7 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
           id="table"
           name="table"
           label="Table"
+          placeholder="Enter Table Name"
           value={table}
           tooltip="DB table name to store/update events, table is auto-created"
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
@@ -252,6 +272,7 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
           id="queue-dir"
           name="queue_dir"
           label="Queue Dir"
+          placeholder="Enter Queue Dir"
           value={queueDir}
           tooltip="staging dir for undelivered messages e.g. '/home/events'"
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
@@ -264,6 +285,7 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
           id="queue-limit"
           name="queue_limit"
           label="Queue Limit"
+          placeholder="Enter Queue Limit"
           type="number"
           value={queueLimit}
           tooltip="maximum limit for undelivered messages, defaults to '10000'"
@@ -273,11 +295,11 @@ const ConfMySql = ({ onChange, classes }: IConfMySqlProps) => {
         />
       </Grid>
       <Grid item xs={12}>
-        <InputBoxWrapper
+        <CommentBoxWrapper
           id="comment"
           name="comment"
           label="Comment"
-          multiline={true}
+          placeholder="Enter Comment"
           value={comment}
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
             setComment(e.target.value);

portal-ui/src/screens/Console/Configurations/CustomForms/ConfPostgres.tsx

@@ -22,7 +22,12 @@ import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBo
 import RadioGroupSelector from "../../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
 import { IElementValue } from "../types";
-import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../../Common/FormComponents/common/styleLibrary";
+import CommentBoxWrapper from "../../Common/FormComponents/CommentBoxWrapper/CommentBoxWrapper";
+import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 interface IConfPostgresProps {
   onChange: (newValue: IElementValue[]) => void;
@@ -32,6 +37,7 @@ interface IConfPostgresProps {
 const styles = (theme: Theme) =>
   createStyles({
     ...modalBasic,
+    ...predefinedList,
   });
 
 const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
@@ -45,7 +51,7 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
   const [port, setPort] = useState<string>("");
   const [user, setUser] = useState<string>("");
   const [password, setPassword] = useState<string>("");
-  const [sslMode, setSslMode] = useState<string>("require");
+  const [sslMode, setSslMode] = useState<string>(" ");
 
   const [table, setTable] = useState<string>("");
   const [format, setFormat] = useState<string>("namespace");
@@ -126,8 +132,11 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
     if (port !== "") {
       strValue = `${strValue} port=${port}`;
     }
+    if (sslMode !== " ") {
+      strValue = `${strValue} sslmode=${sslMode}`;
+    }
 
-    strValue = `${strValue} sslmode=${sslMode}`;
+    strValue = `${strValue} `;
 
     return strValue.trim();
   }, [host, dbName, user, password, port, sslMode]);
@@ -169,48 +178,44 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
     configToString,
   ]);
 
+  useEffect(() => {
+    if (useConnectionString) {
+      // build connection_string
+      const cs = configToString();
+      setConnectionString(cs);
+
+      return;
+    }
+    // parse connection_string
+    const kv = parseConnectionString(connectionString, [
+      "host",
+      "port",
+      "dbname",
+      "user",
+      "password",
+      "sslmode",
+    ]);
+    setHostname(kv.get("host") ? kv.get("host") + "" : "");
+    setPort(kv.get("port") ? kv.get("port") + "" : "");
+    setDbName(kv.get("dbname") ? kv.get("dbname") + "" : "");
+    setUser(kv.get("user") ? kv.get("user") + "" : "");
+    setPassword(kv.get("password") ? kv.get("password") + "" : "");
+    setSslMode(kv.get("sslmode") ? kv.get("sslmode") + "" : " ");
+  }, [useConnectionString]);
+
   return (
     <Grid container className={classes.formScrollable}>
       <Grid item xs={12}>
-        <FormControlLabel
-          control={
-            <Switch
-              checked={useConnectionString}
-              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                if (event.target.checked) {
-                  // build connection_string
-                  const cs = configToString();
-                  setConnectionString(cs);
-                } else {
-                  // parse connection_string
-                  const kv = parseConnectionString(connectionString, [
-                    "host",
-                    "port",
-                    "dbname",
-                    "user",
-                    "password",
-                    "sslmode",
-                  ]);
-                  setHostname(kv.get("host") ? kv.get("host") + "" : "");
-                  setPort(kv.get("port") ? kv.get("port") + "" : "");
-                  setDbName(kv.get("dbname") ? kv.get("dbname") + "" : "");
-                  setUser(kv.get("user") ? kv.get("user") + "" : "");
-                  setPassword(
-                    kv.get("password") ? kv.get("password") + "" : ""
-                  );
-                  setSslMode(
-                    kv.get("sslmode") ? kv.get("sslmode") + "" : "require"
-                  );
-                }
-
-                setUseConnectionString(event.target.checked);
-              }}
-              name="checkedB"
-              color="primary"
-            />
-          }
-          label="Enter Connection String"
-          className={classes.formSlider}
+        <FormSwitchWrapper
+          label={"Manually Configure String"}
+          checked={useConnectionString}
+          id="manualString"
+          name="manualString"
+          onChange={(e) => {
+            setUseConnectionString(e.target.checked);
+          }}
+          value={"manualString"}
+          indicatorLabel={"On"}
         />
       </Grid>
       {useConnectionString ? (
@@ -229,81 +234,97 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
         </React.Fragment>
       ) : (
         <React.Fragment>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="host"
-              name="host"
-              label="Host"
-              value={host}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setHostname(e.target.value);
-              }}
-            />
+          <Grid item xs={12} className={classes.configureString}>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="host"
+                name="host"
+                label=""
+                placeholder="Enter Host"
+                value={host}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setHostname(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="db-name"
+                name="db-name"
+                label=""
+                placeholder="Enter DB Name"
+                value={dbName}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setDbName(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="port"
+                name="port"
+                label=""
+                placeholder="Enter Port"
+                value={port}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setPort(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <SelectWrapper
+                value={sslMode}
+                label=""
+                id="sslmode"
+                name="sslmode"
+                onChange={(e): void => {
+                  if (e.target.value !== undefined) {
+                    setSslMode(e.target.value + "");
+                  }
+                }}
+                options={[
+                  { label: "Enter SSL Mode", value: " " },
+                  { label: "Require", value: "require" },
+                  { label: "Disable", value: "disable" },
+                  { label: "Verify CA", value: "verify-ca" },
+                  { label: "Verify Full", value: "verify-full" },
+                ]}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="user"
+                name="user"
+                label=""
+                placeholder="Enter User"
+                value={user}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setUser(e.target.value);
+                }}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <InputBoxWrapper
+                id="password"
+                name="password"
+                label=""
+                type="password"
+                placeholder="Enter Password"
+                value={password}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setPassword(e.target.value);
+                }}
+              />
+            </Grid>
+          </Grid>
+          <Grid item xs={12} className={classes.predefinedTitle}>
+            Connection String
+          </Grid>
+          <Grid item xs={12} className={classes.predefinedList}>
+            {connectionString}
           </Grid>
           <Grid item xs={12}>
-            <InputBoxWrapper
-              id="db-name"
-              name="db-name"
-              label="DB Name"
-              value={dbName}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setDbName(e.target.value);
-              }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="port"
-              name="port"
-              label="Port"
-              value={port}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setPort(e.target.value);
-              }}
-            />
-          </Grid>
-
-          <Grid item xs={12}>
-            <SelectWrapper
-              value={sslMode}
-              label="SSL Mode"
-              id="sslmode"
-              name="sslmode"
-              onChange={(e): void => {
-                if (e.target.value !== undefined) {
-                  setSslMode(e.target.value + "");
-                }
-              }}
-              options={[
-                { label: "Require", value: "require" },
-                { label: "Disable", value: "disable" },
-                { label: "Verify CA", value: "verify-ca" },
-                { label: "Verify Full", value: "verify-full" },
-              ]}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="user"
-              name="user"
-              label="User"
-              value={user}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setUser(e.target.value);
-              }}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <InputBoxWrapper
-              id="password"
-              name="password"
-              label="Password"
-              type="password"
-              value={password}
-              onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                setPassword(e.target.value);
-              }}
-            />
+            <br />
           </Grid>
         </React.Fragment>
       )}
@@ -312,6 +333,7 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
           id="table"
           name="table"
           label="Table"
+          placeholder={"Enter Table Name"}
           value={table}
           tooltip="DB table name to store/update events, table is auto-created"
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
@@ -340,6 +362,7 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
           id="queue-dir"
           name="queue_dir"
           label="Queue Dir"
+          placeholder="Enter Queue Directory"
           value={queueDir}
           tooltip="staging dir for undelivered messages e.g. '/home/events'"
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
@@ -352,6 +375,7 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
           id="queue-limit"
           name="queue_limit"
           label="Queue Limit"
+          placeholder="Enter Queue Limit"
           type="number"
           value={queueLimit}
           tooltip="maximum limit for undelivered messages, defaults to '10000'"
@@ -361,11 +385,11 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
         />
       </Grid>
       <Grid item xs={12}>
-        <InputBoxWrapper
+        <CommentBoxWrapper
           id="comment"
           name="comment"
           label="Comment"
-          multiline={true}
+          placeholder="Enter Comment"
           value={comment}
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
             setComment(e.target.value);

portal-ui/src/screens/Console/Configurations/types.ts

@@ -27,7 +27,9 @@ export type KVFieldType =
   | "duration"
   | "uri"
   | "sentence"
-  | "csv";
+  | "csv"
+  | "comment"
+  | "switch";
 
 export interface KVField {
   name: string;
@@ -37,6 +39,8 @@ export interface KVField {
   type: KVFieldType;
   options?: SelectorTypes[];
   multiline?: boolean;
+  placeholder?: string;
+  withBorder?: boolean;
 }
 
 export interface IConfigurationElement {

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

@@ -67,22 +67,9 @@ import { ISessionResponse } from "./types";
 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";
 import ListObjects from "./Buckets/ListBuckets/Objects/ListObjects/ListObjects";
-
-function Copyright() {
-  return (
-    <Typography variant="body2" color="textSecondary" align="center">
-      {"Copyright © "}
-      <Link color="inherit" href="https://material-ui.com/">
-        MinIO
-      </Link>{" "}
-      {new Date().getFullYear()}
-      {"."}
-    </Typography>
-  );
-}
+import License from "./License/License";
 
 const drawerWidth = 245;
 
@@ -279,10 +266,6 @@ const Console = ({
       component: Policies,
       path: "/policies",
     },
-    {
-      component: RemoteBuckets,
-      path: "/remote-buckets",
-    },
     {
       component: Trace,
       path: "/trace",
@@ -327,6 +310,10 @@ const Console = ({
       component: TenantDetails,
       path: "/namespaces/:tenantNamespace/tenants/:tenantName",
     },
+    {
+      component: License,
+      path: "/license",
+    },
   ];
   const allowedRoutes = routes.filter((route: any) => allowedPages[route.path]);
 
@@ -385,9 +372,7 @@ const Console = ({
                     />
                   ))}
                   {allowedRoutes.length > 0 ? (
-                    <Route exact path="/">
-                      <Redirect to={allowedRoutes[0].path} />
-                    </Route>
+                    <Redirect to={allowedRoutes[0].path} />
                   ) : null}
                 </Switch>
               </Router>

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

@@ -29,6 +29,9 @@ import { niceBytes } from "../../../common/utils";
 import { LinearProgress } from "@material-ui/core";
 import PageHeader from "../Common/PageHeader/PageHeader";
 import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import AllBucketsIcon from "../../../icons/AllBucketsIcon";
+import UsageIcon from "../../../icons/UsageIcon";
+import EgressIcon from "../../../icons/EgressIcon";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -90,9 +93,13 @@ const styles = (theme: Theme) =>
       boxShadow: "none",
     },
     fixedHeight: {
-      minHeight: 165,
+      height: 165,
       minWidth: 247,
       marginRight: 20,
+      padding: "25px 28px",
+      "& svg": {
+        maxHeight: 18,
+      },
     },
     consumptionValue: {
       color: "#000000",
@@ -106,6 +113,32 @@ const styles = (theme: Theme) =>
     notationContainer: {
       display: "flex",
     },
+    dashboardBG: {
+      width: 390,
+      height: 255,
+      zIndex: 500,
+      position: "absolute",
+      backgroundSize: "fill",
+
+      backgroundImage: "url(/images/BG_IllustrationDarker.svg)",
+      backgroundPosition: "right bottom",
+      right: 0,
+      bottom: 0,
+      backgroundRepeat: "no-repeat",
+    },
+    dashboardContainer: {
+      zIndex: 600,
+      position: "absolute",
+    },
+    elementTitle: {
+      fontWeight: 500,
+      color: "#777777",
+      fontSize: 14,
+      marginTop: -9,
+    },
+    smallUnit: {
+      fontSize: 20,
+    },
   });
 
 interface IDashboardProps {
@@ -141,7 +174,19 @@ const Dashboard = ({ classes }: IDashboardProps) => {
     if (usage === undefined) {
       return "0";
     }
-    return niceBytes(usage);
+
+    const niceBytesUsage = niceBytes(usage).split(" ");
+
+    if (niceBytesUsage.length !== 2) {
+      return niceBytesUsage.join(" ");
+    }
+
+    return (
+      <React.Fragment>
+        {niceBytesUsage[0]}
+        <span className={classes.smallUnit}>{niceBytesUsage[1]}</span>
+      </React.Fragment>
+    );
   };
 
   const prettyNumber = (usage: number | undefined) => {
@@ -155,7 +200,8 @@ const Dashboard = ({ classes }: IDashboardProps) => {
   return (
     <React.Fragment>
       <PageHeader label="Dashboard" />
-      <Grid container>
+      <div className={classes.dashboardBG} />
+      <Grid container className={classes.dashboardContainer}>
         <Grid container spacing={3} className={classes.container}>
           {error !== "" && <Grid container>{error}</Grid>}
           {loading ? (
@@ -168,10 +214,12 @@ const Dashboard = ({ classes }: IDashboardProps) => {
                 <Paper className={fixedHeightPaper}>
                   <Grid container direction="row" alignItems="center">
                     <Grid item className={classes.icon}>
-                      <ViewHeadlineIcon />
+                      <AllBucketsIcon />
                     </Grid>
                     <Grid item>
-                      <Typography variant="h6">All Buckets</Typography>
+                      <Typography className={classes.elementTitle}>
+                        All buckets
+                      </Typography>
                     </Grid>
                   </Grid>
                   <Typography className={classes.consumptionValue}>
@@ -181,10 +229,12 @@ const Dashboard = ({ classes }: IDashboardProps) => {
                 <Paper className={fixedHeightPaper}>
                   <Grid container direction="row" alignItems="center">
                     <Grid item className={classes.icon}>
-                      <PieChartIcon />
+                      <UsageIcon />
                     </Grid>
                     <Grid item>
-                      <Typography variant="h6">Usage</Typography>
+                      <Typography className={classes.elementTitle}>
+                        Usage
+                      </Typography>
                     </Grid>
                   </Grid>
                   <Typography className={classes.consumptionValue}>
@@ -194,10 +244,13 @@ const Dashboard = ({ classes }: IDashboardProps) => {
                 <Paper className={fixedHeightPaper}>
                   <Grid container direction="row" alignItems="center">
                     <Grid item className={classes.icon}>
-                      <NetworkCheckIcon />
+                      <EgressIcon />
                     </Grid>
                     <Grid item>
-                      <Typography variant="h6"> Total Objects</Typography>
+                      <Typography className={classes.elementTitle}>
+                        {" "}
+                        Total Objects
+                      </Typography>
                     </Grid>
                   </Grid>
                   <Typography className={classes.consumptionValue}>

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

@@ -19,12 +19,16 @@ import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { Button, LinearProgress } from "@material-ui/core";
 import Grid from "@material-ui/core/Grid";
 import Typography from "@material-ui/core/Typography";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../Common/FormComponents/common/styleLibrary";
 import api from "../../../common/api";
 import UsersSelectors from "./UsersSelectors";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
 import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
 import RadioGroupSelector from "../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
+import FormSwitchWrapper from "../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 interface IGroupProps {
   open: boolean;
@@ -54,6 +58,7 @@ const styles = (theme: Theme) =>
       textAlign: "right",
     },
     ...modalBasic,
+    ...predefinedList,
   });
 
 const AddGroup = ({
@@ -64,11 +69,12 @@ const AddGroup = ({
 }: IGroupProps) => {
   //Local States
   const [groupName, setGroupName] = useState<string>("");
-  const [groupEnabled, setGroupEnabled] = useState<string>("");
+  const [groupEnabled, setGroupEnabled] = useState<boolean>(false);
   const [saving, isSaving] = useState<boolean>(false);
   const [addError, setError] = useState<string>("");
   const [selectedUsers, setSelectedUsers] = useState<string[]>([]);
   const [loadingGroup, isLoadingGroup] = useState<boolean>(false);
+  const [validGroup, setValidGroup] = useState<boolean>(false);
 
   //Effects
   useEffect(() => {
@@ -80,6 +86,10 @@ const AddGroup = ({
     }
   }, [selectedGroup]);
 
+  useEffect(() => {
+    setValidGroup(groupName.trim() !== "");
+  }, [groupName, selectedUsers]);
+
   useEffect(() => {
     if (saving) {
       const saveRecord = () => {
@@ -88,7 +98,7 @@ const AddGroup = ({
             .invoke("PUT", `/api/v1/groups/${groupName}`, {
               group: groupName,
               members: selectedUsers,
-              status: groupEnabled,
+              status: groupEnabled ? "enabled" : "disabled",
             })
             .then((res) => {
               isSaving(false);
@@ -133,7 +143,7 @@ const AddGroup = ({
         api
           .invoke("GET", `/api/v1/groups/${selectedGroup}`)
           .then((res: MainGroupProps) => {
-            setGroupEnabled(res.status);
+            setGroupEnabled(res.status === "enabled");
             setGroupName(res.name);
             setSelectedUsers(res.members);
           })
@@ -153,12 +163,35 @@ const AddGroup = ({
     isSaving(true);
   };
 
+  const resetForm = () => {
+    if (selectedGroup === null) {
+      setGroupName("");
+    }
+
+    setSelectedUsers([]);
+  };
+
   return (
     <ModalWrapper
       modalOpen={open}
       onClose={closeModalAndRefresh}
-      title={selectedGroup !== null ? `Group Edit - ${groupName}` : "Add Group"}
+      title={selectedGroup !== null ? `Edit Group` : "Create Group"}
     >
+      {selectedGroup !== null && (
+        <div className={classes.floatingEnabled}>
+          <FormSwitchWrapper
+            indicatorLabel={"Enabled"}
+            checked={groupEnabled}
+            value={"group_enabled"}
+            id="group-status"
+            name="group-status"
+            onChange={(e) => {
+              setGroupEnabled(e.target.checked);
+            }}
+            switchOnly
+          />
+        </div>
+      )}
       <form noValidate autoComplete="off" onSubmit={setSaving}>
         <Grid container>
           <Grid item xs={12} className={classes.formScrollable}>
@@ -174,31 +207,13 @@ const AddGroup = ({
               </Grid>
             )}
 
-            {selectedGroup !== null ? (
-              <React.Fragment>
-                <Grid item xs={12}>
-                  <RadioGroupSelector
-                    currentSelection={groupEnabled}
-                    id="group-status"
-                    name="group-status"
-                    label="Status"
-                    onChange={(e) => {
-                      setGroupEnabled(e.target.value);
-                    }}
-                    selectorOptions={[
-                      { label: "Enabled", value: "enabled" },
-                      { label: "Disabled", value: "disabled" },
-                    ]}
-                  />
-                </Grid>
-              </React.Fragment>
-            ) : (
+            {selectedGroup === null ? (
               <React.Fragment>
                 <Grid item xs={12}>
                   <InputBoxWrapper
                     id="group-name"
                     name="group-name"
-                    label="Name"
+                    label="Group Name"
                     value={groupName}
                     onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                       setGroupName(e.target.value);
@@ -206,23 +221,38 @@ const AddGroup = ({
                   />
                 </Grid>
               </React.Fragment>
+            ) : (
+              <React.Fragment>
+                <Grid item xs={12} className={classes.predefinedTitle}>
+                  Group Name
+                </Grid>
+                <Grid item xs={12} className={classes.predefinedList}>
+                  {selectedGroup}
+                </Grid>
+              </React.Fragment>
             )}
-            <Grid item xs={12}>
-              <br />
-            </Grid>
             <Grid item xs={12}>
               <UsersSelectors
                 selectedUsers={selectedUsers}
                 setSelectedUsers={setSelectedUsers}
+                editMode={selectedGroup !== null}
               />
             </Grid>
           </Grid>
           <Grid item xs={12} className={classes.buttonContainer}>
+            <button
+              type="button"
+              color="primary"
+              className={classes.clearButton}
+              onClick={resetForm}
+            >
+              Clear
+            </button>
             <Button
               type="submit"
               variant="contained"
               color="primary"
-              disabled={saving}
+              disabled={saving || !validGroup}
             >
               Save
             </Button>

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

@@ -31,7 +31,11 @@ import AddGroup from "../Groups/AddGroup";
 import DeleteGroup from "./DeleteGroup";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import SetPolicy from "../Policies/SetPolicy";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 
 interface IGroupsProps {
@@ -74,18 +78,8 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 

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

@@ -28,11 +28,16 @@ import TextField from "@material-ui/core/TextField";
 import InputAdornment from "@material-ui/core/InputAdornment";
 import SearchIcon from "@material-ui/icons/Search";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
+import {
+  actionsTray,
+  predefinedList,
+} from "../Common/FormComponents/common/styleLibrary";
 
 interface IGroupsProps {
   classes: any;
   selectedUsers: string[];
   setSelectedUsers: any;
+  editMode?: boolean;
 }
 
 const styles = (theme: Theme) =>
@@ -41,10 +46,11 @@ const styles = (theme: Theme) =>
       marginTop: theme.spacing(3),
     },
     paper: {
-      // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
       flexDirection: "column",
+      paddingTop: 15,
+      boxShadow: "none",
     },
     addSideBar: {
       width: "320px",
@@ -70,36 +76,43 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "left",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    filterField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-      width: "100%",
-      zIndex: 500,
-    },
     noFound: {
       textAlign: "center",
       padding: "10px 0",
     },
     tableContainer: {
-      maxHeight: 250,
+      maxHeight: 200,
     },
     stickyHeader: {
       backgroundColor: "#fff",
     },
+    actionsTitle: {
+      fontWeight: 600,
+      color: "#000",
+      fontSize: 16,
+      alignSelf: "center",
+    },
+    tableBlock: {
+      marginTop: 15,
+    },
+    filterField: {
+      width: 375,
+      fontWeight: 600,
+      "& .input": {
+        "&::placeholder": {
+          fontWeight: 600,
+          color: "#000",
+        },
+      },
+    },
+    ...actionsTray,
   });
 
 const UsersSelectors = ({
   classes,
   selectedUsers,
   setSelectedUsers,
+  editMode = false,
 }: IGroupsProps) => {
   //Local States
   const [records, setRecords] = useState<any[]>([]);
@@ -166,21 +179,22 @@ const UsersSelectors = ({
 
   return (
     <React.Fragment>
-      <Title>Members</Title>
-      {error !== "" ? <div>{error}</div> : <React.Fragment />}
       <Grid item xs={12}>
         <Paper className={classes.paper}>
           {loading && <LinearProgress />}
+          {error !== "" ? <div>{error}</div> : <React.Fragment />}
           {records != null && records.length > 0 ? (
             <React.Fragment>
               <Grid item xs={12} className={classes.actionsTray}>
+                <span className={classes.actionsTitle}>
+                  {editMode ? "Edit" : "Assign"} Members
+                </span>
                 <TextField
                   placeholder="Filter Groups"
                   className={classes.filterField}
                   id="search-resource"
                   label=""
                   InputProps={{
-                    disableUnderline: true,
                     startAdornment: (
                       <InputAdornment position="start">
                         <SearchIcon />
@@ -192,7 +206,7 @@ const UsersSelectors = ({
                   }}
                 />
               </Grid>
-              <Grid item xs={12}>
+              <Grid item xs={12} className={classes.tableBlock}>
                 <TableWrapper
                   columns={[{ label: "Access Key", elementKey: "accessKey" }]}
                   onSelect={selectionChanged}

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

@@ -0,0 +1,335 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from "react";
+import clsx from "clsx";
+import Grid from "@material-ui/core/Grid";
+import Paper from "@material-ui/core/Paper";
+import Button from "@material-ui/core/Button";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+import CheckCircleIcon from "@material-ui/icons/CheckCircle";
+import PageHeader from "../Common/PageHeader/PageHeader";
+import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import { planDetails, planItems, planButtons } from "./utils";
+
+const styles = (theme: Theme) =>
+  createStyles({
+    pageTitle: {
+      fontSize: 18,
+      marginBottom: 20,
+    },
+    paper: {
+      padding: "20px 52px 20px 28px",
+    },
+    tableContainer: {
+      marginLeft: 28,
+    },
+    detailsContainer: {
+      textAlign: "center",
+      paddingTop: 18,
+      paddingBottom: 12,
+      borderRadius: "3px 3px 0 0",
+      marginLeft: 8,
+      maxWidth: "calc(25% - 8px)",
+    },
+    detailsContainerBorder: {
+      border: "1px solid #e2e2e2",
+      borderBottom: 0,
+    },
+    detailsContainerBorderHighlighted: {
+      border: "1px solid #9a93ad",
+      borderBottom: 0,
+    },
+    detailsTitle: {
+      fontSize: 17,
+      fontWeight: 700,
+      marginBottom: 26,
+    },
+    detailsPrice: {
+      fontSize: 12,
+      fontWeight: 700,
+      marginBottom: 8,
+    },
+    detailsCapacityMax: {
+      minHeight: 28,
+      fontSize: 10,
+      fontWeight: 700,
+      marginBottom: 12,
+      padding: "0% 15%",
+      color: "#474747",
+    },
+    detailsCapacityMin: {
+      fontSize: 10,
+    },
+    itemContainer: {
+      height: 36,
+      borderTop: "1px solid #e5e5e5",
+    },
+    itemContainerDetail: {
+      height: 48,
+      borderTop: "1px solid #e5e5e5",
+    },
+    item: {
+      height: "100%",
+      borderLeft: "1px solid #e2e2e2",
+      borderRight: "1px solid #e2e2e2",
+      textAlign: "center",
+      fontSize: 10,
+      fontWeight: 700,
+      display: "flex",
+      alignItems: "center",
+      alignContent: "center",
+      marginLeft: 8,
+      maxWidth: "calc(25% - 8px)",
+    },
+    itemFirst: {
+      borderLeft: 0,
+      borderRight: 0,
+    },
+    itemHighlighted: {
+      borderLeft: "1px solid #9a93ad",
+      borderRight: "1px solid #9a93ad",
+    },
+    field: {
+      textAlign: "left",
+      fontWeight: 400,
+    },
+    checkIcon: {
+      height: 12,
+      color:
+        "transparent linear-gradient(90deg, #073052 0%, #081c42 100%) 0% 0% no-repeat padding-box",
+    },
+    buttonContainer: {
+      paddingTop: 8,
+      paddingBottom: 24,
+      height: "100%",
+      display: "flex",
+      justifyContent: "center",
+      borderRadius: "0 0 3px 3px",
+      border: "1px solid #e2e2e2",
+      borderTop: 0,
+      marginLeft: 8,
+      maxWidth: "calc(25% - 8px)",
+    },
+    buttonContainerBlank: {
+      border: 0,
+    },
+    buttonContainerHighlighted: {
+      border: "1px solid #9a93ad",
+      borderTop: 0,
+    },
+    button: {
+      textTransform: "none",
+      fontSize: 15,
+      fontWeight: 700,
+    },
+    ...containerForHeader(theme.spacing(4)),
+  });
+
+interface ILicense {
+  classes: any;
+}
+
+const License = ({ classes }: ILicense) => {
+  return (
+    <React.Fragment>
+      <PageHeader label="License" />
+      <Grid container>
+        <Grid item xs={12} className={classes.container}>
+          <Paper className={classes.paper}>
+            <Grid container>
+              <Grid item xs={12}>
+                <Typography
+                  component="h2"
+                  variant="h6"
+                  className={classes.pageTitle}
+                >
+                  Upgrade to commercial license
+                </Typography>
+              </Grid>
+              <Grid container item xs={12} className={classes.tableContainer}>
+                <Grid container item xs={12}>
+                  <Grid item xs={3} className={classes.detailsContainer} />
+                  {planDetails.map((details: any) => {
+                    return (
+                      <Grid
+                        container
+                        item
+                        xs={3}
+                        className={clsx(
+                          classes.detailsContainer,
+                          classes.detailsContainerBorder,
+                          {
+                            [classes.detailsContainerBorderHighlighted]:
+                              details.title !== "Community",
+                          }
+                        )}
+                      >
+                        <Grid item xs={12} className={classes.detailsTitle}>
+                          {details.title}
+                        </Grid>
+                        <Grid item xs={12} className={classes.detailsPrice}>
+                          {details.price}
+                        </Grid>
+                        <Grid
+                          item
+                          xs={12}
+                          className={classes.detailsCapacityMax}
+                        >
+                          {details.capacityMax || ""}
+                        </Grid>
+                        <Grid
+                          item
+                          xs={12}
+                          className={classes.detailsCapacityMin}
+                        >
+                          {details.capacityMin}
+                        </Grid>
+                      </Grid>
+                    );
+                  })}
+                </Grid>
+                {planItems.map((item: any) => {
+                  return (
+                    <Grid
+                      container
+                      item
+                      xs={12}
+                      className={clsx(
+                        classes.itemContainer,
+                        item.communityDetail && classes.itemContainerDetail
+                      )}
+                    >
+                      <Grid
+                        item
+                        xs={3}
+                        className={clsx(
+                          classes.item,
+                          classes.field,
+                          classes.itemFirst
+                        )}
+                      >
+                        {item.field}
+                      </Grid>
+                      <Grid container item xs={3} className={classes.item}>
+                        <Grid item xs={12}>
+                          {item.community === "N/A" ? (
+                            ""
+                          ) : item.community === "Yes" ? (
+                            <CheckCircleIcon className={classes.checkIcon} />
+                          ) : (
+                            item.community
+                          )}
+                        </Grid>
+                        {item.communityDetail !== undefined && (
+                          <Grid item xs={12}>
+                            {item.communityDetail}
+                          </Grid>
+                        )}
+                      </Grid>
+                      <Grid
+                        container
+                        item
+                        xs={3}
+                        className={clsx(classes.item, classes.itemHighlighted)}
+                      >
+                        <Grid item xs={12}>
+                          {item.standard === "N/A" ? (
+                            ""
+                          ) : item.standard === "Yes" ? (
+                            <CheckCircleIcon className={classes.checkIcon} />
+                          ) : (
+                            item.standard
+                          )}
+                        </Grid>
+                        {item.standardDetail !== undefined && (
+                          <Grid item xs={12}>
+                            {item.standardDetail}
+                          </Grid>
+                        )}
+                      </Grid>
+                      <Grid
+                        container
+                        item
+                        xs={3}
+                        className={clsx(classes.item, classes.itemHighlighted)}
+                      >
+                        <Grid item xs={12}>
+                          {item.enterprise === "N/A" ? (
+                            ""
+                          ) : item.enterprise === "Yes" ? (
+                            <CheckCircleIcon className={classes.checkIcon} />
+                          ) : (
+                            item.enterprise
+                          )}
+                        </Grid>
+                        {item.enterpriseDetail !== undefined && (
+                          <Grid item xs={12}>
+                            {item.enterpriseDetail}
+                          </Grid>
+                        )}
+                      </Grid>
+                    </Grid>
+                  );
+                })}
+                <Grid container item xs={12}>
+                  <Grid
+                    item
+                    xs={3}
+                    className={clsx(
+                      classes.buttonContainer,
+                      classes.buttonContainerBlank
+                    )}
+                  />
+                  {planButtons.map((button: any) => {
+                    return (
+                      <Grid
+                        container
+                        item
+                        xs={3}
+                        className={clsx(classes.buttonContainer, {
+                          [classes.buttonContainerHighlighted]:
+                            button.text === "Subscribe",
+                        })}
+                      >
+                        <Button
+                          variant={
+                            button.text === "Subscribe"
+                              ? "contained"
+                              : "outlined"
+                          }
+                          color="primary"
+                          className={classes.button}
+                          target="_blank"
+                          href={button.link}
+                        >
+                          {button.text}
+                        </Button>
+                      </Grid>
+                    );
+                  })}
+                </Grid>
+              </Grid>
+            </Grid>
+          </Paper>
+        </Grid>
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(License);

portal-ui/src/screens/Console/License/utils.ts

@@ -0,0 +1,119 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export const planDetails = [
+  {
+    title: "Community",
+    price: "Free",
+    capacityMin: "(No minimum)",
+  },
+  {
+    title: "Standard",
+    price: "$10/TB/month",
+    capacityMax: "Up to 10PB. No additional charges for capacity over 10PB",
+    capacityMin: "(25TB minimum)",
+  },
+  {
+    title: "Enterprise",
+    price: "$20/TB/month",
+    capacityMax: "Up to 5PB. No additional charges for capacity over 5PB",
+    capacityMin: "(100TB minimum)",
+  },
+];
+
+export const planItems = [
+  {
+    field: "License",
+    community: "100% Open Source",
+    communityDetail: "Apache License v2, GNU AGPL v3",
+    standard: "Dual License",
+    standardDetail: "Commercial + Open Source",
+    enterprise: "Dual License",
+    enterpriseDetail: "Commercial + Open Source",
+  },
+  {
+    field: "Software Release",
+    community: "Update to latest",
+    standard: "1 Year Long Term Support",
+    enterprise: "5 Years Long Term Support",
+  },
+  {
+    field: "SLA",
+    community: "No SLA",
+    standard: "<24 hours",
+    enterprise: "<1 hour",
+  },
+  {
+    field: "Support",
+    community: "Community:",
+    communityDetail: "Public Slack Channel + Github Issues",
+    standard: "24x7 L4 direct engineering",
+    standardDetail: "Support via SUBNET",
+    enterprise: "24x7 L4 direct engineering",
+    enterpriseDetail: "Support via SUBNET",
+  },
+  {
+    field: "Security Updates & Critical Bugs",
+    community: "Self Update",
+    standard: "Guided Update",
+    enterprise: "Guided Update",
+  },
+  {
+    field: "Panic Button",
+    community: "N/A",
+    standard: "1 per year",
+    enterprise: "Unlimited",
+  },
+  {
+    field: "Annual Architecture Review",
+    community: "N/A",
+    standard: "Yes",
+    enterprise: "Yes",
+  },
+  {
+    field: "Annual Performance Review",
+    community: "N/A",
+    standard: "Yes",
+    enterprise: "Yes",
+  },
+  {
+    field: "Indemnification",
+    community: "N/A",
+    standard: "N/A",
+    enterprise: "Yes",
+  },
+  {
+    field: "Security + Policy Review",
+    community: "N/A",
+    standard: "N/A",
+    enterprise: "Yes",
+  },
+];
+
+export const planButtons = [
+  {
+    text: "Slack Community",
+    link: "https://slack.min.io",
+  },
+  {
+    text: "Subscribe",
+    link: "https://min.io/pricing",
+  },
+  {
+    text: "Subscribe",
+    link: "https://min.io/pricing",
+  },
+];

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

@@ -13,7 +13,7 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import React, { useEffect } from "react";
+import React, { useState, useEffect } from "react";
 import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
 import { AppState } from "../../../store";
 import { connect } from "react-redux";
@@ -21,42 +21,51 @@ import { logMessageReceived, logResetMessages } from "./actions";
 import { LogMessage } from "./types";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { timeFromDate } from "../../../common/utils";
-import { isNullOrUndefined } from "util";
 import { wsProtocol } from "../../../utils/wsUtils";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
-import { Grid } from "@material-ui/core";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
+import { Button, Grid } from "@material-ui/core";
 import PageHeader from "../Common/PageHeader/PageHeader";
+import TextField from "@material-ui/core/TextField";
+import InputAdornment from "@material-ui/core/InputAdornment";
+import SearchIcon from "@material-ui/icons/Search";
+import { CreateIcon } from "../../../icons";
 
 const styles = (theme: Theme) =>
   createStyles({
     logList: {
-      background: "white",
-      maxHeight: "400px",
+      background: "#fff",
+      minHeight: 400,
+      height: "calc(100vh - 270px)",
       overflow: "auto",
-      "& ul": {
-        margin: "4px",
-        padding: "0px",
-      },
-      "& ul li": {
-        listStyle: "none",
-        margin: "0px",
-        padding: "0px",
-        borderBottom: "1px solid #dedede",
-      },
+      fontSize: 13,
+      padding: "25px 45px",
+      border: "1px solid #EAEDEE",
+      borderRadius: 4,
     },
     tab: {
-      padding: "25px",
+      paddingLeft: 25,
     },
     logerror: {
       color: "#A52A2A",
     },
     logerror_tab: {
       color: "#A52A2A",
-      padding: "25px",
+      paddingLeft: 25,
     },
     ansidefault: {
-      color: "black",
+      color: "#000",
     },
+    highlight: {
+      "& span": {
+        backgroundColor: "#082F5238",
+      },
+    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 
@@ -73,6 +82,8 @@ const Logs = ({
   logResetMessages,
   messages,
 }: ILogs) => {
+  const [highlight, setHighlight] = useState("");
+
   useEffect(() => {
     logResetMessages();
     const url = new URL(window.location.toString());
@@ -128,84 +139,145 @@ const Logs = ({
 
   const renderError = (logElement: LogMessage) => {
     let errorElems = [];
-    if (!isNullOrUndefined(logElement.error)) {
+    if (logElement.error !== null && logElement.error !== undefined) {
       if (logElement.api && logElement.api.name) {
+        const errorText = `API: ${logElement.api.name}`;
+
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
+
         errorElems.push(
-          <li key={`api-${logElement.key}`}>
-            <span className={classes.logerror}>API: {logElement.api.name}</span>
-          </li>
+          <div
+            key={`api-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <br />
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.time) {
+        const errorText = `Time: ${timeFromDate(logElement.time)}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`time-${logElement.key}`}>
-            <span className={classes.logerror}>
-              Time: {timeFromDate(logElement.time)}
-            </span>
-          </li>
+          <div
+            key={`time-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.deploymentid) {
+        const errorText = `DeploymentID: ${logElement.deploymentid}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`deploytmentid-${logElement.key}`}>
-            <span className={classes.logerror}>
-              DeploymentID: {logElement.deploymentid}
-            </span>
-          </li>
+          <div
+            key={`deploytmentid-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.requestID) {
+        const errorText = `RequestID: ${logElement.requestID}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`requestid-${logElement.key}`}>
-            <span className={classes.logerror}>
-              RequestID: {logElement.requestID}
-            </span>
-          </li>
+          <div
+            key={`requestid-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.remotehost) {
+        const errorText = `RemoteHost: ${logElement.remotehost}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`remotehost-${logElement.key}`}>
-            <span className={classes.logerror}>
-              RemoteHost: {logElement.remotehost}
-            </span>
-          </li>
+          <div
+            key={`remotehost-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.host) {
+        const errorText = `Host: ${logElement.host}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`host-${logElement.key}`}>
-            <span className={classes.logerror}>Host: {logElement.host}</span>
-          </li>
+          <div
+            key={`host-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.userAgent) {
+        const errorText = `UserAgent: ${logElement.userAgent}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`useragent-${logElement.key}`}>
-            <span className={classes.logerror}>
-              UserAgent: {logElement.userAgent}
-            </span>
-          </li>
+          <div
+            key={`useragent-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.error.message) {
+        const errorText = `Error: ${logElement.error.message}`;
+        const highlightedLine =
+          highlight !== ""
+            ? errorText.toLowerCase().includes(highlight.toLowerCase())
+            : false;
         errorElems.push(
-          <li key={`message-${logElement.key}`}>
-            <span className={classes.logerror}>
-              Error: {logElement.error.message}
-            </span>
-          </li>
+          <div
+            key={`message-${logElement.key}`}
+            className={`${highlightedLine ? classes.highlight : ""}`}
+          >
+            <span className={classes.logerror}>{errorText}</span>
+          </div>
         );
       }
       if (logElement.error.source) {
         // for all sources add padding
         for (let s in logElement.error.source) {
+          const errorText = logElement.error.source[s];
+          const highlightedLine =
+            highlight !== ""
+              ? errorText.toLowerCase().includes(highlight.toLowerCase())
+              : false;
           errorElems.push(
-            <li key={`source-${logElement.key}-${s}`}>
-              <span className={classes.logerror_tab}>
-                {logElement.error.source[s]}
-              </span>
-            </li>
+            <div
+              key={`source-${logElement.key}-${s}`}
+              className={`${highlightedLine ? classes.highlight : ""}`}
+            >
+              <span className={classes.logerror_tab}>{errorText}</span>
+            </div>
           );
         }
       }
@@ -226,38 +298,72 @@ const Logs = ({
     // only to the first match.
     let substr = logMessage.replace(tColorRegex, "");
 
+    // in case highlight is set, we select the line that contains the requested string
+    let highlightedLine =
+      highlight !== ""
+        ? logMessage.toLowerCase().includes(highlight.toLowerCase())
+        : false;
+
     // if starts with multiple spaces add padding
     if (substr.startsWith("   ")) {
       return (
-        <li key={logElement.key}>
+        <div
+          key={logElement.key}
+          className={`${highlightedLine ? classes.highlight : ""}`}
+        >
           <span className={classes.tab}>{substr}</span>
-        </li>
+        </div>
       );
-    } else if (!isNullOrUndefined(logElement.error)) {
+    } else if (logElement.error !== null && logElement.error !== undefined) {
       // list error message and all sources and error elems
       return renderError(logElement);
     } else {
       // for all remaining set default class
       return (
-        <li key={logElement.key}>
+        <div
+          key={logElement.key}
+          className={`${highlightedLine ? classes.highlight : ""}`}
+        >
           <span className={classes.ansidefault}>{substr}</span>
-        </li>
+        </div>
       );
     }
   };
 
+  const renderLines = messages.map((m) => {
+    return renderLog(m);
+  });
+
   return (
     <React.Fragment>
       <PageHeader label="Logs" />
       <Grid container>
-        <Grid className={classes.container} item xs={12}>
-          <div className={classes.logList}>
-            <ul>
-              {messages.map((m) => {
-                return renderLog(m);
-              })}
-            </ul>
-          </div>
+        <Grid item xs={12} className={classes.container}>
+          <Grid item xs={12} className={classes.actionsTray}>
+            <TextField
+              placeholder="Highlight Line"
+              className={classes.searchField}
+              id="search-resource"
+              label=""
+              onChange={(val) => {
+                setHighlight(val.target.value);
+              }}
+              InputProps={{
+                disableUnderline: true,
+                startAdornment: (
+                  <InputAdornment position="start">
+                    <SearchIcon />
+                  </InputAdornment>
+                ),
+              }}
+            />
+          </Grid>
+          <Grid item xs={12}>
+            <br />
+          </Grid>
+          <Grid item xs={12}>
+            <div className={classes.logList}>{renderLines}</div>
+          </Grid>
         </Grid>
       </Grid>
     </React.Fragment>

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

@@ -21,7 +21,6 @@ import ListItem from "@material-ui/core/ListItem";
 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";
@@ -54,6 +53,10 @@ import {
   WarpIcon,
 } from "../../../icons";
 import { clearSession } from "../../../common/utils";
+import HealIcon from "../../../icons/HealIcon";
+import ConsoleIcon from "../../../icons/ConsoleIcon";
+import LicenseIcon from "../../../icons/LicenseIcon";
+import LogoutIcon from "../../../icons/LogoutIcon";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -200,17 +203,25 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       group: "User",
       type: "item",
       component: NavLink,
-      to: "/service-accounts",
-      name: "Service Accounts",
-      icon: <ServiceAccountsIcon />,
+      to: "/object-browser",
+      name: "Object Browser",
+      icon: <DescriptionIcon />,
     },
     {
       group: "User",
       type: "item",
       component: NavLink,
-      to: "/object-browser",
-      name: "Object Browser",
-      icon: <DescriptionIcon />,
+      to: "/service-accounts",
+      name: "Service Accounts",
+      icon: <ServiceAccountsIcon />,
+    },
+    {
+      group: "Admin",
+      type: "item",
+      component: NavLink,
+      to: "/buckets",
+      name: "Buckets",
+      icon: <BucketsIcon />,
     },
     {
       group: "Admin",
@@ -228,14 +239,6 @@ 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",
@@ -244,21 +247,13 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       name: "IAM Policies",
       icon: <IAMPoliciesIcon />,
     },
-    {
-      group: "Admin",
-      type: "item",
-      component: NavLink,
-      to: "/remote-buckets",
-      name: "Remote Buckets",
-      icon: <CloudUploadIcon />,
-    },
     {
       group: "Tools",
       type: "item",
       component: NavLink,
       to: "/logs",
-      name: "Console Logs",
-      icon: <WebAssetIcon />,
+      name: "Logs",
+      icon: <ConsoleIcon />,
     },
     {
       group: "Tools",
@@ -282,7 +277,7 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       component: NavLink,
       to: "/heal",
       name: "Heal",
-      icon: <HealingIcon />,
+      icon: <HealIcon />,
     },
     {
       group: "Admin",
@@ -324,6 +319,14 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
       name: "Warp",
       icon: <WarpIcon />,
     },
+    {
+      group: "License",
+      type: "item",
+      component: NavLink,
+      to: "/license",
+      name: "License",
+      icon: <LicenseIcon />,
+    },
   ];
 
   const allowedPages = pages.reduce((result: any, item: any, index: any) => {
@@ -436,7 +439,7 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
 
         <ListItem button onClick={logout}>
           <ListItemIcon>
-            <ExitToApp />
+            <LogoutIcon />
           </ListItemIcon>
           <ListItemText primary="Logout" />
         </ListItem>

portal-ui/src/screens/Console/Menu/utils.ts

@@ -20,4 +20,5 @@ export const menuGroups = [
   { label: "Admin", group: "Admin", collapsible: true },
   { label: "Tools", group: "Tools", collapsible: true },
   { label: "Operator", group: "Operator", collapsible: true },
+  { label: "", group: "License", collapsible: false },
 ];

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

@@ -42,6 +42,7 @@ import {
   removeEmptyFields,
 } from "../Configurations/utils";
 import { IElementValue } from "../Configurations/types";
+import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -60,6 +61,69 @@ const styles = (theme: Theme) =>
     logoButton: {
       height: "80px",
     },
+    lambdaNotif: {
+      border: "#393939 1px solid",
+      borderRadius: 5,
+      width: 101,
+      height: 91,
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      marginBottom: 16,
+      cursor: "pointer",
+      "& img": {
+        maxWidth: 71,
+        maxHeight: 71,
+      },
+    },
+    iconContainer: {
+      display: "flex",
+      flexDirection: "row",
+      width: 455,
+      justifyContent: "space-between",
+      flexWrap: "wrap",
+    },
+    nonIconContainer: {
+      marginBottom: 16,
+      "& button": {
+        marginRight: 16,
+      },
+    },
+    pickTitle: {
+      fontWeight: 600,
+      color: "#393939",
+      fontSize: 14,
+      marginBottom: 16,
+    },
+    lambdaFormIndicator: {
+      display: "flex",
+      marginBottom: 40,
+    },
+    lambdaName: {
+      fontSize: 18,
+      fontWeight: 700,
+      color: "#000",
+      marginBottom: 6,
+    },
+    lambdaSubname: {
+      fontSize: 12,
+      color: "#000",
+      fontWeight: 600,
+    },
+    lambdaIcon: {
+      borderRadius: 5,
+      border: "#393939 1px solid",
+      width: 53,
+      height: 48,
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      marginRight: 16,
+      "& img": {
+        width: 38,
+      },
+    },
+    ...modalBasic,
   });
 
 interface IAddNotificationEndpointProps {
@@ -136,186 +200,111 @@ const AddNotificationEndpoint = ({
     }
   }
 
-  let targetTitle = "";
-  switch (service) {
-    case notifyNsq:
-      targetTitle = "NSQ";
-      break;
-    case notifyWebhooks:
-      targetTitle = "Webhooks";
-      break;
-    case notifyElasticsearch:
-      targetTitle = "Elastic Search";
-      break;
-    case notifyNats:
-      targetTitle = "NATS";
-      break;
-    case notifyMqtt:
-      targetTitle = "MQTT";
-      break;
-    case notifyRedis:
-      targetTitle = "Redis";
-      break;
-    case notifyKafka:
-      targetTitle = "Kafka";
-      break;
-    case notifyPostgres:
-      targetTitle = "Postgres";
-      break;
-    case notifyMysql:
-      targetTitle = "Mysql";
-      break;
-    case notifyAmqp:
-      targetTitle = "AMQP";
-      break;
-  }
+  const servicesList = [
+    {
+      actionTrigger: notifyPostgres,
+      targetTitle: "Postgres SQL",
+      logo: "/postgres.png",
+    },
+    {
+      actionTrigger: notifyKafka,
+      targetTitle: "Kafka",
+      logo: "/kafka.png",
+    },
+    {
+      actionTrigger: notifyAmqp,
+      targetTitle: "AMQP",
+      logo: "/amqp.png",
+    },
+    {
+      actionTrigger: notifyMqtt,
+      targetTitle: "MQTT",
+      logo: "/mqtt.png",
+    },
+    {
+      actionTrigger: notifyRedis,
+      targetTitle: "Redis",
+      logo: "/redis.png",
+    },
+    {
+      actionTrigger: notifyNats,
+      targetTitle: "NATS",
+      logo: "/nats.png",
+    },
+    {
+      actionTrigger: notifyMysql,
+      targetTitle: "Mysql",
+      logo: "/mysql.png",
+    },
+    {
+      actionTrigger: notifyElasticsearch,
+      targetTitle: "Elastic Search",
+      logo: "/elasticsearch.png",
+    },
+    {
+      actionTrigger: notifyWebhooks,
+      targetTitle: "Webhook",
+      logo: "",
+    },
+    {
+      actionTrigger: notifyNsq,
+      targetTitle: "NSQ",
+      logo: "",
+    },
+  ];
+
+  const nonLogos = servicesList.filter((elService) => elService.logo === "");
+  const withLogos = servicesList.filter((elService) => elService.logo !== "");
+
+  const targetElement = servicesList.find(
+    (element) => element.actionTrigger === service
+  );
+
+  const goBack = () => {
+    setService("");
+  };
 
   return (
-    <ModalWrapper
-      modalOpen={open}
-      onClose={closeModalAndRefresh}
-      title={`Add Lambda Notification Target ${targetTitle}`}
-    >
+    <ModalWrapper modalOpen={open} onClose={closeModalAndRefresh} title={""}>
       {service === "" && (
         <Grid container>
           <Grid item xs={12}>
-            <p>Pick a supported service:</p>
-            <table className={classes.chooseTable} style={{ width: "100%" }}>
-              <tbody>
-                <tr>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyPostgres);
-                      }}
-                    >
-                      <img
-                        src="/postgres.png"
-                        className={classes.logoButton}
-                        alt="postgres"
-                      />
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyKafka);
-                      }}
-                    >
-                      <img
-                        src="/kafka.png"
-                        className={classes.logoButton}
-                        alt="kafka"
-                      />
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyAmqp);
-                      }}
-                    >
-                      <img
-                        src="/amqp.png"
-                        className={classes.logoButton}
-                        alt="amqp"
-                      />
-                    </Button>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyMqtt);
-                      }}
-                    >
-                      <img
-                        src="/mqtt.png"
-                        className={classes.logoButton}
-                        alt="mqtt"
-                      />
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyRedis);
-                      }}
-                    >
-                      <img
-                        src="/redis.png"
-                        className={classes.logoButton}
-                        alt="redis"
-                      />
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyNats);
-                      }}
-                    >
-                      <img
-                        src="/nats.png"
-                        className={classes.logoButton}
-                        alt="nats"
-                      />
-                    </Button>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyMysql);
-                      }}
-                    >
-                      <img
-                        src="/mysql.png"
-                        className={classes.logoButton}
-                        alt="mysql"
-                      />
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyElasticsearch);
-                      }}
-                    >
-                      <img
-                        src="/elasticsearch.png"
-                        className={classes.logoButton}
-                        alt="elasticsearch"
-                      />
-                    </Button>
-                  </td>
-                  <td></td>
-                </tr>
-                <tr>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyWebhooks);
-                      }}
-                    >
-                      Webhook
-                    </Button>
-                  </td>
-                  <td>
-                    <Button
-                      onClick={() => {
-                        setService(notifyNsq);
-                      }}
-                    >
-                      NSQ
-                    </Button>
-                  </td>
-                  <td />
-                </tr>
-              </tbody>
-            </table>
+            <div className={classes.pickTitle}>Pick a supported service:</div>
+            <div className={classes.nonIconContainer}>
+              {nonLogos.map((item) => {
+                return (
+                  <Button
+                    variant="contained"
+                    color="primary"
+                    key={`non-icon-${item.targetTitle}`}
+                    onClick={() => {
+                      setService(item.actionTrigger);
+                    }}
+                  >
+                    {item.targetTitle.toUpperCase()}
+                  </Button>
+                );
+              })}
+            </div>
+            <div className={classes.iconContainer}>
+              {withLogos.map((item) => {
+                return (
+                  <a
+                    key={`icon-${item.targetTitle}`}
+                    className={classes.lambdaNotif}
+                    onClick={() => {
+                      setService(item.actionTrigger);
+                    }}
+                  >
+                    <img
+                      src={item.logo}
+                      className={classes.logoButton}
+                      alt={item.targetTitle}
+                    />
+                  </a>
+                );
+              })}
+            </div>
           </Grid>
           <Grid item xs={12}>
             <br />
@@ -342,10 +331,37 @@ const AddNotificationEndpoint = ({
             </Grid>
           )}
           <form noValidate onSubmit={submitForm}>
+            <Grid item xs={12} className={classes.lambdaFormIndicator}>
+              {targetElement && targetElement.logo !== "" && (
+                <div className={classes.lambdaIcon}>
+                  <img
+                    src={targetElement.logo}
+                    alt={targetElement.targetTitle}
+                  />
+                </div>
+              )}
+
+              <div className={classes.lambdaTitle}>
+                <div className={classes.lambdaName}>
+                  {targetElement ? targetElement.targetTitle : ""}
+                </div>
+                <div className={classes.lambdaSubname}>
+                  Add Lambda Notification Target
+                </div>
+              </div>
+            </Grid>
             <Grid item xs={12}>
               {srvComponent}
             </Grid>
             <Grid item xs={12} className={classes.buttonContainer}>
+              <button
+                type="button"
+                color="primary"
+                className={classes.clearButton}
+                onClick={goBack}
+              >
+                Back
+              </button>
               <Button
                 type="submit"
                 variant="contained"

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

@@ -35,7 +35,11 @@ import api from "../../../common/api";
 import FiberManualRecordIcon from "@material-ui/icons/FiberManualRecord";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import AddNotificationEndpoint from "./AddNotificationEndpoint";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 
 interface IListNotificationEndpoints {
@@ -53,21 +57,11 @@ const styles = (theme: Theme) =>
     keyName: {
       marginLeft: 5,
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
     iconText: {
       lineHeight: "24px",
     },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 

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

@@ -31,6 +31,10 @@ import { Bucket, BucketList } from "../Buckets/types";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import api from "../../../common/api";
 import history from "../../../history";
+import {
+  actionsTray,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -62,18 +66,6 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
     usedSpaceCol: {
       width: 150,
     },
@@ -81,6 +73,8 @@ const styles = (theme: Theme) =>
       alignItems: "center",
       display: "flex",
     },
+    ...actionsTray,
+    ...searchField,
   });
 
 interface IBrowseBucketsProps {
@@ -162,10 +156,10 @@ const BrowseBuckets = ({ classes }: IBrowseBucketsProps) => {
         />
       )}
       <Grid container>
-        <Grid item xs={6} className={classes.subTitleLabel}>
+        <Grid item xs={2} className={classes.subTitleLabel}>
           <Typography variant="h6">Buckets</Typography>
         </Grid>
-        <Grid item xs={6} className={classes.actionsTray}>
+        <Grid item xs={10} className={classes.actionsTray}>
           <TextField
             placeholder="Search Buckets"
             className={classes.searchField}

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

@@ -16,19 +16,18 @@
 
 import React from "react";
 import Grid from "@material-ui/core/Grid";
-import { UnControlled as CodeMirror } from "react-codemirror2";
 import Typography from "@material-ui/core/Typography";
 import { Button, LinearProgress } from "@material-ui/core";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import api from "../../../common/api";
-import "codemirror/lib/codemirror.css";
-import "codemirror/theme/material.css";
 import { Policy } from "./types";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
+import {
+  fieldBasic,
+  modalBasic,
+} from "../Common/FormComponents/common/styleLibrary";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
 import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
-
-require("codemirror/mode/javascript/javascript");
+import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -39,13 +38,11 @@ const styles = (theme: Theme) =>
       minHeight: 400,
       width: "100%",
     },
-    codeMirror: {
-      fontSize: 14,
-    },
     buttonContainer: {
       textAlign: "right",
     },
     ...modalBasic,
+    ...fieldBasic,
   });
 
 interface IAddPolicyProps {
@@ -108,13 +105,26 @@ class AddPolicy extends React.Component<IAddPolicyProps, IAddPolicyState> {
     if (policyEdit) {
       this.setState({
         policyName: policyEdit.name,
+        policyDefinition: policyEdit
+          ? JSON.stringify(JSON.parse(policyEdit.policy), null, 4)
+          : "",
       });
     }
   }
 
+  resetForm() {
+    this.setState({
+      policyName: "",
+      policyDefinition: "",
+    });
+  }
+
   render() {
     const { classes, open, policyEdit } = this.props;
-    const { addLoading, addError, policyName } = this.state;
+    const { addLoading, addError, policyName, policyDefinition } = this.state;
+
+    const validSave = policyName.trim() !== "";
+
     return (
       <ModalWrapper
         modalOpen={open}
@@ -150,6 +160,7 @@ class AddPolicy extends React.Component<IAddPolicyProps, IAddPolicyState> {
                   id="policy-name"
                   name="policy-name"
                   label="Policy Name"
+                  placeholder="Enter Policy Name"
                   onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                     this.setState({ policyName: e.target.value });
                   }}
@@ -160,31 +171,32 @@ class AddPolicy extends React.Component<IAddPolicyProps, IAddPolicyState> {
               <Grid item xs={12}>
                 <br />
               </Grid>
-              <Grid item xs={12}>
-                <CodeMirror
-                  className={classes.codeMirror}
-                  value={
-                    policyEdit
-                      ? JSON.stringify(JSON.parse(policyEdit.policy), null, 4)
-                      : ""
-                  }
-                  options={{
-                    mode: "javascript",
-                    lineNumbers: true,
-                  }}
-                  onChange={(editor, data, value) => {
-                    this.setState({ policyDefinition: value });
-                  }}
-                />
-              </Grid>
+              <CodeMirrorWrapper
+                label="Write Policy"
+                value={policyDefinition}
+                onBeforeChange={(editor, data, value) => {
+                  this.setState({ policyDefinition: value });
+                }}
+                readOnly={!!policyEdit}
+              />
             </Grid>
             {!policyEdit && (
               <Grid item xs={12} className={classes.buttonContainer}>
+                <button
+                  type="button"
+                  color="primary"
+                  className={classes.clearButton}
+                  onClick={() => {
+                    this.resetForm();
+                  }}
+                >
+                  Clear
+                </button>
                 <Button
                   type="submit"
                   variant="contained"
                   color="primary"
-                  disabled={addLoading}
+                  disabled={addLoading || !validSave}
                 >
                   Save
                 </Button>

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

@@ -23,7 +23,7 @@ import {
   DialogContent,
   DialogContentText,
   DialogTitle,
-  LinearProgress
+  LinearProgress,
 } from "@material-ui/core";
 import api from "../../../common/api";
 import { PolicyList } from "./types";
@@ -32,8 +32,8 @@ import Typography from "@material-ui/core/Typography";
 const styles = (theme: Theme) =>
   createStyles({
     errorBlock: {
-      color: "red"
-    }
+      color: "red",
+    },
   });
 
 interface IDeletePolicyProps {
@@ -54,7 +54,7 @@ class DeletePolicy extends React.Component<
 > {
   state: IDeletePolicyState = {
     deleteLoading: false,
-    deleteError: ""
+    deleteError: "",
   };
   removeRecord() {
     const { deleteLoading } = this.state;
@@ -69,17 +69,17 @@ class DeletePolicy extends React.Component<
           this.setState(
             {
               deleteLoading: false,
-              deleteError: ""
+              deleteError: "",
             },
             () => {
               this.props.closeDeleteModalAndRefresh(true);
             }
           );
         })
-        .catch(err => {
+        .catch((err) => {
           this.setState({
             deleteLoading: false,
-            deleteError: err
+            deleteError: err,
           });
         });
     });
@@ -98,7 +98,7 @@ class DeletePolicy extends React.Component<
         aria-labelledby="alert-dialog-title"
         aria-describedby="alert-dialog-description"
       >
-        <DialogTitle id="alert-dialog-title">Delete Bucket</DialogTitle>
+        <DialogTitle id="alert-dialog-title">Delete Policy</DialogTitle>
         <DialogContent>
           {deleteLoading && <LinearProgress />}
           <DialogContentText id="alert-dialog-description">

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

@@ -30,7 +30,11 @@ import AddPolicy from "./AddPolicy";
 import DeletePolicy from "./DeletePolicy";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import api from "../../../common/api";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 
 const styles = (theme: Theme) =>
@@ -63,18 +67,8 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 

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

@@ -0,0 +1,204 @@
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { useEffect, useState } from "react";
+import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
+import { LinearProgress } from "@material-ui/core";
+import Paper from "@material-ui/core/Paper";
+import Grid from "@material-ui/core/Grid";
+import InputAdornment from "@material-ui/core/InputAdornment";
+import SearchIcon from "@material-ui/icons/Search";
+import TextField from "@material-ui/core/TextField";
+import api from "../../../common/api";
+import { policySort } from "../../../utils/sortFunctions";
+import TableWrapper from "../Common/TableWrapper/TableWrapper";
+import { actionsTray } from "../Common/FormComponents/common/styleLibrary";
+import { PolicyList } from "./types";
+
+interface ISelectPolicyProps {
+  classes: any;
+  selectedPolicy?: string;
+  setSelectedPolicy: any;
+}
+
+const styles = (theme: Theme) =>
+  createStyles({
+    seeMore: {
+      marginTop: theme.spacing(3),
+    },
+    paper: {
+      display: "flex",
+      overflow: "auto",
+      flexDirection: "column",
+      paddingTop: 15,
+      boxShadow: "none",
+    },
+    addSideBar: {
+      width: "320px",
+      padding: "20px",
+    },
+    errorBlock: {
+      color: "red",
+    },
+    tableToolbar: {
+      paddingLeft: theme.spacing(2),
+      paddingRight: theme.spacing(0),
+    },
+    wrapCell: {
+      maxWidth: "200px",
+      whiteSpace: "normal",
+      wordWrap: "break-word",
+    },
+    minTableHeader: {
+      color: "#393939",
+      "& tr": {
+        "& th": {
+          fontWeight: "bold",
+        },
+      },
+    },
+    noFound: {
+      textAlign: "center",
+      padding: "10px 0",
+    },
+    tableContainer: {
+      maxHeight: 200,
+    },
+    stickyHeader: {
+      backgroundColor: "#fff",
+    },
+    actionsTitle: {
+      fontWeight: 600,
+      color: "#000",
+      fontSize: 16,
+      alignSelf: "center",
+    },
+    tableBlock: {
+      marginTop: 15,
+    },
+    filterField: {
+      width: 375,
+      fontWeight: 600,
+      "& .input": {
+        "&::placeholder": {
+          fontWeight: 600,
+          color: "#000",
+        },
+      },
+    },
+    ...actionsTray,
+  });
+
+const PolicySelectors = ({
+  classes,
+  selectedPolicy = "",
+  setSelectedPolicy,
+}: ISelectPolicyProps) => {
+  // Local State
+  const [records, setRecords] = useState<any[]>([]);
+  const [loading, isLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string>("");
+  const [filter, setFilter] = useState<string>("");
+
+  //Effects
+  useEffect(() => {
+    isLoading(true);
+  }, []);
+
+  useEffect(() => {
+    if (loading) {
+      fetchPolicies();
+    }
+  }, [loading]);
+
+  const fetchPolicies = () => {
+    isLoading(true);
+
+    api
+      .invoke("GET", `/api/v1/policies?limit=1000`)
+      .then((res: PolicyList) => {
+        const policies = res.policies === null ? [] : res.policies;
+        isLoading(false);
+        setRecords(policies.sort(policySort));
+        setError("");
+      })
+      .catch((err) => {
+        isLoading(false);
+        setError(err);
+      });
+  };
+
+  const selectionChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const targetD = e.target;
+    const value = targetD.value;
+
+    setSelectedPolicy(value);
+  };
+
+  const filteredRecords = records.filter((elementItem) =>
+    elementItem.name.includes(filter)
+  );
+
+  return (
+    <React.Fragment>
+      <Grid item xs={12}>
+        <Paper className={classes.paper}>
+          {loading && <LinearProgress />}
+          {error !== "" && <div>{error}</div>}
+          {records != null && records.length > 0 ? (
+            <React.Fragment>
+              <Grid item xs={12} className={classes.actionsTray}>
+                <span className={classes.actionsTitle}>Assign Policies</span>
+                <TextField
+                  placeholder="Filter by Policy"
+                  className={classes.filterField}
+                  id="search-resource"
+                  label=""
+                  InputProps={{
+                    startAdornment: (
+                      <InputAdornment position="start">
+                        <SearchIcon />
+                      </InputAdornment>
+                    ),
+                  }}
+                  onChange={(e) => {
+                    setFilter(e.target.value);
+                  }}
+                />
+              </Grid>
+              <Grid item xs={12} className={classes.tableBlock}>
+                <TableWrapper
+                  columns={[{ label: "Policy", elementKey: "name" }]}
+                  onSelect={selectionChanged}
+                  selectedItems={[selectedPolicy]}
+                  isLoading={loading}
+                  records={filteredRecords}
+                  entityName="Policies"
+                  idField="name"
+                  radioSelection
+                />
+              </Grid>
+            </React.Fragment>
+          ) : (
+            <div className={classes.noFound}>No Policies Available</div>
+          )}
+        </Paper>
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+export default withStyles(styles)(PolicySelectors);

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

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useCallback, useEffect, useState } from "react";
+import get from "lodash/get";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import {
   Button,
@@ -28,13 +29,17 @@ import {
   TableRow,
 } from "@material-ui/core";
 import Grid from "@material-ui/core/Grid";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../Common/FormComponents/common/styleLibrary";
 import { User } from "../Users/types";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
 import { Policy, PolicyList } from "./types";
 import api from "../../../common/api";
 import { policySort } from "../../../utils/sortFunctions";
 import { Group } from "../Groups/types";
+import PolicySelectors from "./PolicySelectors";
 
 interface ISetPolicyProps {
   classes: any;
@@ -47,6 +52,7 @@ interface ISetPolicyProps {
 const styles = (theme: Theme) =>
   createStyles({
     ...modalBasic,
+    ...predefinedList,
     buttonContainer: {
       textAlign: "right",
     },
@@ -60,28 +66,12 @@ const SetPolicy = ({
   open,
 }: ISetPolicyProps) => {
   //Local States
-  const [records, setRecords] = useState<Policy[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
+  const [actualPolicy, setActualPolicy] = useState<string>("");
+  const [selectedPolicy, setSelectedPolicy] = useState<string>("");
   const [error, setError] = useState<string>("");
 
-  const fetchRecords = () => {
-    setLoading(true);
-
-    api
-      .invoke("GET", `/api/v1/policies?limit=1000`)
-      .then((res: PolicyList) => {
-        const policies = res.policies === null ? [] : res.policies;
-        setLoading(false);
-        setRecords(policies.sort(policySort));
-        setError("");
-      })
-      .catch((err) => {
-        setLoading(false);
-        setError(err);
-      });
-  };
-
-  const setPolicyAction = (policyName: string) => {
+  const setPolicyAction = () => {
     let entity = "user";
     let value = null;
     if (selectedGroup !== null) {
@@ -96,7 +86,7 @@ const SetPolicy = ({
     setLoading(true);
 
     api
-      .invoke("PUT", `/api/v1/set-policy/${policyName}`, {
+      .invoke("PUT", `/api/v1/set-policy/${selectedPolicy}`, {
         entityName: value,
         entityType: entity,
       })
@@ -111,71 +101,89 @@ const SetPolicy = ({
       });
   };
 
+  const fetchGroupInformation = () => {
+    if (selectedGroup) {
+      api
+        .invoke("GET", `/api/v1/groups/${selectedGroup}`)
+        .then((res: any) => {
+          const groupPolicy = get(res, "policy", "");
+          setActualPolicy(groupPolicy);
+          setSelectedPolicy(groupPolicy);
+        })
+        .catch((err) => {
+          setError(err);
+          setLoading(false);
+        });
+    }
+  };
+
+  const resetSelection = () => {
+    setSelectedPolicy(actualPolicy);
+  };
+
   useEffect(() => {
     if (open) {
-      fetchRecords();
+      if (selectedGroup !== null) {
+        fetchGroupInformation();
+        return;
+      }
+
+      const userPolicy = get(selectedUser, "policy", "");
+      setActualPolicy(userPolicy);
+      setSelectedPolicy(userPolicy);
     }
   }, [open]);
 
+  const userName = get(selectedUser, "accessKey", "");
+
   return (
     <ModalWrapper
       onClose={() => {
         closeModalAndRefresh();
       }}
       modalOpen={open}
-      title={
-        selectedUser !== null ? "Set Policy to User" : "Set Policy to Group"
-      }
+      title="Set Policies"
     >
-      <Grid container className={classes.formScrollable}>
-        <Grid item xs={12}>
-          <TableContainer component={Paper}>
-            <Table
-              className={classes.table}
-              size="small"
-              aria-label="a dense table"
-            >
-              <TableHead>
-                <TableRow>
-                  <TableCell>Policy</TableCell>
-                  <TableCell align="right"></TableCell>
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {records.map((row) => (
-                  <TableRow key={row.name}>
-                    <TableCell component="th" scope="row">
-                      {row.name}
-                    </TableCell>
-                    <TableCell align="right">
-                      <Button
-                        variant="contained"
-                        color="primary"
-                        size={"small"}
-                        onClick={() => {
-                          setPolicyAction(row.name);
-                        }}
-                      >
-                        Set
-                      </Button>
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
+      <Grid item xs={12}>
+        <Grid item xs={12} className={classes.predefinedTitle}>
+          Selected {selectedGroup !== null ? "Group" : "User"}
+        </Grid>
+        <Grid item xs={12} className={classes.predefinedList}>
+          {selectedGroup !== null ? selectedGroup : userName}
         </Grid>
       </Grid>
+      <Grid item xs={12}>
+        <Grid item xs={12} className={classes.predefinedTitle}>
+          Current Policy
+        </Grid>
+        <Grid item xs={12} className={classes.predefinedList}>
+          {actualPolicy}
+        </Grid>
+      </Grid>
+      <PolicySelectors
+        selectedPolicy={selectedPolicy}
+        setSelectedPolicy={setSelectedPolicy}
+      />
+      <Grid item xs={12}>
+        <br />
+      </Grid>
       <Grid item xs={12} className={classes.buttonContainer}>
+        <button
+          type="button"
+          color="primary"
+          className={classes.clearButton}
+          onClick={resetSelection}
+        >
+          Clear
+        </button>
         <Button
-          type="submit"
+          type="button"
           variant="contained"
           color="primary"
-          onClick={() => {
-            closeModalAndRefresh();
-          }}
+          disabled={loading}
+          onClick={setPolicyAction}
         >
-          Cancel
+          Save
         </Button>
       </Grid>
       {loading && (

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

@@ -1,209 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2020 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { useState, useEffect } from "react";
-import Grid from "@material-ui/core/Grid";
-import Typography from "@material-ui/core/Typography";
-import { Button, LinearProgress } from "@material-ui/core";
-import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
-import api from "../../../common/api";
-import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
-import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
-import SelectWrapper from "../Common/FormComponents/SelectWrapper/SelectWrapper";
-
-const styles = (theme: Theme) =>
-  createStyles({
-    errorBlock: {
-      color: "red",
-    },
-    buttonContainer: {
-      textAlign: "right",
-    },
-    ...modalBasic,
-  });
-
-interface IAddBucketProps {
-  classes: any;
-  open: boolean;
-  closeModalAndRefresh: () => void;
-}
-
-const AddRemoteBucket = ({
-  classes,
-  open,
-  closeModalAndRefresh,
-}: IAddBucketProps) => {
-  const [addLoading, setAddLoading] = useState(false);
-  const [addError, setAddError] = useState("");
-  const [accessKey, setAccessKey] = useState("");
-  const [secretKey, setSecretKey] = useState("");
-  const [sourceBucket, setSourceBucket] = useState("");
-  const [targetURL, setTargetURL] = useState("");
-  const [targetBucket, setTargetBucket] = useState("");
-  const [region, setRegion] = useState("");
-
-  useEffect(() => {
-    if (addLoading) {
-      addRecord();
-    }
-  }, [addLoading]);
-
-  const addRecord = () => {
-    const remoteBucketInfo = {
-      accessKey: accessKey,
-      secretKey: secretKey,
-      sourceBucket: sourceBucket,
-      targetURL: targetURL,
-      targetBucket: targetBucket,
-      region: region,
-    };
-
-    api
-      .invoke("POST", "/api/v1/remote-buckets", remoteBucketInfo)
-      .then((res) => {
-        setAddLoading(false);
-        setAddError("");
-        closeModalAndRefresh();
-      })
-      .catch((err) => {
-        setAddLoading(false);
-        setAddError(err);
-      });
-  };
-
-  return (
-    <ModalWrapper
-      title="Create Remote Bucket"
-      modalOpen={open}
-      onClose={() => {
-        setAddError("");
-        closeModalAndRefresh();
-      }}
-      aria-labelledby="alert-dialog-title"
-      aria-describedby="alert-dialog-description"
-    >
-      <form
-        noValidate
-        autoComplete="off"
-        onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
-          e.preventDefault();
-          addRecord();
-        }}
-      >
-        <Grid container>
-          <Grid item xs={12} className={classes.formScrollable}>
-            {addError !== "" && (
-              <Grid item xs={12}>
-                <Typography
-                  component="p"
-                  variant="body1"
-                  className={classes.errorBlock}
-                >
-                  {addError}
-                </Typography>
-              </Grid>
-            )}
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="accessKey"
-                name="accessKey"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setAccessKey(e.target.value);
-                }}
-                label="Access Key"
-                value={accessKey}
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="secretKey"
-                name="secretKey"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setSecretKey(e.target.value);
-                }}
-                label="Secret Key"
-                value={secretKey}
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="sourceBucket"
-                name="sourceBucket"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setSourceBucket(e.target.value);
-                }}
-                label="Source Bucket"
-                value={sourceBucket}
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="targetURL"
-                name="targetURL"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setTargetURL(e.target.value);
-                }}
-                placeholder="https://play.min.io:9000"
-                label="Target URL"
-                value={targetURL}
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="targetBucket"
-                name="targetBucket"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setTargetBucket(e.target.value);
-                }}
-                label="Target Bucket"
-                value={targetBucket}
-              />
-            </Grid>
-            <Grid item xs={12}>
-              <InputBoxWrapper
-                id="region"
-                name="region"
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setRegion(e.target.value);
-                }}
-                label="Region"
-                value={region}
-              />
-            </Grid>
-          </Grid>
-          <Grid item xs={12} className={classes.buttonContainer}>
-            <Button
-              type="submit"
-              variant="contained"
-              color="primary"
-              disabled={addLoading}
-            >
-              Save
-            </Button>
-          </Grid>
-          {addLoading && (
-            <Grid item xs={12}>
-              <LinearProgress />
-            </Grid>
-          )}
-        </Grid>
-      </form>
-    </ModalWrapper>
-  );
-};
-
-export default withStyles(styles)(AddRemoteBucket);

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

@@ -1,137 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2020 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { useState, useEffect } from "react";
-import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import get from "lodash/get";
-import {
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-  LinearProgress,
-} from "@material-ui/core";
-import api from "../../../common/api";
-import Typography from "@material-ui/core/Typography";
-
-const styles = (theme: Theme) =>
-  createStyles({
-    errorBlock: {
-      color: "red",
-    },
-  });
-
-interface IDeleteEventProps {
-  classes: any;
-  closeDeleteModalAndRefresh: (refresh: boolean) => void;
-  deleteOpen: boolean;
-  bucketName: any;
-  sourceBucket: string;
-}
-
-interface IDeleteEventState {
-  deleteLoading: boolean;
-  deleteError: string;
-}
-
-const DeleteRemoteBucket = ({
-  deleteOpen,
-  closeDeleteModalAndRefresh,
-  classes,
-  bucketName,
-  sourceBucket,
-}: IDeleteEventProps) => {
-  const [deleteError, setDeleteError] = useState("");
-  const [deleteLoading, setDeleteLoading] = useState(false);
-
-  useEffect(() => {
-    if (deleteLoading) {
-      removeRecord();
-    }
-  }, [deleteLoading]);
-
-  const removeRecord = () => {
-    api
-      .invoke("DELETE", `/api/v1/remote-buckets/${sourceBucket}/${bucketName}`)
-      .then(() => {
-        setDeleteLoading(false);
-        setDeleteError("");
-        closeDeleteModalAndRefresh(true);
-      })
-      .catch((err) => {
-        setDeleteLoading(false);
-        setDeleteError(err);
-      });
-  };
-
-  return (
-    <Dialog
-      open={deleteOpen}
-      onClose={() => {
-        setDeleteError("");
-        closeDeleteModalAndRefresh(false);
-      }}
-      aria-labelledby="alert-dialog-title"
-      aria-describedby="alert-dialog-description"
-    >
-      <DialogTitle id="alert-dialog-title">Delete Remote Bucket</DialogTitle>
-      <DialogContent>
-        {deleteLoading && <LinearProgress />}
-        <DialogContentText id="alert-dialog-description">
-          Are you sure you want to delete <strong>'{bucketName}'</strong> Remote
-          Bucket?
-          {deleteError !== "" && (
-            <React.Fragment>
-              <br />
-              <Typography
-                component="p"
-                variant="body1"
-                className={classes.errorBlock}
-              >
-                {deleteError}
-              </Typography>
-            </React.Fragment>
-          )}
-        </DialogContentText>
-      </DialogContent>
-      <DialogActions>
-        <Button
-          onClick={() => {
-            setDeleteError("");
-            closeDeleteModalAndRefresh(false);
-          }}
-          color="primary"
-          disabled={deleteLoading}
-        >
-          Cancel
-        </Button>
-        <Button
-          onClick={() => {
-            setDeleteLoading(true);
-          }}
-          color="secondary"
-          autoFocus
-        >
-          Delete
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
-
-export default withStyles(styles)(DeleteRemoteBucket);

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

@@ -1,279 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2020 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { useState, useEffect } from "react";
-import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import Grid from "@material-ui/core/Grid";
-import { Button } from "@material-ui/core";
-import Typography from "@material-ui/core/Typography";
-import TextField from "@material-ui/core/TextField";
-import InputAdornment from "@material-ui/core/InputAdornment";
-import SearchIcon from "@material-ui/icons/Search";
-import Moment from "react-moment";
-import api from "../../../common/api";
-import { Bucket } from "../Buckets/types";
-import TableWrapper from "../Common/TableWrapper/TableWrapper";
-import AddRemoteBucket from "./AddRemoteBucket";
-import { MinTablePaginationActions } from "../../../common/MinTablePaginationActions";
-import { CreateIcon } from "../../../icons";
-import { IRemoteBucket, IRemoteBucketsResponse } from "./types";
-import DeleteRemoteBucket from "./DeleteRemoteBucket";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
-import PageHeader from "../Common/PageHeader/PageHeader";
-
-const styles = (theme: Theme) =>
-  createStyles({
-    seeMore: {
-      marginTop: theme.spacing(3),
-    },
-    paper: {
-      display: "flex",
-      overflow: "auto",
-      flexDirection: "column",
-    },
-
-    addSideBar: {
-      width: "320px",
-      padding: "20px",
-    },
-    errorBlock: {
-      color: "red",
-    },
-    tableToolbar: {
-      paddingLeft: theme.spacing(2),
-      paddingRight: theme.spacing(0),
-    },
-    minTableHeader: {
-      color: "#393939",
-      "& tr": {
-        "& th": {
-          fontWeight: "bold",
-        },
-      },
-    },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
-    ...containerForHeader(theme.spacing(4)),
-  });
-
-interface IRemoteListBucketsProps {
-  classes: any;
-}
-
-const RemoteBucketsList = ({ classes }: IRemoteListBucketsProps) => {
-  const [records, setRecords] = useState<IRemoteBucket[]>([]);
-  const [totalRecords, setTotalRecords] = useState<number>(0);
-  const [loading, setLoading] = useState<boolean>(true);
-  const [error, setError] = useState<string>("");
-  const [addScreenOpen, setAddScreenOpen] = useState<boolean>(false);
-  const [deleteScreenOpen, setDeleteOpen] = useState<boolean>(false);
-  const [page, setPage] = useState<number>(0);
-  const [rowsPerPage, setRowsPerPage] = useState<number>(10);
-  const [selectedBucket, setSelectedBucket] = useState<IRemoteBucket>({
-    remoteARN: "",
-    accessKey: "",
-    name: "",
-    secretKey: "",
-    service: "",
-    sourceBucket: "",
-    status: "",
-    targetBucket: "",
-    targetURL: "",
-  });
-  const [filterBuckets, setFilterBuckets] = useState<string>("");
-
-  useEffect(() => {
-    if (loading) {
-      fetchRecords();
-    }
-  }, [loading]);
-
-  const closeAddModalAndRefresh = () => {
-    setAddScreenOpen(false);
-    setLoading(true);
-  };
-
-  const closeDeleteModalAndRefresh = (reload: boolean) => {
-    setDeleteOpen(false);
-
-    if (reload) {
-      setLoading(true);
-    }
-  };
-
-  const fetchRecords = () => {
-    const offset = page * rowsPerPage;
-    api
-      .invoke("GET", `/api/v1/remote-buckets`)
-      .then((res: IRemoteBucketsResponse) => {
-        setLoading(false);
-        setRecords(res.buckets || []);
-        setTotalRecords(!res.buckets ? 0 : res.total);
-        setError("");
-        // if we get 0 results, and page > 0 , go down 1 page
-        if (
-          (res.buckets === undefined ||
-            res.buckets == null ||
-            res.buckets.length === 0) &&
-          page > 0
-        ) {
-          const newPage = page - 1;
-          setPage(newPage);
-          setLoading(true);
-        }
-      })
-      .catch((err: any) => {
-        setLoading(false);
-        setError(err);
-      });
-  };
-
-  const offset = page * rowsPerPage;
-
-  const handleChangePage = (event: unknown, newPage: number) => {
-    setPage(newPage);
-  };
-
-  const handleChangeRowsPerPage = (
-    event: React.ChangeEvent<HTMLInputElement>
-  ) => {
-    const rPP = parseInt(event.target.value, 10);
-    setPage(0);
-    setRowsPerPage(rPP);
-  };
-
-  const confirmDeleteRemoteBucket = (arnRemoteBucket: IRemoteBucket) => {
-    setSelectedBucket(arnRemoteBucket);
-    setDeleteOpen(true);
-  };
-
-  const tableActions = [{ type: "delete", onClick: confirmDeleteRemoteBucket }];
-
-  const filteredRecords = records
-    .slice(offset, offset + rowsPerPage)
-    .filter((b: IRemoteBucket) => {
-      if (filterBuckets === "") {
-        return true;
-      } else {
-        if (b.name.indexOf(filterBuckets) >= 0) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-    });
-
-  return (
-    <React.Fragment>
-      {addScreenOpen && (
-        <AddRemoteBucket
-          open={addScreenOpen}
-          closeModalAndRefresh={() => {
-            closeAddModalAndRefresh();
-          }}
-        />
-      )}
-      {deleteScreenOpen && (
-        <DeleteRemoteBucket
-          bucketName={selectedBucket.remoteARN}
-          sourceBucket={selectedBucket.sourceBucket}
-          closeDeleteModalAndRefresh={(reload) => {
-            closeDeleteModalAndRefresh(reload);
-          }}
-          deleteOpen={deleteScreenOpen}
-        />
-      )}
-      <PageHeader label="Remote Buckets" />
-      <Grid container>
-        <Grid item xs={12} className={classes.container}>
-          <Grid item xs={12} className={classes.actionsTray}>
-            <TextField
-              placeholder="Search Remote Buckets"
-              className={classes.searchField}
-              id="search-resource"
-              label=""
-              onChange={(val) => {
-                setFilterBuckets(val.target.value);
-              }}
-              InputProps={{
-                disableUnderline: true,
-                startAdornment: (
-                  <InputAdornment position="start">
-                    <SearchIcon />
-                  </InputAdornment>
-                ),
-              }}
-            />
-            <Button
-              variant="contained"
-              color="primary"
-              startIcon={<CreateIcon />}
-              onClick={() => {
-                setAddScreenOpen(true);
-              }}
-            >
-              Create Remote Bucket
-            </Button>
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12}>
-            <TableWrapper
-              itemActions={tableActions}
-              columns={[
-                { label: "Remote ARN", elementKey: "remoteARN" },
-                { label: "Source Bucket", elementKey: "sourceBucket" },
-                { label: "Target Bucket", elementKey: "targetBucket" },
-                { label: "Status", elementKey: "status" },
-              ]}
-              isLoading={loading}
-              records={filteredRecords}
-              entityName="Remote Buckets"
-              idField="remoteARN"
-              paginatorConfig={{
-                rowsPerPageOptions: [5, 10, 25],
-                colSpan: 3,
-                count: totalRecords,
-                rowsPerPage: rowsPerPage,
-                page: page,
-                SelectProps: {
-                  inputProps: { "aria-label": "rows per page" },
-                  native: true,
-                },
-                onChangePage: handleChangePage,
-                onChangeRowsPerPage: handleChangeRowsPerPage,
-                ActionsComponent: MinTablePaginationActions,
-              }}
-            />
-          </Grid>
-        </Grid>
-      </Grid>
-    </React.Fragment>
-  );
-};
-
-export default withStyles(styles)(RemoteBucketsList);

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

@@ -16,19 +16,14 @@
 
 import React, { useEffect, useState } from "react";
 import Grid from "@material-ui/core/Grid";
-import { UnControlled as CodeMirror } from "react-codemirror2";
 import Typography from "@material-ui/core/Typography";
 import { Button, LinearProgress, Tooltip } from "@material-ui/core";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
 import api from "../../../common/api";
-import "codemirror/lib/codemirror.css";
-import "codemirror/theme/material.css";
 import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
-import HelpIcon from "@material-ui/icons/Help";
-
-require("codemirror/mode/javascript/javascript");
+import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -39,9 +34,6 @@ const styles = (theme: Theme) =>
       minHeight: 400,
       width: "100%",
     },
-    codeMirror: {
-      fontSize: 14,
-    },
     buttonContainer: {
       textAlign: "right",
     },
@@ -92,6 +84,10 @@ const AddServiceAccount = ({
     setAddSending(true);
   };
 
+  const resetForm = () => {
+    setPolicyDefinition("");
+  };
+
   return (
     <ModalWrapper
       modalOpen={open}
@@ -120,29 +116,24 @@ const AddServiceAccount = ({
                 </Typography>
               </Grid>
             )}
-            <Grid item xs={12}>
-              <Typography component="h5">
-                Optional Policy
-                <Tooltip
-                  title="A policy that restricts this service account can be attached."
-                  placement="top-start"
-                >
-                  <HelpIcon />
-                </Tooltip>
-              </Typography>
-              <CodeMirror
-                className={classes.codeMirror}
-                options={{
-                  mode: "javascript",
-                  lineNumbers: true,
-                }}
-                onChange={(editor, data, value) => {
-                  setPolicyDefinition(value);
-                }}
-              />
-            </Grid>
+            <CodeMirrorWrapper
+              value={policyDefinition}
+              label="Optional Policy"
+              tooltip="A policy that restricts this service account can be attached."
+              onBeforeChange={(editor, data, value) => {
+                setPolicyDefinition(value);
+              }}
+            />
           </Grid>
           <Grid item xs={12} className={classes.buttonContainer}>
+            <button
+              type="button"
+              color="primary"
+              className={classes.clearButton}
+              onClick={resetForm}
+            >
+              Clear
+            </button>
             <Button
               type="submit"
               variant="contained"

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

@@ -32,7 +32,11 @@ import SearchIcon from "@material-ui/icons/Search";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import { stringSort } from "../../../utils/sortFunctions";
 import PageHeader from "../Common/PageHeader/PageHeader";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -75,18 +79,8 @@ const styles = (theme: Theme) =>
     iconRoot: {
       textAlign: "center",
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 

portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

@@ -29,7 +29,7 @@ import TableRow from "@material-ui/core/TableRow";
 import api from "../../../../common/api";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
-import CheckboxWrapper from "../../Common/FormComponents/CheckboxWrapper/CheckboxWrapper";
+import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
 import {
   calculateDistribution,
@@ -1001,7 +1001,7 @@ const AddTenant = ({
             </span>
             <br />
             <br />
-            <CheckboxWrapper
+            <FormSwitchWrapper
               value="adv_mode"
               id="adv_mode"
               name="adv_mode"
@@ -1033,7 +1033,7 @@ const AddTenant = ({
           </div>
 
           <Grid item xs={12}>
-            <CheckboxWrapper
+            <FormSwitchWrapper
               value="custom_dockerhub"
               id="custom_dockerhub"
               name="custom_dockerhub"
@@ -1083,7 +1083,7 @@ const AddTenant = ({
             </React.Fragment>
           )}
           <Grid item xs={12}>
-            <CheckboxWrapper
+            <FormSwitchWrapper
               value="enable_prometheus"
               id="enable_prometheus"
               name="enable_prometheus"
@@ -1198,7 +1198,7 @@ const AddTenant = ({
                 />
               </Grid>
               <Grid item xs={12}>
-                <CheckboxWrapper
+                <FormSwitchWrapper
                   value="ad_skipTLS"
                   id="ad_skipTLS"
                   name="ad_skipTLS"
@@ -1213,7 +1213,7 @@ const AddTenant = ({
                 />
               </Grid>
               <Grid item xs={12}>
-                <CheckboxWrapper
+                <FormSwitchWrapper
                   value="ad_serverInsecure"
                   id="ad_serverInsecure"
                   name="ad_serverInsecure"
@@ -1302,7 +1302,7 @@ const AddTenant = ({
             <h3>Security</h3>
           </div>
           <Grid item xs={12}>
-            <CheckboxWrapper
+            <FormSwitchWrapper
               value="enableTLS"
               id="enableTLS"
               name="enableTLS"
@@ -1425,7 +1425,7 @@ const AddTenant = ({
             <span>How would you like to encrypt the information at rest.</span>
           </div>
           <Grid item xs={12}>
-            <CheckboxWrapper
+            <FormSwitchWrapper
               value="enableEncryption"
               id="enableEncryption"
               name="enableEncryption"
@@ -2113,6 +2113,7 @@ const AddTenant = ({
       }}
       aria-labelledby="alert-dialog-title"
       aria-describedby="alert-dialog-description"
+      wideLimit={false}
     >
       {addSending && (
         <Grid item xs={12}>

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

@@ -34,6 +34,8 @@ import { NewServiceAccount } from "../../Common/CredentialsPrompt/types";
 import CredentialsPrompt from "../../Common/CredentialsPrompt/CredentialsPrompt";
 import history from "../../../../history";
 import RefreshIcon from "@material-ui/icons/Refresh";
+import { containerForHeader } from "../../Common/FormComponents/common/styleLibrary";
+import PageHeader from "../../Common/PageHeader/PageHeader";
 
 interface ITenantsList {
   classes: any;
@@ -81,6 +83,7 @@ const styles = (theme: Theme) =>
       borderRadius: 5,
       boxShadow: "0px 3px 6px #00000012",
     },
+    ...containerForHeader(theme.spacing(4)),
   });
 
 const ListTenants = ({ classes }: ITenantsList) => {
@@ -245,84 +248,81 @@ const ListTenants = ({ classes }: ITenantsList) => {
           entity="Tenant"
         />
       )}
+      <PageHeader label={"Tenants"} />
       <Grid container>
-        <Grid item xs={12}>
-          <Typography variant="h6">Tenants</Typography>
-        </Grid>
-        <Grid item xs={12}>
-          <br />
-        </Grid>
-        <Grid item xs={12} className={classes.actionsTray}>
-          <IconButton
-            color="primary"
-            aria-label="Refresh Tenant List"
-            component="span"
-            onClick={() => {
-              setIsLoading(true);
-            }}
-          >
-            <RefreshIcon />
-          </IconButton>
+        <Grid item xs={12} className={classes.container}>
+          <Grid item xs={12} className={classes.actionsTray}>
+            <IconButton
+              color="primary"
+              aria-label="Refresh Tenant List"
+              component="span"
+              onClick={() => {
+                setIsLoading(true);
+              }}
+            >
+              <RefreshIcon />
+            </IconButton>
 
-          <TextField
-            placeholder="Search Tenants"
-            className={classes.searchField}
-            id="search-resource"
-            label=""
-            onChange={(val) => {
-              setFilterTenants(val.target.value);
-            }}
-            InputProps={{
-              disableUnderline: true,
-              startAdornment: (
-                <InputAdornment position="start">
-                  <SearchIcon />
-                </InputAdornment>
-              ),
-            }}
-          />
-          <Button
-            variant="contained"
-            color="primary"
-            startIcon={<CreateIcon />}
-            onClick={() => {
-              setCreateTenantOpen(true);
-            }}
-          >
-            Create Tenant
-          </Button>
-        </Grid>
-        <Grid item xs={12}>
-          <br />
-        </Grid>
-        <Grid item xs={12}>
-          <TableWrapper
-            itemActions={tableActions}
-            columns={[
-              { label: "Name", elementKey: "name" },
-              { label: "Capacity", elementKey: "capacity" },
-              { label: "# of Zones", elementKey: "zone_count" },
-              { label: "State", elementKey: "currentState" },
-            ]}
-            isLoading={isLoading}
-            records={filteredRecords}
-            entityName="Tenants"
-            idField="name"
-            paginatorConfig={{
-              rowsPerPageOptions: [5, 10, 25],
-              colSpan: 3,
-              count: filteredRecords.length,
-              rowsPerPage: rowsPerPage,
-              page: page,
-              SelectProps: {
-                inputProps: { "aria-label": "rows per page" },
-                native: true,
-              },
-              onChangePage: handleChangePage,
-              onChangeRowsPerPage: handleChangeRowsPerPage,
-              ActionsComponent: MinTablePaginationActions,
-            }}
-          />
+            <TextField
+              placeholder="Search Tenants"
+              className={classes.searchField}
+              id="search-resource"
+              label=""
+              onChange={(val) => {
+                setFilterTenants(val.target.value);
+              }}
+              InputProps={{
+                disableUnderline: true,
+                startAdornment: (
+                  <InputAdornment position="start">
+                    <SearchIcon />
+                  </InputAdornment>
+                ),
+              }}
+            />
+            <Button
+              variant="contained"
+              color="primary"
+              startIcon={<CreateIcon />}
+              onClick={() => {
+                setCreateTenantOpen(true);
+              }}
+            >
+              Create Tenant
+            </Button>
+          </Grid>
+          <Grid item xs={12}>
+            <br />
+          </Grid>
+          <Grid item xs={12}>
+            <TableWrapper
+              itemActions={tableActions}
+              columns={[
+                { label: "Name", elementKey: "name" },
+                { label: "Capacity", elementKey: "capacity" },
+                { label: "# of Zones", elementKey: "zone_count" },
+                { label: "State", elementKey: "currentState" },
+              ]}
+              isLoading={isLoading}
+              records={filteredRecords}
+              entityName="Tenants"
+              idField="name"
+              paginatorConfig={{
+                rowsPerPageOptions: [5, 10, 25],
+                colSpan: 3,
+                count: filteredRecords.length,
+                rowsPerPage: rowsPerPage,
+                page: page,
+                SelectProps: {
+                  inputProps: { "aria-label": "rows per page" },
+                  native: true,
+                },
+                onChangePage: handleChangePage,
+                onChangeRowsPerPage: handleChangeRowsPerPage,
+                ActionsComponent: MinTablePaginationActions,
+              }}
+            />
+          </Grid>
         </Grid>
       </Grid>
     </React.Fragment>

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

@@ -26,12 +26,13 @@ import { wsProtocol } from "../../../utils/wsUtils";
 import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 import { Grid } from "@material-ui/core";
+import TableWrapper from "../Common/TableWrapper/TableWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
     logList: {
       background: "white",
-      maxHeight: "400px",
+      height: "400px",
       overflow: "auto",
       "& ul": {
         margin: "4px",
@@ -101,20 +102,50 @@ const Trace = ({
       <PageHeader label={"Trace"} />
       <Grid container>
         <Grid item xs={12} className={classes.container}>
-          <div className={classes.logList}>
-            <ul>
-              {messages.map((m) => {
-                return (
-                  <li key={m.key}>
-                    {timeFromDate(m.time)} - {m.api}[{m.statusCode}{" "}
-                    {m.statusMsg}] {m.api} {m.host} {m.client}{" "}
-                    {m.callStats.duration} ↑ {niceBytes(m.callStats.rx + "")} ↓{" "}
-                    {niceBytes(m.callStats.tx + "")}
-                  </li>
-                );
-              })}
-            </ul>
-          </div>
+          <TableWrapper
+            itemActions={[]}
+            columns={[
+              {
+                label: "Time",
+                elementKey: "time",
+                renderFunction: (time: Date) => {
+                  const timeParse = new Date(time);
+                  return timeFromDate(timeParse);
+                },
+              },
+              { label: "Name", elementKey: "api" },
+              {
+                label: "Status",
+                elementKey: "",
+                renderFunction: (fullElement: TraceMessage) =>
+                  `${fullElement.statusCode} ${fullElement.statusMsg}`,
+                renderFullObject: true,
+              },
+              {
+                label: "Location",
+                elementKey: "configuration_id",
+                renderFunction: (fullElement: TraceMessage) =>
+                  `${fullElement.host} ${fullElement.client}`,
+                renderFullObject: true,
+              },
+              { label: "Load Time", elementKey: "callStats.duration" },
+              {
+                label: "Upload",
+                elementKey: "callStats.rx",
+                renderFunction: niceBytes,
+              },
+              {
+                label: "Download",
+                elementKey: "callStats.tx",
+                renderFunction: niceBytes,
+              },
+            ]}
+            isLoading={false}
+            records={messages}
+            entityName="Traces"
+            idField="api"
+            customEmptyMessage="There are no traced Elements yet"
+          />
         </Grid>
       </Grid>
     </React.Fragment>

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

@@ -18,7 +18,10 @@ import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
 import { Button, LinearProgress } from "@material-ui/core";
 import Grid from "@material-ui/core/Grid";
 import Typography from "@material-ui/core/Typography";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../Common/FormComponents/common/styleLibrary";
 import api from "../../../common/api";
 import GroupsSelectors from "./GroupsSelectors";
 import Title from "../../../common/Title";
@@ -46,6 +49,7 @@ const styles = (theme: Theme) =>
       textAlign: "right",
     },
     ...modalBasic,
+    ...predefinedList,
   });
 
 const AddToGroup = ({
@@ -56,6 +60,7 @@ const AddToGroup = ({
 }: IAddToGroup) => {
   //Local States
   const [saving, isSaving] = useState<boolean>(false);
+  const [accepted, setAccepted] = useState<boolean>(false);
   const [updatingError, setError] = useState<string>("");
   const [selectedGroups, setSelectedGroups] = useState<string[]>([]);
 
@@ -71,7 +76,7 @@ const AddToGroup = ({
           .then((res) => {
             isSaving(false);
             setError("");
-            closeModalAndRefresh(true);
+            setAccepted(true);
           })
           .catch((err) => {
             isSaving(false);
@@ -98,62 +103,100 @@ const AddToGroup = ({
     isSaving(true);
   };
 
+  const resetForm = () => {
+    setSelectedGroups([]);
+  };
+
   return (
     <ModalWrapper
       modalOpen={open}
       onClose={() => {
-        closeModalAndRefresh(false);
+        closeModalAndRefresh(accepted);
       }}
-      title="Add Users to Group"
+      title={
+        accepted
+          ? "The selected users were added to the following groups."
+          : "Add Users to Group"
+      }
     >
-      <form noValidate autoComplete="off" onSubmit={setSaving}>
-        <Grid container>
-          <Grid item xs={12} className={classes.formScrollable}>
-            {updatingError !== "" && (
-              <Grid item xs={12}>
-                <Typography
-                  component="p"
-                  variant="body1"
-                  className={classes.errorBlock}
-                >
-                  {updatingError}
-                </Typography>
-              </Grid>
-            )}
-
-            <Grid item xs={12}>
-              <Title>Users to be altered</Title>
+      {accepted ? (
+        <React.Fragment>
+          <Grid container>
+            <Grid item xs={12} className={classes.predefinedTitle}>
+              Groups
             </Grid>
-            <Grid item xs={12}>
+            <Grid item xs={12} className={classes.predefinedList}>
+              {selectedGroups.join(", ")}
+            </Grid>
+            <Grid item xs={12} className={classes.predefinedTitle}>
+              Users
+            </Grid>
+            <Grid item xs={12} className={classes.predefinedList}>
               {checkedUsers.join(", ")}
             </Grid>
-            <Grid item xs={12}>
-              <br />
-            </Grid>
-            <Grid item xs={12}>
-              <GroupsSelectors
-                selectedGroups={selectedGroups}
-                setSelectedGroups={setSelectedGroups}
-              />
-            </Grid>
           </Grid>
-          <Grid item xs={12} className={classes.buttonContainer}>
-            <Button
-              type="submit"
-              variant="contained"
-              color="primary"
-              disabled={saving}
-            >
-              Save
-            </Button>
-          </Grid>
-          {saving && (
-            <Grid item xs={12}>
-              <LinearProgress />
+          <br />
+          <br />
+          <br />
+        </React.Fragment>
+      ) : (
+        <form noValidate autoComplete="off" onSubmit={setSaving}>
+          <Grid container>
+            <Grid item xs={12} className={classes.formScrollable}>
+              {updatingError !== "" && (
+                <Grid item xs={12}>
+                  <Typography
+                    component="p"
+                    variant="body1"
+                    className={classes.errorBlock}
+                  >
+                    {updatingError}
+                  </Typography>
+                </Grid>
+              )}
+
+              <Grid item xs={12} className={classes.predefinedTitle}>
+                Selected Users
+              </Grid>
+              <Grid item xs={12} className={classes.predefinedList}>
+                {checkedUsers.join(", ")}
+              </Grid>
+              <Grid item xs={12}>
+                <br />
+              </Grid>
+              <Grid item xs={12}>
+                <GroupsSelectors
+                  selectedGroups={selectedGroups}
+                  setSelectedGroups={setSelectedGroups}
+                />
+              </Grid>
             </Grid>
-          )}
-        </Grid>
-      </form>
+            <Grid item xs={12} className={classes.buttonContainer}>
+              <button
+                type="button"
+                color="primary"
+                className={classes.clearButton}
+                onClick={resetForm}
+              >
+                Clear
+              </button>
+              <Button
+                type="submit"
+                variant="contained"
+                color="primary"
+                disabled={saving || selectedGroups.length < 1}
+              >
+                Save
+              </Button>
+            </Grid>
+            {saving && (
+              <Grid item xs={12}>
+                <LinearProgress />
+              </Grid>
+            )}
+          </Grid>
+        </form>
+      )}
     </ModalWrapper>
   );
 };

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

@@ -19,13 +19,17 @@ import Grid from "@material-ui/core/Grid";
 import Typography from "@material-ui/core/Typography";
 import { Button, LinearProgress } from "@material-ui/core";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { modalBasic } from "../Common/FormComponents/common/styleLibrary";
+import {
+  modalBasic,
+  predefinedList,
+} from "../Common/FormComponents/common/styleLibrary";
 import { User } from "./types";
 import api from "../../../common/api";
 import GroupsSelectors from "./GroupsSelectors";
 import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
 import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
 import RadioGroupSelector from "../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
+import FormSwitchWrapper from "../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -42,6 +46,7 @@ const styles = (theme: Theme) =>
       textAlign: "right",
     },
     ...modalBasic,
+    ...predefinedList,
   });
 
 interface IAddUserContentProps {
@@ -57,7 +62,8 @@ interface IAddUserContentState {
   accessKey: string;
   secretKey: string;
   selectedGroups: string[];
-  enabled: string;
+  currentGroups: string[];
+  enabled: boolean;
 }
 
 class AddUserContent extends React.Component<
@@ -69,8 +75,9 @@ class AddUserContent extends React.Component<
     addError: "",
     accessKey: "",
     secretKey: "",
-    enabled: "enabled",
+    enabled: false,
     selectedGroups: [],
+    currentGroups: [],
   };
 
   componentDidMount(): void {
@@ -103,7 +110,7 @@ class AddUserContent extends React.Component<
       if (selectedUser !== null) {
         api
           .invoke("PUT", `/api/v1/users/${selectedUser.accessKey}`, {
-            status: enabled,
+            status: enabled ? "enabled" : "disabled",
             groups: selectedGroups,
           })
           .then((res) => {
@@ -167,7 +174,8 @@ class AddUserContent extends React.Component<
           addError: "",
           accessKey: res.accessKey,
           selectedGroups: res.memberOf || [],
-          enabled: res.status,
+          currentGroups: res.memberOf || [],
+          enabled: res.status === "enabled",
         });
       })
       .catch((err) => {
@@ -178,6 +186,16 @@ class AddUserContent extends React.Component<
       });
   }
 
+  resetForm() {
+    if (this.props.selectedUser !== null) {
+      this.setState({ selectedGroups: [] });
+
+      return;
+    }
+
+    this.setState({ accessKey: "", secretKey: "", selectedGroups: [] });
+  }
+
   render() {
     const { classes, selectedUser } = this.props;
     const {
@@ -186,17 +204,38 @@ class AddUserContent extends React.Component<
       accessKey,
       secretKey,
       selectedGroups,
+      currentGroups,
       enabled,
     } = this.state;
 
+    const sendEnabled =
+      accessKey.trim() !== "" &&
+      ((secretKey.trim() !== "" && selectedUser === null) ||
+        selectedUser !== null);
     return (
       <ModalWrapper
         onClose={() => {
           this.props.closeModalAndRefresh();
         }}
         modalOpen={this.props.open}
-        title={selectedUser !== null ? "Edit User" : "Add User"}
+        title={selectedUser !== null ? "Edit User" : "Create User"}
       >
+        {selectedUser !== null && (
+          <div className={classes.floatingEnabled}>
+            <FormSwitchWrapper
+              indicatorLabel={"Enabled"}
+              checked={enabled}
+              value={"user_enabled"}
+              id="user-status"
+              name="user-status"
+              onChange={(e) => {
+                this.setState({ enabled: e.target.checked });
+              }}
+              switchOnly
+            />
+          </div>
+        )}
+
         <React.Fragment>
           <form
             noValidate
@@ -231,19 +270,14 @@ class AddUserContent extends React.Component<
                 />
 
                 {selectedUser !== null ? (
-                  <RadioGroupSelector
-                    currentSelection={enabled}
-                    id="user-status"
-                    name="user-status"
-                    label="Status"
-                    onChange={(e) => {
-                      this.setState({ enabled: e.target.value });
-                    }}
-                    selectorOptions={[
-                      { label: "Enabled", value: "enabled" },
-                      { label: "Disabled", value: "disabled" },
-                    ]}
-                  />
+                  <React.Fragment>
+                    <Grid item xs={12} className={classes.predefinedTitle}>
+                      Current Groups
+                    </Grid>
+                    <Grid item xs={12} className={classes.predefinedList}>
+                      {currentGroups.join(", ")}
+                    </Grid>
+                  </React.Fragment>
                 ) : (
                   <InputBoxWrapper
                     id="standard-multiline-static"
@@ -269,11 +303,21 @@ class AddUserContent extends React.Component<
                 </Grid>
               </Grid>
               <Grid item xs={12} className={classes.buttonContainer}>
+                <button
+                  type="button"
+                  color="primary"
+                  className={classes.clearButton}
+                  onClick={() => {
+                    this.resetForm();
+                  }}
+                >
+                  Clear
+                </button>
                 <Button
                   type="submit"
                   variant="contained"
                   color="primary"
-                  disabled={addLoading}
+                  disabled={addLoading || !sendEnabled}
                 >
                   Save
                 </Button>

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

@@ -28,6 +28,7 @@ import { stringSort } from "../../../utils/sortFunctions";
 import { GroupsList } from "../Groups/types";
 import get from "lodash/get";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
+import { actionsTray } from "../Common/FormComponents/common/styleLibrary";
 
 interface IGroupsProps {
   classes: any;
@@ -41,10 +42,11 @@ const styles = (theme: Theme) =>
       marginTop: theme.spacing(3),
     },
     paper: {
-      // padding: theme.spacing(2),
       display: "flex",
       overflow: "auto",
       flexDirection: "column",
+      paddingTop: 15,
+      boxShadow: "none",
     },
     addSideBar: {
       width: "320px",
@@ -70,20 +72,6 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "left",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    filterField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-      width: "100%",
-      zIndex: 500,
-    },
     noFound: {
       textAlign: "center",
       padding: "10px 0",
@@ -94,6 +82,26 @@ const styles = (theme: Theme) =>
     stickyHeader: {
       backgroundColor: "#fff",
     },
+    actionsTitle: {
+      fontWeight: 600,
+      color: "#000",
+      fontSize: 16,
+      alignSelf: "center",
+    },
+    tableBlock: {
+      marginTop: 15,
+    },
+    filterField: {
+      width: 375,
+      fontWeight: 600,
+      "& .input": {
+        "&::placeholder": {
+          fontWeight: 600,
+          color: "#000",
+        },
+      },
+    },
+    ...actionsTray,
   });
 
 const GroupsSelectors = ({
@@ -164,7 +172,6 @@ const GroupsSelectors = ({
 
   return (
     <React.Fragment>
-      <Title>Groups</Title>
       <Grid item xs={12}>
         <Paper className={classes.paper}>
           {loading && <LinearProgress />}
@@ -172,13 +179,13 @@ const GroupsSelectors = ({
           {records != null && records.length > 0 ? (
             <React.Fragment>
               <Grid item xs={12} className={classes.actionsTray}>
+                <span className={classes.actionsTitle}>Assign Groups</span>
                 <TextField
-                  placeholder="Filter Groups"
+                  placeholder="Filter by Group"
                   className={classes.filterField}
                   id="search-resource"
                   label=""
                   InputProps={{
-                    disableUnderline: true,
                     startAdornment: (
                       <InputAdornment position="start">
                         <SearchIcon />
@@ -190,7 +197,7 @@ const GroupsSelectors = ({
                   }}
                 />
               </Grid>
-              <Grid item xs={12}>
+              <Grid item xs={12} className={classes.tableBlock}>
                 <TableWrapper
                   columns={[{ label: "Group", elementKey: "" }]}
                   onSelect={selectionChanged}

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

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -36,7 +36,11 @@ import AddToGroup from "./AddToGroup";
 import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import DescriptionIcon from "@material-ui/icons/Description";
 import SetPolicy from "../Policies/SetPolicy";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
 
 const styles = (theme: Theme) =>
@@ -74,18 +78,8 @@ const styles = (theme: Theme) =>
         },
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    searchField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      boxShadow: "0px 3px 6px #00000012",
-    },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 
@@ -289,6 +283,7 @@ class Users extends React.Component<IUsersProps, IUsersState> {
             selectedGroup={null}
             closeModalAndRefresh={() => {
               this.setState({ setPolicyOpen: false });
+              this.fetchRecords();
             }}
           />
         )}

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

@@ -22,6 +22,7 @@ export interface User {
   enabled: boolean;
   accessKey: string;
   secretKey: string;
+  policy?: string;
 }
 
 export interface UsersList {

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

@@ -14,7 +14,13 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React, { useEffect, useState } from "react";
-import { Button, Grid, Typography, TextField } from "@material-ui/core";
+import {
+  Button,
+  Grid,
+  Typography,
+  TextField,
+  InputBase,
+} from "@material-ui/core";
 import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
 import { AppState } from "../../../store";
 import { connect } from "react-redux";
@@ -25,14 +31,23 @@ import { niceBytes, timeFromDate } from "../../../common/utils";
 import { wsProtocol } from "../../../utils/wsUtils";
 import api from "../../../common/api";
 import { FormControl, MenuItem, Select } from "@material-ui/core";
-import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
+import {
+  actionsTray,
+  containerForHeader,
+  fieldBasic,
+  searchField,
+} from "../Common/FormComponents/common/styleLibrary";
 import PageHeader from "../Common/PageHeader/PageHeader";
+import InputAdornment from "@material-ui/core/InputAdornment";
+import SearchIcon from "@material-ui/icons/Search";
+import { CreateIcon } from "../../../icons";
+import TableWrapper from "../Common/TableWrapper/TableWrapper";
 
 const styles = (theme: Theme) =>
   createStyles({
     watchList: {
       background: "white",
-      maxHeight: "400px",
+      height: "400px",
       overflow: "auto",
       "& ul": {
         margin: "4px",
@@ -45,31 +60,34 @@ const styles = (theme: Theme) =>
         borderBottom: "1px solid #dedede",
       },
     },
-    actionsTray: {
-      textAlign: "right",
-      "& button": {
-        marginLeft: 10,
-      },
-    },
-    inputField: {
-      background: "#FFFFFF",
-      padding: 12,
-      borderRadius: 5,
-      marginLeft: 10,
-      boxShadow: "0px 3px 6px #00000012",
-    },
-    fieldContainer: {
-      background: "#FFFFFF",
-      padding: 0,
-      borderRadius: 5,
-      marginLeft: 10,
-      textAlign: "left",
-      minWidth: "206px",
-      boxShadow: "0px 3px 6px #00000012",
+    searchPrefix: {
+      flexGrow: 1,
+      marginLeft: 15,
     },
+    ...actionsTray,
+    ...searchField,
     ...containerForHeader(theme.spacing(4)),
   });
 
+const SelectStyled = withStyles((theme: Theme) =>
+  createStyles({
+    root: {
+      width: 450,
+      lineHeight: 1,
+      "label + &": {
+        marginTop: theme.spacing(3),
+      },
+      "& .MuiSelect-select:focus": {
+        backgroundColor: "transparent",
+      },
+    },
+    input: {
+      fontSize: 13,
+      lineHeight: 15,
+    },
+  })
+)(InputBase);
+
 interface IWatch {
   classes: any;
   watchMessageReceived: typeof watchMessageReceived;
@@ -156,6 +174,7 @@ const Watch = ({
     label: bucketName.name,
     value: bucketName.name,
   }));
+
   return (
     <React.Fragment>
       <PageHeader label="Watch" />
@@ -170,8 +189,9 @@ const Watch = ({
                 onChange={(e) => {
                   setBucketName(e.target.value as string);
                 }}
-                className={classes.fieldContainer}
+                className={classes.searchField}
                 disabled={start}
+                input={<SelectStyled />}
               >
                 <MenuItem
                   value={bucketName}
@@ -192,7 +212,7 @@ const Watch = ({
             </FormControl>
             <TextField
               placeholder="Prefix"
-              className={classes.inputField}
+              className={`${classes.searchField} ${classes.searchPrefix}`}
               id="prefix-resource"
               label=""
               disabled={start}
@@ -205,7 +225,7 @@ const Watch = ({
             />
             <TextField
               placeholder="Suffix"
-              className={classes.inputField}
+              className={`${classes.searchField} ${classes.searchPrefix}`}
               id="suffix-resource"
               label=""
               disabled={start}
@@ -229,18 +249,27 @@ const Watch = ({
           <Grid item xs={12}>
             <br />
           </Grid>
-          <div className={classes.watchList}>
-            <ul>
-              {messages.map((m) => {
-                return (
-                  <li key={m.key}>
-                    {timeFromDate(m.Time)} - {niceBytes(m.Size + "")} - {m.Type}{" "}
-                    - {m.Path}
-                  </li>
-                );
-              })}
-            </ul>
-          </div>
+          <TableWrapper
+            columns={[
+              {
+                label: "Time",
+                elementKey: "Time",
+                renderFunction: timeFromDate,
+              },
+              {
+                label: "Size",
+                elementKey: "Size",
+                renderFunction: niceBytes,
+              },
+              { label: "Type", elementKey: "Type" },
+              { label: "Path", elementKey: "Path" },
+            ]}
+            records={messages}
+            entityName={"Watch"}
+            customEmptyMessage={"No Changes at this time"}
+            idField={"watch_table"}
+            isLoading={false}
+          />
         </Grid>
       </Grid>
     </React.Fragment>

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

@@ -18,6 +18,7 @@ import React, { useEffect, useState } from "react";
 import request from "superagent";
 import storage from "local-storage-fallback";
 import { connect, ConnectedProps } from "react-redux";
+import ErrorIcon from "@material-ui/icons/Error";
 import Button from "@material-ui/core/Button";
 import TextField from "@material-ui/core/TextField";
 import Grid from "@material-ui/core/Grid";
@@ -30,22 +31,31 @@ import api from "../../common/api";
 import { ILoginDetails, loginStrategyType } from "./types";
 import { setSession } from "../../common/utils";
 import history from "../../history";
+import { Error } from "@material-ui/icons";
 
 const styles = (theme: Theme) =>
   createStyles({
     "@global": {
       body: {
-        backgroundColor: "#F4F4F4",
+        backgroundColor: "#FAFAFA",
       },
     },
     paper: {
-      marginTop: theme.spacing(16),
-      borderRadius: "3px",
+      borderRadius: 8,
       display: "flex",
       flexDirection: "column",
       alignItems: "center",
-      width: "800px",
+      width: 800,
+      height: 424,
       margin: "auto",
+      position: "absolute",
+      top: "50%",
+      left: "50%",
+      marginLeft: -400,
+      marginTop: -212,
+      "&.MuiPaper-root": {
+        borderRadius: 8,
+      },
     },
     avatar: {
       margin: theme.spacing(1),
@@ -53,36 +63,66 @@ const styles = (theme: Theme) =>
     },
     form: {
       width: "100%", // Fix IE 11 issue.
-      marginTop: theme.spacing(3),
     },
     submit: {
-      margin: theme.spacing(3, 0, 2),
+      margin: "30px 0px 16px",
+      height: 40,
+      boxShadow: "none",
+      padding: "16px 30px",
     },
     errorBlock: {
-      color: "red",
+      backgroundColor: "#C72C48",
+      width: 800,
+      height: 64,
+      display: "flex",
+      justifyContent: "center",
+      alignItems: "center",
+      position: "absolute",
+      left: "50%",
+      top: "50%",
+      marginLeft: -400,
+      marginTop: -290,
+      color: "#fff",
+      fontWeight: 700,
+      fontSize: 14,
+      borderRadius: 8,
     },
     mainContainer: {
-      borderRadius: "3px",
+      position: "relative",
+      height: 424,
     },
     theOcean: {
-      borderTopLeftRadius: "3px",
-      borderBottomLeftRadius: "3px",
+      borderTopLeftRadius: 8,
+      borderBottomLeftRadius: 8,
       background:
-        "transparent linear-gradient(333deg, #281B6F 1%, #271260 13%, #120D53 83%) 0% 0% no-repeat padding-box;",
+        "transparent linear-gradient(to bottom, #073052 0%,#05122b 100%); 0% 0% no-repeat padding-box;",
     },
     oceanBg: {
       backgroundImage: "url(/images/BG_Illustration.svg)",
       backgroundRepeat: "no-repeat",
       backgroundPosition: "bottom left",
       height: "100%",
-      width: "100%",
+      width: 324,
     },
     theLogin: {
-      padding: "76px 62px 20px 62px",
+      padding: "40px 45px 20px 45px",
     },
     loadingLoginStrategy: {
       textAlign: "center",
     },
+    headerTitle: {
+      marginBottom: 10,
+    },
+    submitContainer: {
+      textAlign: "right",
+    },
+    disclaimer: {
+      fontSize: 12,
+      marginTop: 30,
+    },
+    jwtInput: {
+      marginTop: 45,
+    },
   });
 
 const mapState = (state: SystemState) => ({
@@ -182,61 +222,60 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
     case loginStrategyType.form: {
       loginComponent = (
         <React.Fragment>
-          <Typography component="h1" variant="h6">
-            Login
+          <Typography
+            component="h1"
+            variant="h6"
+            className={classes.headerTitle}
+          >
+            Console Login
           </Typography>
           <form className={classes.form} noValidate onSubmit={formSubmit}>
             <Grid container spacing={2}>
-              {error !== "" && (
-                <Grid item xs={12}>
-                  <Typography
-                    component="p"
-                    variant="body1"
-                    className={classes.errorBlock}
-                  >
-                    {error}
-                  </Typography>
-                </Grid>
-              )}
               <Grid item xs={12}>
                 <TextField
-                  required
                   fullWidth
                   id="accessKey"
                   value={accessKey}
                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                     setAccessKey(e.target.value)
                   }
-                  label="Access Key"
+                  label="Enter Access Key"
                   name="accessKey"
                   autoComplete="username"
                 />
               </Grid>
               <Grid item xs={12}>
                 <TextField
-                  required
                   fullWidth
                   value={secretKey}
                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
                     setSecretKey(e.target.value)
                   }
                   name="secretKey"
-                  label="Secret Key"
+                  label="Enter Secret Key"
                   type="password"
                   id="secretKey"
                   autoComplete="current-password"
                 />
               </Grid>
             </Grid>
-            <Button
-              type="submit"
-              fullWidth
-              variant="contained"
-              color="primary"
-              className={classes.submit}
-            >
-              Login
-            </Button>
+            <Grid item xs={12} className={classes.submitContainer}>
+              <Button
+                type="submit"
+                variant="contained"
+                color="primary"
+                className={classes.submit}
+                disabled={secretKey === "" || accessKey === ""}
+              >
+                Login
+              </Button>
+            </Grid>
+            <Grid item xs={12} className={classes.disclaimer}>
+              <strong>Don't have an access key?</strong>
+              <br />
+              <br />
+              Contact your administrator to have one made
+            </Grid>
           </form>
         </React.Fragment>
       );
@@ -245,7 +284,11 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
     case loginStrategyType.redirect: {
       loginComponent = (
         <React.Fragment>
-          <Typography component="h1" variant="h6">
+          <Typography
+            component="h1"
+            variant="h6"
+            className={classes.headerTitle}
+          >
             Login
           </Typography>
           <Button
@@ -255,7 +298,6 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
               window.location.hostname
             )}
             type="submit"
-            fullWidth
             variant="contained"
             color="primary"
             className={classes.submit}
@@ -269,23 +311,16 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
     case loginStrategyType.serviceAccount: {
       loginComponent = (
         <React.Fragment>
-          <Typography component="h1" variant="h6">
-            Login
+          <Typography
+            component="h1"
+            variant="h6"
+            className={classes.headerTitle}
+          >
+            Operator Login
           </Typography>
           <form className={classes.form} noValidate onSubmit={formSubmit}>
             <Grid container spacing={2}>
-              {error !== "" && (
-                <Grid item xs={12}>
-                  <Typography
-                    component="p"
-                    variant="body1"
-                    className={classes.errorBlock}
-                  >
-                    {error}
-                  </Typography>
-                </Grid>
-              )}
-              <Grid item xs={12}>
+              <Grid item xs={12} className={classes.jwtInput}>
                 <TextField
                   required
                   fullWidth
@@ -300,15 +335,22 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
                 />
               </Grid>
             </Grid>
-            <Button
-              type="submit"
-              fullWidth
-              variant="contained"
-              color="primary"
-              className={classes.submit}
-            >
-              Login
-            </Button>
+            <Grid item xs={12} className={classes.submitContainer}>
+              <Button
+                type="submit"
+                variant="contained"
+                color="primary"
+                className={classes.submit}
+                disabled={jwt === ""}
+              >
+                Login
+              </Button>
+            </Grid>
+            <Grid item xs={12} className={classes.disclaimer}>
+              <strong>Don't have an access key?</strong>
+              <br />
+              Contact your administrator to have one made
+            </Grid>
           </form>
         </React.Fragment>
       );
@@ -321,16 +363,24 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
   }
 
   return (
-    <Paper className={classes.paper}>
-      <Grid container className={classes.mainContainer}>
-        <Grid item xs={7} className={classes.theOcean}>
-          <div className={classes.oceanBg} />
+    <React.Fragment>
+      {error !== "" && (
+        <div className={classes.errorBlock}>
+          <ErrorIcon fontSize="small" />
+          &nbsp;{error}
+        </div>
+      )}
+      <Paper className={classes.paper}>
+        <Grid container className={classes.mainContainer}>
+          <Grid item xs={7} className={classes.theOcean}>
+            <div className={classes.oceanBg} />
+          </Grid>
+          <Grid item xs={5} className={classes.theLogin}>
+            {loginComponent}
+          </Grid>
         </Grid>
-        <Grid item xs={5} className={classes.theLogin}>
-          {loginComponent}
-        </Grid>
-      </Grid>
-    </Paper>
+      </Paper>
+    </React.Fragment>
   );
 };
 

portal-ui/src/theme/main.ts

@@ -3,9 +3,9 @@ import { createMuiTheme } from "@material-ui/core";
 const theme = createMuiTheme({
   palette: {
     primary: {
-      light: "#757ce8",
-      main: "#201763",
-      dark: "#362585",
+      light: "#073052",
+      main: "#081C42",
+      dark: "#05122B",
       contrastText: "#fff",
     },
     secondary: {
@@ -38,29 +38,50 @@ const theme = createMuiTheme({
     fontFamily: ["Lato", "sans-serif"].join(","),
     h1: {
       fontWeight: "bold",
-      color: "#201763",
+      color: "#081C42",
     },
     h2: {
       fontWeight: "bold",
-      color: "#201763",
+      color: "#081C42",
     },
     h3: {
       fontWeight: "bold",
-      color: "#201763",
+      color: "#081C42",
     },
     h4: {
       fontWeight: "bold",
-      color: "#201763",
+      color: "#081C42",
     },
     h5: {
       fontWeight: "bold",
-      color: "#201763",
+      color: "#081C42",
     },
     h6: {
       fontWeight: "bold",
       color: "#000000",
     },
   },
+  overrides: {
+    MuiButton: {
+      root: {
+        borderRadius: 3,
+        color: "white",
+        height: 40,
+        padding: "0 20px",
+        fontSize: 14,
+        fontWeight: 600,
+        boxShadow: "none",
+        "& .MuiSvgIcon-root": {
+          maxHeight: 18,
+        },
+        "&.MuiButton-contained.Mui-disabled": {
+          backgroundColor: "#EAEDEE",
+          fontWeight: 600,
+          color: "#767676",
+        },
+      },
+    },
+  },
 });
 
 export default theme;

restapi/admin_tenants.go

@@ -230,9 +230,12 @@ func GetTenantServiceURL(mi *operator.Tenant) (svcURL string) {
 	return fmt.Sprintf("%s://%s", scheme, net.JoinHostPort(svc, strconv.Itoa(port)))
 }
 
-func getTenantAdminClient(ctx context.Context, client K8sClientI, namespace, tenantName, svcURL string, insecure bool) (*madmin.AdminClient, error) {
+func getTenantAdminClient(ctx context.Context, client K8sClientI, tenant *operator.Tenant, svcURL string, insecure bool) (*madmin.AdminClient, error) {
+	if tenant == nil || tenant.Spec.CredsSecret == nil {
+		return nil, errors.New("invalid arguments")
+	}
 	// get admin credentials from secret
-	creds, err := client.getSecret(ctx, namespace, fmt.Sprintf("%s-secret", tenantName), metav1.GetOptions{})
+	creds, err := client.getSecret(ctx, tenant.Namespace, tenant.Spec.CredsSecret.Name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -643,7 +646,6 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
 			},
 			Immutable: &imm,
 			Data: map[string][]byte{
-				"CONSOLE_HMAC_JWT_SECRET":  []byte(RandomCharString(16)),
 				"CONSOLE_PBKDF_PASSPHRASE": []byte(RandomCharString(16)),
 				"CONSOLE_PBKDF_SALT":       []byte(RandomCharString(8)),
 				"CONSOLE_ACCESS_KEY":       []byte(consoleAccess),
@@ -677,7 +679,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
 			return nil, prepareError(errorGeneric)
 		}
 
-		const consoleVersion = "minio/console:v0.4.0"
+		const consoleVersion = "minio/console:v0.4.3"
 		minInst.Spec.Console = &operator.ConsoleConfiguration{
 			Replicas:      1,
 			Image:         consoleVersion,
@@ -1047,8 +1049,7 @@ func getTenantUsageResponse(session *models.Principal, params admin_api.GetTenan
 	mAdmin, err := getTenantAdminClient(
 		ctx,
 		k8sClient,
-		params.Namespace,
-		params.Tenant,
+		minTenant,
 		svcURL,
 		true)
 	if err != nil {

restapi/admin_tenants_test.go

@@ -89,8 +89,7 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 	type args struct {
 		ctx        context.Context
 		client     K8sClientI
-		namespace  string
-		tenantName string
+		tenant     v1.Tenant
 		serviceURL string
 		insecure   bool
 	}
@@ -104,10 +103,15 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		{
 			name: "Return Tenant Admin, no errors",
 			args: args{
-				ctx:        ctx,
-				client:     kClient,
-				namespace:  "default",
-				tenantName: "tenant-1",
+				ctx:    ctx,
+				client: kClient,
+				tenant: v1.Tenant{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "default",
+						Name:      "tenant-1",
+					},
+					Spec: v1.TenantSpec{CredsSecret: &corev1.LocalObjectReference{Name: "secret-name"}},
+				},
 				serviceURL: "http://service-1.default.svc.cluster.local:80",
 			},
 			mockGetSecret: func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error) {
@@ -132,10 +136,14 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		{
 			name: "Access key not stored on secrets",
 			args: args{
-				ctx:        ctx,
-				client:     kClient,
-				namespace:  "default",
-				tenantName: "tenant-1",
+				ctx:    ctx,
+				client: kClient,
+				tenant: v1.Tenant{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "default",
+						Name:      "tenant-1",
+					},
+				},
 				serviceURL: "http://service-1.default.svc.cluster.local:80",
 			},
 			mockGetSecret: func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error) {
@@ -159,10 +167,14 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		{
 			name: "Secret key not stored on secrets",
 			args: args{
-				ctx:        ctx,
-				client:     kClient,
-				namespace:  "default",
-				tenantName: "tenant-1",
+				ctx:    ctx,
+				client: kClient,
+				tenant: v1.Tenant{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "default",
+						Name:      "tenant-1",
+					},
+				},
 				serviceURL: "http://service-1.default.svc.cluster.local:80",
 			},
 			mockGetSecret: func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error) {
@@ -186,10 +198,14 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		{
 			name: "Handle error on getService",
 			args: args{
-				ctx:        ctx,
-				client:     kClient,
-				namespace:  "default",
-				tenantName: "tenant-1",
+				ctx:    ctx,
+				client: kClient,
+				tenant: v1.Tenant{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "default",
+						Name:      "tenant-1",
+					},
+				},
 				serviceURL: "http://service-1.default.svc.cluster.local:80",
 			},
 			mockGetSecret: func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error) {
@@ -209,10 +225,14 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		{
 			name: "Handle error on getSecret",
 			args: args{
-				ctx:        ctx,
-				client:     kClient,
-				namespace:  "default",
-				tenantName: "tenant-1",
+				ctx:    ctx,
+				client: kClient,
+				tenant: v1.Tenant{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: "default",
+						Name:      "tenant-1",
+					},
+				},
 				serviceURL: "http://service-1.default.svc.cluster.local:80",
 			},
 			mockGetSecret: func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error) {
@@ -233,7 +253,7 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 		k8sclientGetSecretMock = tt.mockGetSecret
 		k8sclientGetServiceMock = tt.mockGetService
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := getTenantAdminClient(tt.args.ctx, tt.args.client, tt.args.namespace, tt.args.tenantName, tt.args.serviceURL, tt.args.insecure)
+			got, err := getTenantAdminClient(tt.args.ctx, tt.args.client, &tt.args.tenant, tt.args.serviceURL, tt.args.insecure)
 			if err != nil {
 				if tt.wantErr {
 					return
@@ -996,7 +1016,7 @@ func Test_UpdateTenantAction(t *testing.T) {
 				},
 				params: admin_api.UpdateTenantParams{
 					Body: &models.UpdateTenantRequest{
-						ConsoleImage: "minio/console:v0.4.0",
+						ConsoleImage: "minio/console:v0.4.3",
 					},
 				},
 			},

restapi/client.go

@@ -19,7 +19,9 @@ package restapi
 import (
 	"context"
 	"fmt"
+	"io"
 	"strings"
+	"time"
 
 	"github.com/minio/minio-go/v7/pkg/replication"
 
@@ -54,6 +56,10 @@ type MinioClient interface {
 	getBucketNotification(ctx context.Context, bucketName string) (config notification.Configuration, err error)
 	getBucketPolicy(ctx context.Context, bucketName string) (string, error)
 	listObjects(ctx context.Context, bucket string, opts minio.ListObjectsOptions) <-chan minio.ObjectInfo
+	getObjectRetention(ctx context.Context, bucketName, objectName, versionID string) (mode *minio.RetentionMode, retainUntilDate *time.Time, err error)
+	getObjectLegalHold(ctx context.Context, bucketName, objectName string, opts minio.GetObjectLegalHoldOptions) (status *minio.LegalHoldStatus, err error)
+	putObject(ctx context.Context, bucketName, objectName string, reader io.Reader, objectSize int64, opts minio.PutObjectOptions) (info minio.UploadInfo, err error)
+	putObjectLegalHold(ctx context.Context, bucketName, objectName string, opts minio.PutObjectLegalHoldOptions) error
 }
 
 // Interface implementation
@@ -116,6 +122,22 @@ func (c minioClient) listObjects(ctx context.Context, bucket string, opts minio.
 	return c.client.ListObjects(ctx, bucket, opts)
 }
 
+func (c minioClient) getObjectRetention(ctx context.Context, bucketName, objectName, versionID string) (mode *minio.RetentionMode, retainUntilDate *time.Time, err error) {
+	return c.client.GetObjectRetention(ctx, bucketName, objectName, versionID)
+}
+
+func (c minioClient) getObjectLegalHold(ctx context.Context, bucketName, objectName string, opts minio.GetObjectLegalHoldOptions) (status *minio.LegalHoldStatus, err error) {
+	return c.client.GetObjectLegalHold(ctx, bucketName, objectName, opts)
+}
+
+func (c minioClient) putObject(ctx context.Context, bucketName, objectName string, reader io.Reader, objectSize int64, opts minio.PutObjectOptions) (info minio.UploadInfo, err error) {
+	return c.client.PutObject(ctx, bucketName, objectName, reader, objectSize, opts)
+}
+
+func (c minioClient) putObjectLegalHold(ctx context.Context, bucketName, objectName string, opts minio.PutObjectLegalHoldOptions) error {
+	return c.client.PutObjectLegalHold(ctx, bucketName, objectName, opts)
+}
+
 // MCClient interface with all functions to be implemented
 // by mock when testing, it should include all mc/S3Client respective api calls
 // that are used within this project.
@@ -125,6 +147,8 @@ type MCClient interface {
 	watch(ctx context.Context, options mc.WatchOptions) (*mc.WatchObject, *probe.Error)
 	remove(ctx context.Context, isIncomplete, isRemoveBucket, isBypass bool, contentCh <-chan *mc.ClientContent) <-chan *probe.Error
 	list(ctx context.Context, opts mc.ListOptions) <-chan *mc.ClientContent
+	get(ctx context.Context, opts mc.GetOptions) (io.ReadCloser, *probe.Error)
+	shareDownload(ctx context.Context, versionID string, expires time.Duration) (string, *probe.Error)
 }
 
 // Interface implementation
@@ -161,6 +185,14 @@ func (c mcClient) list(ctx context.Context, opts mc.ListOptions) <-chan *mc.Clie
 	return c.client.List(ctx, opts)
 }
 
+func (c mcClient) get(ctx context.Context, opts mc.GetOptions) (io.ReadCloser, *probe.Error) {
+	return c.client.Get(ctx, opts)
+}
+
+func (c mcClient) shareDownload(ctx context.Context, versionID string, expires time.Duration) (string, *probe.Error) {
+	return c.client.ShareDownload(ctx, versionID, expires)
+}
+
 // ConsoleCredentials interface with all functions to be implemented
 // by mock when testing, it should include all needed consoleCredentials.Login api calls
 // that are used within this project.
@@ -238,7 +270,7 @@ func newConsoleCredentials(accessKey, secretKey, location string) (*credentials.
 				AccessKey:       accessKey,
 				SecretKey:       secretKey,
 				Location:        location,
-				DurationSeconds: xjwt.GetConsoleSTSAndJWTDurationInSeconds(),
+				DurationSeconds: xjwt.GetConsoleSTSDurationInSeconds(),
 			}
 			stsClient := PrepareSTSClient(false)
 			stsAssumeRole := &credentials.STSAssumeRole{
@@ -252,23 +284,14 @@ func newConsoleCredentials(accessKey, secretKey, location string) (*credentials.
 	}
 }
 
-// GetClaimsFromJWT decrypt and returns the claims associated to a provided jwt
-func GetClaimsFromJWT(jwt string) (*auth.DecryptedClaims, error) {
-	claims, err := auth.SessionTokenAuthenticate(jwt)
-	if err != nil {
-		return nil, err
-	}
-	return claims, nil
-}
-
 // getConsoleCredentialsFromSession returns the *consoleCredentials.Login associated to the
-// provided jwt, this is useful for running the Expire() or IsExpired() operations
+// provided session token, this is useful for running the Expire() or IsExpired() operations
 func getConsoleCredentialsFromSession(claims *models.Principal) *credentials.Credentials {
 	return credentials.NewStaticV4(claims.AccessKeyID, claims.SecretAccessKey, claims.SessionToken)
 }
 
 // newMinioClient creates a new MinIO client based on the consoleCredentials extracted
-// from the provided jwt
+// from the provided session token
 func newMinioClient(claims *models.Principal) (*minio.Client, error) {
 	creds := getConsoleCredentialsFromSession(claims)
 	stsClient := PrepareSTSClient(false)

restapi/configure_console.go

@@ -19,10 +19,12 @@
 package restapi
 
 import (
+	"bytes"
 	"crypto/tls"
 	"log"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/minio/console/pkg/auth"
 
@@ -61,7 +63,7 @@ func configureAPI(api *operations.ConsoleAPI) http.Handler {
 	// Applies when the "x-token" header is set
 
 	api.KeyAuth = func(token string, scopes []string) (*models.Principal, error) {
-		// we are validating the jwt by decrypting the claims inside, if the operation succed that means the jwt
+		// we are validating the session token by decrypting the claims inside, if the operation succeed that means the jwt
 		// was generated and signed by us in the first place
 		claims, err := auth.SessionTokenAuthenticate(token)
 		if err != nil {
@@ -229,8 +231,9 @@ func wrapHandlerSinglePageApplication(h http.Handler) http.HandlerFunc {
 		nfrw := &notFoundRedirectRespWr{ResponseWriter: w}
 		h.ServeHTTP(nfrw, r)
 		if nfrw.status == 404 {
-			log.Printf("Redirecting %s to index.html.", r.RequestURI)
-			http.Redirect(w, r, "/index.html", http.StatusFound)
+			indexPage, _ := portalUI.Asset("build/index.html")
+			w.Header().Set("Content-Type", "text/html; charset=utf-8")
+			http.ServeContent(w, r, "index.html", time.Now(), bytes.NewReader(indexPage))
 		}
 	}
 }

restapi/doc.go

@@ -27,6 +27,7 @@
 //
 //  Consumes:
 //    - application/json
+//    - multipart/form-data
 //
 //  Produces:
 //    - application/octet-stream