Skip to content

refactoring #4139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EtienneLt wants to merge 10 commits into
base: main
Choose a base branch
from
Open

refactoring #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9400409
add voltage regulation for battery in tab
EtienneLt Jul 31, 2026
c230e7c
Merge branch 'main' into add-voltage-regulation-for-battery-in-tab
EtienneLt Aug 3, 2026
53ed53b
clean
EtienneLt Aug 3, 2026
d68bb9f
fix
EtienneLt Aug 3, 2026
c4e53cc
Merge branch 'main' into add-voltage-regulation-for-battery-in-tab
EtienneLt Aug 3, 2026
ac022ff
Merge branch 'main' into add-voltage-regulation-for-battery-in-tab
EtienneLt Aug 7, 2026
668d625
Merge branch 'main' into add-voltage-regulation-for-battery-in-tab
souissimai Aug 10, 2026
6c19573
fix duplication
EtienneLt Aug 11, 2026
d5b4a40
remove debug logs
EtienneLt Aug 11, 2026
c65b037
refactoring
EtienneLt Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions src/components/spreadsheet-view/spreadsheet-tabs/toolbar/PartialLoadingMenuButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,18 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
(state: AppState) =>
state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.GENERATOR].regulatingTerminal
);
const remoteBatteryRegTerm = useSelector(
(state: AppState) =>
state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.BATTERY].regulatingTerminal
);
const remoteBusNetworkComponents = useSelector(
(state: AppState) => state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.BUS].networkComponents
);
const [localBranchOlg, setLocalBranchOlg] = useState<boolean>(remoteBranchOlg);
const [localLineOlg, setLocalLineOlg] = useState<boolean>(remoteLineOlg);
const [localTwtOlg, setLocalTwtOlg] = useState<boolean>(remoteTwtOlg);
const [localGeneratorRegTerm, setLocalGeneratorRegTerm] = useState<boolean>(remoteGeneratorRegTerm);
const [localBatteryRegTerm, setLocalBatteryRegTerm] = useState<boolean>(remoteBatteryRegTerm);
const [localBusNetworkComponents, setLocalBusNetworkComponents] = useState<boolean>(remoteBusNetworkComponents);

const handleClick = useCallback<NonNullable<TooltipIconButtonProps['onClick']>>(
Expand All @@ -65,9 +70,17 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
setLocalLineOlg(remoteLineOlg);
setLocalTwtOlg(remoteTwtOlg);
setLocalGeneratorRegTerm(remoteGeneratorRegTerm);
setLocalBatteryRegTerm(remoteBatteryRegTerm);
setLocalBusNetworkComponents(remoteBusNetworkComponents);
},
[remoteBranchOlg, remoteBusNetworkComponents, remoteGeneratorRegTerm, remoteLineOlg, remoteTwtOlg]
[
remoteBatteryRegTerm,
remoteBranchOlg,
remoteBusNetworkComponents,
remoteGeneratorRegTerm,
remoteLineOlg,
remoteTwtOlg,
]
);

const handleClose = useCallback(() => {
Expand All @@ -77,6 +90,7 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
localLineOlg !== remoteLineOlg ||
localTwtOlg !== remoteTwtOlg ||
localGeneratorRegTerm !== remoteGeneratorRegTerm ||
localBatteryRegTerm !== remoteBatteryRegTerm ||
localBusNetworkComponents !== remoteBusNetworkComponents
) {
if (studyUuid) {
Expand All @@ -92,6 +106,9 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
[SpreadsheetEquipmentType.BUS]: {
networkComponents: localBusNetworkComponents,
},
[SpreadsheetEquipmentType.BATTERY]: {
regulatingTerminal: localBatteryRegTerm,
},
});
}
}
Expand All @@ -104,6 +121,8 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
remoteTwtOlg,
localGeneratorRegTerm,
remoteGeneratorRegTerm,
localBatteryRegTerm,
remoteBatteryRegTerm,
localBusNetworkComponents,
remoteBusNetworkComponents,
studyUuid,
Expand All @@ -112,8 +131,21 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
const open = anchorEl !== undefined;

