Skip to content

Add features box to tenant details #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2021
Merged

Add features box to tenant details #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ WORKDIR /go/src/github.com/minio/console/

ENV CGO_ENABLED=0

COPY --from=uilayer /app/build /go/src/github.com/minio/console/portal-ui/build
RUN go build -ldflags "-w -s" -a -o console ./cmd/console

FROM scratch
MAINTAINER MinIO Development "[email protected]"
EXPOSE 9090


COPY --from=golayer /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=golayer /go/src/github.com/minio/console/console .

Expand Down
15 changes: 15 additions & 0 deletions models/tenant.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions portal-ui/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"files": {
"main.css": "/static/css/main.a19f3d53.chunk.css",
"main.js": "/static/js/main.06a632ee.chunk.js",
"main.js.map": "/static/js/main.06a632ee.chunk.js.map",
"main.js": "/static/js/main.914482b9.chunk.js",
"main.js.map": "/static/js/main.914482b9.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.76b14b73.chunk.css": "/static/css/2.76b14b73.chunk.css",
"static/js/2.a05a6b72.chunk.js": "/static/js/2.a05a6b72.chunk.js",
"static/js/2.a05a6b72.chunk.js.map": "/static/js/2.a05a6b72.chunk.js.map",
"static/js/2.0255e016.chunk.js": "/static/js/2.0255e016.chunk.js",
"static/js/2.0255e016.chunk.js.map": "/static/js/2.0255e016.chunk.js.map",
"index.html": "/index.html",
"static/css/2.76b14b73.chunk.css.map": "/static/css/2.76b14b73.chunk.css.map",
"static/css/main.a19f3d53.chunk.css.map": "/static/css/main.a19f3d53.chunk.css.map",
"static/js/2.a05a6b72.chunk.js.LICENSE.txt": "/static/js/2.a05a6b72.chunk.js.LICENSE.txt",
"static/js/2.0255e016.chunk.js.LICENSE.txt": "/static/js/2.0255e016.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.76b14b73.chunk.css",
"static/js/2.a05a6b72.chunk.js",
"static/js/2.0255e016.chunk.js",
"static/css/main.a19f3d53.chunk.css",
"static/js/main.06a632ee.chunk.js"
"static/js/main.914482b9.chunk.js"
]
}
2 changes: 1 addition & 1 deletion portal-ui/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.76b14b73.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.a05a6b72.chunk.js"></script><script src="/static/js/main.06a632ee.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.76b14b73.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.0255e016.chunk.js"></script><script src="/static/js/main.914482b9.chunk.js"></script></body></html>
6 changes: 3 additions & 3 deletions ...al-ui/build/static/js/2.a05a6b72.chunk.js → ...al-ui/build/static/js/2.0255e016.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...static/js/2.a05a6b72.chunk.js.LICENSE.txt → ...static/js/2.0255e016.chunk.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...i/build/static/js/2.a05a6b72.chunk.js.map → ...i/build/static/js/2.0255e016.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions portal-ui/build/static/js/main.06a632ee.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion portal-ui/build/static/js/main.06a632ee.chunk.js.map
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions portal-ui/build/static/js/main.914482b9.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions portal-ui/build/static/js/main.914482b9.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ const ListBuckets = ({
startIcon={<CreateIcon />}
onClick={() => {
addBucketOpen(true);
}}
}}
>
Create Bucket
</Button>
Expand Down
11 changes: 11 additions & 0 deletions portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,3 +568,14 @@ export const wizardCommon = {
},
},
};

export const buttonsStyles = {
anchorButton: {
textDecoration: "underline" as const,
textTransform: "unset" as const,
fontWeight: "normal" as const,
padding: 0,
lineHeight: "unset" as const,
height: "unset" as const,
},
};
30 changes: 15 additions & 15 deletions portal-ui/src/screens/Console/Common/UsageBarWrapper/UsageBarWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React 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 CircularProgress from "@material-ui/core/CircularProgress";
import ErrorBlock from "../../../shared/ErrorBlock";
Expand Down Expand Up @@ -47,6 +46,9 @@ const BorderLinearProgress = withStyles((theme) => ({
borderRadius: 5,
backgroundColor: "#081C42",
},
padChart: {
padding: "5px",
},
}))(LinearProgress);

const UsageBarWrapper = ({
Expand Down Expand Up @@ -84,20 +86,18 @@ const UsageBarWrapper = ({

return (
<React.Fragment>
<Paper className={classes.paperContainer}>
{loading && (
<React.Fragment>
<Grid item xs={12} className={classes.centerItem}>
<CircularProgress
color="primary"
size={40}
variant="indeterminate"
/>
</Grid>
</React.Fragment>
)}
{renderComponent()}
</Paper>
{loading && (
<div className={classes.padChart}>
<Grid item xs={12} className={classes.centerItem}>
<CircularProgress
color="primary"
size={40}
variant="indeterminate"
/>
</Grid>
</div>
)}
{renderComponent()}
</React.Fragment>
);
};
Expand Down
4 changes: 0 additions & 4 deletions portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,6 @@ const ListTiersConfiguration = ({
<SlideOptions
slideOptions={[
<Fragment>
<Grid item xs={12} className={classes.customTitle}>
Tiers
</Grid>

<Grid item xs={12} className={classes.lambdaContainer}>
<Grid item xs={12} className={classes.actionsTray}>
<TextField
Expand Down
5 changes: 2 additions & 3 deletions portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@ const styles = (theme: Theme) =>
syncButton: {
"&.MuiButton-root .MuiButton-iconSizeMedium > *:first-child": {
fontSize: 18,

}
},
},
actionsTray: {
...actionsTray.actionsTray,
padding: "0 10px"
padding: "0 10px",
},
});

Expand Down
5 changes: 5 additions & 0 deletions portal-ui/src/screens/Console/Tenants/ListTenants/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ export interface ITenant {
volumes_per_server: number;
pools: IPool[];
endpoints: IEndpoints;
logEnabled: boolean;
monitoringEnabled: boolean;
encryptionEnabled: boolean;
idpAdEnabled: boolean;
idpOicEnabled: boolean;
// computed
capacity: string;
subnet_license: LicenseInfo;
Expand Down
Loading