@capytale/meta-player 0.7.2 → 0.8.0

package/src/features/activityJS/AfterResetAction.tsx

@@ -1,23 +1,23 @@
-import { FC, useEffect } from "react";
-import {
-  SaveCallback,
-  addAfterReset,
-  removeAfterReset,
-} from "./saverSlice";
-import { useAppDispatch } from "../../app/hooks";
-
-type AfterResetActionProps = SaveCallback;
-
-const AfterResetAction: FC<AfterResetActionProps> = (props) => {
-  const dispatch = useAppDispatch();
-  useEffect(() => {
-    dispatch(addAfterReset(props));
-    return () => {
-      // Remove the callback when the component is unmounted
-      dispatch(removeAfterReset(props.name));
-    };
-  }, [props]);
-  return null;
-};
-
-export default AfterResetAction;
+import { FC, useEffect } from "react";
+import {
+  SaveCallback,
+  addAfterReset,
+  removeAfterReset,
+} from "./saverSlice";
+import { useAppDispatch } from "../../app/hooks";
+
+type AfterResetActionProps = SaveCallback;
+
+const AfterResetAction: FC<AfterResetActionProps> = (props) => {
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    dispatch(addAfterReset(props));
+    return () => {
+      // Remove the callback when the component is unmounted
+      dispatch(removeAfterReset(props.name));
+    };
+  }, [props]);
+  return null;
+};
+
+export default AfterResetAction;

package/src/features/activityJS/AfterSaveAction.tsx

@@ -1,23 +1,23 @@
-import { FC, useEffect } from "react";
-import {
-  SaveCallback,
-  addAfterSave,
-  removeAfterSave,
-} from "./saverSlice";
-import { useAppDispatch } from "../../app/hooks";
-
-type AfterSaveActionProps = SaveCallback;
-
-const AfterSaveAction: FC<AfterSaveActionProps> = (props) => {
-  const dispatch = useAppDispatch();
-  useEffect(() => {
-    dispatch(addAfterSave(props));
-    return () => {
-      // Remove the callback when the component is unmounted
-      dispatch(removeAfterSave(props.name));
-    };
-  }, [props]);
-  return null;
-};
-
-export default AfterSaveAction;
+import { FC, useEffect } from "react";
+import {
+  SaveCallback,
+  addAfterSave,
+  removeAfterSave,
+} from "./saverSlice";
+import { useAppDispatch } from "../../app/hooks";
+
+type AfterSaveActionProps = SaveCallback;
+
+const AfterSaveAction: FC<AfterSaveActionProps> = (props) => {
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    dispatch(addAfterSave(props));
+    return () => {
+      // Remove the callback when the component is unmounted
+      dispatch(removeAfterSave(props.name));
+    };
+  }, [props]);
+  return null;
+};
+
+export default AfterSaveAction;

package/src/features/activityJS/BeforeResetAction.tsx

@@ -1,23 +1,23 @@
-import { FC, useEffect } from "react";
-import {
-  SaveCallback,
-  addBeforeReset,
-  removeBeforeReset,
-} from "./saverSlice";
-import { useAppDispatch } from "../../app/hooks";
-
-type BeforeResetActionProps = SaveCallback;
-
-const BeforeResetAction: FC<BeforeResetActionProps> = (props) => {
-  const dispatch = useAppDispatch();
-  useEffect(() => {
-    dispatch(addBeforeReset(props));
-    return () => {
-      // Remove the callback when the component is unmounted
-      dispatch(removeBeforeReset(props.name));
-    };
-  }, [props]);
-  return null;
-};
-
-export default BeforeResetAction;
+import { FC, useEffect } from "react";
+import {
+  SaveCallback,
+  addBeforeReset,
+  removeBeforeReset,
+} from "./saverSlice";
+import { useAppDispatch } from "../../app/hooks";
+
+type BeforeResetActionProps = SaveCallback;
+
+const BeforeResetAction: FC<BeforeResetActionProps> = (props) => {
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    dispatch(addBeforeReset(props));
+    return () => {
+      // Remove the callback when the component is unmounted
+      dispatch(removeBeforeReset(props.name));
+    };
+  }, [props]);
+  return null;
+};
+
+export default BeforeResetAction;

