From d3fd8525211f3b45e8bfcc3c73b473c649fdfed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isaac=20Rold=C3=A1n?= <isaac.roldan@shopify.com>
Date: Thu, 9 Jul 2026 19:13:36 +0200
Subject: [PATCH] Fix webhook subscription UID to omit the literal "undefined"
 for absent filters

A dynamic-strategy webhook subscription without a `filter` produced a UID
containing the literal string `undefined`
(`orders/delete::undefined::https://...`). Use an empty segment instead
(`orders/delete::::https://...`) so the UID reflects the real configuration.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../app/src/cli/models/extensions/extension-instance.test.ts    | 2 +-
 packages/app/src/cli/models/extensions/extension-instance.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/cli/models/extensions/extension-instance.test.ts b/packages/app/src/cli/models/extensions/extension-instance.test.ts
index bfb1a1680fe..65cedcc3a0c 100644
--- a/packages/app/src/cli/models/extensions/extension-instance.test.ts
+++ b/packages/app/src/cli/models/extensions/extension-instance.test.ts
@@ -416,7 +416,7 @@ describe('buildUIDFromStrategy', async () => {
     // Given
     const extensionInstance = await testSingleWebhookSubscriptionExtension()
     // Then
-    expect(extensionInstance.uid).toBe('orders/delete::undefined::https://my-app.com/webhooks')
+    expect(extensionInstance.uid).toBe('orders/delete::::https://my-app.com/webhooks')
   })
 
   test('returns a custom string when strategy is dynamic and it is a webhook subscription extension with filters', async () => {
diff --git a/packages/app/src/cli/models/extensions/extension-instance.ts b/packages/app/src/cli/models/extensions/extension-instance.ts
index f651bfd5c12..dcd6349515f 100644
--- a/packages/app/src/cli/models/extensions/extension-instance.ts
+++ b/packages/app/src/cli/models/extensions/extension-instance.ts
@@ -543,7 +543,7 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
         // Related issues: PR #559094 in old Core repo
         if ('topic' in this.configuration && 'uri' in this.configuration) {
           const subscription = this.configuration as unknown as SingleWebhookSubscriptionType
-          return `${subscription.topic}::${subscription.filter}::${subscription.uri}`.substring(0, MAX_UID_LENGTH)
+          return `${subscription.topic}::${subscription.filter ?? ''}::${subscription.uri}`.substring(0, MAX_UID_LENGTH)
         } else {
           return nonRandomUUID(JSON.stringify(this.configuration))
         }