updated frontend to display info for other instances of a task w/ bur…

…nettk
sartography · Dec 15, 2023 · 984e6f4 · 984e6f4
1 parent 8f14d30
commit 984e6f4
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 131 deletions.
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
@@ -37,7 +37,6 @@
 from spiffworkflow_backend.exceptions.error import HumanTaskAlreadyCompletedError
 from spiffworkflow_backend.exceptions.error import HumanTaskNotFoundError
 from spiffworkflow_backend.exceptions.error import UserDoesNotHaveAccessToTaskError
-from spiffworkflow_backend.models import task_definition
 from spiffworkflow_backend.models.db import SpiffworkflowBaseDBModel
 from spiffworkflow_backend.models.db import db
 from spiffworkflow_backend.models.group import GroupModel
@@ -319,9 +318,9 @@ def task_instance_list(
     task_guid: str,
 ) -> Response:
     task_model = _get_task_model_from_guid_or_raise(task_guid, process_instance_id)
-    # task_model_instances = TaskModel.query.filter_by(task_definition_id=task_model.task_definition.id, bpmn_process_id=task_model.bpmn_process_id).all()
     task_model_instances = (
-        TaskModel.query.filter_by(task_definition_id=task_model.task_definition.id, bpmn_process_id=task_model.bpmn_process_id).order_by(TaskModel.id.desc())  # type: ignore
+        TaskModel.query.filter_by(task_definition_id=task_model.task_definition.id, bpmn_process_id=task_model.bpmn_process_id)
+        .order_by(TaskModel.id.desc())  # type: ignore
         .join(TaskDefinitionModel, TaskDefinitionModel.id == TaskModel.task_definition_id)
         .add_columns(
             TaskDefinitionModel.bpmn_identifier,
@@ -339,7 +338,6 @@ def task_instance_list(
     return make_response(jsonify(task_model_instances), 200)
 
 
-
 def manual_complete_task(
     modified_process_model_identifier: str,
     process_instance_id: int,

diff --git a/spiffworkflow-frontend/.eslintrc.js b/spiffworkflow-frontend/.eslintrc.js
@@ -36,7 +36,7 @@ module.exports = {
     'jsx-a11y/label-has-associated-control': 'off',
     'no-console': 'off',
     'react/jsx-filename-extension': [
-      1,
+      'warn',
       { extensions: ['.js', '.jsx', '.tsx', '.ts'] },
     ],
     'react/react-in-jsx-scope': 'off',
@@ -71,5 +71,6 @@ module.exports = {
         tsx: 'never',
       },
     ],
+    curly: ['error', 'all'],
   },
 };
diff --git a/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx b/spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx
@@ -176,7 +176,9 @@ export default function ReactDiagramEditor({
     // @ts-ignore
     diagramModelerToUse.on('import.parse.complete', event => { // eslint-disable-line
       // @ts-ignore
-      if (!event.references) return;
+      if (!event.references) {
+        return;
+      }
       const refs = event.references.filter(
         (r: any) =>
           r.property === 'bpmn:loopDataInputRef' ||
@@ -676,7 +678,9 @@ export default function ReactDiagramEditor({
   const getReferencesButton = () => {
     if (callers && callers.length > 0) {
       let buttonText = `View ${callers.length} Reference`;
-      if (callers.length > 1) buttonText += 's';
+      if (callers.length > 1) {
+        buttonText += 's';
+      }
       return (
         <Button onClick={() => setShowingReferences(true)}>{buttonText}</Button>
       );

diff --git a/spiffworkflow-frontend/src/helpers.tsx b/spiffworkflow-frontend/src/helpers.tsx
@@ -30,12 +30,10 @@ export const HUMAN_TASK_TYPES = [
 
 export const MULTI_INSTANCE_TASK_TYPES = [
   'ParallelMultiInstanceTask',
-  'SequentialMultiInstanceTask'
-]
+  'SequentialMultiInstanceTask',
+];
 
-export const LOOP_TASK_TYPES = [
-  'StandardLoopTask'
-]
+export const LOOP_TASK_TYPES = ['StandardLoopTask'];
 
 export const underscorizeString = (inputString: string) => {
   return slugifyString(inputString).replace(/-/g, '_');

diff --git a/spiffworkflow-frontend/src/hooks/UsePrompt.tsx b/spiffworkflow-frontend/src/hooks/UsePrompt.tsx
@@ -19,7 +19,9 @@ export function useBlocker(blocker: any, when: any = true) {
   const { navigator } = useContext(NavigationContext);
 
   useEffect(() => {
-    if (!when) return null;
+    if (!when) {
+      return null;
+    }
 
     const unblock = (navigator as any).block((tx: any) => {
       const autoUnblockingTx = {
@@ -49,7 +51,9 @@ export function usePrompt(message: any, when: any = true) {
   const blocker = useCallback(
     (tx: any) => {
       // eslint-disable-next-line no-alert
-      if (window.confirm(message)) tx.retry();
+      if (window.confirm(message)) {
+        tx.retry();
+      }
     },
     [message]
   );

diff --git a/spiffworkflow-frontend/src/hooks/useKeyboardShortcut.tsx b/spiffworkflow-frontend/src/hooks/useKeyboardShortcut.tsx
@@ -5,7 +5,9 @@ import { KeyboardShortcuts } from '../interfaces';
 
 export const overrideSystemHandling = (e: KeyboardEvent) => {
   if (e) {
-    if (e.preventDefault) e.preventDefault();
+    if (e.preventDefault) {
+      e.preventDefault();
+    }
     if (e.stopPropagation) {
       e.stopPropagation();
     } else if (window.event) {

diff --git a/spiffworkflow-frontend/src/index.css b/spiffworkflow-frontend/src/index.css
@@ -922,3 +922,11 @@ div.onboarding {
   float: right; /* Floats the keys to the right */
   text-align: right; /* Aligns text to the right within the container */
 }
+
+.task-info-modal-accordion .cds--accordion__content {
+  padding-right: 1rem;
+}
+.task-instance-modal-row-item {
+  height: 48px;
+  line-height: 48px;
+}