@datalayer/core 1.0.25 → 1.1.43

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';
@@ -348,9 +349,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const { requestDatalayer } = useDatalayer({ loginRoute });
     const { checkIsOrganizationMember } = useAuthorization();
     // Hook for notebook upload/creation
-    const { isLoading: notebookUploadLoading, uploadAndSubmit: uploadNotebook, progress: notebookUploadProgress, reset: resetNotebookUpload, } = useUploadForm(`${coreStore.configuration.spacerRunUrl}/api/spacer/v1/notebooks`);
+    const { isLoading: notebookUploadLoading, uploadAndSubmit: uploadNotebook, progress: notebookUploadProgress, reset: resetNotebookUpload, } = useUploadForm(`${coreStore.configuration.spacerUrl}/api/spacer/v1/notebooks`);
     // Hook for document upload/creation
-    const { isLoading: documentUploadLoading, uploadAndSubmit: uploadDocument, progress: documentUploadProgress, reset: resetDocumentUpload, } = useUploadForm(`${coreStore.configuration.spacerRunUrl}/api/spacer/v1/lexicals`);
+    const { isLoading: documentUploadLoading, uploadAndSubmit: uploadDocument, progress: documentUploadProgress, reset: resetDocumentUpload, } = useUploadForm(`${coreStore.configuration.spacerUrl}/api/spacer/v1/lexicals`);
     // ============================================================================
     // Transformation Functions (kept from original useCache)
     // Note: These functions use 'any' because they handle dynamic API responses
@@ -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) {
@@ -773,7 +921,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, password, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/login`,
+                    url: `${configuration.iamUrl}/api/iam/v1/login`,
                     method: 'POST',
                     body: { handle, password },
                 });
@@ -800,7 +948,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/logout`,
+                    url: `${configuration.iamUrl}/api/iam/v1/logout`,
                     method: 'GET',
                 });
             },
@@ -822,7 +970,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.auth.me(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/me`,
+                    url: `${configuration.iamUrl}/api/iam/v1/me`,
                     method: 'GET',
                     token,
                 });
@@ -841,7 +989,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ email, firstName, lastName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/me`,
+                    url: `${configuration.iamUrl}/api/iam/v1/me`,
                     method: 'PUT',
                     body: { email, firstName, lastName },
                 });
@@ -859,7 +1007,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.auth.whoami(),
             queryFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/whoami`,
+                    url: `${configuration.iamUrl}/api/iam/v1/whoami`,
                     method: 'GET',
                 });
             },
@@ -882,7 +1030,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.users.detail(userId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/${userId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.user) {
@@ -910,7 +1058,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 // Implementation depends on your API
                 // For now, using search as workaround
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/search`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/search`,
                     method: 'POST',
                     body: { namingPattern: handle },
                 });
@@ -942,7 +1090,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     return null;
                 }
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/public/${encodeURIComponent(normalizedHandle)}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/public/${encodeURIComponent(normalizedHandle)}`,
                     method: 'GET',
                 });
                 if (resp.success) {
@@ -978,7 +1126,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.users.search(namingPattern),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/search`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/search`,
                     method: 'POST',
                     body: { namingPattern },
                 });
@@ -1015,7 +1163,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     return [];
                 }
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/bulk`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/bulk`,
                     method: 'POST',
                     body: { userIds: normalizedUserIds },
                 });
