From d9927506eb478c8ec20f81d137f6191a13746f0e Mon Sep 17 00:00:00 2001
From: burnettk <burnettk@users.noreply.github.com>
Date: Mon, 20 Mar 2023 12:41:58 -0400
Subject: [PATCH 1/2] update the word Filter to Apply

---
 .../src/components/ProcessInstanceListTable.tsx               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
index 41c32aa49..eb4f17bf0 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/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>
       );

From f9a7b3cb7197675f1c3ad1aeb5b7a35f123c7c0e Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Mon, 20 Mar 2023 17:47:52 -0400
Subject: [PATCH 2/2] checking for "falsy" lists in python will return false if
 the list is empty -- but we want to clear out the columns and filters if they
 are empty lists.

---
 .../services/process_instance_report_service.py               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
index 3de0319ec..0f62a7381 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
+++ b/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"]: