Refactor simulation store structures to use arrays instead of records for conveyors, machines, storage units, vehicles, and products; remove useSimulationStore; enhance state management and helper functions for better performance and readability.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { create } from 'zustand';
|
||||
import { immer } from 'zustand/middleware/immer';
|
||||
|
||||
interface MachineStatus extends MachineSchemaEvent {
|
||||
interface MachineStatus extends MachineEventSchema {
|
||||
productId: string;
|
||||
isActive: boolean;
|
||||
idleTime: number;
|
||||
@@ -9,10 +9,10 @@ interface MachineStatus extends MachineSchemaEvent {
|
||||
}
|
||||
|
||||
interface MachineStore {
|
||||
machines: Record<string, MachineStatus>;
|
||||
machines: MachineStatus[];
|
||||
|
||||
// Actions
|
||||
addMachine: (productId: string, machine: MachineSchemaEvent) => void;
|
||||
addMachine: (productId: string, machine: MachineEventSchema) => void;
|
||||
removeMachine: (modelUuid: string) => void;
|
||||
updateMachine: (
|
||||
modelUuid: string,
|
||||
@@ -36,31 +36,31 @@ interface MachineStore {
|
||||
|
||||
export const useMachineStore = create<MachineStore>()(
|
||||
immer((set, get) => ({
|
||||
machines: {},
|
||||
machines: [],
|
||||
|
||||
// Actions
|
||||
addMachine: (productId, machine) => {
|
||||
set((state) => {
|
||||
state.machines[machine.modelUuid] = {
|
||||
state.machines.push({
|
||||
...machine,
|
||||
productId,
|
||||
isActive: false,
|
||||
idleTime: 0,
|
||||
activeTime: 0,
|
||||
state: 'idle',
|
||||
};
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
removeMachine: (modelUuid) => {
|
||||
set((state) => {
|
||||
delete state.machines[modelUuid];
|
||||
state.machines = state.machines.filter(m => m.modelUuid !== modelUuid);
|
||||
});
|
||||
},
|
||||
|
||||
updateMachine: (modelUuid, updates) => {
|
||||
set((state) => {
|
||||
const machine = state.machines[modelUuid];
|
||||
const machine = state.machines.find(m => m.modelUuid === modelUuid);
|
||||
if (machine) {
|
||||
Object.assign(machine, updates);
|
||||
}
|
||||
@@ -70,7 +70,7 @@ export const useMachineStore = create<MachineStore>()(
|
||||
// Status updates
|
||||
setMachineActive: (modelUuid, isActive) => {
|
||||
set((state) => {
|
||||
const machine = state.machines[modelUuid];
|
||||
const machine = state.machines.find(m => m.modelUuid === modelUuid);
|
||||
if (machine) {
|
||||
machine.isActive = isActive;
|
||||
}
|
||||
@@ -79,7 +79,7 @@ export const useMachineStore = create<MachineStore>()(
|
||||
|
||||
setMachineState: (modelUuid, newState) => {
|
||||
set((state) => {
|
||||
const machine = state.machines[modelUuid];
|
||||
const machine = state.machines.find(m => m.modelUuid === modelUuid);
|
||||
if (machine) {
|
||||
machine.state = newState;
|
||||
}
|
||||
@@ -89,7 +89,7 @@ export const useMachineStore = create<MachineStore>()(
|
||||
// Time tracking
|
||||
incrementActiveTime: (modelUuid, incrementBy) => {
|
||||
set((state) => {
|
||||
const machine = state.machines[modelUuid];
|
||||
const machine = state.machines.find(m => m.modelUuid === modelUuid);
|
||||
if (machine) {
|
||||
machine.activeTime += incrementBy;
|
||||
}
|
||||
@@ -98,7 +98,7 @@ export const useMachineStore = create<MachineStore>()(
|
||||
|
||||
incrementIdleTime: (modelUuid, incrementBy) => {
|
||||
set((state) => {
|
||||
const machine = state.machines[modelUuid];
|
||||
const machine = state.machines.find(m => m.modelUuid === modelUuid);
|
||||
if (machine) {
|
||||
machine.idleTime += incrementBy;
|
||||
}
|
||||
@@ -107,23 +107,19 @@ export const useMachineStore = create<MachineStore>()(
|
||||
|
||||
// Helpers
|
||||
getMachineById: (modelUuid) => {
|
||||
return get().machines[modelUuid];
|
||||
return get().machines.find(m => m.modelUuid === modelUuid);
|
||||
},
|
||||
|
||||
getMachinesByProduct: (productId) => {
|
||||
return Object.values(get().machines).filter(
|
||||
m => m.productId === productId
|
||||
);
|
||||
return get().machines.filter(m => m.productId === productId);
|
||||
},
|
||||
|
||||
getActiveMachines: () => {
|
||||
return Object.values(get().machines).filter(m => m.isActive);
|
||||
return get().machines.filter(m => m.isActive);
|
||||
},
|
||||
|
||||
getIdleMachines: () => {
|
||||
return Object.values(get().machines).filter(
|
||||
m => !m.isActive && m.state === 'idle'
|
||||
);
|
||||
return get().machines.filter(m => !m.isActive && m.state === 'idle');
|
||||
},
|
||||
}))
|
||||
);
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user