sfdx-browserforce-plugin 5.1.2 → 5.2.0-next.2

package/lib/plugins/history-tracking/index.js

@@ -1,8 +1,9 @@
+import { waitForPageErrors } from '../../browserforce.js';
 import { BrowserforcePlugin } from '../../plugin.js';
 const BASE_PATH = 'ui/setup/layout/FieldHistoryTracking?pEntity={APINAME}';
-const ENABLE_HISTORY_SELECTOR = 'input[id="enable"][type="checkbox"][name="enable"]';
+const ENABLE_HISTORY_SELECTOR = 'input[type="checkbox"][id="enable"]';
 const ENABLE_FIELD_HISTORY_SELECTOR = 'input[id="{APINAME}_fht"]';
-const SAVE_BUTTON_SELECTOR = 'input[class="btn"][type="submit"][name="save"][title="Save"]';
+const SAVE_BUTTON_SELECTOR = 'input[type="submit"][name="save"]';
 export class HistoryTracking extends BrowserforcePlugin {
     async retrieve(definition) {
         const historyTrackingConfigs = [];
@@ -10,15 +11,16 @@ export class HistoryTracking extends BrowserforcePlugin {
         // This is in case we have field tracking configured for custom fields
         const tableEnumOrIdByObjectApiName = await this.getTableEnumOrIdByObjectApiName(definition);
         // Now we can iterate over all history tracking configurations in the definition
-        for await (const historyTrackingConfig of definition) {
+        for (const historyTrackingConfig of definition) {
             const historyTrackingResult = { ...historyTrackingConfig };
             // Open the object history tracking setup page
             const page = await this.browserforce.openPage(BASE_PATH.replace('{APINAME}', tableEnumOrIdByObjectApiName.get(historyTrackingConfig.objectApiName)));
             // Retrieve the object history tracking
             // If this is a custom object, this checkbox does not exist, so skip
             if (!historyTrackingConfig.objectApiName.includes('__c')) {
-                await page.waitForSelector(ENABLE_HISTORY_SELECTOR);
-                historyTrackingResult.enableHistoryTracking = await page.$eval(ENABLE_HISTORY_SELECTOR, (el) => (el.getAttribute('checked') === 'checked' ? true : false));
+                historyTrackingResult.enableHistoryTracking = await page
+                    .locator(ENABLE_HISTORY_SELECTOR)
+                    .isChecked();
             }
             // If we have no field history tracking, there is nothing more to do
             if (!historyTrackingConfig.fieldHistoryTracking) {
@@ -45,14 +47,17 @@ export class HistoryTracking extends BrowserforcePlugin {
             // This is because custom fields are identified using their CustomField.Id value
             const fieldSelectorByFieldApiName = await this.getFieldSelectorByFieldApiName(tableEnumOrIdByObjectApiName.get(historyTrackingConfig.objectApiName), historyTrackingConfig.fieldHistoryTracking);
             // We can now retrieve the field history settings for the fields specified for the object
-            for await (const fieldHistoryTracking of historyTrackingConfig.fieldHistoryTracking) {
+            for (const fieldHistoryTracking of historyTrackingConfig.fieldHistoryTracking) {
                 const fieldHistoryTrackingResult = { ...fieldHistoryTracking };
                 const fieldApiName = fieldSelectorByFieldApiName.get(fieldHistoryTracking.fieldApiName);
-                fieldHistoryTrackingResult.enableHistoryTracking = await page.$eval(ENABLE_FIELD_HISTORY_SELECTOR.replace('{APINAME}', fieldApiName), (el) => (el.getAttribute('checked') === 'checked' ? true : false));
+                fieldHistoryTrackingResult.enableHistoryTracking = await page
+                    .locator(ENABLE_FIELD_HISTORY_SELECTOR.replace('{APINAME}', fieldApiName))
+                    .isChecked();
                 fieldHistoryTrackingConfigs.push(fieldHistoryTrackingResult);
             }
             historyTrackingResult.fieldHistoryTracking = fieldHistoryTrackingConfigs;
             historyTrackingConfigs.push(historyTrackingResult);
+            await page.close();
         }
         return historyTrackingConfigs;
     }
@@ -61,18 +66,18 @@ export class HistoryTracking extends BrowserforcePlugin {
         // This is in case we are configuring field tracking for custom fields
         const tableEnumOrIdByObjectApiName = await this.getTableEnumOrIdByObjectApiName(plan);
         // Now we can iterate over all history tracking configurations in the plan
-        for await (const historyTrackingConfig of plan) {
+        for (const historyTrackingConfig of plan) {
             // Open the object history tracking setup page
             const page = await this.browserforce.openPage(BASE_PATH.replace('{APINAME}', tableEnumOrIdByObjectApiName.get(historyTrackingConfig.objectApiName)));
             // Retrieve the object history tracking
             // If this is a custom object, this checkbox does not exist, so skip
             if (!historyTrackingConfig.objectApiName.includes('__c')) {
-                await page.waitForSelector(ENABLE_HISTORY_SELECTOR);
-                const historyTrackingEnabled = await page.$eval(ENABLE_HISTORY_SELECTOR, (el) => (el.getAttribute('checked') === 'checked' ? true : false));
+                const historyTrackingEnabled = await page
+                    .locator(ENABLE_HISTORY_SELECTOR)
+                    .isChecked();
                 if (historyTrackingConfig.enableHistoryTracking !== historyTrackingEnabled) {
                     // Click the checkbox
-                    const enableHistoryTracking = await page.waitForSelector(ENABLE_HISTORY_SELECTOR);
-                    await enableHistoryTracking.evaluate((node) => node.click());
+                    await page.locator(ENABLE_HISTORY_SELECTOR).click();
                 }
             }
             if (historyTrackingConfig.fieldHistoryTracking) {
@@ -80,23 +85,30 @@ export class HistoryTracking extends BrowserforcePlugin {
                 // This is because custom fields are identified using their CustomField.Id value
                 const fieldSelectorByFieldApiName = await this.getFieldSelectorByFieldApiName(tableEnumOrIdByObjectApiName.get(historyTrackingConfig.objectApiName), historyTrackingConfig.fieldHistoryTracking);
                 // We can now retrieve the field history settings for the fields specified for the object
-                for await (const fieldHistoryTracking of historyTrackingConfig.fieldHistoryTracking) {
+                for (const fieldHistoryTracking of historyTrackingConfig.fieldHistoryTracking) {
                     const fieldApiName = fieldSelectorByFieldApiName.get(fieldHistoryTracking.fieldApiName);
                     const fieldSelector = ENABLE_FIELD_HISTORY_SELECTOR.replace('{APINAME}', fieldApiName);
-                    const fieldHistoryTrackingEnabled = await page.$eval(fieldSelector, (el) => (el.getAttribute('checked') === 'checked' ? true : false));
+                    const fieldHistoryTrackingEnabled = await page
+                        .locator(fieldSelector)
+                        .isChecked();
                     if (fieldHistoryTracking.enableHistoryTracking !==
                         fieldHistoryTrackingEnabled) {
                         // Click the checkbox
-                        const enableFieldHistoryTracking = await page.waitForSelector(fieldSelector);
-                        await enableFieldHistoryTracking.evaluate((node) => node.click());
+                        await page.locator(fieldSelector).click();
                     }
                 }
             }
             // Save the settings
-            const saveButton = await page.waitForSelector(SAVE_BUTTON_SELECTOR);
-            await saveButton.evaluate((node) => node.click());
-            // Wait for the page to refresh
-            await page.waitForNavigation();
+            const afterSavePromise = Promise.race([
+                page.waitForURL((url) => url.pathname !== `/ui/setup/layout/FieldHistoryTracking`),
+                waitForPageErrors(page),
+            ]);
+            await page
+                .locator(SAVE_BUTTON_SELECTOR)
+                .filter({ visible: true }) // there are three save buttons [not visible, top row, bottom row]
+                .first()
+                .click();
+            await afterSavePromise;
             // Close the page
             await page.close();
         }

package/lib/plugins/history-tracking/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/history-tracking/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,wDAAwD,CAAC;AAE3E,MAAM,uBAAuB,GAC3B,oDAAoD,CAAC;AACvD,MAAM,6BAA6B,GAAG,2BAA2B,CAAC;AAClE,MAAM,oBAAoB,GACxB,8DAA8D,CAAC;AAajE,MAAM,OAAO,eAAgB,SAAQ,kBAAkB;IAC9C,KAAK,CAAC,QAAQ,CACnB,UAAoC;QAEpC,MAAM,sBAAsB,GAA4B,EAAE,CAAC;QAE3D,wFAAwF;QACxF,sEAAsE;QACtE,MAAM,4BAA4B,GAChC,MAAM,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QAEzD,gFAAgF;QAChF,IAAI,KAAK,EAAE,MAAM,qBAAqB,IAAI,UAAU,EAAE,CAAC;YACrD,MAAM,qBAAqB,GAAG,EAAE,GAAG,qBAAqB,EAAE,CAAC;YAE3D,8CAA8C;YAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAC3C,SAAS,CAAC,OAAO,CACf,WAAW,EACX,4BAA4B,CAAC,GAAG,CAAC,qBAAqB,CAAC,aAAa,CAAC,CACtE,CACF,CAAC;YAEF,uCAAuC;YACvC,oEAAoE;YACpE,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;gBAEpD,qBAAqB,CAAC,qBAAqB,GAAG,MAAM,IAAI,CAAC,KAAK,CAC5D,uBAAuB,EACvB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,CAAC;YACJ,CAAC;YAED,oEAAoE;YACpE,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;gBAChD,sBAAsB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACnD,SAAS;YACX,CAAC;YAED,MAAM,2BAA2B,GAAiC,EAAE,CAAC;YAErE,oGAAoG;YACpG,4CAA4C;YAC5C,IACE,CAAC,qBAAqB,CAAC,qBAAqB;gBAC5C,CAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EACpD,CAAC;gBACD,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;oBAC9E,2BAA2B,CAAC,IAAI,CAAC;wBAC/B,GAAG,oBAAoB;wBACvB,qBAAqB,EAAE,KAAK;qBAC7B,CAAC,CAAC;gBACL,CAAC;gBAED,qBAAqB,CAAC,oBAAoB;oBACxC,2BAA2B,CAAC;gBAC9B,sBAAsB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACnD,SAAS;YACX,CAAC;YAED,mFAAmF;YACnF,gFAAgF;YAChF,MAAM,2BAA2B,GAC/B,MAAM,IAAI,CAAC,8BAA8B,CACvC,4BAA4B,CAAC,GAAG,CAAC,qBAAqB,CAAC,aAAa,CAAC,EACrE,qBAAqB,CAAC,oBAAoB,CAC3C,CAAC;YAEJ,yFAAyF;YACzF,IAAI,KAAK,EAAE,MAAM,oBAAoB,IAAI,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;gBACpF,MAAM,0BAA0B,GAAG,EAAE,GAAG,oBAAoB,EAAE,CAAC;gBAE/D,MAAM,YAAY,GAAG,2BAA2B,CAAC,GAAG,CAClD,oBAAoB,CAAC,YAAY,CAClC,CAAC;gBAEF,0BAA0B,CAAC,qBAAqB,GAAG,MAAM,IAAI,CAAC,KAAK,CACjE,6BAA6B,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,EAChE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,CAAC;gBAEF,2BAA2B,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAC/D,CAAC;YAED,qBAAqB,CAAC,oBAAoB,GAAG,2BAA2B,CAAC;YACzE,sBAAsB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAA6B;QAC9C,wFAAwF;QACxF,sEAAsE;QACtE,MAAM,4BAA4B,GAChC,MAAM,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAEnD,0EAA0E;QAC1E,IAAI,KAAK,EAAE,MAAM,qBAAqB,IAAI,IAAI,EAAE,CAAC;YAC/C,8CAA8C;YAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAC3C,SAAS,CAAC,OAAO,CACf,WAAW,EACX,4BAA4B,CAAC,GAAG,CAAC,qBAAqB,CAAC,aAAa,CAAC,CACtE,CACF,CAAC;YAEF,uCAAuC;YACvC,oEAAoE;YACpE,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;gBAEpD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,KAAK,CAC7C,uBAAuB,EACvB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,CAAC;gBAEF,IACE,qBAAqB,CAAC,qBAAqB,KAAK,sBAAsB,EACtE,CAAC;oBACD,qBAAqB;oBACrB,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,eAAe,CACtD,uBAAuB,CACxB,CAAC;oBACF,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3C,IAAoB,CAAC,KAAK,EAAE,CAC9B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;gBAC/C,mFAAmF;gBACnF,gFAAgF;gBAChF,MAAM,2BAA2B,GAC/B,MAAM,IAAI,CAAC,8BAA8B,CACvC,4BAA4B,CAAC,GAAG,CAC9B,qBAAqB,CAAC,aAAa,CACpC,EACD,qBAAqB,CAAC,oBAAoB,CAC3C,CAAC;gBAEJ,yFAAyF;gBACzF,IAAI,KAAK,EAAE,MAAM,oBAAoB,IAAI,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;oBACpF,MAAM,YAAY,GAAG,2BAA2B,CAAC,GAAG,CAClD,oBAAoB,CAAC,YAAY,CAClC,CAAC;oBAEF,MAAM,aAAa,GAAG,6BAA6B,CAAC,OAAO,CACzD,WAAW,EACX,YAAY,CACb,CAAC;oBAEF,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,KAAK,CAClD,aAAa,EACb,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,CAAC;oBAEF,IACE,oBAAoB,CAAC,qBAAqB;wBAC1C,2BAA2B,EAC3B,CAAC;wBACD,qBAAqB;wBACrB,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,eAAe,CAC3D,aAAa,CACd,CAAC;wBACF,MAAM,0BAA0B,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAChD,IAAoB,CAAC,KAAK,EAAE,CAC9B,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,oBAAoB;YACpB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;YACpE,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAE,IAAoB,CAAC,KAAK,EAAE,CAAC,CAAC;YAEnE,+BAA+B;YAC/B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAE/B,iBAAiB;YACjB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAC1C,aAAqB,EACrB,2BAAyD;QAEzD,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9C,MAAM,mBAAmB,GAAG,EAAE,CAAC;QAC/B,MAAM,0BAA0B,GAAG,EAAE,CAAC;QAEtC,KAAK,MAAM,0BAA0B,IAAI,2BAA2B,EAAE,CAAC;YACrE,0EAA0E;YAC1E,IACE,aAAa,KAAK,SAAS;gBAC3B,0BAA0B,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EACxD,CAAC;gBACD,0BAA0B,CAAC,IAAI,CAC7B,IAAI,0BAA0B,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CACnE,CAAC;gBACF,SAAS;YACX,CAAC;YAED,4DAA4D;YAC5D,IAAI,0BAA0B,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,mBAAmB,CAAC,IAAI,CACtB,IAAI,0BAA0B,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAClE,CAAC;gBACF,SAAS;YACX,CAAC;YAED,6EAA6E;YAC7E,2BAA2B,CAAC,GAAG,CAC7B,0BAA0B,CAAC,YAAY,EACvC,0BAA0B,CAAC,YAAY,CACxC,CAAC;QACJ,CAAC;QAED,IACE,mBAAmB,CAAC,MAAM,KAAK,CAAC;YAChC,0BAA0B,CAAC,MAAM,KAAK,CAAC,EACvC,CAAC;YACD,OAAO,2BAA2B,CAAC;QACrC,CAAC;QAED,IAAI,0BAA0B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,GAAG;iBAC5C,aAAa,EAAE;iBACf,OAAO,CAAC,KAAK,CACZ,qEAAqE,0BAA0B,CAAC,IAAI,CAClG,GAAG,CACJ,iCAAiC,CACnC,CAAC;YAEJ,KAAK,MAAM,kBAAkB,IAAI,wBAAwB,CAAC,OAAO,EAAE,CAAC;gBAClE,2BAA2B,CAAC,GAAG,CAC7B,GAAG,kBAAkB,CAAC,aAAa,MAAM,EACzC,kBAAkB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CACvC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,GAAG;iBACrC,aAAa,EAAE;iBACf,OAAO,CAAC,KAAK,CACZ,qEAAqE,mBAAmB,CAAC,IAAI,CAC3F,GAAG,CACJ,0BAA0B,aAAa,GAAG,CAC5C,CAAC;YAEJ,KAAK,MAAM,WAAW,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBACpD,2BAA2B,CAAC,GAAG,CAC7B,GAAG,WAAW,CAAC,aAAa,KAAK,EACjC,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAChC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAC3C,sBAA+C;QAE/C,MAAM,4BAA4B,GAAG,IAAI,GAAG,EAAE,CAAC;QAE/C,MAAM,oBAAoB,GAAG,EAAE,CAAC;QAEhC,KAAK,MAAM,qBAAqB,IAAI,sBAAsB,EAAE,CAAC;YAC3D,2EAA2E;YAC3E,IAAI,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxD,oBAAoB,CAAC,IAAI,CACvB,IAAI,qBAAqB,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAC9D,CAAC;gBACF,SAAS;YACX,CAAC;YAED,gGAAgG;YAChG,4BAA4B,CAAC,GAAG,CAC9B,qBAAqB,CAAC,aAAa,EACnC,qBAAqB,CAAC,aAAa,CACpC,CAAC;QACJ,CAAC;QAED,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,4BAA4B,CAAC;QACtC,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG;aACtC,aAAa,EAAE;aACf,OAAO,CAAC,KAAK,CACZ,sEAAsE,oBAAoB,CAAC,IAAI,CAC7F,GAAG,CACJ,GAAG,CACL,CAAC;QAEJ,KAAK,MAAM,YAAY,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACtD,4BAA4B,CAAC,GAAG,CAC9B,GAAG,YAAY,CAAC,aAAa,KAAK,EAClC,YAAY,CAAC,EAAE,CAChB,CAAC;QACJ,CAAC;QAED,OAAO,4BAA4B,CAAC;IACtC,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/history-tracking/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/home-page-layouts/index.js

@@ -1,3 +1,4 @@
+import { waitForPageErrors } from '../../browserforce.js';
 import { BrowserforcePlugin } from '../../plugin.js';
 const BASE_PATH = 'setup/ui/assignhomelayoutedit.jsp';
 const BASE_SELECTOR = 'table.detailList';
@@ -5,10 +6,12 @@ const SAVE_BUTTON_SELECTOR = 'input[name="save"]';
 export class HomePageLayouts extends BrowserforcePlugin {
     async retrieve() {
         const page = await this.browserforce.openPage(BASE_PATH);
-        await page.waitForSelector(BASE_SELECTOR);
-        const profiles = await page.$$eval('table.detailList tbody tr td label', (labels) => {
+        await page.locator(BASE_SELECTOR).waitFor();
+        const profiles = await page
+            .locator('table.detailList tbody tr td label')
+            .evaluateAll((labels) => {
             return labels.map((label) => {
-                for (let i = 0; label.childNodes.length; i++) {
+                for (let i = 0; i < label.childNodes.length; i++) {
                     if (label.childNodes[i].nodeType === label.TEXT_NODE) {
                         return label.childNodes[i].nodeValue ?? '';
                     }
@@ -16,7 +19,9 @@ export class HomePageLayouts extends BrowserforcePlugin {
                 throw new Error('retrieving HomePageLayouts failed');
             });
         });
-        const layouts = await page.$$eval('table.detailList tbody tr td select', (selects) => {
+        const layouts = await page
+            .locator('table.detailList tbody tr td select')
+            .evaluateAll((selects) => {
             return selects
                 .map((select) => select.selectedOptions[0].text)
                 .map((text) => (text === 'Home Page Default' ? '' : text));
@@ -54,12 +59,12 @@ export class HomePageLayouts extends BrowserforcePlugin {
             .join(',');
         const profiles = await this.org
             .getConnection()
-            .tooling.query(`SELECT Id, Name FROM Profile WHERE Name IN (${profilesList})`);
+            .tooling.query(`SELECT Id, Name FROM Profile WHERE NAME IN (${profilesList})`);
         const homePageLayouts = await this.org
             .getConnection()
             .tooling.query(`SELECT Id, Name FROM HomePageLayout WHERE Name IN (${layoutsList})`);
         const page = await this.browserforce.openPage(BASE_PATH);
-        await page.waitForSelector(BASE_SELECTOR);
+        await page.locator(BASE_SELECTOR).waitFor();
         for (const assignment of config.homePageLayoutAssignments) {
             const homePageLayoutName = assignment.layout;
             const profile = profiles.records.find((p) => p.Name === assignment.profile);
@@ -74,12 +79,14 @@ export class HomePageLayouts extends BrowserforcePlugin {
                 throw new Error(`Could not find home page layout "${homePageLayoutName}" in list of home page layouts: ${homePageLayouts.records.map((l) => l.Name)}`);
             }
             const profileSelector = `select[id='${profile.Id.substring(0, 15)}']`;
-            await page.waitForSelector(profileSelector);
-            await page.select(profileSelector, homePageLayout.Id.substring(0, 15));
+            await page
+                .locator(profileSelector)
+                .selectOption(homePageLayout.Id.substring(0, 15));
         }
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click(SAVE_BUTTON_SELECTOR),
+        await page.locator(SAVE_BUTTON_SELECTOR).first().click();
+        await Promise.race([
+            page.waitForURL((url) => url.pathname !== `/${BASE_PATH}`),
+            waitForPageErrors(page),
         ]);
         await page.close();
     }

package/lib/plugins/home-page-layouts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/home-page-layouts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/home-page-layouts/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/lightning-experience-settings/index.d.ts

@@ -1,4 +1,4 @@
-import { ElementHandle, Page } from 'puppeteer';
+import type { Locator, Page } from 'playwright';
 import { BrowserforcePlugin } from '../../plugin.js';
 type Config = {
     activeThemeName: string;
@@ -6,10 +6,9 @@ type Config = {
 type Theme = {
     developerName: string;
     isActive: boolean;
-    rowElementHandle: ElementHandle;
+    rowLocator: Locator;
 };
 export declare class LightningExperienceSettings extends BrowserforcePlugin {
-    setupDOMObserver(page: Page, elementName: string, callbackName: string): Promise<void>;
     retrieve(): Promise<Config>;
     apply(config: Config): Promise<void>;
     getThemeData(page: Page): Promise<Theme[]>;

package/lib/plugins/lightning-experience-settings/index.e2e-spec.js

@@ -8,7 +8,15 @@ describe(LightningExperienceSettings.name, function () {
             plugin = new LightningExperienceSettings(global.bf);
             configOriginal = await plugin.retrieve();
         });
+        const configSLDS2 = { activeThemeName: 'SalesforceCosmos' };
         const configLightningLite = { activeThemeName: 'LightningLite' };
+        it('should activate SalesforceCosmos theme (SLDS2)', async () => {
+            await plugin.run(configSLDS2);
+        });
+        it('SalesforceCosmos theme should already be activated', async () => {
+            const state = await plugin.retrieve();
+            assert.deepStrictEqual(state, configSLDS2);
+        });
         it('should activate LightningLite theme', async () => {
             await plugin.run(configLightningLite);
         });

package/lib/plugins/lightning-experience-settings/index.e2e-spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/lightning-experience-settings/index.e2e-spec.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAEzD,QAAQ,CAAC,2BAA2B,CAAC,IAAI,EAAE;IACzC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,MAAmC,CAAC;QACxC,IAAI,cAAc,CAAC;QACnB,MAAM,CAAC,KAAK,IAAI,EAAE;YAChB,MAAM,GAAG,IAAI,2BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpD,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;QACjE,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,IAAI,GAAG,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,GAAG,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,MAAM,GAAG,CAAC;YACZ,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/lightning-experience-settings/index.e2e-spec.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAEzD,QAAQ,CAAC,2BAA2B,CAAC,IAAI,EAAE;IACzC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,MAAmC,CAAC;QACxC,IAAI,cAAc,CAAC;QACnB,MAAM,CAAC,KAAK,IAAI,EAAE;YAChB,MAAM,GAAG,IAAI,2BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpD,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,EAAE,eAAe,EAAE,kBAAkB,EAAE,CAAC;QAC5D,MAAM,mBAAmB,GAAG,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;QACjE,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,IAAI,GAAG,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;YAC/C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,GAAG,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,MAAM,GAAG,CAAC;YACZ,CAAC,EAAE,sBAAsB,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/plugins/lightning-experience-settings/index.js

@@ -5,28 +5,6 @@ const THEME_ROW_SELECTOR = '#setupComponent table > tbody > tr';
 const DEVELOPER_NAMES_SELECTOR = `${THEME_ROW_SELECTOR} > td:nth-child(2) > lightning-primitive-cell-factory lightning-base-formatted-text`;
 const STATES_SELECTOR = `${THEME_ROW_SELECTOR} > td:nth-child(6) > lightning-primitive-cell-factory`;
 export class LightningExperienceSettings extends BrowserforcePlugin {
-    async setupDOMObserver(page, elementName, callbackName) {
-        await page.evaluate((elementName, callbackName) => {
-            const observer = new MutationObserver((mutations) => {
-                for (const mutation of mutations) {
-                    for (const node of Array.from(mutation.addedNodes)) {
-                        if (node instanceof Element &&
-                            node.tagName.toLowerCase() === elementName) {
-                            observer.disconnect();
-                            // Call the exposed function to handle the element
-                            window[callbackName]();
-                            return;
-                        }
-                    }
-                }
-            });
-            observer.observe(document.body, { childList: true, subtree: false });
-            // Clean up observer after navigation starts (element won't appear)
-            window.addEventListener('beforeunload', () => {
-                observer.disconnect();
-            }, { once: true });
-        }, elementName, callbackName);
-    }
     async retrieve() {
         const page = await this.browserforce.openPage(BASE_PATH);
         const themes = await this.getThemeData(page);
@@ -43,18 +21,26 @@ export class LightningExperienceSettings extends BrowserforcePlugin {
         await page.close();
     }
     async getThemeData(page) {
-        await page.waitForSelector(THEME_ROW_SELECTOR);
-        const rowElementHandles = await page.$$(THEME_ROW_SELECTOR);
-        await page.waitForSelector(DEVELOPER_NAMES_SELECTOR);
-        const developerNames = await page.$$eval(DEVELOPER_NAMES_SELECTOR, (cells) => cells.map((cell) => cell.innerText));
-        const states = await page.$$eval(STATES_SELECTOR, (cells) => cells.map((cell) => cell.shadowRoot?.querySelector('lightning-primitive-icon') !== null));
-        return developerNames.map((developerName, i) => {
-            return {
+        await page.locator(THEME_ROW_SELECTOR).first().waitFor();
+        const rowLocator = page.locator(THEME_ROW_SELECTOR);
+        const rowCount = await rowLocator.count();
+        await page.locator(DEVELOPER_NAMES_SELECTOR).first().waitFor();
+        const developerNameLocator = page.locator(DEVELOPER_NAMES_SELECTOR);
+        const stateLocator = page.locator(STATES_SELECTOR);
+        const themes = [];
+        for (let i = 0; i < rowCount; i++) {
+            const developerName = await developerNameLocator.nth(i).innerText();
+            const hasIcon = await stateLocator
+                .nth(i)
+                .filter({ has: page.locator('lightning-primitive-icon') })
+                .isVisible();
+            themes.push({
                 developerName,
-                isActive: states[i],
-                rowElementHandle: rowElementHandles[i],
-            };
-        });
+                isActive: hasIcon,
+                rowLocator: rowLocator.nth(i),
+            });
+        }
+        return themes;
     }
     async setActiveTheme(page, themeDeveloperName) {
         const data = await this.getThemeData(page);
@@ -62,35 +48,37 @@ export class LightningExperienceSettings extends BrowserforcePlugin {
         if (!theme) {
             throw new Error(`Could not find theme "${themeDeveloperName}" in list of themes: ${data.map((d) => d.developerName)}`);
         }
-        // When switching from a SDLS2 to a SLDS1 theme, the following modal appears:
-        // Activate this theme?
-        // This theme uses SLDS 1. When you activate this theme, you also disable SLDS 2.
-        // - Never Mind
-        // - Activate
-        await page.exposeFunction('onModalAppeared', async () => {
-            const confirmButtonSelector = 'lightning-modal lightning-button[variant="brand"]';
-            await page.waitForSelector(confirmButtonSelector, { visible: true });
-            const confirmButton = await page.$(confirmButtonSelector);
-            if (confirmButton) {
-                await page.evaluate((e) => e.click(), confirmButton);
-            }
-        });
-        await this.setupDOMObserver(page, 'lightning-overlay-container', 'onModalAppeared');
-        const newActiveThemeRowElementHandle = theme.rowElementHandle;
-        await page.waitForSelector(`${THEME_ROW_SELECTOR} lightning-button-menu`, {
-            visible: true,
-        });
-        const menuButton = await newActiveThemeRowElementHandle.$('td lightning-primitive-cell-factory lightning-primitive-cell-actions lightning-button-menu');
-        await page.evaluate((e) => e.click(), menuButton);
-        await page.waitForSelector(`${THEME_ROW_SELECTOR} lightning-button-menu slot lightning-menu-item`, {
-            visible: true,
-        });
-        const menuItems = await menuButton.$$('slot lightning-menu-item');
+        const newActiveThemeRowLocator = theme.rowLocator;
+        await page
+            .locator(`${THEME_ROW_SELECTOR} lightning-button-menu`)
+            .first()
+            .waitFor();
+        const menuButton = newActiveThemeRowLocator.locator('td lightning-primitive-cell-factory lightning-primitive-cell-actions lightning-button-menu');
+        await menuButton.click();
+        await page
+            .locator(`${THEME_ROW_SELECTOR} lightning-button-menu slot lightning-menu-item`)
+            .first()
+            .waitFor();
         // second last item: [show, activate, preview]
-        const activateMenuItem = menuItems[menuItems.length - 2];
+        const activateMenuItem = menuButton
+            .locator('slot lightning-menu-item')
+            .nth(-2);
         await Promise.all([
-            page.waitForNavigation(),
-            page.evaluate((e) => e.click(), activateMenuItem),
+            Promise.race([
+                page.waitForEvent('load'), // immediate page reload when SLDS1 theme was activated
+                Promise.all([
+                    page.waitForEvent('load'),
+                    // When switching from a SDLS2 to a SLDS1 theme, the following modal appears:
+                    // Activate this theme?
+                    // This theme uses SLDS 1. When you activate this theme, you also disable SLDS 2.
+                    // - Never Mind
+                    // - Activate <--
+                    page
+                        .locator('lightning-modal lightning-button[variant="brand"]')
+                        .click(),
+                ]),
+            ]),
+            activateMenuItem.click(),
         ]);
     }
 }

package/lib/plugins/lightning-experience-settings/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/lightning-experience-settings/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/lightning-experience-settings/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/linkedin-sales-navigator-settings/page.d.ts

@@ -1,4 +1,4 @@
-import { Page } from 'puppeteer';
+import type { Page } from 'playwright';
 export declare class LinkedInSalesNavigatorPage {
     private page;
     constructor(page: Page);

package/lib/plugins/linkedin-sales-navigator-settings/page.js

@@ -1,7 +1,9 @@
-import { throwPageErrors } from '../../browserforce.js';
+import { waitForPageErrors } from '../../browserforce.js';
 const ENABLE_TOGGLE = 'div[data-aura-class="setup_sales_linkedinLinkedInSetupRow"] input[type="checkbox"]:not(:disabled)';
-const CONFIRM_CHECKBOX = 'lightning-input lightning-primitive-input-checkbox input[name="LinkedIn Sales Navigator Integration Acceptance Checkbox"]:not(:disabled)';
-const ACCEPT_BUTTON = 'section[data-aura-class="setup_sales_linkedinLinkedInSetupAcceptTermsModal"] div div button:not(:disabled):nth-child(2)';
+// unfortunately the divs intercept pointer events so we need to click on the label instead
+const ENABLE_BUTTON = 'div[data-aura-class="setup_sales_linkedinLinkedInSetupRow"]:has(input[type="checkbox"]:not(:disabled)) label';
+const CONFIRM_CHECKBOX = 'section[role="dialog"] lightning-input lightning-primitive-input-checkbox';
+const ACCEPT_BUTTON = 'section[role="dialog"] div div button:not(:disabled):nth-child(2)';
 export class LinkedInSalesNavigatorPage {
     page;
     constructor(page) {
@@ -11,21 +13,24 @@ export class LinkedInSalesNavigatorPage {
         return 'lightning/setup/LinkedInSalesNavigatorPage/home';
     }
     async getStatus() {
-        const isEnabled = await this.page
-            .locator(ENABLE_TOGGLE)
-            .map((checkbox) => checkbox.checked)
-            .wait();
+        const isEnabled = await this.page.locator(ENABLE_TOGGLE).isChecked();
         await this.page.close();
         return isEnabled;
     }
     async setStatus(enable) {
-        // NOTE: Unfortunately a simple click() on the locator does not work here
-        await (await this.page.locator(ENABLE_TOGGLE).waitHandle()).evaluate((checkbox) => checkbox.click());
+        const afterSavePromise = Promise.race([
+            this.page.waitForResponse(/LinkedInIntegrationSetup.updatePref=1/),
+            waitForPageErrors(this.page),
+        ]);
         if (enable) {
-            await (await this.page.locator(CONFIRM_CHECKBOX).waitHandle()).evaluate((checkbox) => checkbox.click());
-            await (await this.page.locator(ACCEPT_BUTTON).waitHandle()).evaluate((button) => button.click());
+            await this.page.locator(ENABLE_BUTTON).click();
+            await this.page.locator(CONFIRM_CHECKBOX).click();
+            await this.page.locator(ACCEPT_BUTTON).click();
         }
-        await throwPageErrors(this.page);
+        else {
+            await this.page.locator(ENABLE_BUTTON).click();
+        }
+        await afterSavePromise;
         await this.page.close();
     }
 }

package/lib/plugins/linkedin-sales-navigator-settings/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/plugins/linkedin-sales-navigator-settings/page.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,aAAa,GACjB,mGAAmG,CAAC;AACtG,MAAM,gBAAgB,GACpB,0IAA0I,CAAC;AAC7I,MAAM,aAAa,GACjB,yHAAyH,CAAC;AAE5H,MAAM,OAAO,0BAA0B;IAC7B,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,iDAAiD,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI;aAC9B,OAAO,CAAC,aAAa,CAAC;aACtB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;aACnC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,MAAe;QACpC,yEAAyE;QACzE,MAAM,CACJ,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,UAAU,EAAE,CACpD,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CACJ,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CACvD,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC3C,MAAM,CACJ,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,UAAU,EAAE,CACpD,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/plugins/linkedin-sales-navigator-settings/page.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,aAAa,GACjB,mGAAmG,CAAC;AAEtG,2FAA2F;AAC3F,MAAM,aAAa,GACjB,8GAA8G,CAAC;AACjH,MAAM,gBAAgB,GACpB,2EAA2E,CAAC;AAC9E,MAAM,aAAa,GACjB,mEAAmE,CAAC;AAEtE,MAAM,OAAO,0BAA0B;IAC7B,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,OAAO,iDAAiD,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,CAAC;QACrE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,MAAe;QACpC,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,uCAAuC,CAAC;YAClE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAAC;YAClD,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;QACjD,CAAC;QACD,MAAM,gBAAgB,CAAC;QACvB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF"}

package/lib/plugins/omni-channel-settings/index.e2e-spec.js

@@ -14,11 +14,15 @@ describe(OmniChannelSettings.name, function () {
     };
     it('should enable status based capacity model', async () => {
         await plugin.run(configEnableStatusBasedCapacityModel);
+    });
+    it('should verify status based capacity model is enabled', async () => {
         const res = await plugin.retrieve();
         assert.deepStrictEqual(res, configEnableStatusBasedCapacityModel);
     });
     it('should disable status based capacity model', async () => {
         await plugin.run(configDisableStatusBasedCapacityModel);
+    });
+    it('should verify status based capacity model is disabled', async () => {
         const res = await plugin.retrieve();
         assert.deepStrictEqual(res, configDisableStatusBasedCapacityModel);
     });

package/lib/plugins/omni-channel-settings/index.e2e-spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/omni-channel-settings/index.e2e-spec.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE;IACjC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,IAAI,MAA2B,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE;QACV,MAAM,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,oCAAoC,GAAG;QAC3C,8BAA8B,EAAE,IAAI;KACrC,CAAC;IACF,MAAM,qCAAqC,GAAG;QAC5C,8BAA8B,EAAE,KAAK;KACtC,CAAC;IAEF,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/omni-channel-settings/index.e2e-spec.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE;IACjC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,IAAI,MAA2B,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE;QACV,MAAM,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,oCAAoC,GAAG;QAC3C,8BAA8B,EAAE,IAAI;KACrC,CAAC;IACF,MAAM,qCAAqC,GAAG;QAC5C,8BAA8B,EAAE,KAAK;KACtC,CAAC;IAEF,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/plugins/omni-channel-settings/index.js

@@ -4,25 +4,20 @@ const SAVE_BUTTON_SELECTOR = 'input[id$=":save"]';
 const STATUS_CAPACITY_TOGGLE_SELECTOR = 'input[id$=":toggleOmniStatusCapModelPref"]';
 export class OmniChannelSettings extends BrowserforcePlugin {
     async retrieve(definition) {
-        // Open the omni-channel setup page
         const page = await this.browserforce.openPage(BASE_PATH);
-        // Retrieve the service channel config
-        await page.waitForSelector(STATUS_CAPACITY_TOGGLE_SELECTOR);
-        const enableStatusBasedCapacityModel = await page.$eval(STATUS_CAPACITY_TOGGLE_SELECTOR, (el) => (el.getAttribute('checked') === 'checked' ? true : false));
+        const enableStatusBasedCapacityModel = await page
+            .locator(STATUS_CAPACITY_TOGGLE_SELECTOR)
+            .isChecked();
         return { enableStatusBasedCapacityModel };
     }
     async apply(config) {
-        // Open the omni-channel setup page
         const page = await this.browserforce.openPage(BASE_PATH);
-        // Click the checkbox
-        const capacityModel = await page.waitForSelector(STATUS_CAPACITY_TOGGLE_SELECTOR);
-        await capacityModel.click();
-        // Save the settings
-        const saveButton = await page.waitForSelector(SAVE_BUTTON_SELECTOR);
-        await saveButton.click();
-        // Wait for the page to refresh
-        await page.waitForNavigation();
-        // Close the page
+        await page.locator(STATUS_CAPACITY_TOGGLE_SELECTOR).click();
+        await page.locator(SAVE_BUTTON_SELECTOR).click();
+        // omnichannel/settings.apexp
+        // ->
+        // omnichannel/settings.apexp?setupid=OmniChannelSettings
+        await page.waitForURL((url) => url.searchParams.has('setupid', 'OmniChannelSettings'));
         await page.close();
     }
 }

package/lib/plugins/omni-channel-settings/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/omni-channel-settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,4BAA4B,CAAC;AAE/C,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAClD,MAAM,+BAA+B,GACnC,4CAA4C,CAAC;AAM/C,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB;IAClD,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,mCAAmC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzD,sCAAsC;QACtC,MAAM,IAAI,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC;QAC5D,MAAM,8BAA8B,GAAG,MAAM,IAAI,CAAC,KAAK,CACrD,+BAA+B,EAC/B,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAClE,CAAC;QAEF,OAAO,EAAE,8BAA8B,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,mCAAmC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEzD,qBAAqB;QACrB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAC9C,+BAA+B,CAChC,CAAC;QACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;QAE5B,oBAAoB;QACpB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;QACpE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;QAEzB,+BAA+B;QAC/B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAE/B,iBAAiB;QACjB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/omni-channel-settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,SAAS,GAAG,4BAA4B,CAAC;AAE/C,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAClD,MAAM,+BAA+B,GACnC,4CAA4C,CAAC;AAM/C,MAAM,OAAO,mBAAoB,SAAQ,kBAAkB;IAClD,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,8BAA8B,GAAG,MAAM,IAAI;aAC9C,OAAO,CAAC,+BAA+B,CAAC;aACxC,SAAS,EAAE,CAAC;QACf,OAAO,EAAE,8BAA8B,EAAE,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC,KAAK,EAAE,CAAC;QAC5D,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC;QACjD,6BAA6B;QAC7B,KAAK;QACL,yDAAyD;QACzD,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CACvD,CAAC;QACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}