- Make sure subscription and initial query only grab jobs that have statuses that are on the board

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-07-18 16:59:17 -04:00
parent 118f14ed4c
commit c31d4096c6
4 changed files with 126 additions and 42 deletions

View File

@@ -37,7 +37,7 @@ const mapDispatchToProps = (dispatch) => ({
)
});
function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTrail, associationSettings }) {
function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTrail, associationSettings, statuses }) {
const [boardLanes, setBoardLanes] = useState({ lanes: [] });
const [filter, setFilter] = useState({ search: "", employeeId: null });
const [loading, setLoading] = useState(true);
@@ -57,11 +57,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
useEffect(() => {
setIsMoving(true);
const newBoardData = createBoardData(
[...bodyshop.md_ro_statuses.production_statuses, ...(bodyshop.md_ro_statuses.additional_board_statuses || [])],
data,
filter
);
const newBoardData = createBoardData(statuses, data, filter);
newBoardData.lanes = newBoardData.lanes.map((lane) => ({
...lane,
@@ -140,17 +136,6 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
const newChildCardNewParent = newChildCard ? draggableId : null;
console.log({
oldChildCard,
newChildCard,
oldChildCardNewParent,
newChildCardNewParent,
movedCardNewKanbanParent,
sameColumnTransfer,
movedCardWillBeFirst,
movedCardWillBeLast
});
try {
const update = await client.mutate({
mutation: generate_UPDATE_JOB_KANBAN(
@@ -164,6 +149,8 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
)
});
// TODO (Note): This is causing the subscription to fire
insertAuditTrail({
jobid: draggableId,
operation: AuditTrailMapping.jobstatuschange(targetLane.id),
@@ -187,7 +174,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
setIsMoving(false);
}
},
[boardLanes, client, getCardByID, insertAuditTrail, isMoving, t]
[boardLanes, client, getCardByID, isMoving, t]
);
const totalHrs = useMemo(