From 8de57df36bb60a493992407c5caff089e8fe6bba Mon Sep 17 00:00:00 2001
From: Graham Langford <30706330+grahamlangford@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:26:08 -0500
Subject: [PATCH] Rename service -> integration in Page Editor (#8772)

---
 .../fields/schemaFields/fieldTypeCheckers.ts   |  4 ++--
 src/contrib/google/sheets/bricks/append.ts     |  4 ++--
 src/contrib/google/sheets/bricks/lookup.ts     |  4 ++--
 src/integrations/constants.ts                  |  4 ++--
 .../getModDefinitionIntegrationIds.test.ts     | 14 +++++++-------
 ...etUnconfiguredComponentIntegrations.test.ts | 18 +++++++++---------
 .../edit/DocumentOptions.test.tsx              |  6 +++---
 .../documentBuilder/hooks/useDeleteElement.ts  |  2 +-
 src/pageEditor/fields/FormRendererOptions.tsx  |  8 ++++----
 src/pageEditor/panes/save/saveHelpers.test.ts  | 16 ++++++++--------
 src/pageEditor/panes/save/saveHelpers.ts       |  4 ++--
 .../store/editor/editorSlice.test.ts           | 16 ++++++++--------
 .../tabs/effect/useDocumentPreviewRunBlock.ts  |  6 +++---
 .../activateMod/ActivateModPanel.test.tsx      | 14 +++++++-------
 14 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/components/fields/schemaFields/fieldTypeCheckers.ts b/src/components/fields/schemaFields/fieldTypeCheckers.ts
index 2516e61b22..77fab41b61 100644
--- a/src/components/fields/schemaFields/fieldTypeCheckers.ts
+++ b/src/components/fields/schemaFields/fieldTypeCheckers.ts
@@ -33,7 +33,7 @@ import { isVarExpression } from "@/utils/expressionUtils";
 import {
   INTEGRATION_DEPENDENCY_FIELD_REFS,
   PIXIEBRIX_INTEGRATION_REF_URL,
-  SERVICES_BASE_SCHEMA_URL,
+  INTEGRATIONS_BASE_SCHEMA_URL,
 } from "@/integrations/constants";
 
 export const isPixiebrixIntegrationField = createTypePredicate(
@@ -46,7 +46,7 @@ function isIntegrationRef(ref?: string): boolean {
   }
 
   return (
-    ref.startsWith(SERVICES_BASE_SCHEMA_URL) ||
+    ref.startsWith(INTEGRATIONS_BASE_SCHEMA_URL) ||
     INTEGRATION_DEPENDENCY_FIELD_REFS.includes(ref)
   );
 }
diff --git a/src/contrib/google/sheets/bricks/append.ts b/src/contrib/google/sheets/bricks/append.ts
index 2f47a7a147..6e022c366b 100644
--- a/src/contrib/google/sheets/bricks/append.ts
+++ b/src/contrib/google/sheets/bricks/append.ts
@@ -32,7 +32,7 @@ import { type SpreadsheetTarget } from "@/contrib/google/sheets/core/sheetsApi";
 import { isNullOrBlank } from "@/utils/stringUtils";
 import { isObject } from "@/utils/objectUtils";
 import { propertiesToSchema } from "@/utils/schemaUtils";
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 
 type CellValue = string | number | null;
 
@@ -54,7 +54,7 @@ export const APPEND_SCHEMA: Schema = propertiesToSchema(
       title: "Google Account",
       oneOf: [
         {
-          $ref: `${SERVICES_BASE_SCHEMA_URL}${GOOGLE_OAUTH2_PKCE_INTEGRATION_ID}`,
+          $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${GOOGLE_OAUTH2_PKCE_INTEGRATION_ID}`,
         },
       ],
     },
diff --git a/src/contrib/google/sheets/bricks/lookup.ts b/src/contrib/google/sheets/bricks/lookup.ts
index 0bb0c9146b..88b1e1a65b 100644
--- a/src/contrib/google/sheets/bricks/lookup.ts
+++ b/src/contrib/google/sheets/bricks/lookup.ts
@@ -32,7 +32,7 @@ import {
 } from "@/contrib/google/sheets/core/sheetsApi";
 import { isNullOrBlank } from "@/utils/stringUtils";
 
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 
 export const GOOGLE_SHEETS_LOOKUP_ID = validateRegistryId(
   "@pixiebrix/google/sheets-lookup",
@@ -46,7 +46,7 @@ export const LOOKUP_SCHEMA: Schema = {
       title: "Google Account",
       oneOf: [
         {
-          $ref: `${SERVICES_BASE_SCHEMA_URL}${GOOGLE_OAUTH2_PKCE_INTEGRATION_ID}`,
+          $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${GOOGLE_OAUTH2_PKCE_INTEGRATION_ID}`,
         },
       ],
     },
diff --git a/src/integrations/constants.ts b/src/integrations/constants.ts
index 11b2d92fd9..56cc1befe8 100644
--- a/src/integrations/constants.ts
+++ b/src/integrations/constants.ts
@@ -32,9 +32,9 @@ export const PIXIEBRIX_INTEGRATION_CONFIG_ID: UUID = uuidSequence(0);
 export const PIXIEBRIX_OUTPUT_KEY = validateOutputKey("pixiebrix");
 // We should probably leave this as called "SERVICES_" until if/when the actual url is changed
 // to point to /schemas/integrations/, just as a reminder
-export const SERVICES_BASE_SCHEMA_URL =
+export const INTEGRATIONS_BASE_SCHEMA_URL =
   "https://app.pixiebrix.com/schemas/services/";
-export const PIXIEBRIX_INTEGRATION_REF_URL = `${SERVICES_BASE_SCHEMA_URL}${PIXIEBRIX_INTEGRATION_ID}`;
+export const PIXIEBRIX_INTEGRATION_REF_URL = `${INTEGRATIONS_BASE_SCHEMA_URL}${PIXIEBRIX_INTEGRATION_ID}`;
 export const PIXIEBRIX_INTEGRATION_FIELD_SCHEMA: Schema = {
   $ref: PIXIEBRIX_INTEGRATION_REF_URL,
 };
diff --git a/src/integrations/util/getModDefinitionIntegrationIds.test.ts b/src/integrations/util/getModDefinitionIntegrationIds.test.ts
index 5df7e8741c..e202c2cdb3 100644
--- a/src/integrations/util/getModDefinitionIntegrationIds.test.ts
+++ b/src/integrations/util/getModDefinitionIntegrationIds.test.ts
@@ -20,7 +20,7 @@ import { modComponentDefinitionFactory } from "@/testUtils/factories/modDefiniti
 import { validateOutputKey } from "@/runtime/runtimeTypes";
 import getModDefinitionIntegrationIds from "@/integrations/util/getModDefinitionIntegrationIds";
 
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 
 describe("getModDefinitionIntegrationIds", () => {
   it("works with record services formats", () => {
@@ -56,10 +56,10 @@ describe("getModDefinitionIntegrationIds", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           service2: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: ["service1", "service2"],
@@ -69,7 +69,7 @@ describe("getModDefinitionIntegrationIds", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
         },
         required: ["service1"],
@@ -89,10 +89,10 @@ describe("getModDefinitionIntegrationIds", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           service2: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: ["service1", "service2"],
@@ -102,7 +102,7 @@ describe("getModDefinitionIntegrationIds", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
         },
         required: ["service1"],
diff --git a/src/integrations/util/getUnconfiguredComponentIntegrations.test.ts b/src/integrations/util/getUnconfiguredComponentIntegrations.test.ts
index 8e01d828ce..653b019717 100644
--- a/src/integrations/util/getUnconfiguredComponentIntegrations.test.ts
+++ b/src/integrations/util/getUnconfiguredComponentIntegrations.test.ts
@@ -19,7 +19,7 @@ import getUnconfiguredComponentIntegrations from "@/integrations/util/getUnconfi
 import { validateRegistryId } from "@/types/helpers";
 import { modComponentDefinitionFactory } from "@/testUtils/factories/modDefinitionFactories";
 import { validateOutputKey } from "@/runtime/runtimeTypes";
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 
 describe("getUnconfiguredComponentIntegrations", () => {
   it("returns empty if no integrations", () => {
@@ -36,10 +36,10 @@ describe("getUnconfiguredComponentIntegrations", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           service2: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: ["service1", "service2"],
@@ -85,10 +85,10 @@ describe("getUnconfiguredComponentIntegrations", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           service2: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: ["service1", "service2"],
@@ -100,11 +100,11 @@ describe("getUnconfiguredComponentIntegrations", () => {
         properties: {
           // Same outputKey as above for service1
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           // Unique outputKey for service2
           service3: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: ["service1", "service3"],
@@ -147,10 +147,10 @@ describe("getUnconfiguredComponentIntegrations", () => {
       services: {
         properties: {
           service1: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId1}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId1}`,
           },
           service2: {
-            $ref: `${SERVICES_BASE_SCHEMA_URL}${serviceId2}`,
+            $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${serviceId2}`,
           },
         },
         required: [],
diff --git a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
index 4be5df4a37..c0d3e4dd3d 100644
--- a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
+++ b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
@@ -155,8 +155,8 @@ describe("DocumentOptions", () => {
       // Integration dependencies included in the form state
       const integrationDependencies: IntegrationDependency[] = [
         integrationDependencyFactory({
-          integrationId: validateRegistryId("@test/service"),
-          outputKey: validateOutputKey("serviceOutput"),
+          integrationId: validateRegistryId("@test/integration"),
+          outputKey: validateOutputKey("integrationOuput"),
           configId: uuidSequence,
         }),
       ];
@@ -173,7 +173,7 @@ describe("DocumentOptions", () => {
                   id: validateRegistryId("@test/action"),
                   instanceId: uuidSequence(2),
                   config: {
-                    input: toExpression("var", "@serviceOutput"),
+                    input: toExpression("var", "@integrationOuput"),
                   },
                 },
               ]),
diff --git a/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts b/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
index 28b2019bba..32dd98f126 100644
--- a/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
+++ b/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
@@ -44,7 +44,7 @@ function useDeleteElement(documentBodyName: string) {
         elementsCollection.splice(Number(elementIndex), 1);
       });
 
-      // If the element used a service, remove the service link as well
+      // If the element used an integration, remove the integration link as well
       nextState = produceExcludeUnusedDependencies(nextState);
 
       await setFormState(nextState);
diff --git a/src/pageEditor/fields/FormRendererOptions.tsx b/src/pageEditor/fields/FormRendererOptions.tsx
index a12e1f8fc0..fe0ae13948 100644
--- a/src/pageEditor/fields/FormRendererOptions.tsx
+++ b/src/pageEditor/fields/FormRendererOptions.tsx
@@ -55,7 +55,7 @@ const databaseIdSchema: Schema = {
   $ref: databaseSchema.$id,
 };
 
-function usePruneUnusedServiceDependencies() {
+function usePruneUnusedIntegrationDependencies() {
   const { values: formState, setValues: setFormState } =
     useFormikContext<ModComponentFormState>();
 
@@ -86,7 +86,7 @@ const DEFAULT_STORAGE_TYPE = "state";
 const FormDataBindingOptions: React.FC<{
   makeName: (...names: string[]) => string;
 }> = ({ makeName }) => {
-  const pruneDependencies = usePruneUnusedServiceDependencies();
+  const pruneDependencies = usePruneUnusedIntegrationDependencies();
 
   const [{ value: storage }, , { setValue: setStorageValue }] =
     useField<Storage>(makeName("storage"));
@@ -94,7 +94,7 @@ const FormDataBindingOptions: React.FC<{
   const storageType = storage?.type;
 
   // Sets the storage type and clears out any other values the user might have configured
-  // If the next type is "database", the AppServiceField will initialize the "service" variable
+  // If the next type is "database", the "service" variable will be initialized
   const changeStorageType = async (nextStorageType: string) => {
     if (nextStorageType === "state") {
       await setStorageValue({
@@ -106,7 +106,7 @@ const FormDataBindingOptions: React.FC<{
     }
   };
 
-  // If the storage type changes from "database" to something else, ensure the service record at root is cleared
+  // If the storage type changes from "database" to something else, ensure the "service" record at root is cleared
   const [previousStorageType, setPreviousStorageType] = useState(storageType);
   useAsyncEffect(async () => {
     if (
diff --git a/src/pageEditor/panes/save/saveHelpers.test.ts b/src/pageEditor/panes/save/saveHelpers.test.ts
index b7129dc42c..82c10e27e7 100644
--- a/src/pageEditor/panes/save/saveHelpers.test.ts
+++ b/src/pageEditor/panes/save/saveHelpers.test.ts
@@ -70,7 +70,7 @@ import {
   emptyModOptionsDefinitionFactory,
   normalizeModDefinition,
 } from "@/utils/modUtils";
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 import { registryIdFactory } from "@/testUtils/factories/stringFactories";
 
 jest.mock("@/pageEditor/starterBricks/base", () => ({
@@ -625,7 +625,7 @@ describe("buildNewMod", () => {
     expect(newMod.extensionPoints[0].id).toBe(modComponent.extensionPointId);
   });
 
-  test("Dirty mod component with services", async () => {
+  test("Dirty mod component with integrations", async () => {
     const integrationId = validateRegistryId("@pixiebrix/api");
     const outputKey = validateOutputKey("pixiebrix");
 
@@ -869,7 +869,7 @@ describe("buildNewMod", () => {
   );
 });
 
-describe("findMaxServicesDependencyApiVersion", () => {
+describe("findMaxIntegrationDependencyApiVersion", () => {
   it("returns v1 for v1 dependencies", () => {
     const dependencies: Array<Pick<IntegrationDependency, "apiVersion">> = [
       {
@@ -923,7 +923,7 @@ describe("findMaxServicesDependencyApiVersion", () => {
 });
 
 describe("selectModComponentIntegrations", () => {
-  it("works for v1 services", () => {
+  it("works for v1 integrations", () => {
     const modComponent: Pick<ModComponentBase, "integrationDependencies"> = {
       integrationDependencies: [
         integrationDependencyFactory(),
@@ -941,7 +941,7 @@ describe("selectModComponentIntegrations", () => {
     });
   });
 
-  it("works for v2 services", () => {
+  it("works for v2 integrations", () => {
     const modComponent: Pick<ModComponentBase, "integrationDependencies"> = {
       integrationDependencies: [
         integrationDependencyFactory({
@@ -961,13 +961,13 @@ describe("selectModComponentIntegrations", () => {
     expect(selectModComponentIntegrations(modComponent)).toStrictEqual({
       properties: {
         [modComponent.integrationDependencies[0].outputKey]: {
-          $ref: `${SERVICES_BASE_SCHEMA_URL}${modComponent.integrationDependencies[0].integrationId}`,
+          $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${modComponent.integrationDependencies[0].integrationId}`,
         },
         [modComponent.integrationDependencies[1].outputKey]: {
-          $ref: `${SERVICES_BASE_SCHEMA_URL}${modComponent.integrationDependencies[1].integrationId}`,
+          $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${modComponent.integrationDependencies[1].integrationId}`,
         },
         [modComponent.integrationDependencies[2].outputKey]: {
-          $ref: `${SERVICES_BASE_SCHEMA_URL}${modComponent.integrationDependencies[2].integrationId}`,
+          $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${modComponent.integrationDependencies[2].integrationId}`,
         },
       },
       required: [modComponent.integrationDependencies[1].outputKey],
diff --git a/src/pageEditor/panes/save/saveHelpers.ts b/src/pageEditor/panes/save/saveHelpers.ts
index f35f2c1b25..c52de10673 100644
--- a/src/pageEditor/panes/save/saveHelpers.ts
+++ b/src/pageEditor/panes/save/saveHelpers.ts
@@ -55,7 +55,7 @@ import {
 } from "@/integrations/integrationTypes";
 import { type Schema } from "@/types/schemaTypes";
 import { normalizeModOptionsDefinition } from "@/utils/modUtils";
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 import {
   isStarterBrickDefinitionLike,
   type StarterBrickDefinitionLike,
@@ -173,7 +173,7 @@ export function selectModComponentIntegrations({
       isOptional,
     } of _integrationDependencies) {
       properties[outputKey] = {
-        $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationId}`,
+        $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationId}`,
       };
       if (!isOptional) {
         required.push(outputKey);
diff --git a/src/pageEditor/store/editor/editorSlice.test.ts b/src/pageEditor/store/editor/editorSlice.test.ts
index d37fb9670a..a1863c8822 100644
--- a/src/pageEditor/store/editor/editorSlice.test.ts
+++ b/src/pageEditor/store/editor/editorSlice.test.ts
@@ -52,7 +52,7 @@ function getTabState(
     .nodeUIStates[FOUNDATION_NODE_ID].dataPanel[tabKey];
 }
 
-const GOOGLE_SHEET_SERVICE_ID = validateRegistryId("google/sheet");
+const GOOGLE_SHEET_INTEGRATION_ID = validateRegistryId("google/sheet");
 
 const standardBrick = brickConfigFactory({
   id: teapotBrick.id,
@@ -60,7 +60,7 @@ const standardBrick = brickConfigFactory({
   config: defaultBrickConfig(teapotBrick.inputSchema),
 });
 
-const brickWithService = brickConfigFactory({
+const brickWithIntegration = brickConfigFactory({
   id: echoBrick.id,
   outputKey: "echoOutput" as OutputKey,
   config: {
@@ -132,13 +132,13 @@ describe("Add/Remove Bricks", () => {
       label: "Test Mod Component",
       integrationDependencies: [
         integrationDependencyFactory({
-          integrationId: GOOGLE_SHEET_SERVICE_ID,
+          integrationId: GOOGLE_SHEET_INTEGRATION_ID,
           outputKey: "google" as OutputKey,
           configId: uuidSequence,
         }),
       ],
     },
-    [brickWithService, standardBrick],
+    [brickWithIntegration, standardBrick],
   );
 
   beforeEach(() => {
@@ -182,7 +182,7 @@ describe("Add/Remove Bricks", () => {
     // Remove the brick with integration dependency
     editor = editorSlice.reducer(
       editor,
-      actions.removeNode(brickWithService.instanceId),
+      actions.removeNode(brickWithIntegration.instanceId),
     );
 
     // Ensure Integration Dependency was removed
@@ -195,19 +195,19 @@ describe("Add/Remove Bricks", () => {
   });
 
   test("Remove Brick without Integration Dependency", async () => {
-    // Get initial bricks and services
+    // Get initial bricks and integrations
     const initialBricks =
       editor.modComponentFormStates[0].modComponent.brickPipeline;
     const initialIntegrationDependencies =
       editor.modComponentFormStates[0].integrationDependencies;
 
-    // Remove the brick with service
+    // Remove the brick with integration
     editor = editorSlice.reducer(
       editor,
       actions.removeNode(standardBrick.instanceId),
     );
 
-    // Ensure Service was NOT removed
+    // Ensure integration was NOT removed
     expect(
       editor.modComponentFormStates[0].modComponent.brickPipeline,
     ).toBeArrayOfSize(initialBricks.length - 1);
diff --git a/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts b/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
index 103b772556..3716603744 100644
--- a/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
+++ b/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
@@ -145,14 +145,14 @@ export default function useDocumentPreviewRunBlock(
   const traceRecord = useSelector(
     selectActiveModComponentTraceForBrick(brickInstanceId),
   );
-  const { data: serviceContext, isLoading: isLoadingServiceContext } =
+  const { data: integrationContext, isLoading: isLoadingIntegrationContext } =
     useAsyncState(
       makeIntegrationsContextFromDependencies(integrationDependencies),
       [integrationDependencies],
     );
   const context = {
     ...traceRecord?.templateContext,
-    ...serviceContext,
+    ...integrationContext,
   } as BrickArgsContext;
 
   // This defaults to "inherit" as described in the doc, see BrickConfig.rootMode
@@ -173,7 +173,7 @@ export default function useDocumentPreviewRunBlock(
 
   const debouncedRun = useDebouncedCallback(
     async () => {
-      if (isLoadingServiceContext || isPreviewInfoLoading) {
+      if (isLoadingIntegrationContext || isPreviewInfoLoading) {
         return;
       }
 
diff --git a/src/sidebar/activateMod/ActivateModPanel.test.tsx b/src/sidebar/activateMod/ActivateModPanel.test.tsx
index 32e79609c1..b7e451b193 100644
--- a/src/sidebar/activateMod/ActivateModPanel.test.tsx
+++ b/src/sidebar/activateMod/ActivateModPanel.test.tsx
@@ -52,7 +52,7 @@ import useActivateMod, {
 import brickRegistry from "@/bricks/registry";
 import { registryIdFactory } from "@/testUtils/factories/stringFactories";
 import { propertiesToSchema } from "@/utils/schemaUtils";
-import { SERVICES_BASE_SCHEMA_URL } from "@/integrations/constants";
+import { INTEGRATIONS_BASE_SCHEMA_URL } from "@/integrations/constants";
 
 jest.mock("@/modDefinitions/modDefinitionHooks");
 jest.mock("@/sidebar/sidebarSelectors");
@@ -269,7 +269,7 @@ describe("ActivateModPanel", () => {
           services: {
             properties: {
               service1: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
               },
             },
             required: [],
@@ -313,7 +313,7 @@ describe("ActivateModPanel", () => {
           services: {
             properties: {
               service1: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
               },
             },
             required: ["service1"],
@@ -358,7 +358,7 @@ describe("ActivateModPanel", () => {
           services: {
             properties: {
               service1: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
               },
             },
             required: [],
@@ -402,7 +402,7 @@ describe("ActivateModPanel", () => {
           services: {
             properties: {
               service1: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition.metadata.id}`,
               },
             },
             required: ["service1"],
@@ -445,10 +445,10 @@ describe("ActivateModPanel", () => {
           services: {
             properties: {
               service1: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition1.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition1.metadata.id}`,
               },
               service2: {
-                $ref: `${SERVICES_BASE_SCHEMA_URL}${integrationDefinition2.metadata.id}`,
+                $ref: `${INTEGRATIONS_BASE_SCHEMA_URL}${integrationDefinition2.metadata.id}`,
               },
             },
             required: ["service1"],