@@ -1045,7 +1193,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (onboarding) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/onboardings`,
+                    url: `${configuration.iamUrl}/api/iam/v1/onboardings`,
                     method: 'PUT',
                     body: { onboarding },
                 });
@@ -1062,10 +1210,10 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, settings, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/settings`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/${userId}/settings`,
                     method: 'PUT',
                     body: {
-                        aiagents_url_s: settings.aiAgentsUrl,
+                        aiAgents_url_s: settings.aiAgentsUrl,
                         can_invite_b: settings.canInvite || false,
                     },
                 });
@@ -1088,7 +1236,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.organizations.detail(organizationId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.organization) {
@@ -1112,7 +1260,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryFn: async () => {
                 // Fetch via account endpoint
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/accounts/${handle}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/accounts/${handle}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.organization) {
@@ -1139,7 +1287,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     return null;
                 }
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/public/${encodeURIComponent(normalizedHandle)}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/public/${encodeURIComponent(normalizedHandle)}`,
                     method: 'GET',
                 });
                 if (resp.success) {
@@ -1159,7 +1307,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.organizations.userOrgs(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations`,
                     method: 'GET',
                 });
                 if (resp.success && resp.organizations) {
@@ -1185,7 +1333,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (organization) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations`,
                     method: 'POST',
                     body: {
                         handle: organization.handle,
@@ -1214,7 +1362,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (organization) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organization.id}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organization.id}`,
                     method: 'PUT',
                     body: {
                         name: organization.name,
@@ -1246,7 +1394,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.teams.detail(teamId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.team) {
@@ -1268,7 +1416,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.teams.byOrganization(organizationId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/teams`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/teams`,
                     method: 'GET',
                 });
                 if (resp.success && resp.teams) {
@@ -1294,7 +1442,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ team, organization, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams`,
                     method: 'POST',
                     body: {
                         handle: team.handle,
@@ -1324,7 +1472,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (team) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${team.id}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${team.id}`,
                     method: 'PUT',
                     body: {
                         name: team.name,
@@ -1356,7 +1504,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryFn: async () => {
                 // Note: This might need organization context
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.space) {
@@ -1381,7 +1529,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.spaces.detail(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.space) {
@@ -1404,7 +1552,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.spaces.byOrganization(organizationId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/organizations/${organizationId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/organizations/${organizationId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.spaces) {
@@ -1441,7 +1589,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 }
                 const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/users/me${query ? `?${query}` : ''}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/users/me${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.spaces) {
@@ -1469,7 +1617,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     ? space.seedSpace?.id
                     : undefined;
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces`,
                     method: 'POST',
                     body: {
                         name: space.name,
@@ -1517,7 +1665,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 return requestDatalayer({
                     // Use the canonical space update route. This keeps project runtime
                     // assignment cleanup resilient when stale runtime links must be cleared.
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${id}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${id}`,
                     method: 'PUT',
                     body: {
                         name,
@@ -1546,11 +1694,16 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceUid) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceUid}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceUid}`,
                     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(),
@@ -1569,7 +1722,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.notebooks.detail(notebookId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${notebookId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.notebook) {
@@ -1592,7 +1745,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.notebooks.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/notebook`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/notebook`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -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);
@@ -1648,7 +1803,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ id, name, description, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${id}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${id}`,
                     method: 'PUT',
                     body: { name, description },
                 });
@@ -1674,7 +1829,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ notebookId, nbformat, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}/model`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${notebookId}/model`,
                     method: 'PUT',
                     body: { nbformat },
                 });
@@ -1699,7 +1854,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (notebookId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${notebookId}/clone`,
                     method: 'POST',
                 });
             },
@@ -1729,7 +1884,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.documents.detail(documentId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${documentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lexicals/${documentId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.document) {
@@ -1755,7 +1910,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     return [];
                 }
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/document`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/document`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -1779,7 +1934,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ id, name, description, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${id}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lexicals/${id}`,
                     method: 'PUT',
                     body: { name, description },
                 });
@@ -1805,7 +1960,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ id, model }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${id}/model`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lexicals/${id}/model`,
                     method: 'PUT',
                     body: { model },
                 });
@@ -1859,7 +2014,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (documentId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${documentId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lexicals/${documentId}/clone`,
                     method: 'POST',
                 });
             },
@@ -1889,7 +2044,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.pages.detail(pageId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/pages/${pageId}`,
+                    url: `${configuration.libraryUrl}/api/library/v1/pages/${pageId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.page) {
@@ -1921,7 +2076,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 }
                 const query = params.toString();
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/pages${query ? `?${query}` : ''}`,
+                    url: `${configuration.libraryUrl}/api/library/v1/pages${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.pages) {
@@ -1948,7 +2103,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (page) => {
                 return requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/pages`,
+                    url: `${configuration.libraryUrl}/api/library/v1/pages`,
                     method: 'POST',
                     body: { ...page },
                 });
@@ -1975,7 +2130,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (page) => {
                 return requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/pages/${page.id}`,
+                    url: `${configuration.libraryUrl}/api/library/v1/pages/${page.id}`,
                     method: 'PUT',
                     body: {
                         name: page.name,
@@ -2004,7 +2159,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (pageId) => {
                 return requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/pages/${pageId}`,
+                    url: `${configuration.libraryUrl}/api/library/v1/pages/${pageId}`,
                     method: 'DELETE',
                 });
             },
@@ -2032,7 +2187,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             ],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/datasources`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/datasources`, principalUid, principalKind),
                     method: 'GET',
                 });
                 if (resp.success && resp.datasources) {
@@ -2061,7 +2216,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (datasource) => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/datasources`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/datasources`, principalUid, principalKind),
                     method: 'POST',
                     body: { ...datasource },
                 });
@@ -2097,7 +2252,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             ],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/secrets`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/secrets`, principalUid, principalKind),
                     method: 'GET',
                 });
                 if (resp.success && resp.secrets) {
@@ -2121,7 +2276,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (secret) => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/secrets`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/secrets`, principalUid, principalKind),
                     method: 'POST',
                     body: { ...secret },
                 });
@@ -2146,7 +2301,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (secretId) => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/secrets/${secretId}`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/secrets/${secretId}`, principalUid, principalKind),
                     method: 'DELETE',
                 });
             },
@@ -2166,7 +2321,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.tokens.all(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys`,
+                    url: `${configuration.iamUrl}/api/iam/v1/api-keys`,
                     method: 'GET',
                 });
                 const tokenItems = asArray(resp?.apiKeys ?? resp?.api_keys ?? resp?.tokens);
@@ -2195,7 +2350,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys`,
+                    url: `${configuration.iamUrl}/api/iam/v1/api-keys`,
                     method: 'POST',
                     body: {
                         ...token,
@@ -2228,7 +2383,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.contacts.detail(contactId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.contact) {
@@ -2252,7 +2407,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.contacts.search(query),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/search`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/search`,
                     method: 'POST',
                     body: { query },
                 });
@@ -2282,7 +2437,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (contact) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts`,
                     method: 'POST',
                     body: { contact },
                 });
@@ -2309,7 +2464,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, contact, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}`,
                     method: 'PUT',
                     body: { contact },
                 });
@@ -2333,7 +2488,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (contactId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}`,
                     method: 'DELETE',
                 });
             },
@@ -2359,7 +2514,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (itemId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${itemId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${itemId}`,
                     method: 'DELETE',
                 });
             },
@@ -2416,7 +2571,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             ],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/datasources/${datasourceId}`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/datasources/${datasourceId}`, principalUid, principalKind),
                     method: 'GET',
                 });
                 if (resp.success && resp.datasource) {
@@ -2437,7 +2592,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (datasource) => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/datasources/${datasource.id}`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/datasources/${datasource.id}`, principalUid, principalKind),
                     method: 'PUT',
                     body: { ...datasource },
                 });
@@ -2469,7 +2624,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             ],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/secrets/${secretId}`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/secrets/${secretId}`, principalUid, principalKind),
                     method: 'GET',
                 });
                 if (resp.success && resp.secret) {
@@ -2493,7 +2648,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (secret) => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/secrets/${secret.id}`, principalUid, principalKind),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/secrets/${secret.id}`, principalUid, principalKind),
                     method: 'PUT',
                     body: { ...secret },
                 });
@@ -2517,7 +2672,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.tokens.detail(tokenId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${tokenId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/api-keys/${tokenId}`,
                     method: 'GET',
                 });
                 const tokenPayload = resp?.apiKey ?? resp?.api_key ?? resp?.token;
