@capytale/meta-player 0.5.18 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capytale/meta-player",
-  "version": "0.5.18",
+  "version": "0.6.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/features/activityData/activityJsData.ts

@@ -3,6 +3,8 @@ import { TimeRange } from "@capytale/activity.js/common/field";
 import { InitialEditorStateType } from "@capytale/capytale-rich-text-editor";
 import { wf } from "@capytale/activity.js/activity/field/workflow";
 
+export type Workflow = wf;
+
 export type StudentInfo = {
   firstName: string;
   lastName: string;
@@ -43,7 +45,7 @@ export type ActivityJSData = {
   friendlyType: string;
   comments: string | null;
   grading: string | null;
-  workflow: wf | null | undefined;
+  workflow: Workflow | null | undefined;
   antiCheat?: null | {
     passwordHash?: string | null;
     startLocked: boolean;

package/src/features/activityJS/ActivityJSProvider.tsx

@@ -22,7 +22,6 @@ import tracker from "@capytale/activity.js/backend/capytale/tracker";
 
 const ActivityJSContext = createContext<ActivitySessionLoaderReturnValue>({
   state: "loading",
-  activitySession: null,
 });
 
 type ActivityJSProviderProps = PropsWithChildren<{
@@ -128,16 +127,31 @@ export const ActivityJSProvider: FC<ActivityJSProviderProps> = (props) => {
 };
 
 export const useActivityJS = () => {
-  return useContext(ActivityJSContext);
+  const activityJs = useContext(ActivityJSContext);
+  if (activityJs.state === "loading") {
+    throw new Error("ActivityJS data not loaded");
+  }
+  if (activityJs.state === "error") {
+    throw new Error("Error loading ActivityJS data: " + activityJs.error);
+  }
+  return activityJs;
 };
 
-export const useActivityJsEssentials = () => {
+export const useActivitySession = () => {
   const activityJs = useActivityJS();
-  if (!activityJs.activitySession) {
-    throw new Error("ActivityJS data not loaded");
-  }
-  const mode = activityJs.activitySession.mode;
-  const ab = activityJs.activitySession.activityBunch;
+  return activityJs.activitySession;
+};
+
+export const useActivityBunch = () => {
+  const activitySession = useActivitySession();
+  const ab = activitySession.activityBunch;
+  return ab;
+};
+
+export const useActivityJsEssentials = () => {
+  const activitySession = useActivitySession();
+  const mode = activitySession.mode;
+  const ab = activitySession.activityBunch;
   const hasAssignment = !!ab.assignmentNode;
   const getActivityContent = () => {
     return ab.activityNode.content.value as string | null;

package/src/features/activityJS/hooks.ts

@@ -27,7 +27,7 @@ export const useReset = (props: UseResetProps) => {
     return null;
   }
   return async (reload: boolean = true) => {
-    if (!activityJs.activitySession) {
+    if (activityJs.state !== "loaded") {
       throw new Error("No activity session to reset");
     }
     for (const callback of Object.values(beforeReset)) {

package/src/features/activityJS/internal-hooks.ts

@@ -9,9 +9,13 @@ import type { ActivityBunchOptions as LoadOptions } from "@capytale/activity.js/
 export type { LoadOptions };
 
 export type ActivitySessionLoaderReturnValue = {
-  state: "loading" | "loaded" | "error";
-  activitySession: ActivitySession | null;
-  error?: any;
+  state: "loading";
+} | {
+  state: "loaded";
+  activitySession: ActivitySession;
+} | {
+  state: "error";
+  error: any;
 };
 
 /**
@@ -32,7 +36,6 @@ export function useActivitySessionLoader(
   const callbackW = useHandlerWrapper(callback);
   const [state, setState] = useState<ActivitySessionLoaderReturnValue>({
     state: "loading",
-    activitySession: null,
   });
   useEffect(() => {
     let cancelled = false;
@@ -50,7 +53,6 @@ export function useActivitySessionLoader(
         if (cancelled) return;
         setState({
           state: "error",
-          activitySession: null,
           error,
         });
       });
@@ -58,7 +60,6 @@ export function useActivitySessionLoader(
       cancelled = true;
       setState({
         state: "loading",
-        activitySession: null,
       });
     };
   }, [id, loadOptions?.binaryDataType, loadOptions?.readOnly]);

package/src/index.tsx

@@ -11,6 +11,8 @@ import { useMode, useWorkflow } from "./hooks";
 import { useThemeType } from "./features/theming/hooks";
 import {
   useActivityJS,
+  useActivitySession,
+  useActivityBunch,
   useActivityJsEssentials,
 } from "./features/activityJS/ActivityJSProvider";
 import {
@@ -38,6 +40,7 @@ import type {
 } from "./features/functionalities/functionalitiesSlice";
 
 import type { ActivityMode } from "@capytale/activity.js/activity/activitySession";
+import type { Workflow } from "./features/activityData/activityJsData";
 
 export {
   MetaPlayer,
@@ -49,6 +52,8 @@ export {
   useMode,
   useWorkflow,
   useActivityJS,
+  useActivitySession,
+  useActivityBunch,
   useActivityJsEssentials,
   useNotifyIsDirty,
   useCanSave,
@@ -66,4 +71,10 @@ export {
   useRefreshAttachedFiles,
   Toast,
 };
-export type { ActivityMode, AttachedFileData, UploadedFileInfo, ToastMessage };
+export type {
+  ActivityMode,
+  AttachedFileData,
+  UploadedFileInfo,
+  ToastMessage,
+  Workflow,
+};