fix: usage of contentSourceEditPattern (#804)

* fix: usage of contentSourceEditPattern

* fix: added test

Author: mhaack

src/extension/app/store/app.js

@@ -1293,7 +1293,8 @@ export class AppStore {
       }
 
       let updatedStatus = await this.fetchStatus(false, true, isReview);
-      let editUrl = updatedStatus.edit?.url || this.getBYOMSourceUrl(updatedStatus);
+      // prefer configured contentSourceEditPattern URL; otherwise fall back to status edit URL.
+      let editUrl = this.getBYOMSourceUrl(updatedStatus) || updatedStatus.edit?.url;
 
       if (isReview) {
         // restore original pathname and state
@@ -1302,7 +1303,8 @@ export class AppStore {
         if (!editUrl) {
           // no snapshot source, fall back to original edit URL
           updatedStatus = await this.fetchStatus(false, true);
-          editUrl = updatedStatus.edit?.url || this.getBYOMSourceUrl(updatedStatus);
+          // prefer configured contentSourceEditPattern URL; otherwise fall back to status edit URL.
+          editUrl = this.getBYOMSourceUrl(updatedStatus) || updatedStatus.edit?.url;
         }
       }
 

test/app/store/app.test.js

@@ -708,7 +708,7 @@ describe('Test App Store', () => {
       expect(openPageArgs[0]).to.include(liveHost);
     });
 
-    it('switches from preview to BYOM editor', async () => {
+    it('switches from preview to BYOM editor, no edit URL', async () => {
       instance.siteStore.contentSourceUrl = 'https://aemcloud.com';
       instance.siteStore.contentSourceEditLabel = 'Universal Editor';
       instance.siteStore.contentSourceEditPattern = '{{contentSourceUrl}}{{pathname}}?cmd=open';
@@ -722,6 +722,23 @@ describe('Test App Store', () => {
       expect(loadPage.calledWith('https://aemcloud.com/index?cmd=open')).to.be.true;
     });
 
+    it('switches from preview to BYOM editor, overwrites edit URL ', async () => {
+      instance.siteStore.contentSourceUrl = 'https://aemcloud.com';
+      instance.siteStore.contentSourceEditLabel = 'Universal Editor';
+      instance.siteStore.contentSourceEditPattern = '{{contentSourceUrl}}{{pathname}}?cmd=open';
+
+      const fetchStatusStub = sidekickTest.sandbox.stub(instance, 'fetchStatus');
+      fetchStatusStub.onCall(0).resolves({
+        webPath: '/',
+        edit: { url: 'https://edit.example.com/original-path' },
+      });
+
+      instance.location = new URL(mockStatus.preview.url);
+      instance.status = mockStatus;
+      await instance.switchEnv('edit');
+      expect(loadPage.calledWith('https://aemcloud.com/index?cmd=open')).to.be.true;
+    });
+
     it('switches from review to edit with snapshot path', async () => {
       const fetchStatusStub = sidekickTest.sandbox.stub(instance, 'fetchStatus');
       const isReviewStub = sidekickTest.sandbox.stub(instance, 'isReview');