fixed tests w/ burnettk

This commit is contained in:
jasquat 2023-05-01 12:51:58 -04:00
parent 3247955db5
commit 07b4616d45
5 changed files with 11 additions and 12 deletions

View File

@ -11,7 +11,7 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '68adb1d504e1'
down_revision = '0c7428378d6e'
down_revision = '664bb2f00694'
branch_labels = None
depends_on = None

View File

@ -76,7 +76,7 @@ class ProcessInstanceReportService:
],
"order_by": ["-start_in_seconds", "-id"],
}
system_report_completed_instances_with_tasks_completed_by_my_groups: ReportMetadata = {
system_report_completed_instances: ReportMetadata = {
"columns": cls.builtin_column_options(),
"filter_by": [
{"field_name": "process_status", "field_value": terminal_status_values},
@ -128,7 +128,7 @@ class ProcessInstanceReportService:
],
"order_by": ["-start_in_seconds", "-id"],
}
system_report_in_progress_instances_with_tasks_for_my_group: ReportMetadata = {
system_report_in_progress_instances_with_tasks: ReportMetadata = {
"columns": [
{"Header": "id", "accessor": "id"},
{
@ -156,16 +156,12 @@ class ProcessInstanceReportService:
"system_report_completed_instances_with_tasks_completed_by_me": (
system_report_completed_instances_with_tasks_completed_by_me
),
"system_report_completed_instances_with_tasks_completed_by_my_groups": (
system_report_completed_instances_with_tasks_completed_by_my_groups
),
"system_report_completed_instances": system_report_completed_instances,
"system_report_in_progress_instances_initiated_by_me": system_report_in_progress_instances_initiated_by_me,
"system_report_in_progress_instances_with_tasks_for_me": (
system_report_in_progress_instances_with_tasks_for_me
),
"system_report_in_progress_instances_with_tasks_for_my_group": (
system_report_in_progress_instances_with_tasks_for_my_group
),
"system_report_in_progress_instances_with_tasks": system_report_in_progress_instances_with_tasks,
}
if metadata_key not in temp_system_metadata_map:
return None

View File

@ -197,7 +197,10 @@ class TestProcessInstanceReportService(BaseTest):
process_instance_report = ProcessInstanceReportService.report_with_identifier(
user=user_one,
report_identifier="system_report_completed_instances_with_tasks_completed_by_my_groups",
report_identifier="system_report_completed_instances",
)
process_instance_report.report_metadata["filter_by"].append(
{"field_name": "user_group_identifier", "field_value": user_one.groups[0].identifier}
)
response_json = ProcessInstanceReportService.run_process_instance_report(
report_metadata=process_instance_report.report_metadata,

View File

@ -29,7 +29,7 @@ export default function CompletedInstances() {
paginationQueryParamPrefix="group_completed_instances"
paginationClassName="with-large-bottom-margin"
perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_completed_instances_with_tasks_completed_by_my_groups"
reportIdentifier="system_report_completed_instances"
showReports={false}
textToShowIfEmpty="This group has no completed instances at this time."
additionalReportFilters={[

View File

@ -35,7 +35,7 @@ export default function InProgressInstances() {
).replace('-', '_')}`}
paginationClassName="with-large-bottom-margin"
perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_in_progress_instances_with_tasks_for_my_group"
reportIdentifier="system_report_in_progress_instances_with_tasks"
showReports={false}
textToShowIfEmpty="This group has no instances waiting on it at this time."
additionalReportFilters={[