@@ -2537,7 +2692,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${token.id}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/api-keys/${token.id}`,
                     method: 'PUT',
                     body: { ...token },
                 });
@@ -2561,7 +2716,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (tokenId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/api-keys/${tokenId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/api-keys/${tokenId}`,
                     method: 'DELETE',
                 });
             },
@@ -2581,7 +2736,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.contacts.byHandle(handle),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/handle/${handle}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/handle/${handle}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.contact) {
@@ -2605,7 +2760,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.teams.byHandle(handle),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/handle/${handle}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/handle/${handle}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.team) {
@@ -2629,7 +2784,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.spaces.orgSpaceByHandle(organizationId, handle),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/organizations/${organizationId}/spaces/handle/${handle}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/organizations/${organizationId}/spaces/handle/${handle}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.space) {
@@ -2656,7 +2811,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.spaces.detail(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.space) {
@@ -2683,7 +2838,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 }
                 // If not in cache, fetch all user spaces which will populate it
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/users/me`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/users/me`,
                     method: 'GET',
                 });
                 if (resp.success && resp.spaces) {
@@ -2716,7 +2871,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, spaceId, updates, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/organizations/${organizationId}/spaces/${spaceId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/organizations/${organizationId}/spaces/${spaceId}`,
                     method: 'PUT',
                     body: updates,
                 });
@@ -2741,7 +2896,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (userId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/${userId}`,
                     method: 'GET',
                 });
             },
@@ -2767,7 +2922,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: [...queryKeys.users.detail(userId), 'credits'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/users/${userId}`,
                     method: 'GET',
                 });
                 if (resp.success) {
@@ -2786,7 +2941,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, credits, brand, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/users/${userId}`,
                     method: 'PUT',
                     body: { credits, brand },
                 });
@@ -2805,7 +2960,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, userId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
                     method: 'POST',
                 });
             },
@@ -2826,7 +2981,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, userId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
                     method: 'DELETE',
                 });
             },
@@ -2847,7 +3002,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
                     method: 'POST',
                 });
             },
@@ -2865,7 +3020,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
                     method: 'DELETE',
                 });
             },
@@ -2883,7 +3038,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamId, userId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
                     method: 'POST',
                 });
             },
@@ -2904,7 +3059,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamId, userId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
                     method: 'DELETE',
                 });
             },
@@ -2925,7 +3080,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamId, userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
                     method: 'POST',
                 });
             },
@@ -2943,7 +3098,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamId, userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
                     method: 'DELETE',
                 });
             },
@@ -2961,7 +3116,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, spaceId, accountId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
                     method: 'POST',
                 });
             },
@@ -2982,7 +3137,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, spaceId, accountId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
                     method: 'DELETE',
                 });
             },
@@ -3003,7 +3158,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/public`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/public`,
                     method: 'PUT',
                 });
             },
@@ -3021,7 +3176,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/private`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/private`,
                     method: 'PUT',
                 });
             },
@@ -3042,7 +3197,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, password, passwordConfirm, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/password`,
+                    url: `${configuration.iamUrl}/api/iam/v1/password`,
                     method: 'PUT',
                     body: { handle, password, passwordConfirm },
                 });
@@ -3056,7 +3211,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (email) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/me/email`,
+                    url: `${configuration.iamUrl}/api/iam/v1/me/email`,
                     method: 'PUT',
                     body: { email },
                 });
@@ -3070,7 +3225,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/me/email`,
+                    url: `${configuration.iamUrl}/api/iam/v1/me/email`,
                     method: 'POST',
                     body: { token },
                 });
@@ -3088,7 +3243,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
                     method: 'POST',
                 });
             },
@@ -3106,7 +3261,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, roleName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
                     method: 'DELETE',
                 });
             },
@@ -3125,7 +3280,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['schools'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/schools`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/schools`,
                     method: 'GET',
                 });
                 if (resp.success && resp.orgs) {
@@ -3160,7 +3315,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (organizationId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}`,
                     method: 'GET',
                 });
             },
@@ -3187,7 +3342,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations`,
                     method: 'GET',
                 });
             },
@@ -3216,7 +3371,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamId, organizationId: _organizationId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/teams/${teamId}`,
                     method: 'GET',
                 });
             },
@@ -3243,7 +3398,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (organizationId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/teams`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/${organizationId}/teams`,
                     method: 'GET',
                 });
             },
@@ -3272,7 +3427,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationId, spaceId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/organizations/${organizationId}/spaces/${spaceId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/organizations/${organizationId}/spaces/${spaceId}`,
                     method: 'GET',
                 });
             },
@@ -3296,7 +3451,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (organizationId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/organizations/${organizationId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/organizations/${organizationId}`,
                     method: 'GET',
                 });
             },
@@ -3322,7 +3477,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/users/me`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/users/me`,
                     method: 'GET',
                 });
             },
