Skip to content
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

front: fix infra lock status #7078

Merged
merged 1 commit into from
Apr 5, 2024
Merged

front: fix infra lock status #7078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions front/src/applications/editor/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import { useSwitchTypes } from 'applications/editor/tools/switchEdition/types';
import type { switchProps } from 'applications/editor/tools/switchProps';
import type { CommonToolState } from 'applications/editor/tools/types';
import { centerMapOnObject, selectEntities } from 'applications/editor/tools/utils';
import type { ObjectType } from 'common/api/osrdEditoastApi';
import { osrdEditoastApi, type ObjectType } from 'common/api/osrdEditoastApi';
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
import { LoaderState } from 'common/Loaders';
import MapButtons from 'common/Map/Buttons/MapButtons';
import MapSearch from 'common/Map/Search/MapSearch';
import { useInfraID, useOsrdActions } from 'common/osrdContext';
import { useInfraActions, useInfraID, useOsrdActions } from 'common/osrdContext';
import Tipped from 'common/Tipped';
import type { EditorSliceActions } from 'reducers/editor';
import { getEditorState, getInfraLockStatus } from 'reducers/editor/selectors';
Expand All @@ -49,8 +49,8 @@ const Editor = () => {
const { urlInfra } = useParams();
const infraID = useInfraID();
const [searchParams, setSearchParams] = useSearchParams();
const isLocked = useSelector(getInfraLockStatus);
const isLoading = useSelector(getIsLoading);
const isLocked = useSelector(getInfraLockStatus);
const editorState = useSelector(getEditorState);
const switchTypes = useSwitchTypes(infraID);
/* eslint-disable @typescript-eslint/no-explicit-any */
Expand All @@ -65,6 +65,13 @@ const Editor = () => {
}, [setRenderingFingerprint]);

const [isFormSubmited, setIsFormSubmited] = useState(false);
const { data: infra } = osrdEditoastApi.endpoints.getInfraById.useQuery(
{ id: infraID as number },
{
skip: !infraID,
}
);
const { updateInfra } = useInfraActions();

const switchTool = useCallback(
({ toolType, toolState }: switchProps) => {
Expand Down Expand Up @@ -312,6 +319,12 @@ const Editor = () => {
}
}, [toolAndState.state.entity?.properties.id]);

useEffect(() => {
if (infra) {
dispatch(updateInfra(infra));
}
}, [infra]);

return (
<EditorContext.Provider value={extendedContext as EditorContextType<unknown>}>
<main
Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/editor/tools/rangeEdition/tool-factory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ function getRangeEditionTool<T extends EditorRange>({
id: `save-${objectTypeAction}`,
icon: AiFillSave,
labelTranslationKey: `Editor.tools.${objectTypeEdition}-edition.actions.save-${objectTypeAction}`,
isDisabled({ isLoading, state }) {
if (isLoading) return true;
isDisabled({ isLoading, isInfraLocked, state }) {
if (isLoading || isInfraLocked) return true;
if (canSave) return !canSave(state);
return false;
},
Expand Down
3 changes: 2 additions & 1 deletion front/src/applications/editor/tools/switchEdition/tool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const SwitchEditionTool: Tool<SwitchEditionState> = {
id: 'save-switch',
icon: AiFillSave,
labelTranslationKey: 'Editor.tools.switch-edition.actions.save-switch',
isDisabled({ isLoading, state }) {
isDisabled({ isLoading, isInfraLocked, state }) {
const portWithTracks = filter(state.entity?.properties?.ports ?? {}, (p) => !!p?.track);
const portsKeys = Object.keys(state.entity?.properties?.ports ?? {});
const detectedDuplicates = filter(
Expand All @@ -61,6 +61,7 @@ const SwitchEditionTool: Tool<SwitchEditionState> = {
portWithTracks.length !== portsKeys.length ||
!!detectedDuplicates.length ||
isLoading ||
isInfraLocked ||
false
);
},
Expand Down
Loading