Revert "#8783: update ModComponentRef property names (#8784)"

This reverts commit e8f8e61.
pixiebrix · Jul 10, 2024 · 3bd6a9b · 3bd6a9b
1 parent f577272
commit 3bd6a9b
Show file tree

Hide file tree

Showing 24 changed files with 129 additions and 125 deletions.
diff --git a/src/bricks/transformers/temporaryInfo/DisplayTemporaryInfo.test.ts b/src/bricks/transformers/temporaryInfo/DisplayTemporaryInfo.test.ts
@@ -204,7 +204,7 @@ describe("DisplayTemporaryInfo", () => {
 
     expect(waitForTemporaryPanel).toHaveBeenCalledWith({
       nonce: expect.toBeString(),
-      extensionId: modComponentRef.modComponentId,
+      extensionId: modComponentRef.extensionId,
       location: "modal",
       entry: expect.objectContaining({
         modComponentRef,
@@ -354,8 +354,8 @@ describe("DisplayTemporaryInfo", () => {
       logger: new ConsoleLogger(
         mapModComponentRefToMessageContext(
           modComponentRefFactory({
-            modComponentId: extensionId,
-            modId: null,
+            extensionId,
+            blueprintId: null,
           }),
         ),
       ),

diff --git a/src/components/quickBar/quickBarRegistry.ts b/src/components/quickBar/quickBarRegistry.ts
@@ -122,7 +122,7 @@ class QuickBarRegistry implements QuickBarProtocol {
   removeStarterBrickActions(starterBrickId: RegistryId): void {
     remove(
       this.actions,
-      (x) => x.modComponentRef?.starterBrickId === starterBrickId,
+      (x) => x.modComponentRef?.extensionPointId === starterBrickId,
     );
     this.notifyListeners();
   }
@@ -135,7 +135,7 @@ class QuickBarRegistry implements QuickBarProtocol {
     remove(
       this.actions,
       (x) =>
-        x.modComponentRef?.modComponentId === modComponentId &&
+        x.modComponentRef?.extensionId === modComponentId &&
         // Exclude the root action
         !this.knownGeneratorRootIds.has(x.id),
     );

diff --git a/src/contentScript/ephemeralPanel.ts b/src/contentScript/ephemeralPanel.ts
@@ -114,7 +114,7 @@ export async function ephemeralPanel({
     registerEmptyTemporaryPanel({
       nonce,
       location,
-      extensionId: panelEntryMetadata.modComponentRef.modComponentId,
+      extensionId: panelEntryMetadata.modComponentRef.extensionId,
     });
 
     await showSidebar();
@@ -125,7 +125,7 @@ export async function ephemeralPanel({
       nonce,
       payload: {
         key: uuidv4(),
-        extensionId: panelEntryMetadata.modComponentRef.modComponentId,
+        extensionId: panelEntryMetadata.modComponentRef.extensionId,
         loadingMessage: "Loading",
       },
     });
@@ -141,14 +141,14 @@ export async function ephemeralPanel({
     // Popover/modal location
     // Clear existing to remove stale modals/popovers
     await cancelTemporaryPanelsForExtension(
-      panelEntryMetadata.modComponentRef.modComponentId,
+      panelEntryMetadata.modComponentRef.extensionId,
     );
 
     // Register empty panel for "loading" state
     registerEmptyTemporaryPanel({
       nonce,
       location,
-      extensionId: panelEntryMetadata.modComponentRef.modComponentId,
+      extensionId: panelEntryMetadata.modComponentRef.extensionId,
     });
 
     // Create a source URL for content that will be loaded in the panel iframe
@@ -235,7 +235,7 @@ export async function ephemeralPanel({
       nonce,
       location,
       entry,
-      extensionId: entry.modComponentRef.modComponentId,
+      extensionId: entry.modComponentRef.extensionId,
       onRegister: onReady,
     });
     return panelAction ?? {};

diff --git a/src/contentScript/pageEditor/runRendererBrick.ts b/src/contentScript/pageEditor/runRendererBrick.ts
@@ -63,7 +63,7 @@ export async function runRendererBrick({
 
   let payload: PanelPayload;
   try {
-    await runBrickPreview({ ...args, modId: modComponentRef.modId });
+    await runBrickPreview({ ...args, modId: modComponentRef.blueprintId });
     // We're expecting a HeadlessModeError (or other error) to be thrown in the line above
     // noinspection ExceptionCaughtLocallyJS
     throw new NoRendererError();
@@ -74,14 +74,14 @@ export async function runRendererBrick({
         blockId: error.blockId,
         args: error.args,
         ctxt: error.ctxt,
-        extensionId: modComponentRef.modComponentId,
+        extensionId: modComponentRef.extensionId,
         runId,
       };
     } else {
       payload = {
         key: nonce,
         error: serializeError(error),
-        extensionId: modComponentRef.modComponentId,
+        extensionId: modComponentRef.extensionId,
         runId,
       };
     }
@@ -104,7 +104,7 @@ export async function runRendererBrick({
         await waitForTemporaryPanel({
           nonce,
           location,
-          extensionId: modComponentRef.modComponentId,
+          extensionId: modComponentRef.extensionId,
           entry: {
             modComponentRef,
             nonce,

diff --git a/src/contentScript/sidebarController.tsx b/src/contentScript/sidebarController.tsx
@@ -372,7 +372,7 @@ export function removeModComponents(modComponentIds: UUID[]): void {
   const current = panels.splice(0);
   panels.push(
     ...current.filter(
-      (x) => !modComponentIds.includes(x.modComponentRef.modComponentId),
+      (x) => !modComponentIds.includes(x.modComponentRef.extensionId),
     ),
   );
   void renderPanelsIfVisible();
@@ -393,7 +393,7 @@ export function removeStarterBrick(
   console.debug("sidebarController:removeStarterBrick %s", starterBrickId, {
     preserveExtensionIds,
     panels: panels.filter(
-      (x) => x.modComponentRef.starterBrickId === starterBrickId,
+      (x) => x.modComponentRef.extensionPointId === starterBrickId,
     ),
   });
 
@@ -402,8 +402,8 @@ export function removeStarterBrick(
   panels.push(
     ...current.filter(
       (x) =>
-        x.modComponentRef.starterBrickId !== starterBrickId ||
-        preserveExtensionIds.includes(x.modComponentRef.modComponentId),
+        x.modComponentRef.extensionPointId !== starterBrickId ||
+        preserveExtensionIds.includes(x.modComponentRef.extensionId),
     ),
   );
 
@@ -418,22 +418,25 @@ export function reservePanels(refs: ModComponentRef[]): void {
     return;
   }
 
-  const current = new Set(panels.map((x) => x.modComponentRef.modComponentId));
-  for (const modComponentRef of refs) {
-    const { modComponentId, starterBrickId, modId } = modComponentRef;
-    if (!current.has(modComponentId)) {
+  const current = new Set(panels.map((x) => x.modComponentRef.extensionId));
+  for (const { extensionId, extensionPointId, blueprintId } of refs) {
+    if (!current.has(extensionId)) {
       const entry: PanelEntry = {
         type: "panel",
-        modComponentRef,
+        modComponentRef: {
+          extensionId,
+          extensionPointId,
+          blueprintId,
+        },
         heading: "",
         payload: null,
       };
 
       console.debug(
         "sidebarController:reservePanels: reserve panel %s for %s",
-        modComponentId,
-        starterBrickId,
-        modId,
+        extensionId,
+        extensionPointId,
+        blueprintId,
         { ...entry },
       );
 
@@ -446,15 +449,15 @@ export function reservePanels(refs: ModComponentRef[]): void {
 
 export function updateHeading(extensionId: UUID, heading: string): void {
   const entry = panels.find(
-    (x) => x.modComponentRef.modComponentId === extensionId,
+    (x) => x.modComponentRef.extensionId === extensionId,
   );
 
   if (entry) {
     entry.heading = heading;
     console.debug(
       "updateHeading: update heading for panel %s for %s",
       extensionId,
-      entry.modComponentRef.starterBrickId,
+      entry.modComponentRef.extensionPointId,
       { ...entry },
     );
     void renderPanelsIfVisible();
@@ -471,30 +474,30 @@ export function upsertPanel(
   heading: string,
   payload: PanelPayload,
 ): void {
-  const { modComponentId, starterBrickId, modId } = modComponentRef;
+  const { extensionId, extensionPointId, blueprintId } = modComponentRef;
 
   const entry = panels.find(
-    (panel) => panel.modComponentRef.modComponentId === modComponentId,
+    (panel) => panel.modComponentRef.extensionId === extensionId,
   );
   if (entry) {
     entry.payload = payload;
     entry.heading = heading;
     console.debug(
       "sidebarController:upsertPanel: update existing panel %s for %s",
-      modComponentId,
-      starterBrickId,
-      modId,
+      extensionId,
+      extensionPointId,
+      blueprintId,
       { ...entry },
     );
   } else {
     console.debug(
       "sidebarController:upsertPanel: add new panel %s for %s",
-      modComponentId,
-      starterBrickId,
-      modId,
+      extensionId,
+      extensionPointId,
+      blueprintId,
       {
         entry,
-        starterBrickId,
+        extensionPointId,
         heading,
         payload,
       },

diff --git a/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts b/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
@@ -206,9 +206,9 @@ export default function useDocumentPreviewRunBlock(
           runId: traceRecord.runId,
           title,
           modComponentRef: {
-            modComponentId,
-            modId: modMetadata?.id,
-            starterBrickId,
+            extensionId: modComponentId,
+            blueprintId: modMetadata?.id,
+            extensionPointId: starterBrickId,
           },
           args: {
             apiVersion,

diff --git a/src/platform/forms/formController.ts b/src/platform/forms/formController.ts
@@ -74,8 +74,8 @@ export async function registerForm({
 
   const preexistingForms = [...forms.entries()].filter(
     ([_, registeredForm]) =>
-      registeredForm.modComponentRef.modComponentId ===
-      modComponentRef.modComponentId,
+      registeredForm.modComponentRef.extensionId ===
+      modComponentRef.extensionId,
   );
 
   if (preexistingForms.length > 0) {

diff --git a/src/platform/panels/panelController.ts b/src/platform/panels/panelController.ts
@@ -107,8 +107,8 @@ export function updatePanelDefinition(
   // Panel entry may be undefined if the panel was registered with registerEmptyTemporaryPanel
   if (
     panel.entry &&
-    panel.entry.modComponentRef.modComponentId !==
-      panelDefinition.modComponentRef.modComponentId
+    panel.entry.modComponentRef.extensionId !==
+      panelDefinition.modComponentRef.extensionId
   ) {
     throw new Error("extensionId mismatch");
   }
@@ -205,7 +205,7 @@ function removePanelEntry(panelNonce: UUID): void {
   const panel = panels.get(panelNonce);
   if (panel?.entry) {
     extensionNonces
-      .get(panel.entry.modComponentRef.modComponentId)
+      .get(panel.entry.modComponentRef.extensionId)
       ?.delete(panelNonce);
   }
 

diff --git a/src/sidebar/Tabs.tsx b/src/sidebar/Tabs.tsx
@@ -211,7 +211,7 @@ const Tabs: React.FC = () => {
         >
           {panels.map((panel) => (
             <TabWithDivider
-              key={panel.modComponentRef.modComponentId}
+              key={panel.modComponentRef.extensionId}
               active={isPanelActive(panel)}
               eventKey={eventKeyForEntry(panel)}
             >
@@ -226,7 +226,7 @@ const Tabs: React.FC = () => {
 
           {forms.map((form) => (
             <TabWithDivider
-              key={form.modComponentRef.modComponentId}
+              key={form.modComponentRef.extensionId}
               active={isPanelActive(form)}
               eventKey={eventKeyForEntry(form)}
             >
@@ -311,7 +311,7 @@ const Tabs: React.FC = () => {
               // un-submitted form state/scroll position
               unmountOnExit={false}
               className={cx("full-height flex-grow", styles.paneOverrides)}
-              key={panel.modComponentRef.modComponentId}
+              key={panel.modComponentRef.extensionId}
               eventKey={eventKeyForEntry(panel)}
             >
               <ErrorBoundary

diff --git a/src/sidebar/TemporaryPanelTabPane.tsx b/src/sidebar/TemporaryPanelTabPane.tsx
@@ -62,7 +62,7 @@ export const TemporaryPanelTabPane: React.FC<{
       <ErrorBoundary
         onError={() => {
           reportEvent(Events.VIEW_ERROR, {
-            ...modComponentRef,
+            ...mapModComponentRefToMessageContext(modComponentRef),
             panelType: type,
           });
         }}

diff --git a/src/sidebar/modLauncher/ActiveSidebarModsList.tsx b/src/sidebar/modLauncher/ActiveSidebarModsList.tsx
@@ -124,7 +124,7 @@ export const ActiveSidebarModsList: React.FunctionComponent = () => {
         tableInstance.prepareRow(row);
         return (
           <ActiveSidebarModsListItem
-            key={row.original.modComponentRef.modComponentId}
+            key={row.original.modComponentRef.extensionId}
             panel={row.original}
           />
         );

diff --git a/src/sidebar/sidebarSelectors.ts b/src/sidebar/sidebarSelectors.ts
@@ -63,7 +63,7 @@ const selectSidebarEntries = ({ sidebar }: SidebarRootState) => [
 const extensionForEventKeySelector = createSelector(
   selectSidebarEntries,
   selectActivatedModComponents,
-  (_state: SidebarRootState, eventKey: string) => eventKey,
+  (state: SidebarRootState, eventKey: string) => eventKey,
   (entries, extensions, eventKey): ActivatedModComponent | undefined => {
     // Get sidebar entry by event key
     const sidebarEntry = entries.find(
@@ -76,7 +76,7 @@ const extensionForEventKeySelector = createSelector(
 
     return extensions.find(
       (modComponent) =>
-        modComponent.id === sidebarEntry.modComponentRef.modComponentId,
+        modComponent.id === sidebarEntry.modComponentRef.extensionId,
     );
   },
 );
@@ -102,7 +102,7 @@ export const selectExtensionFromEventKey =
 
     return extensions.find(
       (modComponent) =>
-        modComponent.id === sidebarEntry.modComponentRef.modComponentId,
+        modComponent.id === sidebarEntry.modComponentRef.extensionId,
     );
   };
 

diff --git a/src/starterBricks/sidebar/sidebarStarterBrick.test.ts b/src/starterBricks/sidebar/sidebarStarterBrick.test.ts
@@ -113,7 +113,7 @@ describe("sidebarExtension", () => {
       panels: [
         expect.objectContaining({
           modComponentRef: expect.objectContaining({
-            starterBrickId: starterBrick.id,
+            extensionPointId: starterBrick.id,
           }),
         }),
       ],