const isOptionalData = useMemo(
() => remoteBranchOlg || remoteLineOlg || remoteTwtOlg || remoteGeneratorRegTerm || remoteBusNetworkComponents,
[remoteBranchOlg, remoteBusNetworkComponents, remoteGeneratorRegTerm, remoteLineOlg, remoteTwtOlg]
() =>
remoteBranchOlg ||
remoteLineOlg ||
remoteTwtOlg ||
remoteGeneratorRegTerm ||
remoteBatteryRegTerm ||
remoteBusNetworkComponents,
[
remoteBatteryRegTerm,
remoteBranchOlg,
remoteBusNetworkComponents,
remoteGeneratorRegTerm,
remoteLineOlg,
remoteTwtOlg,
]
);

return (
Expand Down Expand Up @@ -181,6 +213,15 @@ export default function PartialLoadingMenuButton({ disabled }: Readonly<PartialL
onChange={setLocalGeneratorRegTerm}
/>

<ListSubheader sx={styles.headers}>
<FormattedMessage id="BATTERY" />
</ListSubheader>
<PartialLoadingMenuItem
value={localBatteryRegTerm}
labelId="spreadsheet/tabs/lazy_loading/labels/regulatingTerminal"
onChange={setLocalBatteryRegTerm}
/>

<ListSubheader sx={styles.headers}>
<FormattedMessage id="BUS" />
</ListSubheader>
Expand Down
127 changes: 68 additions & 59 deletions ...w/spreadsheet/spreadsheet-content/hooks/use-optional-loading-parameters-for-equipments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { useSelector } from 'react-redux';
import type { AppState } from '../../../../../redux/reducer.type';
import { SpreadsheetEquipmentType } from '../../../types/spreadsheet.type';
import { useCallback, useEffect, useState } from 'react';
import { useCallback, useEffect, useRef, useState } from 'react';

type OptionalLoadingParameters = Record<SpreadsheetEquipmentType, boolean>;

Expand All @@ -33,6 +33,15 @@ const initialOptionalLoadingParameters: Record<SpreadsheetEquipmentType, boolean
[SpreadsheetEquipmentType.BUSBAR_SECTION]: false,
};

const TRACKED_TYPES = [
SpreadsheetEquipmentType.BRANCH,
SpreadsheetEquipmentType.LINE,
SpreadsheetEquipmentType.TWO_WINDINGS_TRANSFORMER,
SpreadsheetEquipmentType.GENERATOR,
SpreadsheetEquipmentType.BATTERY,
SpreadsheetEquipmentType.BUS,
] as const;

export function useOptionalLoadingParametersForEquipments() {
const remoteBranchOlg = useSelector(
(state: AppState) =>
Expand All @@ -51,14 +60,22 @@ export function useOptionalLoadingParametersForEquipments() {
(state: AppState) =>
state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.GENERATOR].regulatingTerminal
);
const remoteBatteryRegTerm = useSelector(
(state: AppState) =>
state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.BATTERY].regulatingTerminal
);
const remoteBusNetworkComponents = useSelector(
(state: AppState) => state.spreadsheetOptionalLoadingParameters[SpreadsheetEquipmentType.BUS].networkComponents
);
const [branchOlg, setBranchOlg] = useState<boolean>(remoteBranchOlg);
const [lineOlg, setLineOlg] = useState<boolean>(remoteLineOlg);
const [twtOlg, setTwtOlg] = useState<boolean>(remoteTwtOlg);
const [generatorRegTerm, setGeneratorRegTerm] = useState<boolean>(remoteGeneratorRegTerm);
const [busNetworkComponents, setBusNetworkComponents] = useState<boolean>(remoteBusNetworkComponents);

const previousValuesRef = useRef<boolean[]>([
remoteBranchOlg,
remoteLineOlg,
remoteTwtOlg,
remoteGeneratorRegTerm,
remoteBatteryRegTerm,
remoteBusNetworkComponents,
]);

const [loadOptional, setLoadOptional] = useState<OptionalLoadingParameters>(initialOptionalLoadingParameters);
const [cleanOptional, setCleanOptional] = useState<OptionalLoadingParameters>(initialOptionalLoadingParameters);
Expand All @@ -76,67 +93,59 @@ export function useOptionalLoadingParametersForEquipments() {
}, []);

