wip

Author: Akctarus

front/src/applications/editor/Editor.tsx

@@ -65,7 +65,12 @@ const Editor = () => {
   }, [setRenderingFingerprint]);
 
   const [isFormSubmited, setIsFormSubmited] = useState(false);
-  const [getInfraById, { data: infra }] = osrdEditoastApi.endpoints.getInfraById.useLazyQuery({});
+  const { data: infra } = osrdEditoastApi.endpoints.getInfraById.useQuery(
+    { id: infraID as number },
+    {
+      skip: !infraID,
+    }
+  );
   const { updateInfra } = useInfraActions();
 
   const switchTool = useCallback(
@@ -314,12 +319,6 @@ const Editor = () => {
     }
   }, [toolAndState.state.entity?.properties.id]);
 
-  useEffect(() => {
-    if (infraID) {
-      getInfraById({ id: infraID });
-    }
-  }, [infraID, getInfraById]);
-
   useEffect(() => {
     if (infra) {
       dispatch(updateInfra(infra));

front/src/applications/editor/tools/rangeEdition/tool-factory.tsx

@@ -98,9 +98,9 @@ function getRangeEditionTool<T extends EditorRange>({
           icon: AiFillSave,
           labelTranslationKey: `Editor.tools.${objectTypeEdition}-edition.actions.save-${objectTypeAction}`,
           isDisabled({ isLoading, isInfraLocked, state }) {
-            if (isLoading) return true;
+            if (isLoading || isInfraLocked) return true;
             if (canSave) return !canSave(state);
-            return !!isInfraLocked;
+            return false;
           },
           async onClick({ state, setState, dispatch, infraID }) {
             const { initialEntity, entity } = state;