Merge remote-tracking branch 'origin/main' into feature/remove_spif_step_details

spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py

@@ -455,9 +455,9 @@ class ProcessInstanceReportService:
 
         instance_metadata_aliases = {}
         stock_columns = ProcessInstanceReportService.get_column_names_for_model(ProcessInstanceModel)
-        if report_filter.report_column_list:
+        if isinstance(report_filter.report_column_list, list):
             process_instance_report.report_metadata["columns"] = report_filter.report_column_list
-        if report_filter.report_filter_by_list:
+        if isinstance(report_filter.report_filter_by_list, list):
             process_instance_report.report_metadata["filter_by"] = report_filter.report_filter_by_list
 
         for column in process_instance_report.report_metadata["columns"]:

spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx

@@ -1273,7 +1273,7 @@ export default function ProcessInstanceListTable({
                 data-qa="filter-button"
                 className="narrow-button"
               >
-                Filter
+                Apply
               </Button>
             </ButtonSet>
           </Column>
@@ -1483,7 +1483,7 @@ export default function ProcessInstanceListTable({
     if (requiresRefilter) {
       refilterTextComponent = (
         <p className="please-press-filter-button">
-          * Please press the filter button when you have completed updating the
+          * Please press the Apply button when you have completed updating the
           filters.
         </p>
       );