@datalayer/core 1.0.24 → 1.1.41

package/lib/hooks/useCache.js

@@ -36,8 +36,9 @@
  * }
  * ```
  */
-import { useQuery, useMutation, useQueryClient, } from '@tanstack/react-query';
-import { BOOTSTRAP_USER_ONBOARDING, asContact, asDatasource, asInvite, asOrganization, asPage, asSecret, asSpace, asTeam, asToken, asUser, } from '../models/index.js';
+import { useQuery, useQueries, useMutation, useQueryClient, } from '@tanstack/react-query';
+import { BOOTSTRAP_USER_ONBOARDING, asContact, asDatasource, asInvite, asOrganization, asSecret, asTeam, asToken, asUser, } from '../models/index.js';
+import { asPage, asSpace } from './cacheConverters.js';
 import { useCoreStore, useIAMStore } from '../state/index.js';
 import { asDisplayName, namesAsInitials, asArray } from '../utils/index.js';
 import { useDatalayer } from './useDatalayer.js';
@@ -361,6 +362,85 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             return asUser(u);
         }
     };
+    const toStudent = (rawStudent) => {
+        if (!rawStudent) {
+            return undefined;
+        }
+        const baseUser = asUser(rawStudent);
+        const studentItems = new Map();
+        const rawItemsSource = rawStudent.student_items ??
+            rawStudent.studentItems ??
+            rawStudent.items ??
+            rawStudent.course_items ??
+            rawStudent.student_items_by_uid ??
+            rawStudent.studentItemsByUid;
+        const rawItems = Array.isArray(rawItemsSource)
+            ? rawItemsSource
+            : rawItemsSource && typeof rawItemsSource === 'object'
+                ? Object.values(rawItemsSource)
+                : [];
+        rawItems.forEach((studentItem) => {
+            const itemId = String(studentItem.item_uid ??
+                studentItem.item_uid_s ??
+                studentItem.itemId ??
+                studentItem.item_id ??
+                studentItem.item_id_s ??
+                '').trim();
+            if (!itemId) {
+                return;
+            }
+            const completedRaw = studentItem.completed_b ??
+                studentItem.completed ??
+                studentItem.is_completed_b ??
+                studentItem.isCompleted ??
+                studentItem.done_b ??
+                studentItem.done;
+            const completed = typeof completedRaw === 'string'
+                ? ['true', '1', 'yes'].includes(completedRaw.toLowerCase())
+                : Boolean(completedRaw);
+            const passRaw = studentItem.pass_b ??
+                studentItem.pass ??
+                studentItem.passed_b ??
+                studentItem.passed;
+            const pass = typeof passRaw === 'string'
+                ? ['true', '1', 'yes'].includes(passRaw.toLowerCase())
+                : passRaw;
+            const mapped = {
+                id: studentItem.uid ?? studentItem.id,
+                type: 'student_item',
+                itemId,
+                itemType: studentItem.item_type_s ??
+                    studentItem.itemType ??
+                    studentItem.type_s ??
+                    studentItem.type,
+                score: studentItem.score_i ??
+                    studentItem.score_f ??
+                    studentItem.score ??
+                    studentItem.total_score_f,
+                codeStudent: studentItem.code_student_t ?? studentItem.codeStudent,
+                completed,
+                pass,
+                nbgrades: studentItem.nbgrades ??
+                    studentItem.grades ??
+                    [],
+                nbgradesTotalPoints: studentItem.nbgrades_total_points_f ??
+                    studentItem.nbgradesTotalPoints ??
+                    studentItem.total_points_f ??
+                    ((studentItem.item_type_s ?? studentItem.itemType ?? studentItem.type_s ?? studentItem.type) === 'assignment'
+                        ? 0
+                        : undefined),
+                nbgradesTotalScore: studentItem.nbgrades_total_score_f ??
+                    studentItem.nbgradesTotalScore ??
+                    studentItem.total_score_f ??
+                    ((studentItem.item_type_s ?? studentItem.itemType ?? studentItem.type_s ?? studentItem.type) === 'assignment'
+                        ? 0
+                        : undefined),
+            };
+            studentItems.set(itemId, mapped);
+        });
+        baseUser.studentItems = studentItems;
+        return baseUser;
+    };
     const toOrganization = (org) => {
         return asOrganization(org);
     };
@@ -447,7 +527,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             path: raw_dataset.s3_path_s,
             cdnUrl: raw_dataset.cdn_url_s,
             creationDate: new Date(raw_dataset.creation_ts_dt),
-            public: raw_dataset.public_b ?? false,
+            public: raw_dataset.is_public_b ?? false,
             lastPublicationDate: raw_dataset.creation_ts_dt
                 ? new Date(raw_dataset.creation_ts_dt)
                 : undefined,
@@ -470,7 +550,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             description: cl.description_t,
             source: cl.source_t,
             creationDate: new Date(cl.creation_ts_dt),
-            public: cl.public_b ?? false,
+            public: cl.is_public_b ?? false,
             lastPublicationDate: cl.last_publication_ts_dt
                 ? new Date(cl.last_publication_ts_dt)
                 : undefined,
@@ -496,7 +576,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             nbformat: raw_notebook.model_s
                 ? JSON.parse(raw_notebook.model_s)
                 : undefined,
-            public: raw_notebook.public_b ?? false,
+            public: raw_notebook.is_public_b ?? false,
             creationDate: new Date(raw_notebook.creation_ts_dt),
             lastUpdateDate: raw_notebook.last_update_ts_dt
                 ? new Date(raw_notebook.last_update_ts_dt)
@@ -523,7 +603,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             name: doc.name_t,
             description: doc.description_t,
             model: doc.model_s ? JSON.parse(doc.model_s) : undefined,
-            public: doc.public_b ?? false,
+            public: doc.is_public_b ?? false,
             creationDate: new Date(doc.creation_ts_dt),
             lastUpdateDate: doc.last_update_ts_dt
                 ? new Date(doc.last_update_ts_dt)
@@ -549,7 +629,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             name: raw_lesson.name_t,
             description: raw_lesson.description_t,
             nbformat: raw_lesson.model_s ? JSON.parse(raw_lesson.model_s) : undefined,
-            public: raw_lesson.public_b ?? false,
+            public: raw_lesson.is_public_b ?? false,
             creationDate: new Date(raw_lesson.creation_ts_dt),
             lastUpdateDate: raw_lesson.last_update_ts_dt
                 ? new Date(raw_lesson.last_update_ts_dt)
@@ -580,7 +660,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             codeQuestion: ex.code_question_t,
             codeSolution: ex.code_solution_t,
             codeTest: ex.code_test_t,
-            public: ex.public_b ?? false,
+            public: ex.is_public_b ?? false,
             creationDate: new Date(ex.creation_ts_dt),
             lastUpdateDate: ex.last_update_ts_dt
                 ? new Date(ex.last_update_ts_dt)
@@ -623,7 +703,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             nbformat: raw_assignment.model_s
                 ? JSON.parse(raw_assignment.model_s)
                 : undefined,
-            public: raw_assignment.public_b ?? false,
+            public: raw_assignment.is_public_b ?? false,
             creationDate: new Date(raw_assignment.creation_ts_dt),
             lastUpdateDate: raw_assignment.last_update_ts_dt
                 ? new Date(raw_assignment.last_update_ts_dt)
@@ -665,6 +745,24 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             },
         };
     };
+    const toEvalset = (raw_evalset) => {
+        const owner = toItemOwner(raw_evalset);
+        return {
+            id: raw_evalset.uid,
+            type: 'evalset',
+            name: raw_evalset.name_t,
+            description: raw_evalset.description_t,
+            public: raw_evalset.is_public_b ?? false,
+            creationDate: raw_evalset.creation_ts_dt
+                ? new Date(raw_evalset.creation_ts_dt)
+                : undefined,
+            lastUpdateDate: raw_evalset.last_update_ts_dt
+                ? new Date(raw_evalset.last_update_ts_dt)
+                : undefined,
+            tags: Array.isArray(raw_evalset.tags_ss) ? raw_evalset.tags_ss : [],
+            owner,
+        };
+    };
     const toItem = (item) => {
         if (!item.type_s) {
             console.error('No type_s found on item', item);
@@ -675,6 +773,45 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 return toAssignment(item);
             case 'cell':
                 return toCell(item);
+            case 'course':
+                return {
+                    id: item.uid,
+                    type: 'course',
+                    name: item.name_t,
+                    description: item.description_t,
+                    tags: item.tags_ss ?? [],
+                    handle: item.handle_s ?? item.handle,
+                    handle_s: item.handle_s,
+                    organization_handle_s: item.organization_handle_s,
+                    owner_handle_s: item.owner_handle_s,
+                    organization: {
+                        handle: item.organization_handle_s,
+                    },
+                    owner: {
+                        handle: item.owner_handle_s,
+                    },
+                };
+            case 'space': {
+                const variant = (item.variant_s ?? item.variant ?? '').toLowerCase();
+                return {
+                    id: item.uid,
+                    type: variant === 'course' ? 'course' : 'space',
+                    name: item.name_t,
+                    description: item.description_t,
+                    tags: item.tags_ss ?? [],
+                    variant,
+                    handle: item.handle_s ?? item.handle,
+                    handle_s: item.handle_s,
+                    organization_handle_s: item.organization_handle_s,
+                    owner_handle_s: item.owner_handle_s,
+                    organization: {
+                        handle: item.organization_handle_s,
+                    },
+                    owner: {
+                        handle: item.owner_handle_s,
+                    },
+                };
+            }
             case 'dataset':
                 return toDataset(item);
             case 'document':
@@ -687,6 +824,8 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 return toNotebook(item);
             case 'page':
                 return toPage(item);
+            case 'evalset':
+                return toEvalset(item);
             default:
                 return {};
         }
@@ -721,17 +860,26 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         if (raw_course.students) {
             students = new Map();
             raw_course.students.forEach((raw_stud) => {
-                const student = toUser(raw_stud);
+                const student = toStudent(raw_stud);
                 if (student && students) {
                     students.set(student.id, student);
                 }
             });
         }
         let itemIds = new Array();
-        let raw_item_uids = raw_course.item_uids_s;
-        if (raw_item_uids && raw_item_uids !== '()') {
-            raw_item_uids = raw_item_uids.replace('(', '').replace(')', '');
-            itemIds = raw_item_uids.split(' ');
+        const rawItemUids = raw_course.item_uids_s;
+        if (Array.isArray(rawItemUids)) {
+            itemIds = Array.from(new Set(rawItemUids
+                .map(uid => String(uid || '').trim())
+                .filter(Boolean)));
+        }
+        else if (typeof rawItemUids === 'string' && rawItemUids !== '()') {
+            itemIds = Array.from(new Set(rawItemUids
+                .replace('(', ' ')
+                .replace(')', ' ')
+                .split(/[\s,]+/g)
+                .map(uid => uid.trim())
+                .filter(Boolean)));
         }
         const items = new Array();
         if (raw_course.items) {
@@ -1550,7 +1698,12 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     method: 'DELETE',
                 });
             },
-            onSuccess: () => {
+            onSuccess: (_resp, deletedSpaceUid) => {
+                const deletedUid = String(deletedSpaceUid || '').trim();
+                // Invalidate deleted space detail cache and all list queries.
+                queryClient.removeQueries({
+                    queryKey: queryKeys.spaces.detail(deletedUid),
+                });
                 // Invalidate all space queries
                 queryClient.invalidateQueries({
                     queryKey: queryKeys.spaces.all(),
@@ -1616,6 +1769,8 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ spaceId, name, description, notebookType = 'notebook', file, }) => {
                 const formData = new FormData();
+                formData.append('space_id', spaceId);
+                // Backward compatibility for endpoints still expecting camelCase.
                 formData.append('spaceId', spaceId);
                 formData.append('notebookType', notebookType);
                 formData.append('name', name);
@@ -2166,11 +2321,12 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.tokens.all(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/tokens`,
+                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys`,
                     method: 'GET',
                 });
-                if (resp.success && resp.tokens) {
-                    const tokens = resp.tokens
+                const tokenItems = asArray(resp?.apiKeys ?? resp?.api_keys ?? resp?.tokens);
+                if (resp.success && tokenItems.length > 0) {
+                    const tokens = tokenItems
                         .map((t) => {
                         const token = toToken(t);
                         if (token) {
@@ -2194,7 +2350,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/tokens`,
+                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys`,
                     method: 'POST',
                     body: {
                         ...token,
@@ -2202,8 +2358,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     },
                 });
                 // Transform the token in the response
-                if (resp.success && resp.token) {
-                    resp.token = toToken(resp.token);
+                const tokenPayload = resp?.apiKey ?? resp?.api_key ?? resp?.token;
+                if (resp.success && tokenPayload) {
+                    resp.token = toToken(tokenPayload);
                 }
                 return resp;
             },
@@ -2515,11 +2672,12 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.tokens.detail(tokenId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/tokens/${tokenId}`,
+                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${tokenId}`,
                     method: 'GET',
                 });
-                if (resp.success && resp.token) {
-                    return toToken(resp.token);
+                const tokenPayload = resp?.apiKey ?? resp?.api_key ?? resp?.token;
+                if (resp.success && tokenPayload) {
+                    return toToken(tokenPayload);
                 }
                 return null;
             },
@@ -2534,14 +2692,15 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/tokens/${token.id}`,
+                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${token.id}`,
                     method: 'PUT',
                     body: { ...token },
                 });
             },
             onSuccess: resp => {
-                if (resp.success && resp.token) {
-                    const tok = toToken(resp.token);
+                const tokenPayload = resp?.apiKey ?? resp?.api_key ?? resp?.token;
+                if (resp.success && tokenPayload) {
+                    const tok = toToken(tokenPayload);
                     if (tok) {
                         queryClient.setQueryData(queryKeys.tokens.detail(tok.id), tok);
                     }
@@ -2557,7 +2716,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (tokenId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/tokens/${tokenId}`,
+                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${tokenId}`,
                     method: 'DELETE',
                 });
             },
@@ -3453,9 +3612,29 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     method: 'POST',
                 });
             },
-            onSuccess: (_, { courseId }) => {
+            onSuccess: (_, { courseId, studentId }) => {
+                // Optimistically add the student to the cached course so enrollment
+                // dependent UI (e.g. the Progress tab) updates immediately. The Solr
+                // read model is eventually consistent, so an immediate refetch would
+                // return stale data; mark the detail query stale without refetching and
+                // let it reconcile on the next natural fetch.
+                const detailKey = ['courses', 'detail', courseId];
+                const cached = queryClient.getQueryData(detailKey);
+                if (cached) {
+                    const nextStudents = cached.students instanceof Map
+                        ? new Map(cached.students)
+                        : new Map();
+                    if (!nextStudents.has(studentId)) {
+                        nextStudents.set(studentId, { id: studentId });
+                    }
+                    queryClient.setQueryData(detailKey, {
+                        ...cached,
+                        students: nextStudents,
+                    });
+                }
                 queryClient.invalidateQueries({
-                    queryKey: ['courses', 'detail', courseId],
+                    queryKey: detailKey,
+                    refetchType: 'none',
                 });
                 queryClient.invalidateQueries({
                     queryKey: ['courses', 'enrollments'],
@@ -3474,9 +3653,25 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     method: 'DELETE',
                 });
             },
-            onSuccess: (_, { courseId }) => {
+            onSuccess: (_, { courseId, studentId }) => {
+                // Optimistically remove the student from the cached course so
+                // enrollment dependent UI (e.g. the Progress tab) updates immediately.
+                // The Solr read model is eventually consistent, so an immediate refetch
+                // would return stale data; mark the detail query stale without
+                // refetching and let it reconcile on the next natural fetch.
+                const detailKey = ['courses', 'detail', courseId];
+                const cached = queryClient.getQueryData(detailKey);
+                if (cached && cached.students instanceof Map) {
+                    const nextStudents = new Map(cached.students);
+                    nextStudents.delete(studentId);
+                    queryClient.setQueryData(detailKey, {
+                        ...cached,
+                        students: nextStudents,
+                    });
+                }
                 queryClient.invalidateQueries({
-                    queryKey: ['courses', 'detail', courseId],
+                    queryKey: detailKey,
+                    refetchType: 'none',
                 });
                 queryClient.invalidateQueries({
                     queryKey: ['courses', 'enrollments'],
@@ -3537,7 +3732,8 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             mutationFn: async (itemId) => {
                 return requestDatalayer({
                     url: `${configuration.libraryRunUrl}/api/library/v1/items/${itemId}/public`,
-                    method: 'PUT',
+                    method: 'PATCH',
+                    body: { is_public: true },
                 });
             },
             onSuccess: () => {
@@ -3552,8 +3748,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (itemId) => {
                 return requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/items/${itemId}/private`,
