From defadf70e35e4f8f1bb391f62ee2ceab9e9bba0a Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Thu, 1 Aug 2024 11:51:13 -0400
Subject: [PATCH] - fix regression in settings - add defaults

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 ...uction-board-kanban.settings.component.jsx | 35 +++++++++++++------
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
index b4519d1fd..d5cadf5f9 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
@@ -14,8 +14,8 @@ const LayoutSettings = ({ t }) => (
           name: "orientation",
           label: t("production.labels.orientation"),
           options: [
-            { value: "vertical", label: t("production.labels.vertical") },
-            { value: "horizontal", label: t("production.labels.horizontal") }
+            { value: true, label: t("production.labels.vertical") },
+            { value: false, label: t("production.labels.horizontal") }
           ]
         },
         {
@@ -31,24 +31,24 @@ const LayoutSettings = ({ t }) => (
           name: "compact",
           label: t("production.labels.compact"),
           options: [
-            { value: "tall", label: t("production.labels.tall") },
-            { value: "wide", label: t("production.labels.wide") }
+            { value: true, label: t("production.labels.tall") },
+            { value: false, label: t("production.labels.wide") }
           ]
         },
         {
           name: "cardcolor",
           label: t("production.labels.cardcolor"),
           options: [
-            { value: "on", label: t("production.labels.on") },
-            { value: "off", label: t("production.labels.off") }
+            { value: true, label: t("production.labels.on") },
+            { value: false, label: t("production.labels.off") }
           ]
         },
         {
           name: "kiosk",
           label: t("production.labels.kiosk_mode"),
           options: [
-            { value: "on", label: t("production.labels.on") },
-            { value: "off", label: t("production.labels.off") }
+            { value: true, label: t("production.labels.on") },
+            { value: false, label: t("production.labels.off") }
           ]
         }
       ].map(({ name, label, options }) => (
@@ -56,7 +56,7 @@ const LayoutSettings = ({ t }) => (
           <Form.Item name={name} label={label}>
             <Radio.Group>
               {options.map((option) => (
-                <Radio.Button key={option.value} value={option.value}>
+                <Radio.Button key={option.value.toString()} value={option.value}>
                   {option.label}
                 </Radio.Button>
               ))}
@@ -67,6 +67,7 @@ const LayoutSettings = ({ t }) => (
     </Row>
   </Card>
 );
+
 const InformationSettings = ({ t }) => (
   <Card title={t("production.settings.information")} style={{ minWidth: "50vw", marginTop: 10 }}>
     <Row gutter={[16, 16]}>
@@ -162,7 +163,7 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
     const result = await updateKbSettings({
       variables: {
         id: associationSettings?.id,
-        ks: { ...values, statisticsOrder }
+        ks: { ...associationSettings.kanban_settings, ...values, statisticsOrder }
       }
     });
 
@@ -183,6 +184,15 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
 
   const handleValuesChange = () => setHasChanges(true);
 
+  const handleRestoreDefaults = () => {
+    form.setFieldsValue({
+      ...defaultKanbanSettings,
+      statisticsOrder: defaultKanbanSettings.statisticsOrder
+    });
+    setStatisticsOrder(defaultKanbanSettings.statisticsOrder);
+    setHasChanges(true);
+  };
+
   const overlay = (
     <Card>
       <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
@@ -219,6 +229,11 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
               {t("general.actions.cancel")}
             </Button>
           </Col>
+          <Col span={8}>
+            <Button block onClick={handleRestoreDefaults}>
+              {t("general.actions.defaults")}
+            </Button>
+          </Col>
           <Col span={8}>
             <Button block onClick={form.submit} loading={loading} type="primary" disabled={!hasChanges}>
               {t("general.actions.save")}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index ae5eb065d..a1bd6623f 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1129,6 +1129,7 @@
     },
     "general": {
       "actions": {
+        "defaults": "Defaults",
         "add": "Add",
         "calculate": "Calculate",
         "cancel": "Cancel",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 6e7e08dae..3e3b3d2f9 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1129,6 +1129,7 @@
 		},
 		"general": {
 			"actions": {
+        "defaults": "defaults",
 				"add": "",
 				"calculate": "",
 				"cancel": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 10958dbbc..f0ded757f 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1129,6 +1129,7 @@
     },
     "general": {
       "actions": {
+        "defaults": "",
         "add": "",
         "calculate": "",
         "cancel": "",