Ark/openmaxio-object-browser
1
0
Fork 0
mirror of https://github.com/OpenMaxIO/openmaxio-object-browser synced 2026-07-01 07:41:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Operator UI improvements (#678)

Browse Source
This commit is contained in:
Daniel Valdivia
2021-04-01 16:13:57 -07:00
committed by GitHub
parent ce473b9286
commit bb91cb66b0
24 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
models/session_response.go
View File

@@ -36,6 +36,9 @@ import (
// swagger:model sessionResponse
type SessionResponse struct {
// features
Features []string `json:"features"`
// operator
Operator bool `json:"operator,omitempty"`

8
pkg/auth/idp/oauth2/provider.go
View File

@@ -110,6 +110,14 @@ func NewOauth2ProviderClient(ctx context.Context, scopes []string, httpClient *h
if err != nil {
return nil, err
}
// if google, change scopes
u, err := url.Parse(GetIdpURL())
if err != nil {
return nil, err
}
if u.Host == "google.com" {
scopes = []string{oidc.ScopeOpenID}
}
// If provided scopes are empty we use a default list
if len(scopes) == 0 {
scopes = []string{oidc.ScopeOpenID, "profile", "app_metadata", "user_metadata", "email"}

14
portal-ui/build/asset-manifest.json
View File

@@ -1,25 +1,25 @@
{
"files": {
"main.css": "/static/css/main.a19f3d53.chunk.css",
"main.js": "/static/js/main.fa0873e1.chunk.js",
"main.js.map": "/static/js/main.fa0873e1.chunk.js.map",
"main.js": "/static/js/main.53ad5aa5.chunk.js",
"main.js.map": "/static/js/main.53ad5aa5.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.f48e99e5.js",
"runtime-main.js.map": "/static/js/runtime-main.f48e99e5.js.map",
"static/css/2.f324abd6.chunk.css": "/static/css/2.f324abd6.chunk.css",
"static/js/2.44b7c49b.chunk.js": "/static/js/2.44b7c49b.chunk.js",
"static/js/2.44b7c49b.chunk.js.map": "/static/js/2.44b7c49b.chunk.js.map",
"static/js/2.fff5f618.chunk.js": "/static/js/2.fff5f618.chunk.js",
"static/js/2.fff5f618.chunk.js.map": "/static/js/2.fff5f618.chunk.js.map",
"index.html": "/index.html",
"static/css/2.f324abd6.chunk.css.map": "/static/css/2.f324abd6.chunk.css.map",
"static/css/main.a19f3d53.chunk.css.map": "/static/css/main.a19f3d53.chunk.css.map",
"static/js/2.44b7c49b.chunk.js.LICENSE.txt": "/static/js/2.44b7c49b.chunk.js.LICENSE.txt",
"static/js/2.fff5f618.chunk.js.LICENSE.txt": "/static/js/2.fff5f618.chunk.js.LICENSE.txt",
"static/media/minio_console_logo.0837460e.svg": "/static/media/minio_console_logo.0837460e.svg",
"static/media/minio_operator_logo.1312b7c9.svg": "/static/media/minio_operator_logo.1312b7c9.svg"
},
"entrypoints": [
"static/js/runtime-main.f48e99e5.js",
"static/css/2.f324abd6.chunk.css",
"static/js/2.44b7c49b.chunk.js",
"static/js/2.fff5f618.chunk.js",
"static/css/main.a19f3d53.chunk.css",
"static/js/main.fa0873e1.chunk.js"
"static/js/main.53ad5aa5.chunk.js"
]
}

2
portal-ui/build/index.html
View File

@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="/static/css/2.f324abd6.chunk.css" rel="stylesheet"><link href="/static/css/main.a19f3d53.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/static/js/2.44b7c49b.chunk.js"></script><script src="/static/js/main.fa0873e1.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="/static/css/2.f324abd6.chunk.css" rel="stylesheet"><link href="/static/css/main.a19f3d53.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/static/js/2.fff5f618.chunk.js"></script><script src="/static/js/main.53ad5aa5.chunk.js"></script></body></html>

1
portal-ui/build/static/js/2.44b7c49b.chunk.js.map
View File

File diff suppressed because one or more lines are too long

6
portal-ui/build/static/js/2.44b7c49b.chunk.js → portal-ui/build/static/js/2.fff5f618.chunk.js
View File

File diff suppressed because one or more lines are too long

0
portal-ui/build/static/js/2.44b7c49b.chunk.js.LICENSE.txt → portal-ui/build/static/js/2.fff5f618.chunk.js.LICENSE.txt
View File

1
portal-ui/build/static/js/2.fff5f618.chunk.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
portal-ui/build/static/js/main.53ad5aa5.chunk.js Normal file
View File

File diff suppressed because one or more lines are too long

1
portal-ui/build/static/js/main.53ad5aa5.chunk.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
portal-ui/build/static/js/main.fa0873e1.chunk.js
View File

File diff suppressed because one or more lines are too long

1
portal-ui/build/static/js/main.fa0873e1.chunk.js.map
View File

File diff suppressed because one or more lines are too long

2
portal-ui/src/screens/Console/Buckets/ViewBucket/DeleteEvent.tsx
View File

@@ -93,7 +93,7 @@ const DeleteEvent = ({
<DialogContent>
{deleteLoading && <LinearProgress />}
<DialogContentText id="alert-dialog-description">
Are you sure you want to delete the this event?
Are you sure you want to delete this event?
</DialogContentText>
</DialogContent>
<DialogActions>

1
portal-ui/src/screens/Console/Tenants/AddTenant/Steps/TenantSize.tsx
View File

@@ -283,6 +283,7 @@ const TenantSize = ({
memorySize,
limitSize,
selectedStorageClass,
isPageValid,
]);
/* End Validation of pages */

4
portal-ui/src/screens/Console/Tenants/ListTenants/ListTenants.tsx
View File

@@ -231,10 +231,6 @@ const ListTenants = ({
<SlideOptions
slideOptions={[
<Fragment>
<Grid item xs={12} className={classes.customTitle}>
Tenants List
</Grid>
<Grid item xs={12} className={classes.tenantsContainer}>
<Grid item xs={12} className={classes.actionsTray}>
<TextField

27
portal-ui/src/screens/Console/Tenants/TenantsMain.tsx
View File

@@ -1,10 +1,8 @@
import React, { Fragment, useState } from "react";
import React, { Fragment } from "react";
import PageHeader from "../Common/PageHeader/PageHeader";
import { Grid } from "@material-ui/core";
import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
import Tab from "@material-ui/core/Tab";
import Tabs from "@material-ui/core/Tabs";
import ListTenants from "./ListTenants/ListTenants";
interface IConfigurationMain {
@@ -23,33 +21,12 @@ const styles = (theme: Theme) =>
});
const TenantsMain = ({ classes }: IConfigurationMain) => {
const [selectedTab, setSelectedTab] = useState<number>(0);
return (
<Fragment>
<PageHeader label="Tenants" />
<Grid container>
<Grid item xs={12} className={classes.container}>
<Grid item xs={12} className={classes.headerLabel}>
Tenants Management
</Grid>
<Tabs
value={selectedTab}
indicatorColor="primary"
textColor="primary"
onChange={(_, newValue: number) => {
setSelectedTab(newValue);
}}
aria-label="tenant-tabs"
>
<Tab label="Tenants" />
</Tabs>
<Grid item xs={12}>
{selectedTab === 0 && (
<Grid item xs={12}>
<ListTenants />
</Grid>
)}
</Grid>
<ListTenants />
</Grid>
</Grid>
</Fragment>

1
portal-ui/src/screens/Console/reducer.ts
View File

@@ -26,6 +26,7 @@ const initialState: ConsoleState = {
operator: false,
status: "",
pages: [],
features: [],
},
};

1
portal-ui/src/screens/Console/types.ts
View File

@@ -17,5 +17,6 @@
export interface ISessionResponse {
status: string;
pages: string[];
features: string[];
operator: boolean;
}

4
portal-ui/src/screens/LoginPage/LoginPage.tsx
View File

@@ -336,7 +336,7 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
variant="h6"
className={classes.headerTitle}
>
Login
Welcome
</Typography>
<Button
component={"a"}
@@ -349,7 +349,7 @@ const Login = ({ classes, userLoggedIn }: ILoginProps) => {
color="primary"
className={classes.submit}
>
Welcome
Login with SSO
</Button>
</React.Fragment>
);

2
restapi/admin_subscription.go
View File

@@ -165,7 +165,7 @@ func getSubscriptionActivateResponse(session *models.Principal, namespace, tenan
}
// If console is not deployed for this tenant return an error
if minTenant.Spec.Console == nil {
return prepareError(errorGenericNotFound)
return prepareError(ErrorGenericNotFound)
}
// configure kubernetes client

12
restapi/embedded_spec.go
View File

@@ -5347,6 +5347,12 @@ func init() {
"sessionResponse": {
"type": "object",
"properties": {
"features": {
"type": "array",
"items": {
"type": "string"
}
},
"operator": {
"type": "boolean"
},
@@ -11660,6 +11666,12 @@ func init() {
"sessionResponse": {
"type": "object",
"properties": {
"features": {
"type": "array",
"items": {
"type": "string"
}
},
"operator": {
"type": "boolean"
},

4
restapi/error.go
View File

@@ -17,7 +17,7 @@ var (
errorGenericInvalidSession = errors.New("invalid session")
errorGenericUnauthorized = errors.New("unauthorized")
errorGenericForbidden = errors.New("forbidden")
errorGenericNotFound = errors.New("not found")
ErrorGenericNotFound = errors.New("not found")
// Explicit error messages
errorInvalidErasureCodingValue = errors.New("invalid Erasure Coding Value")
errorUnableToGetTenantUsage = errors.New("unable to get tenant usage")
@@ -54,7 +54,7 @@ func prepareError(err ...error) *models.Error {
}
if k8sErrors.IsNotFound(err[0]) {
errorCode = 404
errorMessage = errorGenericNotFound.Error()
errorMessage = ErrorGenericNotFound.Error()
}
if errors.Is(err[0], errInvalidCredentials) {
errorCode = 401

12
restapi/user_session.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/minio/console/pkg/acl"
"github.com/minio/console/restapi/operations"
"github.com/minio/console/restapi/operations/user_api"
"github.com/minio/minio/pkg/env"
)
func registerSessionHandlers(api *operations.ConsoleAPI) {
@@ -43,8 +44,19 @@ func getSessionResponse(session *models.Principal) (*models.SessionResponse, *mo
}
sessionResp := &models.SessionResponse{
Pages: acl.GetAuthorizedEndpoints(session.Actions),
Features: getListOfEnabledFeatures(),
Status: models.SessionResponseStatusOk,
Operator: acl.GetOperatorMode(),
}
return sessionResp, nil
}
// getListOfEnabledFeatures returns a list of features
func getListOfEnabledFeatures() []string {
var features []string
ilm := env.IsSet("_CONSOLE_ILM_SUPPORT")
if ilm {
features = append(features, "ilm")
}
return features
}

7
swagger.yml
View File

@@ -2798,6 +2798,10 @@ definitions:
type: array
items:
type: string
features:
type: array
items:
type: string
status:
type: string
enum: [ ok ]
@@ -4158,6 +4162,7 @@ definitions:
type: string
bucket_name:
type: string
hasPermissionRequest:
type: object
properties:
@@ -4165,6 +4170,7 @@ definitions:
type: array
items:
$ref: "#/definitions/policyArgs"
permissionAction:
type: object
properties:
@@ -4172,6 +4178,7 @@ definitions:
type: string
can:
type: boolean
hasPermissionResponse:
type: object
properties: