Skip to content

Commit 0e492da

Browse files
dvaldiviadvaldivia
authored
Add Restruct with policy selector in add SA modal (#689)
1 parent b722177 commit 0e492da

10 files changed

+50
-22
lines changed

‎portal-ui/build/asset-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.a19f3d53.chunk.css",
4-
"main.js": "/static/js/main.007b630d.chunk.js",
5-
"main.js.map": "/static/js/main.007b630d.chunk.js.map",
4+
"main.js": "/static/js/main.36f300f5.chunk.js",
5+
"main.js.map": "/static/js/main.36f300f5.chunk.js.map",
66
"runtime-main.js": "/static/js/runtime-main.f48e99e5.js",
77
"runtime-main.js.map": "/static/js/runtime-main.f48e99e5.js.map",
88
"static/css/2.f324abd6.chunk.css": "/static/css/2.f324abd6.chunk.css",
9-
"static/js/2.26e254ca.chunk.js": "/static/js/2.26e254ca.chunk.js",
10-
"static/js/2.26e254ca.chunk.js.map": "/static/js/2.26e254ca.chunk.js.map",
9+
"static/js/2.d137deb9.chunk.js": "/static/js/2.d137deb9.chunk.js",
10+
"static/js/2.d137deb9.chunk.js.map": "/static/js/2.d137deb9.chunk.js.map",
1111
"index.html": "/index.html",
1212
"static/css/2.f324abd6.chunk.css.map": "/static/css/2.f324abd6.chunk.css.map",
1313
"static/css/main.a19f3d53.chunk.css.map": "/static/css/main.a19f3d53.chunk.css.map",
14-
"static/js/2.26e254ca.chunk.js.LICENSE.txt": "/static/js/2.26e254ca.chunk.js.LICENSE.txt",
14+
"static/js/2.d137deb9.chunk.js.LICENSE.txt": "/static/js/2.d137deb9.chunk.js.LICENSE.txt",
1515
"static/media/minio_console_logo.0837460e.svg": "/static/media/minio_console_logo.0837460e.svg",
1616
"static/media/minio_operator_logo.1312b7c9.svg": "/static/media/minio_operator_logo.1312b7c9.svg"
1717
},
1818
"entrypoints": [
1919
"static/js/runtime-main.f48e99e5.js",
2020
"static/css/2.f324abd6.chunk.css",
21-
"static/js/2.26e254ca.chunk.js",
21+
"static/js/2.d137deb9.chunk.js",
2222
"static/css/main.a19f3d53.chunk.css",
23-
"static/js/main.007b630d.chunk.js"
23+
"static/js/main.36f300f5.chunk.js"
2424
]
2525
}

‎portal-ui/build/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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.26e254ca.chunk.js"></script><script src="/static/js/main.007b630d.chunk.js"></script></body></html>
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.d137deb9.chunk.js"></script><script src="/static/js/main.36f300f5.chunk.js"></script></body></html>

‎portal-ui/build/static/js/2.26e254ca.chunk.js renamed to ‎portal-ui/build/static/js/2.d137deb9.chunk.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/build/static/js/2.26e254ca.chunk.js.LICENSE.txt renamed to ‎portal-ui/build/static/js/2.d137deb9.chunk.js.LICENSE.txt

File renamed without changes.

‎portal-ui/build/static/js/2.26e254ca.chunk.js.map renamed to ‎portal-ui/build/static/js/2.d137deb9.chunk.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/build/static/js/main.007b630d.chunk.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎portal-ui/build/static/js/main.007b630d.chunk.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎portal-ui/build/static/js/main.36f300f5.chunk.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/build/static/js/main.36f300f5.chunk.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/src/screens/Console/Account/AddServiceAccount.tsx

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
2525
import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
2626
import { setModalErrorSnackMessage } from "../../../actions";
2727
import { connect } from "react-redux";
28+
import FormSwitchWrapper from "../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
2829

2930
const styles = (theme: Theme) =>
3031
createStyles({
@@ -39,6 +40,11 @@ const styles = (theme: Theme) =>
3940
color: "#393939",
4041
fontSize: 12,
4142
fontStyle: "italic",
43+
marginBottom: "8px",
44+
},
45+
containerScrollable: {
46+
maxHeight: "calc(100vh - 300px)" as const,
47+
overflowY: "auto" as const,
4248
},
4349
...modalBasic,
4450
});
@@ -56,8 +62,11 @@ const AddServiceAccount = ({
5662
closeModalAndRefresh,
5763
setModalErrorSnackMessage,
5864
}: IAddServiceAccountProps) => {
59-
const [addSending, setAddSending] = useState(false);
60-
const [policyDefinition, setPolicyDefinition] = useState("");
65+
const [addSending, setAddSending] = useState<boolean>(false);
66+
const [policyDefinition, setPolicyDefinition] = useState<string>("");
67+
const [isRestrictedByPolicy, setIsRestrictedByPolicy] = useState<boolean>(
68+
false
69+
);
6170

6271
useEffect(() => {
6372
if (addSending) {
@@ -106,8 +115,8 @@ const AddServiceAccount = ({
106115
addServiceAccount(e);
107116
}}
108117
>
109-
<Grid container>
110-
<Grid item xs={12} className={classes.formScrollable}>
118+
<Grid container className={classes.containerScrollable}>
119+
<Grid item xs={12}>
111120
<div className={classes.infoDetails}>
112121
Service Accounts inherit the policy explicitly attached to the
113122
parent user and the policy attached to each group in which the
@@ -117,13 +126,32 @@ const AddServiceAccount = ({
117126
parent user. You cannot modify the Service Account optional policy
118127
after saving.
119128
</div>
120-
<CodeMirrorWrapper
121-
value={policyDefinition}
122-
onBeforeChange={(editor, data, value) => {
123-
setPolicyDefinition(value);
129+
</Grid>
130+
<Grid item xs={12}>
131+
<FormSwitchWrapper
132+
value="locking"
133+
id="locking"
134+
name="locking"
135+
checked={isRestrictedByPolicy}
136+
onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
137+
setIsRestrictedByPolicy(event.target.checked);
124138
}}
139+
label={"Restrict with policy"}
140+
indicatorLabels={["On", "Off"]}
125141
/>
126142
</Grid>
143+
{isRestrictedByPolicy && (
144+
<Grid item xs={12}>
145+
<CodeMirrorWrapper
146+
value={policyDefinition}
147+
onBeforeChange={(editor, data, value) => {
148+
setPolicyDefinition(value);
149+
}}
150+
/>
151+
</Grid>
152+
)}
153+
</Grid>
154+
<Grid container>
127155
<Grid item xs={12} className={classes.buttonContainer}>
128156
<button
129157
type="button"

0 commit comments

Comments
 (0)