Skip to content

Commit 81087ae

Browse files
bexsoftBenjamin Perez
bexsoft
and
Benjamin Perez
authored
Added validation for users to not delete their own account (#633)
Also Implemented an option to show / hide actions in table wrapper Co-authored-by: Benjamin Perez <[email protected]>
1 parent ebab2e1 commit 81087ae

File tree

15 files changed

+77
-16
lines changed

15 files changed

+77
-16
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.0e3d4f4a.chunk.js",
5-
"main.js.map": "/static/js/main.0e3d4f4a.chunk.js.map",
4+
"main.js": "/static/js/main.35167004.chunk.js",
5+
"main.js.map": "/static/js/main.35167004.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.76b14b73.chunk.css": "/static/css/2.76b14b73.chunk.css",
9-
"static/js/2.fa5f1dc1.chunk.js": "/static/js/2.fa5f1dc1.chunk.js",
10-
"static/js/2.fa5f1dc1.chunk.js.map": "/static/js/2.fa5f1dc1.chunk.js.map",
9+
"static/js/2.9510b4a1.chunk.js": "/static/js/2.9510b4a1.chunk.js",
10+
"static/js/2.9510b4a1.chunk.js.map": "/static/js/2.9510b4a1.chunk.js.map",
1111
"index.html": "/index.html",
1212
"static/css/2.76b14b73.chunk.css.map": "/static/css/2.76b14b73.chunk.css.map",
1313
"static/css/main.a19f3d53.chunk.css.map": "/static/css/main.a19f3d53.chunk.css.map",
14-
"static/js/2.fa5f1dc1.chunk.js.LICENSE.txt": "/static/js/2.fa5f1dc1.chunk.js.LICENSE.txt",
14+
"static/js/2.9510b4a1.chunk.js.LICENSE.txt": "/static/js/2.9510b4a1.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.76b14b73.chunk.css",
21-
"static/js/2.fa5f1dc1.chunk.js",
21+
"static/js/2.9510b4a1.chunk.js",
2222
"static/css/main.a19f3d53.chunk.css",
23-
"static/js/main.0e3d4f4a.chunk.js"
23+
"static/js/main.35167004.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.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.fa5f1dc1.chunk.js"></script><script src="/static/js/main.0e3d4f4a.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.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.9510b4a1.chunk.js"></script><script src="/static/js/main.35167004.chunk.js"></script></body></html>

‎portal-ui/build/static/js/2.fa5f1dc1.chunk.js‎ renamed to ‎portal-ui/build/static/js/2.9510b4a1.chunk.js‎

Lines changed: 3 additions & 3 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.fa5f1dc1.chunk.js.LICENSE.txt‎ renamed to ‎portal-ui/build/static/js/2.9510b4a1.chunk.js.LICENSE.txt‎

File renamed without changes.

‎portal-ui/build/static/js/2.fa5f1dc1.chunk.js.map‎ renamed to ‎portal-ui/build/static/js/2.9510b4a1.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.0e3d4f4a.chunk.js‎

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

‎portal-ui/build/static/js/main.0e3d4f4a.chunk.js.map‎

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

‎portal-ui/build/static/js/main.35167004.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.35167004.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/Common/TableWrapper/TableWrapper.tsx‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
} from "@material-ui/core";
2828
import { Table, Column, AutoSizer, InfiniteLoader } from "react-virtualized";
2929
import { createStyles, withStyles } from "@material-ui/core/styles";
30+
import CircularProgress from "@material-ui/core/CircularProgress";
3031
import ViewColumnIcon from "@material-ui/icons/ViewColumn";
3132
import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown";
3233
import ArrowDropUpIcon from "@material-ui/icons/ArrowDropUp";
@@ -45,6 +46,8 @@ interface ItemActions {
4546
onClick?(valueToSend: any): any;
4647
to?: string;
4748
sendOnlyId?: boolean;
49+
hideButtonFunction?: (itemValue: any) => boolean;
50+
showLoaderFunction?: (itemValue: any) => boolean;
4851
}
4952

5053
interface IColumns {
@@ -267,6 +270,19 @@ const styles = () =>
267270
".text-right": {
268271
textAlign: "right",
269272
},
273+
".progress-enabled": {
274+
paddingTop: 3,
275+
display: "inline-block",
276+
margin: "0 10px",
277+
position: "relative",
278+
width: 18,
279+
height: 18,
280+
},
281+
".progress-enabled > .MuiCircularProgress-root": {
282+
position: "absolute",
283+
left: 0,
284+
top: 3,
285+
},
270286
},
271287
...checkboxIcons,
272288
...radioIcons,
@@ -413,6 +429,30 @@ const elementActions = (
413429
return null;
414430
}
415431

432+
const vlSend =
433+
typeof valueToSend === "string" ? valueToSend : valueToSend[idField];
434+
435+
if (action.hideButtonFunction) {
436+
if (action.hideButtonFunction(vlSend)) {
437+
return null;
438+
}
439+
}
440+
441+
if (action.showLoaderFunction) {
442+
if (action.showLoaderFunction(vlSend)) {
443+
return (
444+
<div className={"progress-enabled"}>
445+
<CircularProgress
446+
color="primary"
447+
size={18}
448+
variant="indeterminate"
449+
key={`actions-loader-${action.type}-${index.toString()}`}
450+
/>
451+
</div>
452+
);
453+
}
454+
}
455+
416456
return (
417457
<TableActionButton
418458
type={action.type}

0 commit comments

Comments
 (0)