#9242: migrate unsaved standalone mod components in the Page Editor (#…

…9246)
pixiebrix · Oct 8, 2024 · 91ceceb · 91ceceb
1 parent b0027a6
commit 91ceceb
Show file tree

Hide file tree

Showing 48 changed files with 477 additions and 1,190 deletions.
diff --git a/...s/pageEditor/moveCopyModComponent.spec.ts → ...pageEditor/moveOrCopyModComponent.spec.ts b/...s/pageEditor/moveCopyModComponent.spec.ts → ...pageEditor/moveOrCopyModComponent.spec.ts
diff --git a/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts b/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts
@@ -57,6 +57,7 @@ import { getOutputReference, isOutputKey } from "@/runtime/runtimeTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 import { BusinessError } from "@/errors/businessErrors";
 import { adapterForComponent } from "@/pageEditor/starterBricks/adapter";
+import { isInnerDefinitionRegistryId } from "@/types/helpers";
 
 export const INVALID_VARIABLE_GENERIC_MESSAGE = "Invalid variable name";
 
@@ -305,11 +306,13 @@ async function setOptionsVars(
   formState: ModComponentFormState,
   contextVars: VarMap,
 ): Promise<void> {
-  if (formState.modMetadata == null) {
+  const modId = formState.modMetadata.id;
+
+  // Mod is unsaved, so definition won't be in the registry
+  if (isInnerDefinitionRegistryId(modId)) {
     return;
   }
 
-  const modId = formState.modMetadata.id;
   const mod = await modRegistry.lookup(modId);
   const optionsSchema = mod?.options?.schema;
   if (isEmpty(optionsSchema)) {

diff --git a/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts b/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts
@@ -31,7 +31,10 @@ import { validateOutputKey } from "@/runtime/runtimeTypes";
 import { toExpression } from "@/utils/expressionUtils";
 import { normalizeAvailability } from "@/bricks/available";
 import { StarterBrickTypes } from "@/types/starterBrickTypes";
-import { emptyModVariablesDefinitionFactory } from "@/utils/modUtils";
+import {
+  createNewUnsavedModMetadata,
+  emptyModVariablesDefinitionFactory,
+} from "@/utils/modUtils";
 
 describe("selectVariables", () => {
   test("selects nothing when no services used", () => {
@@ -224,7 +227,7 @@ describe("selectVariables", () => {
       permissions: emptyPermissionsFactory(),
       optionsArgs: {},
       variablesDefinition: emptyModVariablesDefinitionFactory(),
-      modMetadata: undefined,
+      modMetadata: createNewUnsavedModMetadata({ modName: "Document Mod" }),
       modComponent: {
         brickPipeline: [
           {

diff --git a/src/pageEditor/hooks/useAddNewModComponent.ts b/src/pageEditor/hooks/useAddNewModComponent.ts
@@ -89,19 +89,20 @@ function useAddNewModComponent(modMetadata?: ModMetadata): AddNewModComponent {
         setInsertingStarterBrickType(null);
       }
 
-      const url = await getCurrentInspectedURL();
-      const metadata = internalStarterBrickMetaFactory();
-      const initialFormState = fromNativeElement(url, metadata, element);
+      const initialFormState = fromNativeElement({
+        url: await getCurrentInspectedURL(),
+        starterBrickMetadata: internalStarterBrickMetaFactory(),
+        modMetadata:
+          modMetadata ??
+          createNewUnsavedModMetadata({
+            modName: generateFreshModName(),
+          }),
+        element,
+      });
 
       initialFormState.modComponent.brickPipeline =
         getExampleBrickPipeline(starterBrickType);
 
-      initialFormState.modMetadata =
-        modMetadata ??
-        createNewUnsavedModMetadata({
-          modName: generateFreshModName(),
-        });
-
       return initialFormState as ModComponentFormState;
     },
     [

diff --git a/src/pageEditor/hooks/useClearModChanges.ts b/src/pageEditor/hooks/useClearModChanges.ts
@@ -47,7 +47,7 @@ function useClearModChanges(): (modId: RegistryId) => Promise<void> {
 
       await Promise.all(
         modComponentFormStates
-          .filter((x) => x.modMetadata?.id === modId)
+          .filter((x) => x.modMetadata.id === modId)
           .map(async (modComponentFormState) =>
             clearModComponentChanges({
               modComponentId: modComponentFormState.uuid,

diff --git a/src/pageEditor/hooks/useMigrateStandaloneComponentsToMods.test.ts b/src/pageEditor/hooks/useMigrateStandaloneComponentsToMods.test.ts