fix: ui not loading full execution output (#1641)

* fix: ui not loading full execution output
distribworks · Jan 4, 2025 · 07e2181 · 07e2181
1 parent 0637194
commit 07e2181
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 50 deletions.
diff --git a/dkron/ui-dist/assets/index-6dc28a61.js → dkron/ui-dist/assets/index-a0a8ac74.js b/dkron/ui-dist/assets/index-6dc28a61.js → dkron/ui-dist/assets/index-a0a8ac74.js
diff --git a/dkron/ui-dist/index.html b/dkron/ui-dist/index.html
@@ -119,7 +119,7 @@
             window.DKRON_FAILED_JOBS = {{.DKRON_FAILED_JOBS}};
             window.DKRON_UNTRIGGERED_JOBS = {{.DKRON_UNTRIGGERED_JOBS}};
             window.DKRON_ACL_ENABLED = {{.DKRON_ACL_ENABLED}};</script>
-      <script type="module" crossorigin src="./assets/index-6dc28a61.js"></script>
+      <script type="module" crossorigin src="./assets/index-a0a8ac74.js"></script>
       <link rel="stylesheet" href="./assets/index-73a69410.css">
     </head>
 

diff --git a/ui/package.json b/ui/package.json
@@ -41,5 +41,6 @@
     "prettier": "^2.8.8",
     "typescript": "^5.1.6",
     "vite": "^4.3.9"
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/ui/src/TagsField.tsx b/ui/src/TagsField.tsx
@@ -1,6 +1,8 @@
 import { Chip } from '@mui/material';
+import { useRecordContext } from 'react-admin';
 
-export const TagsField = ({ record }: any) => {
+export const TagsField = () => {
+    const record = useRecordContext();
     if (record === undefined) {
 		return null
     } else {
@@ -11,6 +13,3 @@ export const TagsField = ({ record }: any) => {
         </ul>
     }
 };
-TagsField.defaultProps = {
-    addLabel: true
-};
diff --git a/ui/src/dashboard/Dashboard.tsx b/ui/src/dashboard/Dashboard.tsx
@@ -62,7 +62,7 @@ const Dashboard = () => (
                         <TextField source="Addr" sortable={false} />
                         <TextField source="Port" sortable={false} />
                         <TextField label="Status" source="statusText" sortable={false} />
-                        <TagsField source="Tags" sortable={false} />
+                        <TagsField source="Tags" />
                     </Datagrid>
                 </List>
             </CardContent>

diff --git a/ui/src/jobs/JobShow.tsx b/ui/src/jobs/JobShow.tsx
@@ -47,15 +47,15 @@ const FullButton = ({record}: any) => {
         setLoading(true);
         httpClient(`${apiUrl}/jobs/${record.job_name}/executions/${record.id}`)
             .then((response) => {
-                if (response.ok) {
+                if (response.status === 200) {
                     notify('Success loading full output');
-                    return response.json()
+                    return response.json
                 }
                 throw response
             })
             .then((data) => {
-                record.output_truncated = false
-                record.output = data.output
+                record.output_truncated = false;
+                record.output = data.output;
             })
             .catch((e) => {
                 notify('Error on loading full output', { type: 'warning' })
@@ -64,6 +64,9 @@ const FullButton = ({record}: any) => {
                 setLoading(false);
             });
     };
+
+    if (record.output_truncated === false) return record.output;
+
     return (
         <Button 
             label="Load full output"
@@ -72,7 +75,7 @@ const FullButton = ({record}: any) => {
         >
             <FullIcon/>
         </Button>
-    );
+    )
 };
 
 const SpecialOutputPanel = () => {