From fade40ccb817e94228aef2944c0032b2edf5bff9 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 20 Apr 2023 15:26:54 -0400 Subject: [PATCH] * Because end events won't always have information, allow the interstitial api endpoint to return the last task, even if it doesn't have any end user information. This prevents us from just redirecting everthing back to the home page and encourages better end event messaging. * Cleaning up icons so they are a little smaller and more consistent. * Always show that action column. * Improve the state managment and layout of the interstitial page. --- .../routes/tasks_controller.py | 9 +- .../public/interstitial/checkmark.png | Bin 2995 -> 0 bytes .../public/interstitial/clock.png | Bin 4172 -> 0 bytes .../public/interstitial/completed.png | Bin 0 -> 2009 bytes .../public/interstitial/lock.png | Bin 2392 -> 0 bytes .../public/interstitial/locked.png | Bin 0 -> 1898 bytes .../public/interstitial/redirect.png | Bin 0 -> 1881 bytes .../public/interstitial/waiting.png | Bin 0 -> 1750 bytes .../src/components/InstructionsForEndUser.tsx | 3 +- .../src/components/MyCompletedInstances.tsx | 1 + .../src/routes/CompletedInstances.tsx | 3 + .../src/routes/ProcessInstanceList.tsx | 2 +- .../src/routes/ProcessInterstitial.tsx | 112 ++++++++++-------- 13 files changed, 74 insertions(+), 56 deletions(-) delete mode 100644 spiffworkflow-frontend/public/interstitial/checkmark.png delete mode 100644 spiffworkflow-frontend/public/interstitial/clock.png create mode 100644 spiffworkflow-frontend/public/interstitial/completed.png delete mode 100644 spiffworkflow-frontend/public/interstitial/lock.png create mode 100644 spiffworkflow-frontend/public/interstitial/locked.png create mode 100644 spiffworkflow-frontend/public/interstitial/redirect.png create mode 100644 spiffworkflow-frontend/public/interstitial/waiting.png diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py index c836456a9..4e1de9a59 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py @@ -396,9 +396,6 @@ def _interstitial_stream(process_instance_id: int) -> Generator[str, str, None]: process_instance = _find_process_instance_by_id_or_raise(process_instance_id) processor = ProcessInstanceProcessor(process_instance) reported_ids = [] # bit of an issue with end tasks showing as getting completed twice. - - # return Response(get_data(), mimetype='text/event-stream') - spiff_task = processor.next_task() last_task = None while last_task != spiff_task: @@ -413,7 +410,11 @@ def _interstitial_stream(process_instance_id: int) -> Generator[str, str, None]: spiff_task = processor.next_task() # Note, this has to be done in case someone leaves the page, # which can otherwise cancel this function and leave completed tasks un-registered. - processor.save() # Fixme - maybe find a way not to do this on every method? + processor.save() # Fixme - maybe find a way not to do this on every loop? + if len(reported_ids) == 0: + # Always provide some response, in the event no instructions were provided. + task = ProcessInstanceService.spiff_task_to_api_task(processor, processor.next_task()) + yield f"data: {current_app.json.dumps(task)} \n\n" def interstitial(process_instance_id: int) -> Response: diff --git a/spiffworkflow-frontend/public/interstitial/checkmark.png b/spiffworkflow-frontend/public/interstitial/checkmark.png deleted file mode 100644 index 6467b220ca806199b59f43a13b315f2efcd967ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2995 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 TDyHn08pz7R*8GX-mFxcnUld#B diff --git a/spiffworkflow-frontend/public/interstitial/clock.png b/spiffworkflow-frontend/public/interstitial/clock.png deleted file mode 100644 index 3e4e5119aed2d2d74588b5645800ca2d89cddc37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4172 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 Ul-wu*4*4JxLvw>#J=cW)0YkePV*mgE diff --git a/spiffworkflow-frontend/public/interstitial/completed.png b/spiffworkflow-frontend/public/interstitial/completed.png new file mode 100644 index 0000000000000000000000000000000000000000..e5cf351003c99da93b6b5cbd63cf3debd8255275 GIT binary patch literal 2009 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 diff --git a/spiffworkflow-frontend/public/interstitial/locked.png b/spiffworkflow-frontend/public/interstitial/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..fd39fb0d155874ff51f96917cc8f8600bfac1918 GIT binary patch literal 1898 zcmY*aX;_l!8vX!7%Y|Gj5H-vcTM*F9tz1|XbrdUeOlJ}V5(4=MQBg}PvrZE#n6_wT zi^@1%TIu9z8S|@-hUQkbpt+T6V>+g0Y1={jbIy&N))sy7v>Fg@*$9n08{eMJElyZ0gUnY|zcoK=AgeT^R1QNDXwvdy^<;mCr5s~b^ zX|uB{alx6eU`&WjAuI+a{J7!k=SAr@MlRZek`$>RjxPhKR1z*MF;*nt;AmhxTOh{K zcw7PJN4Nz?ogrs2Y!Z(H#>a!=ghf-yqK3ODA*S-AAd&1uA~p=v&H=!Zhk-P|aQV6M zbFV;)ooFZ{TDwwsoKb%lW*T3hSMePG`HlU1`hU>dXr}a``)=k6OOWV58(4i1nR%IJ zzkbCPRNI0aFRb`^IvfInFaEo&9>jmWoe;LZkMgxZ3QCdaq#l3Gs`n&V@HyNSej~L#! z(mj`T7ylNQI2_J0e~;LNw9-qTeCl^GjP8NmiY;4P0Xa3ppP)oQ1aKOdJ2*9^G2mo< z6xFdiy;P=+`EP!@c$z=rqkjq>vU8L_#jPW?cNjL8cNHnfC;4g=;1>NX#n9Q`q~mtc z(_5)ep91?Cx2_OjElWqm$QJ>l>Ba9tYZP*ep4)IqG25d8vWD!S9ne;YezXd;yw|pp zyb+)9%b^La<8|#t#ce2Uw+8}J;=THZ#+Ou*9pjGU)!AVyG4uHtDP(fkdi@$#(r=}Z zff-OSyFvxk`p&5D8J!7h>J;OO*G*7RP1VS$#~wEtvh7@xas40_I)NOjG`=wwYS-rM zi5hB2(G5*_ic+v=Q+P!^>?V-{f299%5h59uivxYQQ?>d&mh+n z1Nj5rHe`JR0a=weWOO)fY$>-1Tkjua{RDj-@-17st7tOuD;wA0FFEEG)S!M6H8OkS z(wCV0-Hc?TT9j=|X3TWR%I-9a=+pJ>*ucz|2g>*hxXl<%&6*fMqrT^Hw6_8>`e%gA zHL|H63;LEwp7A$(e&tbVaN~E4@9f@^*&$W${*@A{Q4gI}c-m7bn3QX#3quM~iFoE@ z^Y~|j+es{+r^EB(9}TJ)HuyQ~o+J1S^et~na?HV6j`o^7f^T;##84Q_4CwkbUK=j7 z^xIqA5J8`KgHAsdTW#ze-1v{7YFG9~OlUPfz$1lgS#hbeY|ac@1iMf^xY}6t_VP0i zdp|^#aFO3$0IO+t(0gd>EO?ijHJR@zqaSet=P;PU%k$Snd-!^)g2r2h%EasK( z&o}~0Z8>pbPtkC&NQC^vwD05I5mI27Rc@?nJui~zn_^-)E|8C{-|vIYCp^Cl?5v4I zE8UKY9z@;WbI=gVh0PgihM$xgDiOyDW=y>iimdUQ{~8bamVN4j*0(xv`qFxlzPu=J z_00}ekWE@gWJ{S%@DQG|VLnw74NZ6DvBNA&|2*o2ri$14f?oH>?%Qc*dMs;%5+7;% zT1Fek^;8d|u{R3um}~y-vp%GneNUhieezR+Lf$9H53cTKKSn;+Qswydz0dC02j z3wjW8$^oezCK4MD7J8=J+o7@2S%X2eyuQh6E4A()p=dnp;mje?aahaC4c}rRIVc4%WhUVFb)$?#!mE zOZ&(v?n|&{cE?2CM-Mz8o@~A&F`S2)`y{#?_uQPla?m~e%#}Le-?5K6tt8k<;gQz1 zGn7@a!>ptL4ocd7r*KGv(Ogp1B2#BwvL^VSn*B|t&dz)ZP;$aIs08sG-;`{q6sm=U z7Zib=#d+@sw%u%3=s8VOCa&vZSa>RK9eN!{2?H$bZt*~Bb z!hW(ToYq=@{(K(uYzacH|MeTqRREV`tEmU^#?#6TQ87CXu+k3URj&fi;;v@Cn^tj3 ztTm3Y-c`$Y&#h*f0DbV7HDi`_YH|7hznzO6^qoem*>^Xi&|UXs0D<&SS|x>b_`iaS BNCyA_ literal 0 HcmV?d00001 diff --git a/spiffworkflow-frontend/public/interstitial/redirect.png b/spiffworkflow-frontend/public/interstitial/redirect.png new file mode 100644 index 0000000000000000000000000000000000000000..b9de365bce9554d6dcfb2c2c36bbace3a1f60971 GIT binary patch literal 1881 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 L2&wTv!ViA|qFMt2 literal 0 HcmV?d00001 diff --git a/spiffworkflow-frontend/src/components/InstructionsForEndUser.tsx b/spiffworkflow-frontend/src/components/InstructionsForEndUser.tsx index c779e9520..2a6cecdb9 100644 --- a/spiffworkflow-frontend/src/components/InstructionsForEndUser.tsx +++ b/spiffworkflow-frontend/src/components/InstructionsForEndUser.tsx @@ -6,8 +6,7 @@ export default function InstructionsForEndUser({ task }: any) { if (!task) { return null; } - let instructions = ''; - console.log('I was passed a task: ', task); + let instructions = 'There is no additional instructions or information for this task.'; const { properties } = task; const { instructionsForEndUser } = properties; if (instructionsForEndUser) { diff --git a/spiffworkflow-frontend/src/components/MyCompletedInstances.tsx b/spiffworkflow-frontend/src/components/MyCompletedInstances.tsx index 47042e910..f0f9705e9 100644 --- a/spiffworkflow-frontend/src/components/MyCompletedInstances.tsx +++ b/spiffworkflow-frontend/src/components/MyCompletedInstances.tsx @@ -10,6 +10,7 @@ export default function MyCompletedInstances() { perPageOptions={[2, 5, 25]} reportIdentifier="system_report_completed_instances_initiated_by_me" showReports={false} + showActionsColumn /> ); } diff --git a/spiffworkflow-frontend/src/routes/CompletedInstances.tsx b/spiffworkflow-frontend/src/routes/CompletedInstances.tsx index 78f73e92f..6d43020df 100644 --- a/spiffworkflow-frontend/src/routes/CompletedInstances.tsx +++ b/spiffworkflow-frontend/src/routes/CompletedInstances.tsx @@ -33,6 +33,7 @@ export default function CompletedInstances() { showReports={false} textToShowIfEmpty="This group has no completed instances at this time." additionalParams={`user_group_identifier=${userGroup}`} + showActionsColumn /> ); @@ -61,6 +62,7 @@ export default function CompletedInstances() { textToShowIfEmpty="You have no completed instances at this time." paginationClassName="with-large-bottom-margin" autoReload + showActionsColumn />

