Sort correct field in workflow-instances

sillsdev · Feb 4, 2025 · ff6034c · ff6034c
1 parent 9d48530
commit ff6034c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/workflow-instances/+page.server.ts b/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/workflow-instances/+page.server.ts
@@ -142,19 +142,17 @@ export const actions: Actions = {
 
     const instances = await prisma.workflowInstances.findMany({
       orderBy:
-        form.data.sort?.field === 'product'
-          ? { ProductId: form.data.sort.direction }
-          : form.data.sort?.field === 'organization'
+        form.data.sort?.field === 'organization'
           ? { Product: { Project: { Organization: { Name: form.data.sort.direction } } } }
           : form.data.sort?.field === 'project'
-          ? { Product: { Project: { Name: form.data.sort.direction } } }
-          : form.data.sort?.field === 'definition'
-          ? { Product: { ProductDefinition: { Name: form.data.sort.direction } } }
-          : form.data.sort?.field === 'state'
-          ? { State: form.data.sort.direction }
-          : form.data.sort?.field === 'date'
-          ? { DateUpdated: form.data.sort.direction }
-          : undefined,
+            ? { Product: { Project: { Name: form.data.sort.direction } } }
+            : form.data.sort?.field === 'definition'
+              ? { Product: { ProductDefinition: { Name: form.data.sort.direction } } }
+              : form.data.sort?.field === 'state'
+                ? { State: form.data.sort.direction }
+                : form.data.sort?.field === 'date'
+                  ? { DateUpdated: form.data.sort.direction }
+                  : undefined,
       where: where,
       select: {
         State: true,

diff --git a/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/workflow-instances/+page.svelte b/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/workflow-instances/+page.svelte
@@ -95,7 +95,7 @@
             compare: () => 0
           },
           {
-            id: 'product',
+            id: 'definition',
             header: m.tasks_product(),
             compare: () => 0
           },