MWPW-160015: M@S: support for mnemonic multifield (#3075)

* MWPW-160015: M@S: support for mnemonic multifield during card hydration. * updated deps
adobecom · Oct 30, 2024 · fa39a05 · fa39a05
1 parent 7255d63
commit fa39a05
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 158 deletions.
diff --git a/libs/deps/mas/mas.js b/libs/deps/mas/mas.js
diff --git a/libs/features/mas/mas/dist/mas.js b/libs/features/mas/mas/dist/mas.js
diff --git a/libs/features/mas/web-components/src/aem-fragment.js b/libs/features/mas/web-components/src/aem-fragment.js
@@ -72,7 +72,7 @@ export class AemFragment extends HTMLElement {
     /**
      * Internal promise to track the readiness of the web-component to render.
      */
-    _readyPromise;
+    #readyPromise;
 
     static get observedAttributes() {
         return [ATTRIBUTE_FRAGMENT];
@@ -113,17 +113,17 @@ export class AemFragment extends HTMLElement {
     }
 
     async refresh(flushCache = true) {
-        if (this._readyPromise) {
+        if (this.#readyPromise) {
             const ready = await Promise.race([
-                this._readyPromise,
+                this.#readyPromise,
                 Promise.resolve(false),
             ]);
             if (!ready) return; // already fetching data
         }
         if (flushCache) {
             cache.remove(this.fragmentId);
         }
-        this._readyPromise = this.fetchData()
+        this.#readyPromise = this.fetchData()
             .then(() => {
                 this.dispatchEvent(
                     new CustomEvent(EVENT_AEM_LOAD, {
@@ -137,9 +137,10 @@ export class AemFragment extends HTMLElement {
             .catch(() => {
                 /* c8 ignore next 3 */ 
                 this.#fail('Network error: failed to load fragment');
-                this._readyPromise = null;
+                this.#readyPromise = null;
                 return false;
             });
+        this.#readyPromise;
     }
 
     #fail(error) {
@@ -168,7 +169,7 @@ export class AemFragment extends HTMLElement {
 
     get updateComplete() {
         return (
-            this._readyPromise ??
+            this.#readyPromise ??
             Promise.reject(new Error('AEM fragment cannot be loaded'))
         );
     }

diff --git a/libs/features/mas/web-components/test/aem-fragment.test.html.js b/libs/features/mas/web-components/test/aem-fragment.test.html.js
@@ -95,15 +95,15 @@ runTests(async () => {
         });
 
         it('merch-card fails when aem-fragment contains incorrect merch data', async () => {
-          const [, , , , , cardWithWrongOsis] = getTemplateContent('cards');
-
-          let masErrorTriggered = false;
-          cardWithWrongOsis.addEventListener(EVENT_MAS_ERROR, () => {
-              masErrorTriggered = true;
-          });
-          spTheme.append(cardWithWrongOsis);
-          await delay(100);          
-          expect(masErrorTriggered).to.true;
+            const [, , , , , cardWithWrongOsis] = getTemplateContent('cards');
+
+            let masErrorTriggered = false;
+            cardWithWrongOsis.addEventListener(EVENT_MAS_ERROR, () => {
+                masErrorTriggered = true;
+            });
+            spTheme.append(cardWithWrongOsis);
+            await delay(100);
+            expect(masErrorTriggered).to.true;
         });
 
         it('uses ims token to retrieve a fragment', async () => {
@@ -115,18 +115,16 @@ runTests(async () => {
             sinon.assert.calledOnce(window.adobeid.authorize);
         });
 
-
         it('renders ccd slice card', async () => {
-          const [, , , , , , sliceCard] = getTemplateContent('cards');
-          spTheme.append(sliceCard);
-          await delay(100);   
-          expect(sliceCard.querySelector('merch-icon')).to.exist;
-          expect(sliceCard.querySelector('div[slot="image"]')).to.exist;
-          expect(sliceCard.querySelector('div[slot="body-s"]')).to.exist;
-          expect(sliceCard.querySelector('div[slot="footer"]')).to.exist;
-          const badge = sliceCard.shadowRoot?.querySelector('div#badge');
-          expect(badge).to.exist;
-
+            const [, , , , , , sliceCard] = getTemplateContent('cards');
+            spTheme.append(sliceCard);
+            await delay(100);
+            expect(sliceCard.querySelector('merch-icon')).to.exist;
+            expect(sliceCard.querySelector('div[slot="image"]')).to.exist;
+            expect(sliceCard.querySelector('div[slot="body-s"]')).to.exist;
+            expect(sliceCard.querySelector('div[slot="footer"]')).to.exist;
+            const badge = sliceCard.shadowRoot?.querySelector('div#badge');
+            expect(badge).to.exist;
         });
     });
 });