Adapt fields to admin v4

distribworks · Feb 8, 2024 · a1e1799 · a1e1799
1 parent 0acb306
commit a1e1799
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/ui/index.html b/ui/index.html
@@ -111,6 +111,7 @@
             href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap"
             rel="stylesheet"
         />
+        <script>window.global = window;</script>
         <script>window.DKRON_API_URL = {{.DKRON_API_URL }};
             window.DKRON_LEADER = {{.DKRON_LEADER }};
             window.DKRON_TOTAL_JOBS = {{.DKRON_TOTAL_JOBS }};

diff --git a/ui/src/jobs/EnabledField.tsx b/ui/src/jobs/EnabledField.tsx
@@ -1,9 +1,12 @@
 import SuccessIcon from '@mui/icons-material/CheckCircle';
 import FailedIcon from '@mui/icons-material/Cancel';
 import { Tooltip } from '@mui/material';
+import { useRecordContext } from 'react-admin';
 
-const EnabledField = (props: any) => {
-    if (props.record !== undefined && props.record[props.source] === true) {
+const EnabledField = () => {
+    const record = useRecordContext();
+
+    if (record.disabled) {
         return <Tooltip title="Disabled"><FailedIcon htmlColor="red" /></Tooltip>
     } else {
         return <Tooltip title="Enabled"><SuccessIcon htmlColor="green" /></Tooltip>

diff --git a/ui/src/jobs/StatusField.tsx b/ui/src/jobs/StatusField.tsx
@@ -2,18 +2,17 @@ import SuccessIcon from '@mui/icons-material/CheckCircle';
 import FailedIcon from '@mui/icons-material/Cancel';
 import UntriggeredIcon from '@mui/icons-material/Timer';
 import { Tooltip } from '@mui/material';
+import { useRecordContext } from 'react-admin';
 
-const StatusField = (props: any) => {
-	if (props.record === undefined) {
-		return null
+const StatusField = () => {
+	const record = useRecordContext();
+
+	if (record.status === 'success') {
+		return <Tooltip title="Success"><SuccessIcon htmlColor="green" /></Tooltip> 
+	} else if (record.status === 'failed') {
+		return <Tooltip title="Error"><FailedIcon htmlColor="red" /></Tooltip>
 	} else {
-		if (props.record[props.source] === 'success') {
-			return <Tooltip title="Success"><SuccessIcon htmlColor="green" /></Tooltip> 
-		} else if (props.record[props.source] === 'failed') {
-			return <Tooltip title="Error"><FailedIcon htmlColor="red" /></Tooltip>
-		} else {
-			return <Tooltip title="Waiting to Run"><UntriggeredIcon htmlColor="blue" /></Tooltip>
-		}
+		return <Tooltip title="Waiting to Run"><UntriggeredIcon htmlColor="blue" /></Tooltip>
 	}
 };