@datalayer/core 0.0.2 → 0.0.3

package/lib/hooks/useCache.js

@@ -2,18 +2,13 @@
  * Copyright (c) 2023-2025 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-/*
- * Copyright (c) 2021-2024 Datalayer, Inc.
- *
- * Datalayer License
- */
 import { URLExt } from '@jupyterlab/coreutils';
 import { BOOTSTRAP_USER_ONBOARDING, LinkedInUser, asContact, asDatasource, asInbound, asInvite, asOrganization, asOutbound, asPage, asSecret, asSpace, asSurvey, asTeam, asToken, asUsage, asUser, } from "../models";
 import { useCoreStore, useIAMStore } from '../state';
 import { asDisplayName, namesAsInitials, asArray } from "../utils";
 import { IAMProvidersSpecs } from '../models';
 import { newUserMock } from './../mocks';
-import { useRun } from "./useRun";
+import { useDatalayer } from "./useDatalayer";
 import { useAuthorization } from "./useAuthorization";
 import { OUTPUTSHOT_PLACEHOLDER_DEFAULT_SVG } from './assets';
 const CONTACTS_BY_HANDLE = new Map();
@@ -71,7 +66,7 @@ const DEFAULT_SEARCH_OPTS = {
 export const useCache = ({ loginRoute = '/login' } = {}) => {
     const { configuration } = useCoreStore();
     const { user } = useIAMStore();
-    const { requestRun } = useRun({ loginRoute });
+    const { requestDatalayer } = useDatalayer({ loginRoute });
     const { checkIsOrganizationMember } = useAuthorization();
     // Caches -------------------------------------------------------------------
     const clearAllCaches = () => {
@@ -128,7 +123,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Authentication ------------------------------------------------------------------
     const login = (handle, password) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/login`,
             method: 'POST',
             body: {
@@ -139,14 +134,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const logout = () => {
         clearAllCaches();
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/logout`,
             method: 'GET',
         });
     };
     // Join ------------------------------------------------------------------
     const requestJoin = (handle, email, firstName, lastName, password, passwordConfirm) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/join/request`,
             method: 'POST',
             body: {
@@ -160,7 +155,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const requestJoinToken = (handle, email, firstName, lastName, password, passwordConfirm) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/join/request/token`,
             method: 'POST',
             body: {
@@ -174,7 +169,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const joinWithInvite = (formValues, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/join/invites/token`,
             method: 'POST',
             body: {
@@ -184,14 +179,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const confirmJoinWithToken = (userHandle, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/join/users/${userHandle}/tokens/${token}`,
             method: 'GET',
         });
     };
     // Password ------------------------------------------------------------------
     const changePassword = (handle, password, passwordConfirm) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/password`,
             method: 'PUT',
             body: {
@@ -202,7 +197,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const createTokenForPasswordChange = (handle, password, passwordConfirm) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/password/token`,
             method: 'POST',
             body: {
@@ -213,20 +208,20 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const confirmPassworkWithToken = (userHandle, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/password/confirm/users/${userHandle}/tokens/${token}`,
             method: 'PUT',
         });
     };
     // OAuth2 -------------------------------------------------------------------
     const getOAuth2AuthorizationURL = async (queryArgs) => {
-        return requestRun({
+        return requestDatalayer({
             url: URLExt.join(configuration.iamRunUrl, 'api/iam/v1/oauth2/authz/url') + URLExt.objectToQueryString(queryArgs),
             notifyOnError: false,
         });
     };
     const getOAuth2AuthorizationLinkURL = async (queryArgs) => {
-        return requestRun({
+        return requestDatalayer({
             url: URLExt.join(configuration.iamRunUrl, 'api/iam/v1/oauth2/authz/url/link') + URLExt.objectToQueryString(queryArgs),
         });
     };
@@ -340,7 +335,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Proxy -------------------------------------------------------------------
     const proxyGET = async (url, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: URLExt.join(configuration.iamRunUrl, 'api/iam/v1/proxy/request'),
             method: 'POST',
             body: {
@@ -351,7 +346,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const proxyPOST = async (url, body, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: URLExt.join(configuration.iamRunUrl, 'api/iam/v1/proxy/request'),
             method: 'POST',
             body: {
@@ -363,7 +358,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const proxyPUT = async (url, body, token) => {
-        return requestRun({
+        return requestDatalayer({
             url: URLExt.join(configuration.iamRunUrl, 'api/iam/v1/proxy/request'),
             method: 'POST',
             body: {
@@ -376,7 +371,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Waiting List -------------------------------------------------------------
     const registerToWaitingList = (formData) => {
-        requestRun({
+        requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/waitinglist/register`,
             method: 'POST',
             body: {
@@ -400,7 +395,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Profile ------------------------------------------------------------------
     const getMe = async (token) => {
-        const resp = await requestRun({
+        const resp = await requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/me`,
             method: 'GET',
             token
@@ -413,7 +408,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return null;
     };
     const updateMe = (email, firstName, lastName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/me`,
             method: 'PUT',
             body: {
@@ -424,13 +419,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const whoami = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/whoami`,
             method: 'GET',
         });
     };
     const requestEmailUpdate = (email) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/me/email`,
             method: 'PUT',
             body: {
@@ -439,7 +434,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const confirmEmailUpdate = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/me/email`,
             method: 'POST',
             body: {
@@ -449,7 +444,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Onboarding ---------------------------------------------------------------
     const updateUserOnboarding = (onboarding) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/onboardings`,
             method: 'PUT',
             body: {
@@ -459,7 +454,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Settings -----------------------------------------------------------------
     const updateUserSettings = (userId, settings) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/settings`,
             method: 'PUT',
             body: {
@@ -477,7 +472,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         }
     };
     const createPage = (page) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/pages`,
             method: 'POST',
             body: { ...page }
@@ -495,7 +490,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updatePage = (page) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/pages/${page.id}`,
             method: 'PUT',
             body: {
@@ -513,7 +508,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const deletePage = (page) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/pages/${page.id}`,
             method: 'DELETE',
         });
@@ -521,7 +516,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getPage = (pageId) => PAGES_BY_ID.get(pageId);
     const clearCachedPages = () => PAGES_BY_ID.clear();
     const refreshPage = (pageId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/pages/${pageId}`,
             method: 'GET',
         }).then(resp => {
@@ -537,7 +532,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(PAGES_BY_ID.values());
     };
     const refreshPages = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/pages`,
             method: 'GET',
         }).then(resp => {
@@ -562,7 +557,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         }
     };
     const createDatasource = (datasource) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/datasources`,
             method: 'POST',
             body: { ...datasource }
@@ -576,7 +571,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateDatasource = (datasource) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/datasources/${datasource.id}`,
             method: 'PUT',
             body: { ...datasource }
@@ -592,7 +587,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getDatasource = (datasourceId) => DATASOURCES_BY_ID.get(datasourceId);
     const clearCachedDatasources = () => DATASOURCES_BY_ID.clear();
     const refreshDatasource = (datasourceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/datasources/${datasourceId}`,
             method: 'GET',
         }).then(resp => {
@@ -608,7 +603,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(DATASOURCES_BY_ID.values());
     };
     const refreshDatasources = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/datasources`,
             method: 'GET',
         }).then(resp => {
@@ -633,7 +628,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         }
     };
     const createSecret = (secret) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/secrets`,
             method: 'POST',
             body: { ...secret }
@@ -647,7 +642,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateSecret = (secret) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/secrets/${secret.id}`,
             method: 'PUT',
             body: { ...secret }
@@ -661,7 +656,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const deleteSecret = (secret) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/secrets/${secret.id}`,
             method: 'DELETE',
         });
@@ -669,7 +664,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSecret = (secretId) => SECRETS_BY_ID.get(secretId);
     const clearCachedSecrets = () => SECRETS_BY_ID.clear();
     const refreshSecret = (secretId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/secrets/${secretId}`,
             method: 'GET',
         }).then(resp => {
@@ -685,7 +680,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(SECRETS_BY_ID.values());
     };
     const refreshSecrets = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/secrets`,
             method: 'GET',
         }).then(resp => {
@@ -710,7 +705,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         }
     };
     const createToken = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/tokens`,
             method: 'POST',
             body: {
@@ -727,7 +722,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateToken = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/tokens/${token.id}`,
             method: 'PUT',
             body: { ...token }
@@ -743,7 +738,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getToken = (tokenId) => TOKENS_BY_ID.get(tokenId);
     const clearCachedTokens = () => TOKENS_BY_ID.clear();
     const refreshToken = (tokenId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/tokens/${tokenId}`,
             method: 'GET',
         }).then(resp => {
@@ -759,7 +754,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(TOKENS_BY_ID.values());
     };
     const refreshTokens = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/tokens`,
             method: 'GET',
         }).then(resp => {
@@ -777,7 +772,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Layout -------------------------------------------------------------------
     const refreshLayout = (accountHandle, spaceHandle, user) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/layouts/accounts/${accountHandle}${spaceHandle !== undefined ? '/spaces/' + spaceHandle : ''}`,
             method: 'GET',
         }).then(resp => {
@@ -819,7 +814,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Invites -------------------------------------------------------------------
     const requestInvite = (firstName, lastName, email, socialUrl) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/invites/request`,
             method: 'POST',
             body: {
@@ -831,7 +826,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const sendInvite = (invite) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/invites`,
             method: 'POST',
             body: {
@@ -846,7 +841,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getInvite = (token) => INVITES_BY_TOKEN.get(token);
     const clearCachedInvites = () => INVITES_BY_TOKEN.clear();
     const refreshInvite = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/invites/tokens/${token}`,
             method: 'GET',
         }).then(resp => {
@@ -866,7 +861,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(INVITES_BY_TOKEN.values());
     };
     const refreshInvites = (accountId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/invites/users/${accountId}`,
             method: 'GET',
         }).then(resp => {
@@ -882,14 +877,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const putInvite = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/invites/tokens/${token}`,
             method: 'PUT',
         });
     };
     // Accounts -------------------------------------------------------------------
     const refreshAccount = (accountHandle) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/accounts/${accountHandle}`,
             method: 'GET',
         }).then(resp => {
@@ -916,7 +911,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getContactById = (contactId) => CONTACTS_BY_ID.get(contactId);
     const getContactByHandle = (contactHandle) => CONTACTS_BY_HANDLE.get(contactHandle);
     const createContact = (contact) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts`,
             method: 'POST',
             body: {
@@ -930,7 +925,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateContact = (contactId, contact) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
             method: 'PUT',
             body: {
@@ -944,7 +939,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const refreshContact = (contactId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
             method: 'GET',
         }).then(resp => {
@@ -955,7 +950,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const searchContacts = (query) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/search`,
             method: 'POST',
             body: {
@@ -970,25 +965,25 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const assignTagToContact = (contactId, tagName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
             method: 'POST',
         });
     };
     const unassignTagFromContact = (contactId, tagName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/tags/${tagName}`,
             method: 'DELETE',
         });
     };
     const deleteContact = (contactId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}`,
             method: 'DELETE',
         });
     };
     const sendInviteToContact = (contact, message) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/invites`,
             method: 'POST',
             body: {
@@ -999,19 +994,19 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Contacts Enrich ----------------------------------------------------------
     const enrichContactEmail = (contactId, useDomain) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/enrich/email?useDomain=${useDomain}`,
             method: 'GET',
         });
     };
     const enrichContactLinkedin = (contactId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contactId}/enrich/linkedin`,
             method: 'GET',
         });
     };
     const sendLinkedinConnectionRequest = (contact, message) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/${contact.id}/connect/linkedin`,
             method: 'POST',
             body: {
@@ -1026,14 +1021,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Contacts Links -----------------------------------------------------------
     const linkUserWithContact = (userId, contactId) => {
-        return requestRun({
-            url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}`,
+        return requestDatalayer({
+            url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
             method: 'POST',
         });
     };
     const unlinkUserFromContact = (userId, contactId) => {
-        return requestRun({
-            url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}`,
+        return requestDatalayer({
+            url: `${configuration.growthRunUrl}/api/growth/v1/users/${userId}/contacts/${contactId}/link`,
             method: 'DELETE',
         });
     };
@@ -1049,7 +1044,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getUser = (id) => USERS_BY_ID.get(id);
     const getUserByHandle = (handle) => USERS_BY_HANDLE.get(handle);
     const refreshUser = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}`,
             method: 'GET',
         }).then(resp => {
@@ -1060,7 +1055,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const searchUsers = (namingPattern) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/users/search`,
             method: 'POST',
             body: {
@@ -1076,13 +1071,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // User Roles ---------------------------------------------------------------
     const assignRoleToUser = (userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
             method: 'POST',
         });
     };
     const unassignRoleFromUser = (userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/users/${userId}/roles/${roleName}`,
             method: 'DELETE',
         });
@@ -1095,7 +1090,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return organization;
     };
     const createOrganization = (organization) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations`,
             method: 'POST',
             body: {
@@ -1117,7 +1112,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         ORGANISATIONS_FOR_USER_BY_ID.clear();
     };
     const refreshOrganization = (user, organizationId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}`,
             method: 'GET',
         }).then(resp => {
@@ -1134,7 +1129,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateOrganization = (organization) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organization.id}`,
             method: 'PUT',
             body: {
@@ -1155,7 +1150,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getUserOrganizations = () => Array.from(ORGANISATIONS_FOR_USER_BY_ID.values());
     const getUserOrganizationById = (organizationId) => ORGANISATIONS_FOR_USER_BY_ID.get(organizationId);
     const refreshUserOrganizations = (user) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations`,
             method: 'GET',
         }).then(resp => {
@@ -1171,25 +1166,25 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const addMemberToOrganization = (organizationId, userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
             method: 'POST',
         });
     };
     const removeMemberFromOrganization = (organizationId, userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}`,
             method: 'DELETE',
         });
     };
     const addRoleToOrganizationMember = (organizationId, userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
             method: 'POST',
         });
     };
     const removeRoleFromOrganizationMember = (organizationId, userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/members/${userId}/roles/${roleName}`,
             method: 'DELETE',
         });
@@ -1202,7 +1197,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return team;
     };
     const createTeam = (team, organization) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams`,
             method: 'POST',
             body: {
@@ -1225,7 +1220,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         TEAMS_BY_ID.clear();
     };
     const refreshTeam = (teamId, organizationId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}`,
             method: 'GET',
         }).then(resp => {
@@ -1241,7 +1236,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateTeam = (team) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${team.id}`,
             method: 'PUT',
             body: {
@@ -1262,7 +1257,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getTeamsByOrganizationId = (organizationId) => TEAMS_BY_ORGANIZATION_BY_ID.get(organizationId);
     const refreshTeams = (organizationId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/${organizationId}/teams`,
             method: 'GET',
         }).then(resp => {
@@ -1279,25 +1274,25 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const addMemberToTeam = (teamId, userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
             method: 'POST',
         });
     };
     const removeMemberFromTeam = (teamId, userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}`,
             method: 'DELETE',
         });
     };
     const addRoleToTeamMember = (teamId, userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
             method: 'POST',
         });
     };
     const removeRoleFromTeamMember = (teamId, userId, roleName) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/teams/${teamId}/members/${userId}/roles/${roleName}`,
             method: 'DELETE',
         });
@@ -1307,13 +1302,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return Array.from(SCHOOLS_BY_ID.values());
     };
     const refreshSchools = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/organizations/schools`,
             method: 'GET',
         }).then(resp => {
             if (resp.success) {
                 resp.orgs.forEach(s => {
-                    var dean = undefined;
+                    const dean = undefined;
                     const students = new Array();
                     const members = new Array();
                     const courses = new Array();
@@ -1348,7 +1343,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         const seedSpaceId = (space.variant === 'course')
             ? space.seedSpace?.id
             : undefined;
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces`,
             method: 'POST',
             body: {
@@ -1389,7 +1384,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return organizationSpaces ? organizationSpaces.get(spaceHandle) : undefined;
     };
     const refreshOrganizationSpace = (organizationId, spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}`,
             method: 'GET',
         }).then(resp => {
@@ -1409,13 +1404,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const exportSpace = (spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/export`,
             method: 'GET',
         });
     };
     const updateOrganizationSpace = (organization, space) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/organizations/${organization.id}`,
             method: 'PUT',
             body: {
@@ -1441,7 +1436,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         return [];
     };
     const refreshOrganizationSpaces = (organizationId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/organizations/${organizationId}`,
             method: 'GET',
         }).then(resp => {
@@ -1461,7 +1456,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getUserSpaces = () => Array.from(SPACES_FOR_USER_BY_ID.values());
     const refreshUserSpaces = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/users/me`,
             method: 'GET',
         }).then(resp => {
@@ -1478,7 +1473,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getUserSpace = (userId) => SPACES_FOR_USER_BY_ID.get(userId);
     const getUserSpaceByHandle = (userHandle) => SPACES_FOR_USER_BY_HANDLE.get(userHandle);
     const refreshUserSpace = (userId, spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/users/${userId}`,
             method: 'GET',
         }).then(resp => {
@@ -1494,7 +1489,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateSpace = (space) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/users/${user?.id}`,
             method: 'PUT',
             body: {
@@ -1513,13 +1508,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const addMemberToOrganizationSpace = (organizationId, spaceId, accountId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
             method: 'POST',
         });
     };
     const removeMemberFromOrganizationSpace = (organizationId, spaceId, accountId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/organizations/${organizationId}/members/${accountId}`,
             method: 'DELETE',
         }).then(resp => {
@@ -1530,13 +1525,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const makeSpacePublic = (spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/public`,
             method: 'PUT',
         });
     };
     const makeSpacePrivate = (spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/private`,
             method: 'PUT',
         });
@@ -1628,7 +1623,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             raw_item_uids = raw_item_uids.replace('(', '').replace(')', '');
             itemIds = raw_item_uids.split(' ');
         }
-        let items = new Array();
+        const items = new Array();
         if (raw_course.items) {
             raw_course.items.forEach(item => {
                 const i = toItem(item);
@@ -1655,7 +1650,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getCourse = (courseId) => COURSES_BY_ID.get(courseId);
     const updateCourse = (courseId, name, description) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}`,
             method: 'PUT',
             body: {
@@ -1665,7 +1660,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const refreshCourse = (courseId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}`,
             method: 'GET',
         }).then(resp => {
@@ -1679,13 +1674,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const enrollStudentToCourse = (courseId, studentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
             method: 'POST',
         });
     };
     const removeStudentFromCourse = (courseId, studentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentId}`,
             method: 'DELETE',
         }).then(resp => {
@@ -1697,7 +1692,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getStudent = (courseId, studentId) => STUDENTS_BY_ID.get(courseId + '-' + studentId);
     const refreshStudent = (courseId, studentHandle) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/enrollments/students/${studentHandle}`,
             method: 'GET',
         }).then(resp => {
@@ -1709,7 +1704,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getPublicCourses = () => Array.from(PUBLIC_COURSES_BY_ID.values());
     const refreshPublicCourses = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/courses/public`,
             method: 'GET',
         }).then(resp => {
@@ -1723,7 +1718,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getInstructorCourses = () => Array.from(COURSES_INSTRUCTORS_BY_ID.values());
     const refreshInstructorCourses = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/instructors/${user?.id}/courses`,
             method: 'GET',
         }).then(resp => {
@@ -1737,7 +1732,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getCoursesEnrollments = () => Array.from(COURSES_ENROLLMENTS_BY_ID.values());
     const refreshCoursesEnrollments = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/enrollments/me`,
             method: 'GET',
         }).then(resp => {
@@ -1750,7 +1745,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const confirmCourseItemCompletion = (courseId, itemType, itemId, completed) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${courseId}/types/${itemType}/items/${itemId}/complete`,
             method: 'PUT',
             body: {
@@ -1759,7 +1754,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const setCourseItems = (courseId, itemIds) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/courses/${courseId}/items`,
             method: 'PUT',
             body: {
@@ -1769,7 +1764,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Surveys ---------------------------------------------------------------------
     const getUserSurveys = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/surveys/users/${userId}`,
             method: 'GET',
         }).then(resp => {
@@ -1795,7 +1790,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getInbound = (id) => INBOUNDS_BY_ID.get(id);
     const getInboundByHandle = (handle) => INBOUNDS_BY_HANDLE.get(handle);
     const refreshInbound = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds/${userId}`,
             method: 'GET',
         }).then(resp => {
@@ -1806,7 +1801,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const getInbounds = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.inboundsRunUrl}/api/inbounds/v1/inbounds`,
             method: 'GET',
         }).then(resp => {
@@ -1827,7 +1822,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getOutbound = (id) => OUTBOUNDS_BY_ID.get(id);
     const refreshOutbound = (outboundId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}`,
             method: 'GET',
         }).then(resp => {
@@ -1839,7 +1834,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const getOutbounds = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds`,
             method: 'GET',
         }).then(resp => {
@@ -1851,28 +1846,28 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const draftBulkEmailsOutbounds = (params) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/emails/bulk/draft`,
             method: 'POST',
             body: params,
         });
     };
     const tryBulkEmailsOutbounds = (outboundId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}/try`,
             method: 'POST',
             body: {},
         });
     };
     const launchBulkEmailsOutbounds = (outboundId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}/launch`,
             method: 'POST',
             body: {},
         });
     };
     const sendOutboundEmailToUser = (userId, recipient, subject, content) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/email`,
             method: 'POST',
             body: {
@@ -1884,19 +1879,19 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const enableUserMFA = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
             method: 'PUT',
         });
     };
     const disableUserMFA = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
             method: 'DELETE',
         });
     };
     const validateUserMFACode = (userUid, code) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/mfa`,
             method: 'POST',
             body: {
@@ -1906,31 +1901,31 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const subscribeUserToOutbounds = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/outbounds/users/${userId}`,
             method: 'PUT',
         });
     };
     const unsubscribeUserFromOutbounds = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/outbounds/users/${userId}`,
             method: 'DELETE',
         });
     };
     const unsubscribeContactFromOutbounds = (contactId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/contacts/unsubscribe/${contactId}`,
             method: 'GET',
         });
     };
     const unsubscribeInviteeFromOutbounds = (token) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/unsubscribe/${token}`,
             method: 'GET',
         });
     };
     const deleteOutbound = (outboundId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/outbounds/${outboundId}`,
             method: 'DELETE',
         });
@@ -1965,7 +1960,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const clearCachedPublicItems = () => PUBLIC_ITEMS_BY_ID.clear();
     const getPublicItems = () => Array.from(PUBLIC_ITEMS_BY_ID.values());
     const refreshPublicItems = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/items/public`,
             method: 'GET',
         }).then(resp => {
@@ -1980,7 +1975,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getSpaceItems = () => Array.from(SPACE_ITEMS_CACHE.values());
     const refreshSpaceItems = (spaceId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${spaceId}/items`,
             method: 'GET',
         }).then(resp => {
@@ -1996,19 +1991,19 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const makeItemPublic = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/items/${id}/public`,
             method: 'PUT',
         });
     };
     const makeItemPrivate = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/items/${id}/private`,
             method: 'PUT',
         });
     };
     const deleteItem = (itemId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${itemId}`,
             method: 'DELETE',
         }).then(resp => {
@@ -2035,7 +2030,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
             max: max.toFixed(0).toString(),
             public: 'true',
         };
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.libraryRunUrl}/api/library/v1/search${URLExt.objectToQueryString(queryArgs)}`,
             method: 'GET',
         }).then(resp => {
@@ -2082,7 +2077,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getDataset = (id) => SPACE_DATASETS_BY_ID.get(id);
     const refreshDataset = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2098,7 +2093,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceDatasets = () => Array.from(SPACE_DATASETS_BY_ID.values());
     const refreshSpaceDatasets = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/dataset`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2111,7 +2106,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateDataset = (id, name, description) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/datasets/${id}`,
             method: 'PUT',
             body: {
@@ -2148,7 +2143,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getCell = (id) => SPACE_CELLS_BY_ID.get(id);
     const refreshCell = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2164,7 +2159,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceCells = () => Array.from(SPACE_CELLS_BY_ID.values());
     const refreshSpaceCells = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/cell`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2177,14 +2172,14 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateCell = (cell) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/cells/${cell.id}`,
             method: 'PUT',
             body: cell
         });
     };
     const cloneCell = (cellId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/cells/${cellId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2222,7 +2217,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getNotebook = (notebookId) => SPACE_NOTEBOOKS_BY_ID.get(notebookId);
     const refreshNotebook = (notebookId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}`,
             method: 'GET',
         }).then(resp => {
@@ -2239,7 +2234,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceNotebook = (id) => SPACE_NOTEBOOKS_BY_ID.get(id);
     const refreshSpaceNotebooks = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/notebook`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2252,7 +2247,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const cloneNotebook = (notebookId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2263,7 +2258,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateNotebook = (id, name, description) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${id}`,
             method: 'PUT',
             body: {
@@ -2273,7 +2268,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateNotebookModel = (notebookId, nbformat) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${notebookId}/model`,
             method: 'PUT',
             body: {
@@ -2308,7 +2303,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getDocument = (id) => SPACE_DOCUMENTS_BY_ID.get(id);
     const refreshDocument = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2325,7 +2320,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceDocument = (id) => SPACE_DOCUMENTS_BY_ID.get(id);
     const refreshSpaceDocuments = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/document`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2338,7 +2333,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const cloneDocument = (documentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${documentId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2349,7 +2344,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateDocument = (id, name, description) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${id}`,
             method: 'PUT',
             body: {
@@ -2359,7 +2354,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateDocumentModel = (id, model) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/lexicals/${id}/model`,
             method: 'PUT',
             body: {
@@ -2392,7 +2387,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getEnvironment = (id) => SPACE_ENVIRONMENTS_BY_ID.get(id);
     const refreshEnvironment = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2408,7 +2403,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceEnvironments = () => Array.from(SPACE_ENVIRONMENTS_BY_ID.values());
     const refreshSpaceEnvironments = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/environment`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2448,7 +2443,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getLesson = (id) => SPACE_LESSONS_BY_ID.get(id);
     const refreshLesson = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/lessons/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2465,7 +2460,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceLesson = (id) => SPACE_LESSONS_BY_ID.get(id);
     const refreshSpaceLessons = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/lesson`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2478,7 +2473,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const cloneLesson = (lessonId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${lessonId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2520,7 +2515,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getExercise = (id) => SPACE_EXERCISES_BY_ID.get(id);
     const refreshExercise = (id) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/spaces/items/${id}`,
             method: 'GET',
         }).then(resp => {
@@ -2538,7 +2533,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const refreshSpaceExercises = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/exercise`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2551,7 +2546,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const cloneExercise = (exerciseId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${exerciseId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2562,7 +2557,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateExercise = ({ id, name, description, help, codePre, codeSolution, codeQuestion, codeTest, }) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${id}`,
             method: 'PUT',
             body: {
@@ -2577,7 +2572,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateExercisePoints = (id, codeStudent, points) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/exercises/${id}/points`,
             method: 'PUT',
             body: {
@@ -2631,7 +2626,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getAssignment = (assignmentId) => SPACE_ASSIGNMENTS_BY_ID.get(assignmentId);
     const refreshAssignment = (assignmentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}`,
             method: 'GET',
         }).then(resp => {
@@ -2646,7 +2641,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     const getAssignmentForStudent = (assignmentId) => STUDENT_ASSIGNMENTS_BY_ID.get(assignmentId);
     const refreshAssignmentForStudent = (courseId, user, assignmentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/courses/${courseId}/students/${user.id}`,
             method: 'GET',
         }).then(resp => {
@@ -2660,7 +2655,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const resetAssignmentForStudent = (courseId, user, assignmentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/reset`,
             method: 'POST',
         }).then(resp => {
@@ -2674,7 +2669,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const gradeAssignmentForStudent = (courseId, user, assignmentId, model) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/students/${user.id}/grade`,
             method: 'PUT',
             body: {
@@ -2694,7 +2689,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     const getSpaceAssignment = (id) => SPACE_ASSIGNMENTS_BY_ID.get(id);
     const refreshSpaceAssignments = (space, organization) => {
         const url = `${configuration.spacerRunUrl}/api/spacer/v1/spaces/${space.id}/items/types/assignment`;
-        return requestRun({
+        return requestDatalayer({
             url,
             method: 'GET',
         }).then(resp => {
@@ -2707,7 +2702,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const cloneAssignment = (assignmentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/notebooks/${assignmentId}/clone`,
             method: 'POST',
         }).then(resp => {
@@ -2718,21 +2713,21 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const getAssignmentStudentVersion = (assignmentId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.spacerRunUrl}/api/spacer/v1/assignments/${assignmentId}/student_version`,
             method: 'GET',
         });
     };
     // Prices -------------------------------------------------------------------
     const refreshStripePrices = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/stripe/v1/prices`,
             method: 'GET',
         });
     };
     // Checkout -------------------------------------------------------------------
     const createCheckoutSession = (product, location) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/stripe/v1/checkout/session`,
             method: 'POST',
             body: {
@@ -2747,7 +2742,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Credits -------------------------------------------------------------------
     const burnCredit = (credits) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits`,
             method: "DELETE",
             body: {
@@ -2756,13 +2751,13 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const getUserCredits = (userId) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/users/${userId}`,
             method: "GET",
         });
     };
     const updateUserCredits = (userId, credits, brand) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/credits/users/${userId}`,
             method: "PUT",
             body: {
@@ -2772,7 +2767,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const updateUserCreditsQuota = (userId, quota) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/quota`,
             method: "PUT",
             body: {
@@ -2787,7 +2782,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      * Get user usages
      */
     const getUsages = async () => {
-        const data = await requestRun({
+        const data = await requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/user`,
             method: "GET",
         });
@@ -2798,7 +2793,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      * Get user usages
      */
     const getUsagesForUser = async (userId) => {
-        const data = await requestRun({
+        const data = await requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/users/${userId}`,
             method: "GET",
         });
@@ -2809,7 +2804,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
      * Get platform usages
      */
     const getPlatformUsages = async () => {
-        const data = await requestRun({
+        const data = await requestDatalayer({
             url: `${configuration.iamRunUrl}/api/iam/v1/usage/platform`,
             method: "GET",
         });
@@ -2818,7 +2813,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Support ------------------------------------------------------------------
     const requestPlatformSupport = (subject, message, email, brand) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.supportRunUrl}/api/support/v1/support/request`,
             method: 'POST',
             body: {
@@ -2830,7 +2825,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
         });
     };
     const requestPlatformSupport2 = (accountHandle, firstName, lastName, email, message) => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.supportRunUrl}/api/support/v1/support/request2`,
             method: 'POST',
             body: {
@@ -2844,7 +2839,7 @@ export const useCache = ({ loginRoute = '/login' } = {}) => {
     };
     // Growth ------------------------------------------------------------------
     const getGrowthKPI = () => {
-        return requestRun({
+        return requestDatalayer({
             url: `${configuration.growthRunUrl}/api/growth/v1/kpis`,
             method: 'GET',
         });