feat: Executions sorting (#885)

* feat: Executions sorting * Restore the necessary code to sort executions datagrid. * Only sort by some fields * Update assets
distribworks · Jan 7, 2021 · 31df1ae · 31df1ae
1 parent 50db5aa
commit 31df1ae
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 82 deletions.
diff --git a/dkron/assets_ui/assets_vfsdata.go b/dkron/assets_ui/assets_vfsdata.go
diff --git a/ui/src/dataProvider.ts b/ui/src/dataProvider.ts
@@ -1,26 +1,25 @@
 import { fetchUtils } from 'ra-core';
 import jsonServerProvider from 'ra-data-json-server';
+import { stringify } from 'query-string';
 
 export const apiUrl = window.DKRON_API_URL || 'http://localhost:8080/v1'
 const dataProvider = jsonServerProvider(apiUrl);
 
 const myDataProvider = {
     ...dataProvider,
     getManyReference: (resource: any, params: any) => {
-        // Commented because executions query do not accept any query options yet
-
-        // const { page, perPage } = params.pagination;
-        // const { field, order } = params.sort;
+        const { page, perPage } = params.pagination;
+        const { field, order } = params.sort;
 
-        // const query = {
-        //     ...fetchUtils.flattenObject(params.filter),
-        //     [params.target]: params.id,
-        //     _sort: field,
-        //     _order: order,
-        //     _start: (page - 1) * perPage,
-        //     _end: page * perPage,
-        // };
-        const url = `${apiUrl}/${params.target}/${params.id}/${resource}`;
+        const query = {
+            ...fetchUtils.flattenObject(params.filter),
+            [params.target]: params.id,
+            _sort: field,
+            _order: order,
+            _start: (page - 1) * perPage,
+            _end: page * perPage,
+        };
+        const url = `${apiUrl}/${params.target}/${params.id}/${resource}?${stringify(query)}`;
 
         return fetchUtils.fetchJson(url).then(({ headers, json }) => {
             if (!headers.has('x-total-count')) {

diff --git a/ui/src/jobs/JobShow.tsx b/ui/src/jobs/JobShow.tsx
@@ -74,12 +74,12 @@ const JobShow = (props: any) => (
                 <ReferenceManyField reference="executions" target="jobs" label="Executions">
                     <Datagrid rowClick="expand" isRowSelectable={ record => false } expand={<OutputPanel {...props} />}>
                         <TextField source="id" />
-                        <TextField source="group" />
-                        <TextField source="job_name" />
+                        <TextField source="group" sortable={false} />
+                        <TextField source="job_name" sortable={false} />
                         <DateField source="started_at" showTime />
                         <DateField source="finished_at" showTime />
-                        <TextField source="node_name" />
-                        <BooleanField source="success" />
+                        <TextField source="node_name" sortable={false} />
+                        <BooleanField source="success" sortable={false} />
                         <NumberField source="attempt" />
                     </Datagrid>
                 </ReferenceManyField>