From adeef0da195138fd13dd9e84dc8b00a15c3ba9df Mon Sep 17 00:00:00 2001
From: Gavin Reynolds <greynolds@pagerduty.com>
Date: Fri, 12 Jul 2024 11:46:16 +0100
Subject: [PATCH] Ensure value is loaded from saved columns and that
 expression/expressionType is persisted and loaded

Signed-off-by: Gavin Reynolds <greynolds@pagerduty.com>
---
 src/config/column-generator.jsx   | 4 ++++
 src/redux/incident_table/sagas.js | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/config/column-generator.jsx b/src/config/column-generator.jsx
index f361bbec..04bd6254 100644
--- a/src/config/column-generator.jsx
+++ b/src/config/column-generator.jsx
@@ -155,6 +155,8 @@ export const incidentColumn = ({
   minWidth,
   sortType,
   columnType,
+  expression,
+  expressionType,
 }) => {
   const wrappedRenderer = ({
     cell, value: cellValue, row,
@@ -203,6 +205,8 @@ export const incidentColumn = ({
     minWidth,
     columnType: columnType || 'incident',
     Filter: ColumnFilterComponent,
+    expression,
+    expressionType,
   };
 
   if (sortType) {
diff --git a/src/redux/incident_table/sagas.js b/src/redux/incident_table/sagas.js
index dcf69ada..6f178555 100644
--- a/src/redux/incident_table/sagas.js
+++ b/src/redux/incident_table/sagas.js
@@ -58,11 +58,14 @@ export function* saveIncidentTableImpl(action) {
         tempCol.width = tempCol.minWidth;
       }
       return {
+        value: tempCol.value,
         Header: tempCol.Header,
         accessorPath: tempCol.accessorPath,
         aggregator: tempCol.aggregator,
         width: tempCol.width,
         columnType: tempCol.columnType,
+        expressionType: tempCol.expressionType,
+        expression: tempCol.expression,
       };
     });