Add filter to prevent NPE while reactivating from extension console (#…

…6410) * add filter to prevent NPE while reactivating * move filter and add test
pixiebrix · Sep 7, 2023 · 655c496 · 655c496
1 parent 76868c3
commit 655c496
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/store/extensionsUtils.test.ts b/src/store/extensionsUtils.test.ts
@@ -23,6 +23,7 @@ import { type IntegrationDependency } from "@/types/integrationTypes";
 import { uuidv4, validateRegistryId } from "@/types/helpers";
 import { validateOutputKey } from "@/runtime/runtimeTypes";
 import { integrationDependencyFactory } from "@/testUtils/factories/integrationFactories";
+import { PIXIEBRIX_INTEGRATION_ID } from "@/services/constants";
 
 describe("inferRecipeOptions", () => {
   it("returns first option", () => {
@@ -98,4 +99,13 @@ describe("inferModIntegrations", () => {
       })
     ).toBeEmpty();
   });
+
+  it("handles unconfigured integrations when the id is the default", () => {
+    const unconfigured = integrationDependencyFactory();
+    delete unconfigured.config;
+    unconfigured.id = validateRegistryId(PIXIEBRIX_INTEGRATION_ID);
+    expect(
+      inferConfiguredModIntegrations([{ services: [unconfigured] }])
+    ).toBeEmpty();
+  });
 });
diff --git a/src/store/extensionsUtils.ts b/src/store/extensionsUtils.ts
@@ -66,16 +66,12 @@ export function inferConfiguredModIntegrations(
       ({ config }) => config
     );
 
-    if (
-      id !== PIXIEBRIX_INTEGRATION_ID &&
-      configuredDependencies.length === 0
-    ) {
-      if (optional) {
-        continue;
-      } else {
-        // PIXIEBRIX_SERVICE_ID gets the implicit configuration
+    if (configuredDependencies.length === 0) {
+      if (id !== PIXIEBRIX_INTEGRATION_ID && !optional) {
         throw new Error(`Integration ${id} is not configured`);
       }
+
+      continue;
     }
 
     // If optional is passed in, we know that the user is being given an