@@ -3352,7 +3507,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['courses', 'detail', courseId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.course) {
@@ -3371,7 +3526,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, name, description, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}`,
                     method: 'PUT',
                     body: { name, description },
                 });
@@ -3396,7 +3551,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['courses', 'public'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/courses/public`,
+                    url: `${configuration.libraryUrl}/api/library/v1/courses/public`,
                     method: 'GET',
                 });
                 if (resp.success && resp.courses) {
@@ -3415,7 +3570,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['courses', 'instructor', userId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/instructors/${userId}/courses`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/instructors/${userId}/courses`,
                     method: 'GET',
                 });
                 if (resp.success && resp.courses) {
@@ -3435,7 +3590,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['courses', 'enrollments', 'me'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/enrollments/me`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/enrollments/me`,
                     method: 'GET',
                 });
                 if (resp.success && resp.enrollments) {
@@ -3453,13 +3608,33 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, studentId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
                     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,13 +3649,29 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, studentId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
                     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'],
@@ -3496,7 +3687,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['spaces', spaceId, 'items'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3518,7 +3709,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['spaces', spaceId, 'default-items'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/default-items`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/default-items`,
                     method: 'GET',
                 });
                 if (resp.success) {
@@ -3540,8 +3731,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (itemId) => {
                 return requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/items/${itemId}/public`,
-                    method: 'PUT',
+                    url: `${configuration.libraryUrl}/api/library/v1/items/${itemId}/public`,
+                    method: 'PATCH',
+                    body: { is_public: true },
                 });
             },
             onSuccess: () => {
@@ -3556,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.libraryUrl}/api/library/v1/items/${itemId}/public`,
+                    method: 'PATCH',
+                    body: { is_public: false },
                 });
             },
             onSuccess: () => {
@@ -3577,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.spacerUrl}${path}`,
                     method: 'GET',
                 });
             },
@@ -3590,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) {
@@ -3602,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) {
@@ -3623,7 +3835,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/export`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/export`,
                     method: 'GET',
                 });
             },
@@ -3640,7 +3852,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.cells.detail(cellId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${cellId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${cellId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.item) {
@@ -3663,7 +3875,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.cells.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/cell`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/cell`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3682,7 +3894,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (cell) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/cells/${cell.id}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/cells/${cell.id}`,
                     method: 'PUT',
                     body: cell,
                 });
@@ -3707,7 +3919,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (cellId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/cells/${cellId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/cells/${cellId}/clone`,
                     method: 'POST',
                 });
             },
@@ -3729,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.runtimesUrl}/api/runtimes/v1/spaces/items/${datasetId}${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.item) {
@@ -3749,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.runtimesUrl}/api/runtimes/v1/spaces/${spaceId}/items/types/dataset${query ? `?${query}` : ''}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3771,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.runtimesUrl}/api/runtimes/v1/datasets/${id}${query ? `?${query}` : ''}`,
                     method: 'PUT',
                     body: { name, description },
                 });
@@ -3801,7 +4045,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.environments.detail(environmentId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${environmentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${environmentId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.item) {
@@ -3821,7 +4065,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.environments.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/environment`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/environment`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3841,7 +4085,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.lessons.detail(lessonId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lessons/${lessonId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lessons/${lessonId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.lesson) {
@@ -3861,7 +4105,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.lessons.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/lesson`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/lesson`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3880,7 +4124,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (lessonId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${lessonId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${lessonId}/clone`,
                     method: 'POST',
                 });
             },
@@ -3910,7 +4154,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.exercises.detail(exerciseId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${exerciseId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${exerciseId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.item) {
@@ -3930,7 +4174,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.exercises.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/exercise`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/exercise`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -3949,7 +4193,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ id, name, description, help, codePre, codeSolution, codeQuestion, codeTest, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${id}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/exercises/${id}`,
                     method: 'PUT',
                     body: {
                         name,
@@ -3977,7 +4221,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (exerciseId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${exerciseId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/exercises/${exerciseId}/clone`,
                     method: 'POST',
                 });
             },
@@ -4004,7 +4248,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.assignments.detail(assignmentId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.assignment) {
@@ -4024,7 +4268,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.assignments.bySpace(spaceId),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/assignment`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/assignment`,
                     method: 'GET',
                 });
                 if (resp.success && resp.items) {
@@ -4043,7 +4287,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (assignmentId) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${assignmentId}/clone`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${assignmentId}/clone`,
                     method: 'POST',
                 });
             },
@@ -4070,7 +4314,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['invites', 'token', token],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/tokens/${token}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/tokens/${token}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.invite) {
@@ -4090,7 +4334,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['invites', 'user', accountId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/users/${accountId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/users/${accountId}`,
                     method: 'GET',
                 });
                 if (resp.success && resp.invites) {
@@ -4109,7 +4353,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/tokens/${token}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/tokens/${token}`,
                     method: 'PUT',
                 });
             },
@@ -4132,7 +4376,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['assignments', 'student', assignmentId, courseId, userId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/courses/${courseId}/students/${userId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}/courses/${courseId}/students/${userId}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -4151,7 +4395,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ assignmentId, courseId: _courseId, userId: _userId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/reset`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}/reset`,
                     method: 'POST',
                 });
             },
@@ -4162,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'],
+                });
             },
         });
     };
@@ -4173,7 +4423,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ assignmentId, courseId: _courseId, userId, model, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/students/${userId}/grade`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}/students/${userId}/grade`,
                     method: 'PUT',
                     body: { model },
                 });
@@ -4185,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'],
+                });
             },
         });
     };
@@ -4196,7 +4452,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['assignments', 'studentVersion', assignmentId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/student_version`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}/student_version`,
                     method: 'GET',
                 });
                 return resp;
@@ -4208,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.spacerUrl}/api/spacer/v1/exercises/${exerciseId}/score`,
                     method: 'PUT',
-                    body: { codeStudent, points },
+                    body: { codeStudent, score, courseId },
                 });
             },
             onSuccess: (_, { exerciseId }) => {
@@ -4241,18 +4497,46 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['courses', courseId, 'students', studentId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
                     method: 'GET',
                 });
                 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.spacerUrl}/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
      */
@@ -4261,7 +4545,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, itemType, itemId, completed, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${courseId}/types/${itemType}/items/${itemId}/complete`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${courseId}/types/${itemType}/items/${itemId}/complete`,
                     method: 'PUT',
                     body: { completed },
                 });
@@ -4273,6 +4557,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 queryClient.invalidateQueries({
                     queryKey: ['courses', courseId, 'items'],
                 });
+                queryClient.invalidateQueries({
+                    queryKey: ['courses', courseId, 'students'],
+                });
             },
         });
     };