useEffect(() => {
if (remoteBranchOlg !== branchOlg && remoteBranchOlg) {
setLoadOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.BRANCH]: true };
});
} else if (remoteBranchOlg !== branchOlg && !remoteBranchOlg) {
setCleanOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.BRANCH]: true };
});
}
if (remoteLineOlg !== lineOlg && remoteLineOlg) {
setLoadOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.LINE]: true };
});
} else if (remoteLineOlg !== lineOlg && !remoteLineOlg) {
setCleanOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.LINE]: true };
});
}
if (remoteTwtOlg !== twtOlg && remoteTwtOlg) {
setLoadOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.TWO_WINDINGS_TRANSFORMER]: true };
});
} else if (remoteTwtOlg !== twtOlg && !remoteTwtOlg) {
setCleanOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.TWO_WINDINGS_TRANSFORMER]: true };
});
}
if (remoteGeneratorRegTerm !== generatorRegTerm && remoteGeneratorRegTerm) {
setLoadOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.GENERATOR]: true };
});
} else if (remoteGeneratorRegTerm !== generatorRegTerm && !remoteGeneratorRegTerm) {
setCleanOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.GENERATOR]: true };
const currentValues = [
remoteBranchOlg,
remoteLineOlg,
remoteTwtOlg,
remoteGeneratorRegTerm,
remoteBatteryRegTerm,
remoteBusNetworkComponents,
];
const previousValues = previousValuesRef.current;

const toLoad: SpreadsheetEquipmentType[] = [];
const toClean: SpreadsheetEquipmentType[] = [];

TRACKED_TYPES.forEach((type, index) => {
const current = currentValues[index];
if (current === previousValues[index]) {
return;
}
if (current) {
toLoad.push(type);
} else {
toClean.push(type);
}
});

if (toLoad.length > 0) {
setLoadOptional((prev) => {
const next = { ...prev };
toLoad.forEach((type) => {
next[type] = true;
});
return next;
});
}
if (remoteBusNetworkComponents !== busNetworkComponents && remoteBusNetworkComponents) {
setLoadOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.BUS]: true };
});
} else if (remoteBusNetworkComponents !== busNetworkComponents && !remoteBusNetworkComponents) {
setCleanOptional((prevState) => {
return { ...prevState, [SpreadsheetEquipmentType.BUS]: true };

if (toClean.length > 0) {
setCleanOptional((prev) => {
const next = { ...prev };
toClean.forEach((type) => {
next[type] = true;
});
return next;
});
}
setBranchOlg(remoteBranchOlg);
setLineOlg(remoteLineOlg);
setTwtOlg(remoteTwtOlg);
setGeneratorRegTerm(remoteGeneratorRegTerm);
setBusNetworkComponents(remoteBusNetworkComponents);

previousValuesRef.current = currentValues;
}, [
branchOlg,
busNetworkComponents,
generatorRegTerm,
lineOlg,
remoteBranchOlg,
remoteBusNetworkComponents,
remoteGeneratorRegTerm,
remoteLineOlg,
remoteTwtOlg,
twtOlg,
remoteGeneratorRegTerm,
remoteBatteryRegTerm,
remoteBusNetworkComponents,
]);

return {
Expand Down
3 changes: 3 additions & 0 deletions src/components/spreadsheet-view/types/spreadsheet.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ export type SpreadsheetOptionalLoadingParameters = {
[SpreadsheetEquipmentType.GENERATOR]: {
regulatingTerminal: boolean;
};
[SpreadsheetEquipmentType.BATTERY]: {
regulatingTerminal: boolean;
};
[SpreadsheetEquipmentType.BUS]: {
networkComponents: boolean;
};
Expand Down
3 changes: 3 additions & 0 deletions src/redux/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,9 @@ const initialState: AppState = {
[SpreadsheetEquipmentType.BUS]: {
networkComponents: false,
},
[SpreadsheetEquipmentType.BATTERY]: {
regulatingTerminal: false,
},
},
networkVisualizationsParameters: null,
highlightedModificationUuid: null,
Expand Down
Loading