From 4b16e0df5905a6b7d68809d75c1cc0a3b86a7c8f Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Fri, 30 Dec 2022 13:59:52 -0500
Subject: [PATCH] do not error when removing columns from instance column
 filters w/ burnettk

---
 .../components/ProcessInstanceListTable.tsx   | 60 ++++++++++---------
 spiffworkflow-frontend/src/index.css          |  4 +-
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
index 5058235b..2fc81265 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
@@ -774,7 +774,6 @@ export default function ProcessInstanceListTable({
       setReportMetadata(reportMetadataCopy);
       setReportColumnToOperateOn(null);
       setShowReportColumnForm(false);
-      setShowReportColumnForm(false);
     }
   };
 
@@ -795,9 +794,12 @@ export default function ProcessInstanceListTable({
   };
 
   const updateReportColumn = (event: any) => {
-    const reportColumnForEditing = reportColumnToReportColumnForEditing(
-      event.selectedItem
-    );
+    let reportColumnForEditing = null;
+    if (event.selectedItem) {
+      reportColumnForEditing = reportColumnToReportColumnForEditing(
+        event.selectedItem
+      );
+    }
     setReportColumnToOperateOn(reportColumnForEditing);
   };
 
@@ -827,7 +829,29 @@ export default function ProcessInstanceListTable({
     if (reportColumnFormMode === '') {
       return null;
     }
-    const formElements = [
+    const formElements = [];
+    if (reportColumnFormMode === 'new') {
+      formElements.push(
+        <ComboBox
+          onChange={updateReportColumn}
+          id="report-column-selection"
+          data-qa="report-column-selection"
+          data-modal-primary-focus
+          items={availableReportColumns}
+          itemToString={(reportColumn: ReportColumn) => {
+            if (reportColumn) {
+              return reportColumn.accessor;
+            }
+            return null;
+          }}
+          shouldFilterItem={shouldFilterReportColumn}
+          placeholder="Choose a column to show"
+          titleText="Column"
+          selectedItem={reportColumnToOperateOn}
+        />
+      );
+    }
+    formElements.push([
       <TextInput
         id="report-column-display-name"
         name="report-column-display-name"
@@ -844,7 +868,7 @@ export default function ProcessInstanceListTable({
           }
         }}
       />,
-    ];
+    ]);
     if (reportColumnToOperateOn && reportColumnToOperateOn.filterable) {
       formElements.push(
         <TextInput
@@ -860,27 +884,9 @@ export default function ProcessInstanceListTable({
         />
       );
     }
-    if (reportColumnFormMode === 'new') {
-      formElements.push(
-        <ComboBox
-          onChange={updateReportColumn}
-          className="combo-box-in-modal"
-          id="report-column-selection"
-          data-qa="report-column-selection"
-          data-modal-primary-focus
-          items={availableReportColumns}
-          itemToString={(reportColumn: ReportColumn) => {
-            if (reportColumn) {
-              return reportColumn.accessor;
-            }
-            return null;
-          }}
-          shouldFilterItem={shouldFilterReportColumn}
-          placeholder="Choose a column to show"
-          titleText="Column"
-        />
-      );
-    }
+    formElements.push(
+      <div className="vertical-spacer-to-allow-combo-box-to-expand-in-modal" />
+    );
     const modalHeading =
       reportColumnFormMode === 'new'
         ? 'Add Column'
diff --git a/spiffworkflow-frontend/src/index.css b/spiffworkflow-frontend/src/index.css
index 248a23d7..08e8341c 100644
--- a/spiffworkflow-frontend/src/index.css
+++ b/spiffworkflow-frontend/src/index.css
@@ -355,8 +355,8 @@ svg.notification-icon {
   word-break: normal;
 }
 
-.combo-box-in-modal {
-  height: 300px;
+.vertical-spacer-to-allow-combo-box-to-expand-in-modal {
+  height: 250px;
 }
 
 .cds--btn.narrow-button {