@@ -4284,7 +4571,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, itemIds, }) => {
                 return requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/items`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}/items`,
                     method: 'PUT',
                     body: { itemIds },
                 });
@@ -4310,7 +4597,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['inbounds'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds`,
+                    url: `${configuration.inboundsUrl}/api/inbounds/v1/inbounds`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -4329,7 +4616,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['outbounds', outboundId],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/${outboundId}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -4349,7 +4636,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['outbounds'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -4368,7 +4655,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (params) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/emails/bulk/draft`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/emails/bulk/draft`,
                     method: 'POST',
                     body: params,
                 });
@@ -4392,7 +4679,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (outboundId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}/try`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/${outboundId}/try`,
                     method: 'POST',
                     body: {},
                 });
@@ -4413,7 +4700,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (outboundId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}/launch`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/${outboundId}/launch`,
                     method: 'POST',
                     body: {},
                 });
@@ -4436,7 +4723,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, recipient, subject, content, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/email`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/email`,
                     method: 'POST',
                     body: { userId, recipient, subject, content },
                 });
@@ -4451,7 +4738,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (outboundId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/${outboundId}`,
                     method: 'DELETE',
                 });
             },
@@ -4476,7 +4763,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (userId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/outbounds/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/outbounds/users/${userId}`,
                     method: 'PUT',
                 });
             },
@@ -4489,7 +4776,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (userId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/outbounds/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/outbounds/users/${userId}`,
                     method: 'DELETE',
                 });
             },
@@ -4502,7 +4789,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (contactId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/unsubscribe/${contactId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/unsubscribe/${contactId}`,
                     method: 'GET',
                 });
             },
@@ -4515,7 +4802,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/unsubscribe/${token}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/unsubscribe/${token}`,
                     method: 'GET',
                 });
             },
@@ -4532,7 +4819,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
+                    url: `${configuration.iamUrl}/api/iam/v1/mfa`,
                     method: 'PUT',
                 });
             },
@@ -4549,7 +4836,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
+                    url: `${configuration.iamUrl}/api/iam/v1/mfa`,
                     method: 'DELETE',
                 });
             },
@@ -4565,7 +4852,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userUid, code, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
+                    url: `${configuration.iamUrl}/api/iam/v1/mfa`,
                     method: 'POST',
                     body: { userUid, code },
                 });
@@ -4617,7 +4904,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     }));
                 };
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/stripe/v1/plans/prices`,
+                    url: `${configuration.iamUrl}/api/iam/stripe/v1/plans/prices`,
                     method: 'GET',
                 });
                 if (resp?.success === false) {
@@ -4644,7 +4931,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ product, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/stripe/v1/topup/payment-intent`,
+                    url: `${configuration.iamUrl}/api/iam/stripe/v1/topup/payment-intent`,
                     method: 'POST',
                     body: {
                         price_id: product?.id,
@@ -4663,7 +4950,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['subscription', 'plans', scope?.accountUid ?? 'self'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/plans/catalog`, scope?.accountUid),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/plans/catalog`, scope?.accountUid),
                     method: 'GET',
                 });
                 return resp.plans || [];
@@ -4678,7 +4965,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ plan, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/stripe/v1/subscription/payment-intent`,
+                    url: `${configuration.iamUrl}/api/iam/stripe/v1/subscription/payment-intent`,
                     method: 'POST',
                     body: {
                         price_id: plan?.id,
@@ -4696,7 +4983,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/stripe/v1/subscription/resume/setup-intent`,
+                    url: `${configuration.iamUrl}/api/iam/stripe/v1/subscription/resume/setup-intent`,
                     method: 'POST',
                     body: scope?.accountUid ? { account_uid: scope.accountUid } : {},
                 });
@@ -4712,7 +4999,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['subscription', 'status', scope?.accountUid ?? 'self'],
             queryFn: async () => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/plans`, scope?.accountUid),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/plans`, scope?.accountUid),
                     method: 'GET',
                 });
             },
@@ -4727,7 +5014,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['subscription', 'eligible-accounts'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/plans/eligible-accounts`,
+                    url: `${configuration.iamUrl}/api/iam/v1/plans/eligible-accounts`,
                     method: 'GET',
                 });
                 return resp.accounts || [];
@@ -4746,7 +5033,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['subscription', 'accounts-details', normalizedAccountUids],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/plans/accounts/details`,
+                    url: `${configuration.iamUrl}/api/iam/v1/plans/accounts/details`,
                     method: 'POST',
                     body: {
                         account_uids: normalizedAccountUids,
@@ -4766,7 +5053,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/plans/cancel`, scope?.accountUid),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/plans/cancel`, scope?.accountUid),
                     method: 'POST',
                 });
             },
@@ -4785,7 +5072,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 return requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/plans/resume`, scope?.accountUid),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/plans/resume`, scope?.accountUid),
                     method: 'POST',
                 });
             },
@@ -4804,7 +5091,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['subscription', 'admin', userId],
             queryFn: async () => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/plans/admin/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/plans/admin/${userId}`,
                     method: 'GET',
                 });
             },
@@ -4820,7 +5107,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (userId) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/plans/admin/${userId}/reset`,
+                    url: `${configuration.iamUrl}/api/iam/v1/plans/admin/${userId}/reset`,
                     method: 'POST',
                 });
             },