package/src/features/activityJS/BeforeSaveAction.tsx

@@ -1,23 +1,23 @@
-import { FC, useEffect } from "react";
-import {
-  SaveCallback,
-  addBeforeSave,
-  removeBeforeSave,
-} from "./saverSlice";
-import { useAppDispatch } from "../../app/hooks";
-
-type BeforeSaveActionProps = SaveCallback;
-
-const BeforeSaveAction: FC<BeforeSaveActionProps> = (props) => {
-  const dispatch = useAppDispatch();
-  useEffect(() => {
-    dispatch(addBeforeSave(props));
-    return () => {
-      // Remove the callback when the component is unmounted
-      dispatch(removeBeforeSave(props.name));
-    };
-  }, [props]);
-  return null;
-};
-
-export default BeforeSaveAction;
+import { FC, useEffect } from "react";
+import {
+  SaveCallback,
+  addBeforeSave,
+  removeBeforeSave,
+} from "./saverSlice";
+import { useAppDispatch } from "../../app/hooks";
+
+type BeforeSaveActionProps = SaveCallback;
+
+const BeforeSaveAction: FC<BeforeSaveActionProps> = (props) => {
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    dispatch(addBeforeSave(props));
+    return () => {
+      // Remove the callback when the component is unmounted
+      dispatch(removeBeforeSave(props.name));
+    };
+  }, [props]);
+  return null;
+};
+
+export default BeforeSaveAction;

package/src/features/activityJS/Saver.tsx