{groupTableComponents()} diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx index ca69eb7d3..d46778434 100644 --- a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx @@ -51,7 +51,7 @@ export default function ProcessInstanceList({ variant }: OwnProps) {
{processInstanceBreadcrumbElement()} {processInstanceTitleElement()} - + ); } diff --git a/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx b/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx index 0e6b3c637..8d5fb0e82 100644 --- a/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessInterstitial.tsx @@ -14,7 +14,7 @@ import { ProcessInstanceTask } from '../interfaces'; export default function ProcessInterstitial() { const [data, setData] = useState([]); const [lastTask, setLastTask] = useState(null); - const [status, setStatus] = useState('running'); + const [state, setState] = useState('RUNNING'); const params = useParams(); const navigate = useNavigate(); const userTasks = ['User Task', 'Manual Task']; @@ -31,62 +31,74 @@ export default function ProcessInterstitial() { setLastTask(task); }, onclose() { - setStatus('closed'); - console.log('Connection Closed by the Server'); + setState('CLOSED'); }, } ); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); // it is critical to only run this once. + const shouldRedirect = (myTask: ProcessInstanceTask): boolean => { + return myTask && myTask.can_complete && userTasks.includes(myTask.type); + }; + useEffect(() => { // Added this seperate use effect so that the timer interval will be cleared if // we end up redirecting back to the TaskShow page. - if ( - lastTask && - lastTask.can_complete && - userTasks.includes(lastTask.type) - ) { + if (shouldRedirect(lastTask)) { + setState('REDIRECTING'); + lastTask.properties.instructionsForEndUser = ''; const timerId = setInterval(() => { navigate(`/tasks/${lastTask.process_instance_id}/${lastTask.id}`); - }, 1000); + }, 2000); return () => clearInterval(timerId); } return undefined; }, [lastTask, navigate, userTasks]); - const processStatusImage = () => { - if (status !== 'running') { - setStatus(lastTask.state); - } + const getStatus = (): string => { if (!lastTask.can_complete && userTasks.includes(lastTask.type)) { - setStatus('LOCKED'); + return 'LOCKED'; } - switch (status) { - case 'running': + if (state === 'CLOSED') { + return lastTask.state; + } + console.log('The State is: ', state); + return state; + }; + + const getStatusImage = () => { + switch (getStatus()) { + case 'RUNNING': return ( ); - case 'WAITING': - return Waiting ....; - case 'COMPLETED': - return Completed; case 'LOCKED': - return ( - Locked, Waiting on someone else. - ); - default: - return null; + return Locked; + case 'REDIRECTING': + return Redirecting ....; + case 'WAITING': + return Waiting ....; + case 'COMPLETED': + return Completed; } }; + function capitalize(str: string): string { + console.log('Capitalizing: ', str); + if (str && str.length > 0) { + return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase(); + } + return ''; + } + const userMessage = (myTask: ProcessInstanceTask) => { if (!myTask.can_complete && userTasks.includes(myTask.type)) { return
This next task must be completed by a different person.
; } + if (shouldRedirect(myTask)) { + return
Redirecting you to the next task now ...
; + } return (
@@ -96,7 +108,7 @@ export default function ProcessInterstitial() { /** In the event there is no task information and the connection closed, * redirect to the home page. */ - if (status === 'closed' && lastTask === null) { + if (state === 'closed' && lastTask === null) { navigate(`/tasks`); } if (lastTask) { @@ -113,26 +125,28 @@ export default function ProcessInterstitial() { [`Process Instance Id: ${lastTask.process_instance_id}`], ]} /> -

- {processStatusImage()} - {lastTask.process_model_display_name}: {lastTask.process_instance_id} -

- - - - {data && - data.map((d) => ( -
-
- Task: {d.title} -
-
{userMessage(d)}
-
- ))} - - +
+ {getStatusImage()} +
+

+ {lastTask.process_model_display_name}:{' '} + {lastTask.process_instance_id} +

+
Status: {capitalize(getStatus())}
+
+
+
+
+ {data.map((d) => ( + + + Task: {d.title} + + + {userMessage(d)} + + + ))} ); }