@@ -4839,7 +5126,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (credits) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits`,
                     method: 'DELETE',
                     body: { credits },
                 });
@@ -4859,7 +5146,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ subject, message, email, brand, }) => {
                 return requestDatalayer({
-                    url: `${configuration.supportRunUrl}/api/support/v1/support/request`,
+                    url: `${configuration.supportUrl}/api/support/v1/support/request`,
                     method: 'POST',
                     body: { subject, message, email, brand },
                 });
@@ -4873,7 +5160,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ accountHandle, firstName, lastName, email, message, }) => {
                 return requestDatalayer({
-                    url: `${configuration.supportRunUrl}/api/support/v1/support/request2`,
+                    url: `${configuration.supportUrl}/api/support/v1/support/request2`,
                     method: 'POST',
                     body: { accountHandle, firstName, lastName, email, message },
                 });
@@ -4888,7 +5175,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['users', userId, 'surveys'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/surveys/users/${userId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/surveys/users/${userId}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -4913,7 +5200,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, email, firstName, lastName, password, passwordConfirm, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/join/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/join/request`,
                     method: 'POST',
                     body: {
                         handle,
@@ -4934,7 +5221,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, email, firstName, lastName, password, passwordConfirm, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/join/request/token`,
+                    url: `${configuration.iamUrl}/api/iam/v1/join/request/token`,
                     method: 'POST',
                     body: {
                         handle,
@@ -4955,7 +5242,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ formValues, token, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/join/invites/token`,
+                    url: `${configuration.iamUrl}/api/iam/v1/join/invites/token`,
                     method: 'POST',
                     body: { ...formValues, token },
                 });
@@ -4969,7 +5256,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userHandle, token, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/join/users/${userHandle}/tokens/${token}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/join/users/${userHandle}/tokens/${token}`,
                     method: 'GET',
                 });
             },
@@ -4985,7 +5272,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, password, passwordConfirm, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/password/token`,
+                    url: `${configuration.iamUrl}/api/iam/v1/password/token`,
                     method: 'POST',
                     body: { handle, password, passwordConfirm },
                 });
@@ -4999,7 +5286,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ handle, password, passwordConfirm, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/password`,
+                    url: `${configuration.iamUrl}/api/iam/v1/password`,
                     method: 'PUT',
                     body: { handle, password, passwordConfirm },
                 });
@@ -5013,7 +5300,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userHandle, token, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/password/confirm/users/${userHandle}/tokens/${token}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/password/confirm/users/${userHandle}/tokens/${token}`,
                     method: 'PUT',
                 });
             },
@@ -5032,7 +5319,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
                     .join('&');
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/oauth2/authz/url?${queryString}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/oauth2/authz/url?${queryString}`,
                     notifyOnError: false,
                 });
                 return resp.autorization_url;
@@ -5049,7 +5336,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
                     .join('&');
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/oauth2/authz/url/link?${queryString}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/oauth2/authz/url/link?${queryString}`,
                 });
                 return resp;
             },
@@ -5066,7 +5353,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, tagName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
                     method: 'POST',
                 });
             },
@@ -5086,7 +5373,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, tagName, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
                     method: 'DELETE',
                 });
             },
@@ -5105,7 +5392,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, message, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/invites`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/invites`,
                     method: 'POST',
                     body: { contactId, message },
                 });
@@ -5120,7 +5407,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, useDomain, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/enrich/email?useDomain=${useDomain}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}/enrich/email?useDomain=${useDomain}`,
                     method: 'GET',
                 });
             },
@@ -5139,7 +5426,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (contactId) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/enrich/linkedin`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}/enrich/linkedin`,
                     method: 'GET',
                 });
             },
@@ -5158,7 +5445,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ contactId, message, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/connect/linkedin`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}/connect/linkedin`,
                     method: 'POST',
                     body: { message },
                 });
@@ -5181,7 +5468,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, contactId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
+                    url: `${configuration.growthUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
                     method: 'POST',
                 });
             },
@@ -5203,7 +5490,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, contactId, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
+                    url: `${configuration.growthUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
                     method: 'DELETE',
                 });
             },
@@ -5228,7 +5515,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.credits.organizationOverview(organizationUid),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/overview`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/overview`,
                     method: 'GET',
                 });
                 return resp.overview ?? { organization: null, teams: [] };
@@ -5245,7 +5532,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.credits.teamOverview(teamUid),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/overview`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/overview`,
                     method: 'GET',
                 });
                 return resp.overview ?? { team: null, members: [] };
@@ -5262,7 +5549,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.credits.organizationHistory(organizationUid),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/history`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/history`,
                     method: 'GET',
                 });
                 return (resp.history ?? { organization_uid: organizationUid, events: [] });
@@ -5279,7 +5566,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.credits.teamHistory(teamUid),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/history`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/history`,
                     method: 'GET',
                 });
                 return resp.history ?? { team_uid: teamUid, events: [] };
@@ -5295,7 +5582,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationUid, teamUid, amount, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/teams/${teamUid}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/teams/${teamUid}`,
                     method: 'POST',
                     body: { amount },
                 });
@@ -5323,7 +5610,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamUid, memberUid, amount, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/members/${memberUid}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/members/${memberUid}`,
                     method: 'POST',
                     body: { amount },
                 });
@@ -5345,7 +5632,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ organizationUid, teamUid, amount, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/teams/${teamUid}/revoke`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/organizations/${organizationUid}/teams/${teamUid}/revoke`,
                     method: 'POST',
                     body: { amount },
                 });
@@ -5373,7 +5660,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ teamUid, memberUid, amount, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/members/${memberUid}/revoke`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/credits/allocations/teams/${teamUid}/members/${memberUid}/revoke`,
                     method: 'POST',
                     body: { amount },
                 });
@@ -5396,7 +5683,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, quota, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/quota`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/quota`,
                     method: 'PUT',
                     body: {
                         user_uid: userId,
@@ -5478,7 +5765,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     };
                 };
                 const resp = await requestDatalayer({
-                    url: withAccountUidQuery(`${configuration.iamRunUrl}/api/iam/v1/usage/user`, scope?.accountUid),
+                    url: withAccountUidQuery(`${configuration.iamUrl}/api/iam/v1/usage/user`, scope?.accountUid),
                     method: 'GET',
                 });
                 // Transform snake_case API response to camelCase IUsage interface
@@ -5545,7 +5832,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     };
                 };
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/users/${userId}`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/users/${userId}`,
                     method: 'GET',
                 });
                 // Transform snake_case API response to camelCase IUsage interface
@@ -5613,7 +5900,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     };
                 };
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/usage/platform`,
+                    url: `${configuration.iamUrl}/api/iam/v1/usage/platform`,
                     method: 'GET',
                 });
                 // Transform snake_case API response to camelCase IUsage interface