-                    method: 'PUT',
+                    url: `${configuration.libraryRunUrl}/api/library/v1/items/${itemId}/public`,
+                    method: 'PATCH',
+                    body: { is_public: false },
                 });
             },
             onSuccess: () => {
@@ -3573,9 +3770,16 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      */
     const useRefreshLayout = () => {
         return useMutation({
-            mutationFn: async ({ accountHandle, spaceHandle, }) => {
+            mutationFn: async ({ accountHandle, teamHandle, spaceHandle, }) => {
+                let path = `/api/spacer/v1/layouts/accounts/${accountHandle}`;
+                if (teamHandle !== undefined && spaceHandle !== undefined) {
+                    path += `/teams/${teamHandle}/spaces/${spaceHandle}`;
+                }
+                else if (spaceHandle !== undefined) {
+                    path += `/spaces/${spaceHandle}`;
+                }
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/layouts/accounts/${accountHandle}${spaceHandle !== undefined ? '/spaces/' + spaceHandle : ''}`,
+                    url: `${configuration.spacerRunUrl}${path}`,
                     method: 'GET',
                 });
             },
@@ -3586,6 +3790,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     const transformedOrganization = resp.organization
                         ? toOrganization(resp.organization)
                         : undefined;
+                    const transformedTeam = resp.team && transformedOrganization
+                        ? toTeam(resp.team, transformedOrganization.id)
+                        : undefined;
                     const transformedSpace = resp.space ? toSpace(resp.space) : undefined;
                     // Set data directly into cache instead of just invalidating
                     if (transformedUser) {
@@ -3598,6 +3805,15 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                             queryKey: queryKeys.organizations.all(),
                         });
                     }
+                    if (transformedTeam) {
+                        if (transformedTeam.id) {
+                            queryClient.setQueryData(queryKeys.teams.detail(transformedTeam.id), transformedTeam);
+                        }
+                        if (variables.teamHandle) {
+                            queryClient.setQueryData(queryKeys.teams.byHandle(variables.teamHandle), transformedTeam);
+                        }
+                        queryClient.invalidateQueries({ queryKey: queryKeys.teams.all() });
+                    }
                     if (transformedSpace) {
                         // Set both user and org space queries based on which type it is
                         if (transformedUser && variables.spaceHandle) {
@@ -3725,12 +3941,24 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     /**
      * Get dataset by ID
      */
-    const useDataset = (datasetId) => {
+    const useDataset = (datasetId, scope) => {
         return useQuery({
-            queryKey: queryKeys.datasets.detail(datasetId),
+            queryKey: [
+                ...queryKeys.datasets.detail(datasetId),
+                scope?.selectedPrincipalUid || '',
+                scope?.selectedPrincipalKind || '',
+            ],
             queryFn: async () => {
+                const params = new URLSearchParams();
+                if (scope?.selectedPrincipalUid) {
+                    params.set('selected_principal_uid', scope.selectedPrincipalUid);
+                }
+                if (scope?.selectedPrincipalKind) {
+                    params.set('selected_principal_kind', scope.selectedPrincipalKind);
+                }
+                const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${datasetId}`,
+                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/spaces/items/${datasetId}${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.item) {
@@ -3745,12 +3973,24 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     /**
      * Get datasets by space
      */
-    const useDatasetsBySpace = (spaceId) => {
+    const useDatasetsBySpace = (spaceId, scope) => {
         return useQuery({
-            queryKey: queryKeys.datasets.bySpace(spaceId),
+            queryKey: [
+                ...queryKeys.datasets.bySpace(spaceId),
+                scope?.selectedPrincipalUid || '',
+                scope?.selectedPrincipalKind || '',
+            ],
             queryFn: async () => {
+                const params = new URLSearchParams();
+                if (scope?.selectedPrincipalUid) {
+                    params.set('selected_principal_uid', scope.selectedPrincipalUid);
+                }
+                if (scope?.selectedPrincipalKind) {
+                    params.set('selected_principal_kind', scope.selectedPrincipalKind);
+                }
+                const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/dataset`,
+                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/spaces/${spaceId}/items/types/dataset${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3767,9 +4007,17 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      */
     const useUpdateDataset = () => {
         return useMutation({
-            mutationFn: async ({ id, name, description, }) => {
+            mutationFn: async ({ id, name, description, selectedPrincipalUid, selectedPrincipalKind, }) => {
+                const params = new URLSearchParams();
+                if (selectedPrincipalUid) {
+                    params.set('selected_principal_uid', selectedPrincipalUid);
+                }
+                if (selectedPrincipalKind) {
+                    params.set('selected_principal_kind', selectedPrincipalKind);
+                }
+                const query = params.toString();
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/datasets/${id}`,
+                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/datasets/${id}${query ? `?${query}` : ''}`,
                     method: 'PUT',
                     body: { name, description },
                 });
@@ -4158,6 +4406,12 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 queryClient.invalidateQueries({
                     queryKey: ['assignments', assignmentId],
                 });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', 'detail', courseId],
+                });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', courseId, 'students'],
+                });
             },
         });
     };
@@ -4181,6 +4435,12 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 queryClient.invalidateQueries({
                     queryKey: ['assignments', assignmentId],
                 });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', 'detail', courseId],
+                });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', courseId, 'students'],
+                });
             },
         });
     };
@@ -4204,16 +4464,16 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     // Exercise Grading
     // ============================================================================
     /**
-     * Grade an exercise by assigning points to student code
+     * Grade an exercise by assigning a score to student code
      */
-    const useUpdateExercisePoints = () => {
+    const useUpdateExerciseScore = () => {
         const queryClient = useQueryClient();
         return useMutation({
-            mutationFn: async ({ exerciseId, codeStudent, points, }) => {
+            mutationFn: async ({ exerciseId, codeStudent, score, courseId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${exerciseId}/points`,
+                    url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${exerciseId}/score`,
                     method: 'PUT',
-                    body: { codeStudent, points },
+                    body: { codeStudent, score, courseId },
                 });
             },
             onSuccess: (_, { exerciseId }) => {
@@ -4243,12 +4503,40 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 if (!resp.success) {
                     throw new Error(resp.message || 'Failed to fetch student');
                 }
-                return resp.student;
+                return toStudent(resp.student);
             },
             enabled: !!courseId && !!studentId,
             ...options,
         });
     };
+    /**
+     * Hydrate multiple students (with their student items) for a course.
+     *
+     * The course payload only carries the public member projection of each
+     * student (uid/handle/name) and intentionally omits the nested
+     * `student_items`. To compute per-item progress (e.g. in the course report)
+     * each student must be fetched individually through the enrollment endpoint,
+     * which returns the deep student document including its items.
+     */
+    const useStudents = (courseId, studentIds) => {
+        const uniqueStudentIds = Array.from(new Set((studentIds || []).map(id => String(id || '').trim()).filter(Boolean)));
+        return useQueries({
+            queries: uniqueStudentIds.map(studentId => ({
+                queryKey: ['courses', courseId, 'students', studentId],
+                queryFn: async () => {
+                    const resp = await requestDatalayer({
+                        url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
+                        method: 'GET',
+                    });
+                    if (!resp.success) {
+                        throw new Error(resp.message || 'Failed to fetch student');
+                    }
+                    return toStudent(resp.student);
+                },
+                enabled: !!courseId && !!studentId,
+            })),
+        });
+    };
     /**
      * Mark a course item as completed
      */
@@ -4269,6 +4557,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 queryClient.invalidateQueries({
                     queryKey: ['courses', courseId, 'items'],
                 });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', courseId, 'students'],
+                });
             },
         });
     };
@@ -5627,12 +5918,19 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      */
     const useSearchPublicItems = () => {
         return useMutation({
-            mutationFn: async ({ q, types = ['notebook', 'document', 'lesson'], max = 100, }) => {
+            mutationFn: async ({ q, types = ['notebook', 'document', 'cell', 'lesson', 'evalset', 'course'], max = 100, }) => {
+                const normalizedTypes = Array.from(new Set((types || [])
+                    .map(type => String(type || '')
+                    .trim()
+                    .toLowerCase())
+                    .filter(Boolean)
+                    .map(type => (type === 'eval' ? 'evalset' : type))));
                 const queryString = Object.entries({
                     q: q || '*',
-                    types: types.join(' '),
+                    types: (normalizedTypes.length > 0
+                        ? normalizedTypes
+                        : ['notebook', 'document', 'cell', 'lesson', 'evalset', 'course']).join(' '),
                     max: max.toString(),
-                    public: 'true',
                 })
                     .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
                     .join('&');
@@ -6240,14 +6538,26 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const useRefreshDataset = (options) => {
         const queryClient = useQueryClient();
         return useMutation({
-            mutationFn: async (datasetId) => {
+            mutationFn: async (variables) => {
+                const datasetId = typeof variables === 'string' ? variables : variables.datasetId;
+                const selectedPrincipalUid = typeof variables === 'string' ? undefined : variables.selectedPrincipalUid;
+                const selectedPrincipalKind = typeof variables === 'string' ? undefined : variables.selectedPrincipalKind;
+                const params = new URLSearchParams();
+                if (selectedPrincipalUid) {
+                    params.set('selected_principal_uid', selectedPrincipalUid);
+                }
+                if (selectedPrincipalKind) {
+                    params.set('selected_principal_kind', selectedPrincipalKind);
+                }
+                const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${datasetId}`,
+                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/spaces/items/${datasetId}${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 return resp;
             },
-            onSuccess: (data, datasetId) => {
+            onSuccess: (data, variables) => {
+                const datasetId = typeof variables === 'string' ? variables : variables.datasetId;
                 queryClient.invalidateQueries({
                     queryKey: queryKeys.datasets.detail(datasetId),
                 });
@@ -6262,14 +6572,26 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const useRefreshSpaceDatasets = (options) => {
         const queryClient = useQueryClient();
         return useMutation({
-            mutationFn: async (spaceId) => {
+            mutationFn: async (variables) => {
+                const spaceId = typeof variables === 'string' ? variables : variables.spaceId;
+                const selectedPrincipalUid = typeof variables === 'string' ? undefined : variables.selectedPrincipalUid;
+                const selectedPrincipalKind = typeof variables === 'string' ? undefined : variables.selectedPrincipalKind;
+                const params = new URLSearchParams();
+                if (selectedPrincipalUid) {
+                    params.set('selected_principal_uid', selectedPrincipalUid);
+                }
+                if (selectedPrincipalKind) {
+                    params.set('selected_principal_kind', selectedPrincipalKind);
+                }
+                const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/dataset`,
+                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/spaces/${spaceId}/items/types/dataset${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 return resp;
             },
-            onSuccess: (data, spaceId) => {
+            onSuccess: (data, variables) => {
+                const spaceId = typeof variables === 'string' ? variables : variables.spaceId;
                 queryClient.invalidateQueries({
                     queryKey: queryKeys.datasets.bySpace(spaceId),
                 });
@@ -6306,10 +6628,37 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.items.public(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/items/public`,
+                    url: `${configuration.libraryRunUrl}/api/library/v1/search?q=*&max=-1`,
                     method: 'GET',
                 });
-                return resp;
+                return {
+                    ...resp,
+                    items: (resp.items || [])
+                        .map((item) => toItem(item))
+                        .filter(Boolean),
+                };
+            },
+            ...options,
+        });
+    };
+    /**
+     * Get the current user's own public items (publications).
+     * @param options - Query options
+     */
+    const usePublications = (options) => {
+        return useQuery({
+            queryKey: [...queryKeys.items.all(), 'publications'],
+            queryFn: async () => {
+                const resp = await requestDatalayer({
+                    url: `${configuration.libraryRunUrl}/api/library/v1/publications`,
+                    method: 'GET',
+                });
+                return {
+                    ...resp,
+                    items: (resp.items || [])
+                        .map((item) => toItem(item))
+                        .filter(Boolean),
+                };
             },
             ...options,
         });
@@ -6323,10 +6672,15 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/items/public`,
+                    url: `${configuration.libraryRunUrl}/api/library/v1/search?q=*&max=-1`,
                     method: 'GET',
                 });
-                return resp;
+                return {
+                    ...resp,
+                    items: (resp.items || [])
+                        .map((item) => toItem(item))
+                        .filter(Boolean),
+                };
             },
             onSuccess: () => {
                 queryClient.invalidateQueries({ queryKey: queryKeys.items.public() });
@@ -6621,6 +6975,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             },
             onSuccess: () => {
                 queryClient.invalidateQueries({ queryKey: queryKeys.items.public() });
+                queryClient.invalidateQueries({
+                    queryKey: [...queryKeys.items.all(), 'publications'],
+                });
             },
             ...options,
         });
@@ -7114,6 +7471,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useEnrollStudentToCourse,
         useRemoveStudentFromCourse,
         useStudent,
+        useStudents,
         useConfirmCourseItemCompletion,
         useSetCourseItems,
         useRefreshCourse,
@@ -7168,7 +7526,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useExercisesBySpace,
         useUpdateExercise,
         useCloneExercise,
-        useUpdateExercisePoints,
+        useUpdateExerciseScore,
         useRefreshExercise,
         useRefreshSpaceExercises,
         // Assignments
@@ -7190,6 +7548,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useMakeItemPrivate,
         useSearchPublicItems,
         usePublicItems,
+        usePublications,
         useRefreshPublicItems,
         useRefreshSpaceItems,
         useClearCachedPublicItems,