diff --git a/client/src/components/production-board-kanban/production-board-kanban.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
index f42f04038..eac2f1849 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -17,7 +17,7 @@ import ProductionBoardFilters from "../production-board-filters/production-board
import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
import "./production-board-kanban.styles.scss";
-import { createBoardData, createFakeBoardData } from "./production-board-kanban.utils.js";
+import { createBoardData } from "./production-board-kanban.utils.js";
import ProductionBoardKanbanSettings from "./production-board-kanban.settings.component.jsx";
import cloneDeep from "lodash/cloneDeep";
import isEqual from "lodash/isEqual";
@@ -42,16 +42,14 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insert
const [filter, setFilter] = useState({ search: "", employeeId: null });
const [loading, setLoading] = useState(true);
const [isMoving, setIsMoving] = useState(false);
+ const [orientation, setOrientation] = useState("vertical");
- const orientation = useMemo(
- () => (associationSettings?.kanban_settings?.orientation ? "vertical" : "horizontal"),
- [associationSettings]
- );
const { t } = useTranslation();
useEffect(() => {
if (associationSettings) {
setLoading(false);
+ setOrientation(associationSettings?.kanban_settings?.orientation ? "vertical" : "horizontal");
}
}, [associationSettings]);
@@ -215,6 +213,10 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insert
[associationSettings]
);
+ const handleSettingsChange = (newSettings) => {
+ setOrientation(newSettings.orientation ? "vertical" : "horizontal");
+ };
+
if (loading) {
return ;
}
@@ -237,7 +239,11 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insert
-
+
}
/>
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 1b37922b5..10e276a8f 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
@@ -9,10 +9,13 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
const [open, setOpen] = useState(false);
const [loading, setLoading] = useState(false);
const [hasChanges, setHasChanges] = useState(false);
+ const [orientation, setOrientation] = useState(true); // Default to vertical
+
const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS);
useEffect(() => {
form.setFieldsValue(associationSettings?.kanban_settings);
+ setOrientation(associationSettings?.kanban_settings?.orientation ?? true);
}, [form, associationSettings, open]);
const { t } = useTranslation();
@@ -24,7 +27,7 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
const result = await updateKbSettings({
variables: {
id: associationSettings?.id,
- ks: values
+ ks: { ...values, orientation }
}
});
if (result.errors) {
@@ -45,6 +48,11 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
setHasChanges(true);
};
+ const handleOrientationChange = (checked) => {
+ setOrientation(checked);
+ setHasChanges(true);
+ };
+
const cardStyle = { minWidth: "50vw", marginTop: 10 };
const renderCardSettings = () => (
@@ -131,8 +139,13 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par
Orientation
-
-
+
+
diff --git a/client/src/components/production-board-kanban/production-board-kanban.utils.js b/client/src/components/production-board-kanban/production-board-kanban.utils.js
index 565019db0..a10446928 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.utils.js
+++ b/client/src/components/production-board-kanban/production-board-kanban.utils.js
@@ -1,5 +1,5 @@
import { groupBy } from "lodash";
-import fakeData from "./testData/board300.json";
+import fakeData from "./testData/board600.json";
const sortByParentId = (arr) => {
// return arr.reduce((accumulator, currentValue) => {
diff --git a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
index ff313417c..3d88755f3 100644
--- a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
@@ -124,16 +124,7 @@ const BoardContainer = ({
},
[dispatch, onDragEnd]
);
- // id: PropTypes.string.isRequired,
- // title: PropTypes.node,
- // index: PropTypes.number,
- // laneSortFunction: PropTypes.func,
- // cards: PropTypes.array,
- // orientation: PropTypes.string,
- // isProcessing: PropTypes.bool,
- // cardSettings: PropTypes.object,
- // technician: PropTypes.object,
- // bodyshop: PropTypes.object
+
return (