@@ -5631,17 +5918,24 @@ 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('&');
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/search?${queryString}`,
+                    url: `${configuration.libraryUrl}/api/library/v1/search?${queryString}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -5698,7 +5992,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (accessToken) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'GET',
@@ -5729,7 +6023,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     },
                 };
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'POST',
@@ -5763,7 +6057,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                         },
                     };
                     const registerResp = await requestDatalayer({
-                        url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                        url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                         method: 'POST',
                         body: {
                             request_method: 'POST',
@@ -5776,7 +6070,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     const uploadUrl = registerResp.response.value.uploadMechanism['com.linkedin.digitalmedia.uploading.MediaUploadHttpRequest'].uploadUrl;
                     // Step 2: Upload image
                     await requestDatalayer({
-                        url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                        url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                         method: 'POST',
                         body: {
                             request_method: 'PUT',
@@ -5829,7 +6123,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     };
                 }
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'POST',
@@ -5851,7 +6145,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ url, token }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'GET',
@@ -5869,7 +6163,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ url, body, token, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'POST',
@@ -5888,7 +6182,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ url, body, token, }) => {
                 return requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/proxy/request`,
+                    url: `${configuration.iamUrl}/api/iam/v1/proxy/request`,
                     method: 'POST',
                     body: {
                         request_method: 'PUT',
@@ -5910,7 +6204,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ firstName, lastName, email, affiliation, }) => {
                 return requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/waitinglist/register`,
+                    url: `${configuration.growthUrl}/api/growth/v1/waitinglist/register`,
                     method: 'POST',
                     body: {
                         firstName,
@@ -5930,7 +6224,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['growth', 'kpi'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/kpis`,
+                    url: `${configuration.growthUrl}/api/growth/v1/kpis`,
                     method: 'GET',
                 });
                 return resp;
@@ -5946,7 +6240,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['growth', 'contacts-kpi'],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/kpis/contacts`,
+                    url: `${configuration.growthUrl}/api/growth/v1/kpis/contacts`,
                     method: 'GET',
                 });
                 return resp;
@@ -5968,7 +6262,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ userId, spaceId, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/users/${userId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/users/${userId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -5994,7 +6288,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (courseId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6016,7 +6310,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.libraryRunUrl}/api/library/v1/courses/public`,
+                    url: `${configuration.libraryUrl}/api/library/v1/courses/public`,
                     method: 'GET',
                 });
                 return resp;
@@ -6038,7 +6332,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/instructors/${user?.id}/courses`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/instructors/${user?.id}/courses`,
                     method: 'GET',
                 });
                 return resp;
@@ -6060,7 +6354,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/enrollments/me`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/enrollments/me`,
                     method: 'GET',
                 });
                 return resp;
@@ -6082,7 +6376,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, studentHandle, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentHandle}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentHandle}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6104,7 +6398,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (notebookId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/notebooks/${notebookId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6126,7 +6420,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/notebook`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/notebook`,
                     method: 'GET',
                 });
                 return resp;
@@ -6158,7 +6452,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (documentId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${documentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lexicals/${documentId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6180,7 +6474,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/document`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/document`,
                     method: 'GET',
                 });
                 return resp;
@@ -6202,7 +6496,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (cellId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${cellId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${cellId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6224,7 +6518,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/cell`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/cell`,
                     method: 'GET',
                 });
                 return resp;
@@ -6244,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.runtimesUrl}/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),
                 });
@@ -6266,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.runtimesUrl}/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),
                 });
@@ -6290,7 +6608,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.iamRunUrl}/api/iam/v1/organizations/schools`,
+                    url: `${configuration.iamUrl}/api/iam/v1/organizations/schools`,
                     method: 'GET',
                 });
                 return resp;
@@ -6310,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.libraryUrl}/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.libraryUrl}/api/library/v1/publications`,
+                    method: 'GET',
+                });
+                return {
+                    ...resp,
+                    items: (resp.items || [])
+                        .map((item) => toItem(item))
+                        .filter(Boolean),
+                };
             },
             ...options,
         });
@@ -6327,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.libraryUrl}/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() });
@@ -6347,7 +6697,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items`,
                     method: 'GET',
                 });
                 return resp;
@@ -6406,7 +6756,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (environmentId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${environmentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${environmentId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6428,7 +6778,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/environment`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/environment`,
                     method: 'GET',
                 });
                 return resp;
@@ -6450,7 +6800,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (lessonId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/lessons/${lessonId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/lessons/${lessonId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6472,7 +6822,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/lesson`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/lesson`,
                     method: 'GET',
                 });
                 return resp;
@@ -6494,7 +6844,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (exerciseId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${exerciseId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/items/${exerciseId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6516,7 +6866,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/exercise`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/exercise`,
                     method: 'GET',
                 });
                 return resp;
@@ -6538,7 +6888,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (assignmentId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6560,7 +6910,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ courseId, userId, assignmentId, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/courses/${courseId}/students/${userId}`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/assignments/${assignmentId}/courses/${courseId}/students/${userId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6582,7 +6932,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (spaceId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items/types/assignment`,
+                    url: `${configuration.spacerUrl}/api/spacer/v1/spaces/${spaceId}/items/types/assignment`,
                     method: 'GET',
                 });
                 return resp;
@@ -6625,6 +6975,9 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             },
             onSuccess: () => {
                 queryClient.invalidateQueries({ queryKey: queryKeys.items.public() });
+                queryClient.invalidateQueries({
+                    queryKey: [...queryKeys.items.all(), 'publications'],
+                });
             },
             ...options,
         });