@@ -1,154 +1,167 @@
-import { FC, useEffect } from "react";
-import { useAppDispatch, useAppSelector } from "../../app/hooks";
-import {
-  selectSharedNotesContent,
-  selectComments,
-  selectGrading,
-  selectInstructions,
-  selectSaveState,
-  setIsMPDirty,
-  setIsPlayerDirty,
-  setSaveState,
-  setWorkflow,
-  selectSharedNotesType,
-  selectInstructionsType,
-} from "../activityData/activityDataSlice";
-import { useActivityJS } from "./ActivityJSProvider";
-import { selectBeforeSave, selectAfterSave } from "./saverSlice";
-import { useToast } from "../toast";
-
-const Saver: FC<{}> = () => {
-  const dispatch = useAppDispatch();
-  const activityJs = useActivityJS();
-  const instructions = useAppSelector(selectInstructions);
-  const instructionsType = useAppSelector(selectInstructionsType);
-  const sharedNotesContent = useAppSelector(selectSharedNotesContent);
-  const sharedNotesType = useAppSelector(selectSharedNotesType);
-  const comments = useAppSelector(selectComments);
-  const grading = useAppSelector(selectGrading);
-  const beforeSave = useAppSelector(selectBeforeSave);
-  const afterSave = useAppSelector(selectAfterSave);
-
-  const toast = useToast();
-
-  const executePrepareSave = () => {};
-  const save = async () => {
-    if (!activityJs.activitySession) {
-      throw new Error("No activity session to save");
-    }
-    for (const callback of Object.values(beforeSave)) {
-      try {
-        const v = callback();
-        if (v instanceof Promise) {
-          await v;
-        }
-      } catch (e) {
-        console.error("Error in beforeSave callback", e);
-        dispatch(setSaveState("idle"));
-        toast.show({
-          summary: "Erreur : enregistrement annulé",
-          detail: (e as any).toString(),
-          severity: "error",
-          life: 10000,
-        });
-        return;
-      }
-    }
-    const ab = activityJs.activitySession.activityBunch;
-    if (activityJs.activitySession.mode === "create") {
-      if (instructionsType === "rich") {
-        ab.instructions.value = {
-          lexical:
-            instructions?.format === "lexical"
-              ? typeof instructions.value === "string"
-                ? instructions.value
-                : JSON.stringify(instructions.value)
-              : null,
-          html:
-            instructions?.format === "lexical"
-              ? instructions.htmlValue
-              : (instructions?.value as string),
-        };
-      } else {
-        ab.instructions.value = {
-          lexical: null,
-          html: null,
-        };
-      }
-    }
-    if (activityJs.activitySession.mode === "review") {
-      ab.assignmentNode!.comments.value = comments || "";
-      ab.assignmentNode!.grading.value = grading || "";
-    }
-    if (
-      activityJs.activitySession.mode === "create" ||
-      activityJs.activitySession.mode === "review" ||
-      activityJs.activitySession.mode === "assignment"
-    ) {
-      if (sharedNotesContent && sharedNotesType === "rich") {
-        ab.shared_notes.value =
-          typeof sharedNotesContent === "string"
-            ? sharedNotesContent
-            : JSON.stringify(sharedNotesContent);
-      } else {
-        ab.shared_notes.value = null;
-      }
-    }
-    try {
-      await ab.save();
-      dispatch(setSaveState("idle"));
-      if (
-        activityJs.activitySession.mode === "assignment" ||
-        activityJs.activitySession.mode === "review"
-      ) {
-        dispatch(setWorkflow(ab.assignmentNode!.workflow));
-      }
-      dispatch(setIsPlayerDirty(false));
-      dispatch(setIsMPDirty(false));
-      toast.show({
-        summary: "Sauvegarde réussie",
-        detail: "L'activité a bien été enregistrée.",
-        severity: "success",
-        life: 2000,
-      });
-      for (const callback of Object.values(afterSave)) {
-        try {
-          const v = callback();
-          if (v instanceof Promise) {
-            await v;
-          }
-        } catch (e) {
-          console.error("Error in afterSave callback", e);
-          dispatch(setSaveState("idle"));
-          toast.show({
-            summary: "Erreur après sauvegarde",
-            detail: (e as any).toString(),
-            severity: "error",
-            life: 10000,
-          });
-        }
-      }
-    } catch (error: any) {
-      console.error("Error saving", error);
-      dispatch(setSaveState("idle"));
-      toast.show({
-        summary: "Erreur lors de l'enregistrement",
-        detail: error.toString(),
-        severity: "error",
-        life: 10000,
-      });
-    }
-  };
-
-  const saveState = useAppSelector(selectSaveState);
-  useEffect(() => {
-    if (saveState === "should-save") {
-      dispatch(setSaveState("saving"));
-      executePrepareSave();
-      save();
-    }
-  }, [saveState]);
-  return null;
-};
-
-export default Saver;
+import { FC, useCallback, useEffect } from "react";
+import { useAppDispatch, useAppSelector } from "../../app/hooks";
+import {
+  selectSharedNotesContent,
+  selectComments,
+  selectGrading,
+  selectInstructions,
+  selectSaveState,
+  setIsMPDirty,
+  setIsPlayerDirty,
+  setSaveState,
+  setWorkflow,
+  selectSharedNotesType,
+  selectInstructionsType,
+} from "../activityData/activityDataSlice";
+import { useActivityJS } from "./ActivityJSProvider";
+import { selectBeforeSave, selectAfterSave } from "./saverSlice";
+import { useToast } from "../toast";
+
+const Saver: FC<{}> = () => {
+  const dispatch = useAppDispatch();
+  const activityJs = useActivityJS();
+  const instructions = useAppSelector(selectInstructions);
+  const instructionsType = useAppSelector(selectInstructionsType);
+  const sharedNotesContent = useAppSelector(selectSharedNotesContent);
+  const sharedNotesType = useAppSelector(selectSharedNotesType);
+  const comments = useAppSelector(selectComments);
+  const grading = useAppSelector(selectGrading);
+  const beforeSave = useAppSelector(selectBeforeSave);
+  const afterSave = useAppSelector(selectAfterSave);
+
+  const toast = useToast();
+
+  const executePrepareSave = useCallback(() => {}, []);
+  const save = useCallback(async () => {
+    if (!activityJs.activitySession) {
+      throw new Error("No activity session to save");
+    }
+    for (const callback of Object.values(beforeSave)) {
+      try {
+        const v = callback();
+        if (v instanceof Promise) {
+          await v;
+        }
+      } catch (e) {
+        console.error("Error in beforeSave callback", e);
+        dispatch(setSaveState("idle"));
+        toast.show({
+          summary: "Erreur : enregistrement annulé",
+          detail: (e as any).toString(),
+          severity: "error",
+          life: 10000,
+        });
+        return;
+      }
+    }
+    const ab = activityJs.activitySession.activityBunch;
+    if (activityJs.activitySession.mode === "create") {
+      if (instructionsType === "rich") {
+        ab.instructions.value = {
+          lexical:
+            instructions?.format === "lexical"
+              ? typeof instructions.value === "string"
+                ? instructions.value
+                : JSON.stringify(instructions.value)
+              : null,
+          html:
+            instructions?.format === "lexical"
+              ? instructions.htmlValue
+              : (instructions?.value as string),
+        };
+      } else {
+        ab.instructions.value = {
+          lexical: null,
+          html: null,
+        };
+      }
+    }
+    if (activityJs.activitySession.mode === "review") {
+      ab.assignmentNode!.comments.value = comments || "";
+      ab.assignmentNode!.grading.value = grading || "";
+    }
+    if (
+      activityJs.activitySession.mode === "create" ||
+      activityJs.activitySession.mode === "review" ||
+      activityJs.activitySession.mode === "assignment"
+    ) {
+      if (sharedNotesContent && sharedNotesType === "rich") {
+        ab.shared_notes.value =
+          typeof sharedNotesContent === "string"
+            ? sharedNotesContent
+            : JSON.stringify(sharedNotesContent);
+      } else {
+        ab.shared_notes.value = null;
+      }
+    }
+    try {
+      await ab.save();
+      dispatch(setSaveState("idle"));
+      if (
+        activityJs.activitySession.mode === "assignment" ||
+        activityJs.activitySession.mode === "review"
+      ) {
+        dispatch(setWorkflow(ab.assignmentNode!.workflow));
+      }
+      dispatch(setIsPlayerDirty(false));
+      dispatch(setIsMPDirty(false));
+      toast.show({
+        summary: "Sauvegarde réussie",
+        detail: "L'activité a bien été enregistrée.",
+        severity: "success",
+        life: 2000,
+      });
+      for (const callback of Object.values(afterSave)) {
+        try {
+          const v = callback();
+          if (v instanceof Promise) {
+            await v;
+          }
+        } catch (e) {
+          console.error("Error in afterSave callback", e);
+          dispatch(setSaveState("idle"));
+          toast.show({
+            summary: "Erreur après sauvegarde",
+            detail: (e as any).toString(),
+            severity: "error",
+            life: 10000,
+          });
+        }
+      }
+    } catch (error: any) {
+      console.error("Error saving", error);
+      dispatch(setSaveState("idle"));
+      toast.show({
+        summary: "Erreur lors de l'enregistrement",
+        detail: error.toString(),
+        severity: "error",
+        life: 10000,
+      });
+    }
+  }, [
+    activityJs.activitySession,
+    instructions,
+    instructionsType,
+    sharedNotesContent,
+    sharedNotesType,
+    comments,
+    grading,
+    beforeSave,
+    afterSave,
+    dispatch,
+    setSaveState,
+    toast,
+  ]);
+
+  const saveState = useAppSelector(selectSaveState);
+  useEffect(() => {
+    if (saveState === "should-save") {
+      dispatch(setSaveState("saving"));
+      executePrepareSave();
+      save();
+    }
+  }, [saveState]);
+  return null;
+};
+
+export default Saver;