From cdb4da9e5fb124e84039c73e5b4babd7a5ce39bd Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 5 Oct 2021 09:40:25 -0700
Subject: [PATCH] IO-1412 Resolve production list saving and loading.

---
 ...ction-list-save-config-button.component.jsx |  7 +------
 ...uction-list-table-view-select.component.jsx | 18 ++++++++++++++++++
 .../production-list-table.component.jsx        | 11 +++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
index 0f7381c84..246177367 100644
--- a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
+++ b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
@@ -66,12 +66,7 @@ export function ProductionListSaveConfigButton({
   };
   const popMenu = (
     <div>
-      <Form
-        layout="vertical"
-        form={form}
-        onFinish={handleSaveConfig}
-        initialValues={{ driveable: true, towin: false }}
-      >
+      <Form layout="vertical" form={form} onFinish={handleSaveConfig}>
         <Form.Item
           label={t("production.labels.viewname")}
           name="name"
diff --git a/client/src/components/production-list-table/production-list-table-view-select.component.jsx b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
index f64d1121a..fb617f869 100644
--- a/client/src/components/production-list-table/production-list-table-view-select.component.jsx
+++ b/client/src/components/production-list-table/production-list-table-view-select.component.jsx
@@ -55,6 +55,19 @@ export function ProductionListTable({
     if (assoc) {
       await updateDefaultProdView({
         variables: { assocId: assoc.id, view: value },
+        update(cache) {
+          cache.modify({
+            id: cache.identify(bodyshop),
+            fields: {
+              associations(existingAssociations, { readField }) {
+                return existingAssociations.map((a) => {
+                  if (a.useremail !== currentUser.email) return a;
+                  return { ...a, default_prod_list_view: value };
+                });
+              },
+            },
+          });
+        },
       });
     }
   };
@@ -85,13 +98,18 @@ export function ProductionListTable({
 
     setState(bodyshop.production_config[0].columns.tableState);
   };
+  const assoc = bodyshop.associations.find(
+    (a) => a.useremail === currentUser.email
+  );
 
+  const defaultView = assoc && assoc.default_prod_list_view;
   return (
     <div style={{ width: "10rem" }}>
       <Select
         onSelect={handleSelect}
         placeholder={t("production.labels.selectview")}
         optionLabelProp="label"
+        defaultValue={defaultView}
       >
         {bodyshop.production_config.map((config) => (
           <Select.Option key={config.name} label={config.name}>
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index 32e61e1d0..158d07c9f 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -32,12 +32,11 @@ export function ProductionListTable({
 }) {
   const [searchText, setSearchText] = useState("");
 
-  const defaultView = useMemo(() => {
-    const assoc = bodyshop.associations.find(
-      (a) => a.useremail === currentUser.email
-    );
-    return assoc && assoc.default_prod_list_view;
-  }, [bodyshop.associations, currentUser.email]);
+  const assoc = bodyshop.associations.find(
+    (a) => a.useremail === currentUser.email
+  );
+
+  const defaultView = assoc && assoc.default_prod_list_view;
 
   const [state, setState] = useState(
     (bodyshop.production_config &&