@@ -6640,7 +6993,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ firstName, lastName, email, socialUrl, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/request`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/request`,
                     method: 'POST',
                     body: {
                         first_name: firstName,
@@ -6663,7 +7016,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async ({ email, firstName, lastName, message, brand, }) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites`,
                     method: 'POST',
                     body: {
                         email,
@@ -6690,7 +7043,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (token) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/tokens/${token}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/tokens/${token}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6710,7 +7063,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (accountId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/invites/users/${accountId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/invites/users/${accountId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6747,7 +7100,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (contactId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/contacts/${contactId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6770,7 +7123,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['inbounds', id],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds/${id}`,
+                    url: `${configuration.inboundsUrl}/api/inbounds/v1/inbounds/${id}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6788,7 +7141,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: ['inbounds', 'handle', handle],
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds/handles/${handle}`,
+                    url: `${configuration.inboundsUrl}/api/inbounds/v1/inbounds/handles/${handle}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6805,7 +7158,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (userId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds/${userId}`,
+                    url: `${configuration.inboundsUrl}/api/inbounds/v1/inbounds/${userId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6826,7 +7179,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (outboundId) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}`,
+                    url: `${configuration.growthUrl}/api/growth/v1/outbounds/${outboundId}`,
                     method: 'GET',
                 });
                 return resp;
@@ -6846,7 +7199,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.ray.clusters(),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/clusters`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/clusters`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -6861,7 +7214,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             },
             ...DEFAULT_QUERY_OPTIONS,
             refetchOnMount: true,
-            enabled: Boolean(configuration.runtimesRunUrl),
+            enabled: Boolean(configuration.runtimesUrl),
         });
     };
     const useRayCluster = (namespace = 'default', clusterName = '') => {
@@ -6869,7 +7222,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             queryKey: queryKeys.ray.cluster(namespace, clusterName),
             queryFn: async () => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}?namespace=${encodeURIComponent(namespace)}`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}?namespace=${encodeURIComponent(namespace)}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -6878,7 +7231,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 return resp.cluster || null;
             },
             ...DEFAULT_QUERY_OPTIONS,
-            enabled: Boolean(configuration.runtimesRunUrl) &&
+            enabled: Boolean(configuration.runtimesUrl) &&
                 Boolean(namespace) &&
                 Boolean(clusterName),
         });
@@ -6887,7 +7240,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (payload) => {
                 const resp = await requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/clusters`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/clusters`,
                     method: 'POST',
                     body: payload,
                 });
@@ -6905,7 +7258,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (clusterName) => {
                 return requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}?namespace=${encodeURIComponent(namespace)}`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}?namespace=${encodeURIComponent(namespace)}`,
                     method: 'DELETE',
                 });
             },
@@ -6924,7 +7277,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                     params.set('cluster_name', clusterName);
                 }
                 const resp = await requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/jobs?${params.toString()}`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/jobs?${params.toString()}`,
                     method: 'GET',
                 });
                 if (!resp.success) {
@@ -6933,14 +7286,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 return asArray(resp.jobs);
             },
             ...DEFAULT_QUERY_OPTIONS,
-            enabled: Boolean(configuration.runtimesRunUrl),
+            enabled: Boolean(configuration.runtimesUrl),
         });
     };
     const useSubmitRayJob = (clusterName) => {
         return useMutation({
             mutationFn: async (payload) => {
                 return requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}/jobs`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/clusters/${encodeURIComponent(clusterName)}/jobs`,
                     method: 'POST',
                     body: payload,
                 });
@@ -6954,7 +7307,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return useMutation({
             mutationFn: async (jobName) => {
                 return requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/jobs/${encodeURIComponent(jobName)}?namespace=${encodeURIComponent(namespace)}`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/jobs/${encodeURIComponent(jobName)}?namespace=${encodeURIComponent(namespace)}`,
                     method: 'DELETE',
                 });
             },
@@ -6971,7 +7324,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 params.set('namespace', namespace);
                 params.set('tail_lines', String(tailLines));
                 const resp = await requestDatalayer({
-                    url: `${configuration.runtimesRunUrl}/api/runtimes/v1/ray/jobs/${encodeURIComponent(jobName)}/logs?${params.toString()}`,
+                    url: `${configuration.runtimesUrl}/api/runtimes/v1/ray/jobs/${encodeURIComponent(jobName)}/logs?${params.toString()}`,
                     method: 'GET',
                     // Logs naturally 404 once a job is deleted; never surface a toast.
                     notifyOnError: false,
@@ -6985,7 +7338,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
                 };
             },
             ...DEFAULT_QUERY_OPTIONS,
-            enabled: Boolean(configuration.runtimesRunUrl) && Boolean(jobName) && enabled,
+            enabled: Boolean(configuration.runtimesUrl) && Boolean(jobName) && enabled,
             refetchOnMount: 'always',
             refetchInterval: query => {
                 const status = String(query.state.data?.status || '').toLowerCase();
@@ -7118,6 +7471,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useEnrollStudentToCourse,
         useRemoveStudentFromCourse,
         useStudent,
+        useStudents,
         useConfirmCourseItemCompletion,
         useSetCourseItems,
         useRefreshCourse,
@@ -7172,7 +7526,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useExercisesBySpace,
         useUpdateExercise,
         useCloneExercise,
-        useUpdateExercisePoints,
+        useUpdateExerciseScore,
         useRefreshExercise,
         useRefreshSpaceExercises,
         // Assignments
@@ -7194,6 +7548,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         useMakeItemPrivate,
         useSearchPublicItems,
         usePublicItems,
+        usePublications,
         useRefreshPublicItems,
         useRefreshSpaceItems,
         useClearCachedPublicItems,