diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py index 191a22c1..29b91cc6 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py @@ -109,12 +109,22 @@ def task_list_my_tasks( HumanTaskModel.task_title, HumanTaskModel.process_model_display_name, HumanTaskModel.process_instance_id, + + ProcessInstanceModel.process_model_identifier, + ProcessInstanceModel.status.label("process_instance_status"), # type: ignore + ProcessInstanceModel.updated_at_in_seconds, + ProcessInstanceModel.created_at_in_seconds, + process_initiator_user.username.label("process_initiator_username"), + GroupModel.identifier.label("assigned_user_group_identifier"), + + # func.max does not seem to return columns so we need to call both func.max(ProcessInstanceModel.process_model_identifier), func.max(ProcessInstanceModel.status.label("process_instance_status")), # type: ignore func.max(ProcessInstanceModel.updated_at_in_seconds), func.max(ProcessInstanceModel.created_at_in_seconds), func.max(process_initiator_user.username.label("process_initiator_username")), func.max(GroupModel.identifier.label("assigned_user_group_identifier")), + potential_owner_usernames_from_group_concat_or_similar, ).paginate(page=page, per_page=per_page, error_out=False) diff --git a/spiffworkflow-frontend/cypress/e2e/process_models.cy.js b/spiffworkflow-frontend/cypress/e2e/process_models.cy.js index 3a36f710..a709b624 100644 --- a/spiffworkflow-frontend/cypress/e2e/process_models.cy.js +++ b/spiffworkflow-frontend/cypress/e2e/process_models.cy.js @@ -165,7 +165,6 @@ describe('process-models', () => { .click(); cy.runPrimaryBpmnFile(); - // cy.getBySel('process-instance-list-link').click(); cy.getBySel('process-instance-show-link').click(); cy.getBySel('process-instance-delete').click(); cy.contains('Are you sure'); diff --git a/spiffworkflow-frontend/cypress/fixtures/test_bpmn_file_upload.bpmn b/spiffworkflow-frontend/cypress/fixtures/test_bpmn_file_upload.bpmn index e9160b8d..6d355c1b 100644 --- a/spiffworkflow-frontend/cypress/fixtures/test_bpmn_file_upload.bpmn +++ b/spiffworkflow-frontend/cypress/fixtures/test_bpmn_file_upload.bpmn @@ -1,6 +1,6 @@ - + Flow_07vd2ar diff --git a/spiffworkflow-frontend/cypress/support/commands.js b/spiffworkflow-frontend/cypress/support/commands.js index 8369a22c..05126412 100644 --- a/spiffworkflow-frontend/cypress/support/commands.js +++ b/spiffworkflow-frontend/cypress/support/commands.js @@ -97,7 +97,7 @@ Cypress.Commands.add( cy.reload(true); cy.contains('Process Model:').should('exist'); cy.contains(/Process Instance.*[kK]icked [oO]ff/).should('not.exist'); - cy.contains('[data-qa=process-model-show-permissions-loaded]', 'true'); + cy.getBySel('process-model-show-permissions-loaded').should('exist'); } } ); @@ -152,17 +152,14 @@ Cypress.Commands.add('assertNoItemInPaginatedResults', () => { cy.contains(/\b0–0 of 0 items/); }); -Cypress.Commands.add( - 'deleteProcessModelAndConfirm', - (buttonId, groupId) => { - cy.getBySel(buttonId).click(); - cy.contains('Are you sure'); - cy.getBySel('delete-process-model-button-modal-confirmation-dialog') - .find('.cds--btn--danger') - .click(); - cy.url().should( - 'include', - `process-groups/${modifyProcessIdentifierForPathParam(groupId)}` - ); - } -); +Cypress.Commands.add('deleteProcessModelAndConfirm', (buttonId, groupId) => { + cy.getBySel(buttonId).click(); + cy.contains('Are you sure'); + cy.getBySel('delete-process-model-button-modal-confirmation-dialog') + .find('.cds--btn--danger') + .click(); + cy.url().should( + 'include', + `process-groups/${modifyProcessIdentifierForPathParam(groupId)}` + ); +});