From 8330c5b38342b2086a8be6baf4349d0a4c4ade1d Mon Sep 17 00:00:00 2001 From: jasquat <2487833+jasquat@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:58:02 -0400 Subject: [PATCH] Feature/treat blank task as manual (#598) * adds basic support to use certain components in extensions w/ burnettk * treat a blank Task as a manual task on the frontend w/ burnettk * updated remaining references for ManualTask vs UserTask w/ burnettk --------- Co-authored-by: jasquat --- spiffworkflow-frontend/src/components/TaskListTable.tsx | 2 +- spiffworkflow-frontend/src/helpers.tsx | 1 + spiffworkflow-frontend/src/routes/TaskShow.tsx | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spiffworkflow-frontend/src/components/TaskListTable.tsx b/spiffworkflow-frontend/src/components/TaskListTable.tsx index 4c780f6f5..6f1378abb 100644 --- a/spiffworkflow-frontend/src/components/TaskListTable.tsx +++ b/spiffworkflow-frontend/src/components/TaskListTable.tsx @@ -141,7 +141,7 @@ export default function TaskListTable({ // TODO: move this and the code from TaskShow to new component to handle instructions and manual tasks let formUiSchema; let jsonSchema = formSubmissionTask.form_schema; - if (formSubmissionTask.typename === 'ManualTask') { + if (formSubmissionTask.typename !== 'UserTask') { jsonSchema = { type: 'object', required: [], diff --git a/spiffworkflow-frontend/src/helpers.tsx b/spiffworkflow-frontend/src/helpers.tsx index d70837ccf..f102c3dba 100644 --- a/spiffworkflow-frontend/src/helpers.tsx +++ b/spiffworkflow-frontend/src/helpers.tsx @@ -25,6 +25,7 @@ export const HUMAN_TASK_TYPES = [ 'Manual Task', 'UserTask', 'ManualTask', + 'Task', ]; export const underscorizeString = (inputString: string) => { diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx index 82ebac664..898971dcd 100644 --- a/spiffworkflow-frontend/src/routes/TaskShow.tsx +++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx @@ -102,7 +102,7 @@ export default function TaskShow() { // https://github.com/sartography/spiff-arena/blob/182f56a1ad23ce780e8f5b0ed00efac3e6ad117b/spiffworkflow-frontend/src/routes/TaskShow.tsx#L329 const autoSaveTaskData = (formData: any, successCallback?: Function) => { // save-draft gets called when a manual task form loads but there's no data to save so don't do it - if (taskWithTaskData?.typename === 'ManualTask') { + if (['ManualTask', 'Task'].includes(taskWithTaskData?.typename || '')) { return undefined; } let successCallbackToUse = successCallback; @@ -240,7 +240,7 @@ export default function TaskShow() { let formUiSchema; let jsonSchema = taskWithTaskData.form_schema; let reactFragmentToHideSubmitButton = null; - if (taskWithTaskData.typename === 'ManualTask') { + if (taskWithTaskData.typename !== 'UserTask') { jsonSchema = { type: 'object', required: [],