@capytale/meta-player 0.1.4 → 0.1.6

package/.eslintrc.json

@@ -3,7 +3,8 @@
     "eslint:recommended",
     "react-app",
     "plugin:react/jsx-runtime",
-    "prettier"
+    "prettier",
+    "plugin:react-hooks/recommended"
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": { "project": true, "tsconfigRootDir": "./" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capytale/meta-player",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -20,8 +20,6 @@
     "@uidotdev/usehooks": "^2.4.1",
     "primeicons": "^7.0.0",
     "primereact": "^10.8.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "react-html-props": "^2.0.9",
     "react-redux": "^9.1.0",
     "screenfull": "^6.0.2"
@@ -31,18 +29,25 @@
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.2",
-    "@types/react": "^18.2.47",
-    "@types/react-dom": "^18.2.18",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@types/react": "^18.3.8",
+    "@types/react-dom": "^18.3.0",
+    "@vitejs/plugin-react": "^4.3.1",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "jsdom": "^23.2.0",
     "prettier": "^3.2.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "sass": "^1.75.0",
     "typescript": "^5.3.3",
     "vite": "^5.4.6",
     "vitest": "^1.2.0"
+  },
+  "peerDependencies": {
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   }
 }

package/src/features/activityJS/Saver.tsx

@@ -6,10 +6,10 @@ import {
   selectGrading,
   selectInstructions,
   selectSaveState,
-  selectWorkflow,
   setIsMPDirty,
   setIsPlayerDirty,
   setSaveState,
+  setWorkflow,
 } from "../activityData/activityDataSlice";
 import { useActivityJS } from "./ActivityJSProvider";
 import { Toast } from "primereact/toast";
@@ -24,7 +24,6 @@ const Saver: FC<{}> = () => {
   const grading = useAppSelector(selectGrading);
   const beforeSave = useAppSelector(selectBeforeSave);
   const afterSave = useAppSelector(selectAfterSave);
-  const workflow = useAppSelector(selectWorkflow);
 
   const toast = useRef<Toast>(null);
 
@@ -85,16 +84,16 @@ const Saver: FC<{}> = () => {
           ? answerSheetContent
           : JSON.stringify(answerSheetContent);
     }
-    if (
-      activityJs.activitySession.mode === "assignment" ||
-      activityJs.activitySession.mode === "review"
-    ) {
-      ab.assignmentNode!.workflow = workflow!;
-    }
     try {
       const saveData = await ab.save();
       console.log("Save return data", saveData);
       dispatch(setSaveState("idle"));
+      if (
+        activityJs.activitySession.mode === "assignment" ||
+        activityJs.activitySession.mode === "review"
+      ) {
+        dispatch(setWorkflow(ab.assignmentNode!.workflow));
+      }
       dispatch(setIsPlayerDirty(false));
       dispatch(setIsMPDirty(false));
       toast.current!.show({

package/src/features/navbar/ActivityMenu.tsx

@@ -1,4 +1,4 @@
-import { memo, useState } from "react";
+import { memo, useMemo, useState } from "react";
 import styles from "./style.module.scss";
 
 import { Button } from "primereact/button";
@@ -17,6 +17,7 @@ const ActivityMenu: React.FC = memo(() => {
   const isFullscreen = useFullscreen(wantFullscreen, () =>
     setWantFullscreen(false),
   );
+  const isInIframe = useMemo(() => capytaleUI.isInCapytaletIframe(), []);
   const [helpDialogVisible, setHelpDialogVisible] = useState(false);
   const activityJS = useActivityJS();
   return (
@@ -46,18 +47,20 @@ const ActivityMenu: React.FC = memo(() => {
         }}
         onClick={() => setWantFullscreen((prev) => !prev)}
       />
-      <Button
-        severity="secondary"
-        size="small"
-        icon={"pi pi-times"}
-        text
-        tooltip="Retour à la liste des activités"
-        tooltipOptions={{
-          position: "left",
-          showDelay: settings.TOOLTIP_SHOW_DELAY,
-        }}
-        onClick={() => capytaleUI.closeCapytaleIframe()}
-      />
+      {isInIframe && (
+        <Button
+          severity="secondary"
+          size="small"
+          icon={"pi pi-times"}
+          text
+          tooltip="Retour à la liste des activités"
+          tooltipOptions={{
+            position: "left",
+            showDelay: settings.TOOLTIP_SHOW_DELAY,
+          }}
+          onClick={() => capytaleUI.closeCapytaleIframe()}
+        />
+      )}
       <Sidebar
         header="Paramètres"
         visible={settingsSidebarVisible}

package/src/features/navbar/CapytaleMenu.tsx

@@ -17,7 +17,6 @@ import {
   selectShowSaveButton,
   selectWorkflow,
   setSaveState,
-  setWorkflow,
 } from "../activityData/activityDataSlice";
 import { copyToClipboard } from "../../utils/clipboard";
 import settings from "../../settings";
@@ -25,9 +24,11 @@ import { wf } from "@capytale/activity.js/activity/field/workflow";
 import capytaleUI from "@capytale/activity.js/backend/capytale/ui";
 import ButtonDoubleIcon from "../../utils/ButtonDoubleIcon";
 import CardSelector from "../../utils/CardSelector";
+import { useActivityJS } from "../activityJS/ActivityJSProvider";
 
 const CapytaleMenu: React.FC = () => {
   const dispatch = useAppDispatch();
+  const activityJS = useActivityJS();
   const sharingInfo = useAppSelector(selectSharingInfo);
   const saveState = useAppSelector(selectSaveState);
   const windowsSize = useWindowSize();
@@ -46,7 +47,7 @@ const CapytaleMenu: React.FC = () => {
   const isInIframe = useMemo(() => capytaleUI.isInCapytaletIframe(), []);
   const toast = useRef<Toast>(null);
   const changeWorkflow = (value: wf) => {
-    dispatch(setWorkflow(value));
+    activityJS.activitySession!.activityBunch.assignmentNode!.workflow = value;
     dispatch(setSaveState("should-save"));
   };
   const confirmFinishAssignment = () => {
@@ -80,25 +81,27 @@ const CapytaleMenu: React.FC = () => {
             }}
           />
         )}
-        {showSaveButton && (
-          <Button
-            label={isQuiteSmall ? undefined : "Enregistrer"}
-            disabled={!isDirty}
-            severity={"warning"}
-            size="small"
-            icon="pi pi-save"
-            loading={saveState !== "idle"}
+        {
+          showSaveButton && (
+            <Button
+              label={isQuiteSmall ? undefined : "Enregistrer"}
+              disabled={!isDirty}
+              severity={"warning"}
+              size="small"
+              icon="pi pi-save"
+              loading={saveState !== "idle"}
+              onClick={() => {
+                dispatch(setSaveState("should-save"));
+              }}
+            />
+          ) /**
             tooltip={isDirty ? "Enregistrer l'activité" : "Rien à enregistrer"}
             tooltipOptions={{
               position: "bottom",
               showDelay: settings.TOOLTIP_SHOW_DELAY,
               showOnDisabled: true,
-            }}
-            onClick={() => {
-              dispatch(setSaveState("should-save"));
-            }}
-          />
-        )}
+            }} */
+        }
 
         {mode === "create" && (
           <SplitButton