Break product action into function, handle cancel

FyreByrd · FyreByrd · commit 07c34b07b078 · 2025-02-07T15:21:04.000-05:00
diff --git a/source/SIL.AppBuilder.Portal/src/lib/products/index.ts b/source/SIL.AppBuilder.Portal/src/lib/products/index.ts
@@ -0,0 +1,40 @@
+import { WorkflowType } from "sil.appbuilder.portal.common/prisma";
+
+export enum ProductActionType {
+  Rebuild = 'rebuild',
+  Republish = 'republish',
+  Cancel = 'cancel'
+}
+
+export function getProductActions(
+  product: {
+    WorkflowInstance: {
+      WorkflowDefinition: {
+        Type: WorkflowType;
+      };
+    } | null;
+    DatePublished: unknown;
+    ProductDefinition: { RebuildWorkflowId: unknown; RepublishWorkflowId: unknown };
+  },
+  projectOwnerId: number,
+  userId: number
+) {
+  const ret: ProductActionType[] = [];
+  if (!product.WorkflowInstance) {
+    if (product.DatePublished) {
+      if (product.ProductDefinition.RebuildWorkflowId !== null) {
+        ret.push(ProductActionType.Rebuild);
+      }
+      if (product.ProductDefinition.RepublishWorkflowId !== null) {
+        ret.push(ProductActionType.Republish);
+      }
+    }
+  } else if (
+    projectOwnerId === userId &&
+    product.WorkflowInstance.WorkflowDefinition.Type !== WorkflowType.Startup
+  ) {
+    ret.push(ProductActionType.Cancel);
+  }
+
+  return ret;
+}
diff --git a/source/SIL.AppBuilder.Portal/src/lib/products/server.ts b/source/SIL.AppBuilder.Portal/src/lib/products/server.ts
@@ -0,0 +1,87 @@
+import { BullMQ, DatabaseWrites, prisma, Queues, Workflow } from 'sil.appbuilder.portal.common';
+import { ProductTransitionType, WorkflowType } from 'sil.appbuilder.portal.common/prisma';
+import { ProductActionType } from '.';
+
+export async function doProductAction(productId: string, action: ProductActionType) {
+  const product = await prisma.products.findUnique({
+    where: {
+      Id: productId
+    },
+    select: {
+      Id: true,
+      ProjectId: true,
+      ProductDefinition: {
+        select: {
+          RebuildWorkflow: {
+            select: {
+              Type: true,
+              ProductType: true,
+              WorkflowOptions: true
+            }
+          },
+          RepublishWorkflow: {
+            select: {
+              Type: true,
+              ProductType: true,
+              WorkflowOptions: true
+            }
+          }
+        }
+      },
+      WorkflowInstance: {
+        select: {
+          WorkflowDefinition: {
+            select: { Type: true }
+          }
+        }
+      }
+    }
+  });
+
+  if (product) {
+    switch (action) {
+    case ProductActionType.Rebuild:
+    case ProductActionType.Republish: {
+      const flowType = action === 'rebuild' ? 'RebuildWorkflow' : 'RepublishWorkflow';
+      if (product.ProductDefinition[flowType] && !product.WorkflowInstance) {
+        await Workflow.create(productId, {
+          productType: product.ProductDefinition[flowType].ProductType,
+          options: new Set(product.ProductDefinition[flowType].WorkflowOptions),
+          workflowType: product.ProductDefinition[flowType].Type
+        });
+      }
+      break;
+    }
+    case ProductActionType.Cancel:
+      if (
+        product.WorkflowInstance?.WorkflowDefinition &&
+          product.WorkflowInstance.WorkflowDefinition.Type !== WorkflowType.Startup
+      ) {
+        // TODO: this won't cancel a build that is in progress
+        await Queues.UserTasks.add(
+          `Delete UserTasks for canceled workflow (product #${productId})`,
+          {
+            type: BullMQ.JobType.UserTasks_Modify,
+            scope: 'Product',
+            productId,
+            operation: {
+              type: BullMQ.UserTasks.OpType.Delete
+            }
+          }
+        );
+        await DatabaseWrites.productTransitions.create({
+          data: {
+            ProductId: productId,
+            // This is how S1 does it. May want to change later
+            AllowedUserNames: '',
+            DateTransition: new Date(),
+            TransitionType: ProductTransitionType.CancelWorkflow,
+            WorkflowType: product.WorkflowInstance.WorkflowDefinition.Type
+          }
+        });
+        await DatabaseWrites.workflowInstances.delete(productId, product.ProjectId);
+      }
+      break;
+    }
+  }
+}
diff --git a/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[filter=projectSelector]/[id]/+page.server.ts b/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[filter=projectSelector]/[id]/+page.server.ts
@@ -1,3 +1,5 @@
+import { ProductActionType } from '$lib/products';
+import { doProductAction } from '$lib/products/server';
 import {
   bulkProjectActionSchema,
   canModifyProject,
@@ -7,15 +9,15 @@ import {
 import { doProjectAction, projectFilter, userGroupsForOrg } from '$lib/projects/common.server';
 import type { Prisma } from '@prisma/client';
 import { error, redirect, type Actions } from '@sveltejs/kit';
-import { prisma, Workflow } from 'sil.appbuilder.portal.common';
+import { prisma } from 'sil.appbuilder.portal.common';
 import { fail, superValidate } from 'sveltekit-superforms';
 import { valibot } from 'sveltekit-superforms/adapters';
 import * as v from 'valibot';
 import type { PageServerLoad } from './$types';
 
 const bulkProductActionSchema = v.object({
   products: v.array(v.pipe(v.string(), v.uuid())),
-  operation: v.nullable(v.picklist(['rebuild', 'republish']))
+  operation: v.nullable(v.pipe(v.enum(ProductActionType), v.excludes(ProductActionType.Cancel)))
 });
 
 function whereStatements(
@@ -187,45 +189,7 @@ export const actions: Actions = {
     const form = await superValidate(event.request, valibot(bulkProductActionSchema));
     if (!form.valid || !form.data.operation) return fail(400, { form, ok: false });
 
-    const products = await prisma.products.findMany({
-      where: {
-        Id: { in: form.data.products },
-        WorkflowInstance: null
-      },
-      select: {
-        Id: true,
-        ProductDefinition: {
-          select: {
-            RebuildWorkflow: {
-              select: {
-                Type: true,
-                ProductType: true,
-                WorkflowOptions: true
-              }
-            },
-            RepublishWorkflow: {
-              select: {
-                Type: true,
-                ProductType: true,
-                WorkflowOptions: true
-              }
-            }
-          }
-        }
-      }
-    });
-
-    const flowType = form.data.operation === 'rebuild' ? 'RebuildWorkflow' : 'RepublishWorkflow';
-    
-    await Promise.all(products.map(async (p) => {
-      if (p.ProductDefinition[flowType]) {
-        await Workflow.create(p.Id, {
-          productType: p.ProductDefinition[flowType].ProductType,
-          options: new Set(p.ProductDefinition[flowType].WorkflowOptions),
-          workflowType: p.ProductDefinition[flowType].Type
-        });
-      }
-    }));
+    await Promise.all(form.data.products.map((p) => doProductAction(p, form.data.operation!)));
 
     return { form, ok: true };
   }
diff --git a/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts b/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[id=idNumber]/+page.server.ts
@@ -1,3 +1,5 @@
+import { getProductActions, ProductActionType } from '$lib/products';
+import { doProductAction } from '$lib/products/server';
 import { canModifyProject, projectActionSchema } from '$lib/projects/common';
 import {
   doProjectAction,
@@ -6,7 +8,7 @@ import {
 } from '$lib/projects/common.server';
 import { idSchema } from '$lib/valibot';
 import { error } from '@sveltejs/kit';
-import { BullMQ, DatabaseWrites, prisma, Queues, Workflow } from 'sil.appbuilder.portal.common';
+import { BullMQ, DatabaseWrites, prisma, Queues } from 'sil.appbuilder.portal.common';
 import { RoleId } from 'sil.appbuilder.portal.common/prisma';
 import { fail, superValidate } from 'sveltekit-superforms';
 import { valibot } from 'sveltekit-superforms/adapters';
@@ -35,8 +37,10 @@ const addProductSchema = v.object({
   productDefinitionId: idSchema,
   storeId: idSchema
 });
+
 const productActionSchema = v.object({
-  id: v.pipe(v.string(), v.uuid())
+  id: v.pipe(v.string(), v.uuid()),
+  productAction: v.enum(ProductActionType)
 });
 
 // Are we sending too much data?
@@ -95,7 +99,12 @@ export const load = (async ({ locals, params }) => {
           },
           WorkflowInstance: {
             select: {
-              Id: true
+              Id: true,
+              WorkflowDefinition: {
+                select: {
+                  Type: true
+                }
+              }
             }
           }
         }
@@ -235,8 +244,7 @@ export const load = (async ({ locals, params }) => {
         ActiveTransition: strippedTransitions.find(
           (t) => (t[0] ?? t[1])?.ProductId === product.Id
         )?.[1],
-        CanRebuild: !product.WorkflowInstance && product.ProductDefinition.RebuildWorkflowId !== null,
-        CanRepublish: !product.WorkflowInstance && product.ProductDefinition.RepublishWorkflowId !== null
+        actions: getProductActions(product, project.Owner.Id, session.user.userId)
       }))
     },
     possibleProjectOwners: await prisma.users.findMany({
@@ -338,7 +346,7 @@ export const actions = {
 
     return { form, ok: !!productId };
   },
-  async rebuildProduct(event) {
+  async productAction(event) {
     if (!verifyCanViewAndEdit((await event.locals.auth())!, parseInt(event.params.id)))
       return fail(403);
     const form = await superValidate(event.request, valibot(productActionSchema));
@@ -348,77 +356,13 @@ export const actions = {
         Id: form.data.id
       },
       select: {
-        ProjectId: true,
-        ProductDefinition: {
-          select: {
-            RebuildWorkflow: {
-              select: {
-                Id: true,
-                Type: true,
-                ProductType: true,
-                WorkflowOptions: true
-              }
-            }
-          }
-        },
-        WorkflowInstance: {
-          select: {
-            Id: true
-          }
-        }
+        ProjectId: true
       }
     });
     if (!product || product.ProjectId !== parseInt(event.params.id)) return fail(404);
-    if (!product.WorkflowInstance && product.ProductDefinition.RebuildWorkflow) {
-      await Workflow.create(form.data.id, {
-        productType: product.ProductDefinition.RebuildWorkflow.ProductType,
-        options: new Set(product.ProductDefinition.RebuildWorkflow.WorkflowOptions),
-        workflowType: product.ProductDefinition.RebuildWorkflow.Type
-      });
-    } else {
-      return fail(400, { form, ok: false });
-    }
-  },
-  async republishProduct(event) {
-    if (!verifyCanViewAndEdit((await event.locals.auth())!, parseInt(event.params.id)))
-      return fail(403);
-    const form = await superValidate(event.request, valibot(productActionSchema));
-    if (!form.valid) return fail(400, { form, ok: false });
-    const product = await prisma.products.findUnique({
-      where: {
-        Id: form.id
-      },
-      select: {
-        ProjectId: true,
-        ProductDefinition: {
-          select: {
-            RepublishWorkflow: {
-              select: {
-                Id: true,
-                Type: true,
-                ProductType: true,
-                WorkflowOptions: true
-              }
-            }
-          }
-        },
-        WorkflowInstance: {
-          select: {
-            Id: true
-          }
-        }
-      }
-    });
-    if (!product || product.ProjectId !== parseInt(event.params.id)) return fail(404);
-    if (!product.WorkflowInstance && product.ProductDefinition.RepublishWorkflow) {
-      await Workflow.create(form.data.id, {
-        productType: product.ProductDefinition.RepublishWorkflow.ProductType,
-        options: new Set(product.ProductDefinition.RepublishWorkflow.WorkflowOptions),
-        workflowType: product.ProductDefinition.RepublishWorkflow.Type
-      });
-    } else {
-      return fail(400, { form, ok: false });
-    }
+    await doProductAction(form.data.id, form.data.productAction);
+
+    return { form, ok: true };
   },
   async addAuthor(event) {
     if (!verifyCanViewAndEdit((await event.locals.auth())!, parseInt(event.params.id)))
diff --git a/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte b/source/SIL.AppBuilder.Portal/src/routes/(authenticated)/projects/[id=idNumber]/+page.svelte
@@ -269,26 +269,21 @@
                       class="dropdown-content bottom-12 right-0 p-1 bg-base-200 z-10 rounded-md min-w-36 w-auto shadow-lg"
                     >
                       <ul class="menu menu-compact overflow-hidden rounded-md">
-                        {#if product.CanRebuild}
+                        {#each product.actions as action}
+                          {@const message = 
+                            //@ts-expect-error this is in fact correct
+                            m['products_actions_'+action]()
+                          }
                           <li class="w-full rounded-none">
-                            <form action="?/rebuildProduct" method="post" use:enhance>
+                            <form action="?/productAction" method="post" use:enhance>
                               <input type="hidden" name="id" value={product.Id} />
+                              <input type="hidden" name="productAction" value={action} />
                               <button type="submit" class="text-nowrap">
-                                {m.products_actions_rebuild()}
+                                {message}
                               </button>
                             </form>
                           </li>
-                        {/if}
-                        {#if product.CanRepublish}
-                          <li class="w-full rounded-none">
-                            <form action="?/republishProduct" method="post" use:enhance>
-                              <input type="hidden" name="id" value={product.Id} />
-                              <button type="submit" class="text-nowrap">
-                                {m.products_actions_republish()}
-                              </button>
-                            </form>
-                          </li>
-                        {/if}
+                        {/each}
                         <li class="w-full rounded-none">
                           <button class="text-nowrap" on:click={() => openModal(product.Id)}>
                             {m.project_products_popup_details()}
